262c0688de
Merge pull request #16845 from Shadowlight213/Bluemag
...
Adds bluespace emag as a badmin item
2016-04-15 20:26:02 -04:00
ea3fea4d63
fixes dna injector bug
2016-04-14 12:45:05 -07:00
2f52e7daf9
Merge pull request #16829 from erwgd/LetUsMakeDinnerware
...
New autolathe category for kitchen+bar items
2016-04-14 11:56:21 -05:00
95b41dfaee
Merge pull request #16851 from coiax/helpimonfire
...
Using fire extinguisher in help intent is helpful
2016-04-14 11:47:17 -05:00
d8a724f1c4
Merge pull request #16806 from coiax/airlock-painter
...
Airlock painter now printable in autolathe; plus meme suicides
2016-04-14 09:29:10 -04:00
54675eb415
Only call get lungs once
2016-04-14 08:27:59 +01:00
7eb6ed727e
Merge pull request #16838 from Shadowlight213/implantlogging
...
Explosive implant logging and general improvements.
2016-04-13 18:11:30 -05:00
6aa77cc95d
Removed unneeded seperation
2016-04-13 22:13:02 +01:00
51b41fc124
Use correct variable names and correct proc calls
2016-04-13 22:09:26 +01:00
64f5f1a08e
Removed check preventing self target extinguisher
...
The comment on this code segment implies it's to stop the fire
extinguisher from going off when put in a bag. Except it doesn't go
off when put in a bag, even without this code check.
As such, it was stopping self targeting with a fire extinguisher.
Make sure the safety is off though!
2016-04-13 18:17:00 +01:00
cafd76c7f2
Handled case where someone lost their lungs
...
We won't remove your lungs if you don't have any. But how did you
manage to lose them in this tiny window, you horrible person?
2016-04-13 11:33:25 +01:00
01a3d0e761
Added help to extinguisher/attack but bugged
...
It's not triggering the afterattack proc to spray the water...
2016-04-13 11:25:11 +01:00
5ebf9be9ab
Grammar
2016-04-12 21:02:49 -07:00
24770414cc
desc change
2016-04-12 20:01:31 -07:00
0364d1850b
Adds bluespace emag
...
Removes depreciated clown data card.
2016-04-12 19:45:18 -07:00
d2e2e3f6d3
Made explosive implants actually log who triggered them
...
Removed some copy pasta
Made explosive implants not drop brains
2016-04-12 15:26:53 -07:00
4c8ea85b59
Merge pull request #16810 from Shadowlight213/giftsprite
...
Fixes gift sprite
2016-04-12 17:19:49 -05:00
55677ea370
Make the floor wet when you empty the extinguisher
2016-04-12 21:52:22 +01:00
9c535cf7e8
Vomit out my colorful lungs in front of me
...
Removed the sleeps, moved the lungs in front of you, added a case
for no lungs.
2016-04-12 21:36:45 +01:00
0d1cdfd9e9
Put in checks for medical wrench suicide
...
Better make sure user is still around and they haven't died during their
suicide.
2016-04-12 20:52:29 +01:00
0078f91d8a
Added hacked autolathe design for butcher cleaver
...
Defined materials for butcher cleaver
2016-04-12 20:01:26 +01:00
f0a6af827e
Added bowl design to biogenerator.dm
...
Added recipes for fork and drinking glass to autolathe_designs.dm
Defined materials for fork, bowl, drinking glass
2016-04-12 19:39:09 +01:00
9e85fe81be
Merge pull request #16743 from TrustyGun/flask
...
Changes Flasks a little
2016-04-12 00:03:19 -05:00
89b0b3c50e
Fixes gift sprite
2016-04-11 11:32:32 -07:00
cb68053368
Meme suicide: M E D I C A L W R E N C H
...
Pray to it, and it'll set you free of your earthly concerns.
2016-04-11 14:21:24 +01:00
373aac1dfd
Suicide memes: Airlock painter edition
...
Hope you have enough toner to commit suicide with, although I'm pretty
sure that all that dye is good for your lungs.
2016-04-11 13:32:04 +01:00
98cb68f78a
Fixes spelling error in message
2016-04-11 11:55:25 +01:00
9a6b11e785
Merge branch 'master' of https://github.com/tgstation/-tg-station into golemship
...
# Conflicts:
# config/admins.txt
2016-04-10 17:13:19 -07:00
af01ed7e00
Golem ship tweaks and additions
2016-04-09 21:19:38 -07:00
84ae3dd731
...
2016-04-09 12:33:32 -04:00
022d9e573f
okay mr.phil man
2016-04-09 10:43:35 -04:00
927e08d271
Flasks!
2016-04-08 06:26:30 -04:00
13bb58dbc0
orange prisoner ids now show up in wallets
2016-04-07 19:27:17 -04:00
b8026883ee
Adds the Medical Wrench
2016-04-06 12:56:38 -04:00
abe689cac9
Merge pull request #16587 from xxalpha/cigbrand
...
Cigarette packs will brand their cigarettes.
2016-04-05 19:59:09 +02:00
a6cd496c95
Merge pull request #16521 from erwgd/StorageEnhance
...
Exosuit and utility belt enhancements, holster description change
2016-04-04 20:57:03 -05:00
b271395b06
Merge pull request #16573 from bgobandit/carrotrobustness
...
Minor knife changes.
2016-04-04 17:47:09 -05:00
cf4ffc2781
Merge pull request #16026 from duncathan/turfs
...
[REVIEW-READY] removes simulated turfs (and asteroid station)
2016-04-04 01:49:45 -05:00
4a43bdbfda
Merge pull request #16589 from psykzz/patch-1
...
Suicide messages
2016-04-03 22:01:30 -05:00
a2a554c48a
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
code/game/objects/explosion.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/structures/girders.dm
code/game/objects/structures/grille.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/events/wormholes.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
73bb67a1ea
typo
2016-04-03 07:02:59 -04:00
d6301ff735
Cigarette packs will brand their cigarettes.
...
an
the macros dont work
2016-04-03 10:42:53 +01:00
af51a66e37
Adds sandbags
...
* sandbgs an stuff
* mmmm
* fucking sandbags
* okokok
* aaaaaaaaaaaaaaaaaaaaaah
2016-04-02 23:52:12 -04:00
70040af586
Suicide messages
2016-04-03 01:51:46 +01:00
5e3727a85f
Minor knife changes.
2016-04-02 03:40:26 -04:00
efe5ec8dbc
Merge pull request #16500 from erwgd/SpearIntoLathe
...
Cable restraints and spears can be recycled in autolathe, but not zipties
2016-04-01 20:47:16 -05:00
82350431b2
Merge pull request #16439 from KorPhaeron/mecha2
...
Mining Gear Balance
2016-03-31 22:10:07 -04:00
2c7fda0148
removed a redundant carried in shoulder holster desc
2016-03-31 13:07:47 +01:00
5c90078c5b
Lets you carry gloves in tool, sec, med and jani belts, bounced radios in tool, sec and med, edited shoulder holster description, let you carry handheld crew monitor in labcoats
2016-03-31 12:19:15 +01:00
03216dce2e
Merge pull request #16465 from TehZombehz/foodbox
...
Adds random ingredient food packages to chefs
2016-03-31 04:03:09 -05:00
Joan Lung
PKPenguin321
Cheridan
Jack Edge
Shadowlight213
KorPhaeron
erwgd
RandomMarine
TrustyGun
AnturK
duncathan
bgobandit
xxalpha
bawhoppen
Matt Smith