726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
5b0aba0e67
Merge pull request #4262 from kyrahabattoir/ItemNameFixing07-2014
...
Another lowercasing pass on a bunch of items and furnitures.
2014-08-02 18:02:50 -07:00
c74601646a
Merge pull request #4287 from AndroidSFV/taperecorderfix
...
Fixes a minor span class in tape recorder
2014-07-31 22:28:27 -05:00
1b2c95a81c
Merge branch 'master' into ItemNameFixing07-2014
2014-07-31 18:54:38 +02:00
589d38660a
Merge pull request #3967 from CollenN/radscanner
...
Adds Radioactive Microlaser to Traitor Arsenal
2014-07-30 10:13:10 +01:00
99e7957db0
Fixes a minor span class in tape recorder
2014-07-29 14:59:51 -05:00
fcb2fb9de3
Another lowercasing pass on a bunch of items and furnitures.
...
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
2014-07-27 19:14:40 +02:00
3bf4ecfba5
fixes laziness
2014-07-18 18:30:23 -07:00
fc4c299252
Lighting cigarettes with flares/torches
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-07-16 16:34:42 +02:00
cf7c466779
Merge pull request #4144 from Rockdtben/securityPDA
...
PDA - Security Records were missing tables.
2014-07-14 14:17:11 +01:00
72423a7bd0
Merge pull request #4059 from Miauw62/goodbyeparapen
...
Replaces the parapen
2014-07-14 12:47:14 +01:00
9173a46bfd
Makes C4 unable to be planted on mobs and reduces C4 cost to 1 TC
2014-07-14 13:28:42 +02:00
eddcde41a8
Merge pull request #4135 from Rolan7/Issue_1919
...
Fixes tray layer issue
2014-07-14 09:26:05 +01:00
0e26850893
PDA - Security Records were missing tables.
...
Fixed a bug where printing would stop working if a record was deleted.
2014-07-12 20:54:47 -05:00
d567d23be8
Changes the layer for items on trays to -1. This makes them display on top of the tray, but not above other things.
2014-07-11 22:17:03 -04:00
7a853c5f86
round 2
2014-07-10 20:24:49 -07:00
b92397a2e3
paprikkas gay
2014-07-10 20:12:24 -07:00
0aae810b87
fixes merge issue with killer tomatoes
...
fixes soap
2014-07-07 13:59:59 -05:00
065028cf1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications
...
i am going to murder you miauw
2014-07-07 12:51:56 -05:00
7b90557dea
..()
2014-07-07 13:46:59 -04:00
f88b6a6c4d
Merge pull request #4069 from AstralSerpent/borgment_harmweldhertz
...
Using a welding tool on augmented limbs, cyborgs or bots will hurt while on harm intent, instead of heal.
2014-07-07 10:25:45 +01:00
d497387355
Merge pull request #4048 from Kelenius/OfAIAndHUD
...
Gives the AI a simple hud
2014-07-06 12:58:13 -05:00
e9d2124220
usr -> user
2014-07-06 21:33:05 +04:00
92cd196731
Stuff 2
2014-07-06 08:54:07 -04:00
ae0be09cba
Stuff
...
Stuff: The Commit: The Update
2014-07-05 22:53:19 -04:00
10c9d4d14e
Attacking augmented limbs or cyborgs with a welder on harm intent will actually harm.
2014-07-06 02:33:13 +10:00
52c9abbd27
Growns: The OOPening.
...
Refactors grown.dm to use OO programming techniques.
merge commit
conflict in map
map fix
fixing the map. again. thanks obama.
map commit
wtf
Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications
map conflict fix. this should work.
updates metastation
2014-07-03 16:43:07 -05:00
d8ae776f64
Gives the AI a hud
2014-07-03 18:52:11 +04:00
b02b93ce2a
Notifications + Random Stuff
...
Adds sound notifications for Ninja and Wizard Apprentice spawning -- hopefully means fewer afk antags.
Adds a ghostnotice span class, used in the new notify_ghosts proc. Upon creation, things that require ghostly attention (NarSie, golem runes) give more visible messages to the dead.
Retires the 'moderate' span class, which was only used in tomato throwing? Refactors tomato code (this ended up being the meat of this PR, somehow...)
Reorganizes some item definition/procs.
2014-07-01 23:16:02 -05:00
734558f7cc
Removes reagent check
...
I've been somewhat busy recently.
2014-06-30 17:01:29 -04:00
854d6452f6
Merge pull request #3978 from LandoTheClimber/lockboxpda
...
Allows PDA's to unlock lockboxes.
2014-06-25 11:56:00 -05:00
c6bd1174b1
Switched it to use GetID() proc
2014-06-23 07:45:45 -04:00
1494b8062f
Makes the spare PDA box on the bridge not invisible
2014-06-22 16:21:42 -07:00
756b317e4e
Allows PDA's to unlock lockboxes.
2014-06-22 16:04:59 -04:00
36261f94c8
return 1
2014-06-21 15:40:16 -04:00
5913913c45
Fixes scan message
...
Now it uses the right color and punctuation
2014-06-21 15:26:16 -04:00
c2dacb8d1f
Balancing
...
Tweaks the cooldown numbers, as well as the wavelength calculations.
Anti-toxin, hyronalin, and arithrazine all reduce the effects of the
radiation now.
2014-06-21 14:30:49 -04:00
39fb126171
Merge pull request #3963 from Miauw62/itsnotmyfault
...
Removes custom law board confusion
2014-06-21 01:08:49 -05:00
f786a6c2c0
Merge pull request #3959 from CollenN/mutrace-final
...
Finalizes Mutantrace Datum Update
2014-06-20 21:47:54 -05:00
d50c2b9ec9
Adds Radioactive Microlaser
...
Adds the radioactive microlaser, a device disguised as a health analyzer
used to irradiate people, as a traitor item. It costs 4 telecrystals to
purchase, and is fairly powerful in clever hands.
The strength of the radiation is determined by the 'intensity' setting,
while the delay between the scan and the irradiation kicking in is
determined by the wavelength.
Each scan will cause the microlaser to have a brief cooldown period.
Higher intensity will increase the cooldown, while higher wavelength
will decrease it.
Wavelength is also slightly increased by the intensity as well.
2014-06-20 20:58:14 -04:00
06edd41bab
Merge pull request #3889 from Kelenius/OfCyborgsAndModules
...
Of cyborgs and modules
2014-06-20 15:03:15 -05:00
80a093643c
Removes confusion because players cannot understand my genius.
2014-06-20 14:55:04 +02:00
2aab5fa71c
Finalizes Mutantrace Datum Update
...
https://github.com/tgstation/-tg-station/pull/3609
Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
2dc79a7bbe
Merge pull request #3836 from phil235/TachyonDetectorFix
...
Fix Tachyon detector and TTV not being deleted if exploding inside something
2014-06-19 11:01:14 +01:00
6d80b17745
Merge pull request #3886 from Cheridan/burnitall
...
Burnables
2014-06-19 11:00:04 +01:00
a8b7588c12
Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
...
Conflicts:
code/game/objects/items/weapons/grenades/ghettobomb.dm
code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
caef47f075
removing the commented part
2014-06-18 20:59:03 +02:00
a3a0ede3a0
Merge pull request #3922 from phil235/BlindHealthScanFix
...
Scanners messages fix
2014-06-16 10:43:50 +01:00
c84f26a96d
Scanners messages fix
2014-06-13 22:36:36 +02:00
df285ff7b3
Resolved conflicts:
...
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
paprka
MrPerson
Cheridan
KyrahAbattoir
Alex
AndroidSFV
Firecage
Miauw
Rockdtben
Rolan7
CollenN
Ben G.
Kelenius
AstralSerpent
LandoTheClimber
phil235
ikarrus