Alex
589d38660a
Merge pull request #3967 from CollenN/radscanner
...
Adds Radioactive Microlaser to Traitor Arsenal
2014-07-30 10:13:10 +01:00
paprka
056289a273
fixed moving between adjacent tables
2014-07-29 09:12:01 -07:00
Firecage
2df25335e2
You cannot instant wrench dislodged girders.
2014-07-26 23:25:01 +02:00
Alex
e4de28b13e
Merge pull request #4170 from RemieRichards/FixDoorLockerWeld
...
Fixes Permanent Airlock welding, adds sound to dismantling a locker
2014-07-22 15:18:32 +01:00
Alex
172322c0ad
Merge pull request #4192 from paprka/sleepyfix
...
Fixes miauw's parapen laziness
2014-07-22 15:16:46 +01:00
Alex
07267b4220
Merge pull request #4208 from paprka/tfwnogrille
...
Grille hitting text fix.
2014-07-22 08:02:55 +01:00
paprka
9747d26081
you no longer kick grilles
2014-07-20 22:58:48 -07:00
Firecage
7779a2f7e8
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-20 21:10:53 +02:00
paprka
3bf4ecfba5
fixes laziness
2014-07-18 18:30:23 -07:00
Firecage
fc4c299252
Lighting cigarettes with flares/torches
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-07-16 16:34:42 +02:00
Robson Richards
fdadd6ad86
Fixes Permanent Airlock welding, adds sound to dismantling a locker
2014-07-16 00:45:38 +01:00
Alex
cf7c466779
Merge pull request #4144 from Rockdtben/securityPDA
...
PDA - Security Records were missing tables.
2014-07-14 14:17:11 +01:00
Alex
72423a7bd0
Merge pull request #4059 from Miauw62/goodbyeparapen
...
Replaces the parapen
2014-07-14 12:47:14 +01:00
Miauw
9173a46bfd
Makes C4 unable to be planted on mobs and reduces C4 cost to 1 TC
2014-07-14 13:28:42 +02:00
Alex
eddcde41a8
Merge pull request #4135 from Rolan7/Issue_1919
...
Fixes tray layer issue
2014-07-14 09:26:05 +01:00
Rockdtben
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
Rolan7
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
paprka
7a853c5f86
round 2
2014-07-10 20:24:49 -07:00
paprka
b92397a2e3
paprikkas gay
2014-07-10 20:12:24 -07:00
Cheridan
0aae810b87
fixes merge issue with killer tomatoes
...
fixes soap
2014-07-07 13:59:59 -05:00
Cheridan
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
CollenN
7b90557dea
..()
2014-07-07 13:46:59 -04:00
Alex
8e883deff7
Merge pull request #4057 from Aranclanos/OfficeChairs
...
Rolling chairs fixes.
2014-07-07 10:27:03 +01:00
Alex
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
Ben G.
d497387355
Merge pull request #4048 from Kelenius/OfAIAndHUD
...
Gives the AI a simple hud
2014-07-06 12:58:13 -05:00
Kelenius
e9d2124220
usr -> user
2014-07-06 21:33:05 +04:00
ikarrus
81e9431c64
Resolved Conflicts:
...
_maps/map_files/tgstation.2.1.3.dmm
2014-07-06 10:37:05 -06:00
CollenN
92cd196731
Stuff 2
2014-07-06 08:54:07 -04:00
CollenN
ae0be09cba
Stuff
...
Stuff: The Commit: The Update
2014-07-05 22:53:19 -04:00
AstralSerpent
10c9d4d14e
Attacking augmented limbs or cyborgs with a welder on harm intent will actually harm.
2014-07-06 02:33:13 +10:00
Aranclanos
5c03b51879
Office/rolling chairs will now work properly when carrying mobs, those will not slip out of the chair, becoming an ungrabless mobs. And the direction of the chair and mob will be better and easier to notice when they bump something.
...
Their direction changes will work even better if mob movement code finally removes all the spawn() calls. I'm not planning of adding any special code for that here.
2014-07-04 04:46:32 -03:00
Cheridan
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
Alex
a68c426301
Merge pull request #4038 from Cheridan/ghost_notifications
...
Notifications + Random Stuff
2014-07-03 17:29:49 +01:00
Kelenius
d8ae776f64
Gives the AI a hud
2014-07-03 18:52:11 +04:00
Alex
78679366a7
Merge pull request #4030 from Aranclanos/singforthemoment
...
fixes issue #4025 - service borg violin not working
2014-07-03 13:43:20 +01:00
Cheridan
d34f9fd02e
Merge pull request #3946 from RemieRichards/16/06/2014-AirlockWelding
...
Airlocks and Lockers take time to weld and unweld
2014-07-01 23:22:51 -05:00
Cheridan
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
ikarrus
a89054dfaa
Resolving Conflicts:
...
_maps/map_files/tgstation.2.1.3.dmm
code/controllers/configuration.dm
config/game_options.txt
2014-07-01 13:31:08 -06:00
Aranclanos
e47095d376
fixes issue #4025
...
the song datum will now use properly the canUseTopic() proc
2014-07-01 00:00:40 -03:00
CollenN
734558f7cc
Removes reagent check
...
I've been somewhat busy recently.
2014-06-30 17:01:29 -04:00
Aranclanos
c65aa2b5a4
Merge pull request #4000 from Cheridan/terribleidea
...
MONKEY MODE REDUX
2014-06-30 16:27:22 -03:00
Cheridan
854d6452f6
Merge pull request #3978 from LandoTheClimber/lockboxpda
...
Allows PDA's to unlock lockboxes.
2014-06-25 11:56:00 -05:00
LandoTheClimber
c6bd1174b1
Switched it to use GetID() proc
2014-06-23 07:45:45 -04:00
MrPerson
1494b8062f
Makes the spare PDA box on the bridge not invisible
2014-06-22 16:21:42 -07:00
LandoTheClimber
756b317e4e
Allows PDA's to unlock lockboxes.
2014-06-22 16:04:59 -04:00
CollenN
36261f94c8
return 1
2014-06-21 15:40:16 -04:00
CollenN
5913913c45
Fixes scan message
...
Now it uses the right color and punctuation
2014-06-21 15:26:16 -04:00
CollenN
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
Cheridan
39fb126171
Merge pull request #3963 from Miauw62/itsnotmyfault
...
Removes custom law board confusion
2014-06-21 01:08:49 -05:00
Cheridan
f786a6c2c0
Merge pull request #3959 from CollenN/mutrace-final
...
Finalizes Mutantrace Datum Update
2014-06-20 21:47:54 -05:00
