a7c0ca8dfd
Merge pull request #4506 from Jordie0608/itsawondernanotrasendoesntreplaceweldingfuelwithsomethinglessvolatile
...
Makes welderbombs use fueltank's ex_act
2014-08-21 22:14:13 -05:00
7ac7ecb277
Summon Events Initial Commit: See the pull for complete details
2014-08-21 20:05:41 -04:00
4198e61af1
This fixes the message issues
2014-08-22 01:15:13 +02:00
44383ec1c8
Disregard that I suck cocks
2014-08-21 07:35:51 -07:00
f5c3d0b9cf
Fix for 1 use freedom implant
2014-08-21 16:11:26 +02:00
f17200bc7f
Makes welderbombs use fueltank's ex_act
2014-08-21 00:56:17 +10:00
13b03a6d43
Hopefully final pass of object -> mob examine switch
2014-08-20 07:07:30 -07:00
d0c97aae72
Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/game/gamemodes/cult/ritual.dm
code/game/gamemodes/nuclear/pinpointer.dm
code/game/machinery/spaceheater.dm
code/game/machinery/status_display.dm
code/game/objects/effects/decals/crayon.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/airlock_painter.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/items/weapons/storage/secure.dm
code/game/objects/items/weapons/tanks/tank_types.dm
code/modules/assembly/assembly.dm
code/modules/assembly/holder.dm
code/modules/assembly/mousetrap.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/mob/living/carbon/slime/examine.dm
code/modules/power/cable.dm
code/modules/reagents/grenade_launcher.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/recycling/sortingmachinery.dm
Thanks Firecage, this is all your fault
2014-08-20 05:54:20 -07:00
09071b88d5
Merge pull request #4357 from paprka/nerfninja
...
Makes ninja less stupidly broken (balancing)
2014-08-16 04:13:49 -07:00
cb27ad34a6
Cutting cables, too
2014-08-15 19:50:09 -06:00
3fe03bbea7
Constructing Tables will add fingerprints
2014-08-15 19:40:04 -06:00
74c22755be
Merge pull request #4365 from paprka/fingerlessgloves
...
Adds fingerless gloves, other glove related changes
2014-08-15 08:03:37 +01:00
ff25503b4d
Merge pull request #4384 from Ikarrus/deputybands
...
[MAP] Boxstation Update and Deputy Armbands
2014-08-12 08:12:15 +01:00
e3c26bfdd1
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/game/objects/items/weapons/storage/uplink_kits.dm
2014-08-09 16:19:33 -07:00
8a5d1325d1
Update boxes.dm
2014-08-09 14:23:37 -06:00
22e0081cf3
Resolved Conflicts:
...
code/game/objects/items/weapons/storage/boxes.dm
2014-08-09 14:19:43 -06:00
3c96428603
[MAP] Boxstation Update and Deputy Armbands
...
-Singularity engine is now sealed off from outer space, making it more secure from saboteurs and safe from meteors
-Deputy armbands (red) added to HoS office. These can be ad-hoc distributed by the HoS when deputizing crew
-Slight remap of HoS office to fit everything in there. added a filing cabinet and paper, too
-Shutters added under robotics and R&D's primary hallway windows
-Filing cabinet and paper added in bridge
2014-08-09 14:11:04 -06:00
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
24b18fad93
Absolute paths for item files.
2014-08-07 23:02:43 +02:00
3b00fa9cfa
cargonia strong!
2014-08-07 05:51:27 -07:00
c09d8981fe
makes ninja less stupidly broken
2014-08-06 15:13:06 -07:00
6b42d39228
does more shit
2014-08-05 19:17:21 +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
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
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
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
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
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
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
c6bd1174b1
Switched it to use GetID() proc
2014-06-23 07:45:45 -04:00
756b317e4e
Allows PDA's to unlock lockboxes.
2014-06-22 16:04:59 -04:00
39fb126171
Merge pull request #3963 from Miauw62/itsnotmyfault
...
Removes custom law board confusion
2014-06-21 01:08:49 -05: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
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
c43518351f
Some fixes and minor improvements to examining.
2014-06-13 09:01:52 -07:00
df285ff7b3
Resolved conflicts:
...
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
0aa1b9cae1
Merge pull request #3907 from Ikarrus/nosearchstrip
...
Non-carbon mobs can no longer search storage items
2014-06-13 09:16:59 +01:00
f00c623514
Reverted stripping restrictions
2014-06-12 09:29:45 -06:00
a8432993c0
Cyborgs can no longer strip people or search storage items
...
-Secborgs can still use their handcuff module to uncuff people
2014-06-11 21:50:41 -06:00
4cd64a51d1
Changed the weighting on blast range, 4 turns out to be quite big so shouldn't happen too often
2014-06-12 01:09:58 +01:00
5da7210e97
Changed the IEDs name and desc to firebombs
...
Changed changelog entry per request
2014-06-11 19:30:52 +01:00
01a7c23b94
Merge branch 'master' of https://github.com/tgstation/-tg-station into iracocktail
2014-06-11 19:06:44 +01:00
Cheridan
Incoming
Firecage
MrPerson
Jordie0608
ikarrus
Alex
paprka
Miauw
Rolan7
AstralSerpent
LandoTheClimber
Kelenius
phil235
Malkevin