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
7f328ba077
Added ORIGINAL CONTENT skeleton toys that chatter when you play with them ( #16792 )
...
* Step one, aquire voices for skeletons
* Moved sounds to their own folder
* Added samples of up to ten phomemes long for papyrus
* Added samples of up to ten sans phomemes
* Add skeleton talking
Skeletons now produce audible sound effects representing their distinctive
speech.
* Skeletons now respect punctuation in their chatter
Except for semi-colons, due to HTML escapes of the ' character.
* Lowered volume of skeleton phomemes
* Use Dunc's regex for parsing messages
* Added sans and papyrus toy sprites
Spriting is hard. But I think I managed to crush the images down to fit
in our 32x32 box.
* Generic talking action figures
Talking action figures like the owl figure and the griffin figure are
now generic, and have a pool of messages to pick from. This allows us to
make our TOTALLY ORIGINAL skeleton toys.
* Added the toys to the prize list
No point making these if you can't get them.
* Moved skeleton vocalising code into toys
* Fixes runtimes and bugs with skeleton talk
Remaking the regex each time makes sure it gives output everytime,
and we've also put a check that the item in the list is actually
a number before calling max() that was causing a runtime previously.
* Restored original form of skeleton span picking
Remie's was better.
* More messages for skeleton toys
I think that's probably enough to satisfy me.
* Changed for loop to new style
2016-04-14 09:30:33 -04: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
b19a638af3
Merge pull request #16805 from KorPhaeron/gravity
...
Fixes gravity in new areas
2016-04-14 09:21:43 -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
4b7f274e3f
Merge pull request #16742 from Core0verload/master
...
Cargo Exports (and a very basic economy system)
2016-04-13 17:41:05 +02: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
05cdcabb48
Gravity Fix
2016-04-12 22:13:23 -05:00
04f1aafa78
Exports
2016-04-13 06:01:40 +03: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
c907776872
Merge pull request #16814 from erwgd/PlankMakeRollingPin
...
Add rolling pin datum to wooden plank recipes
2016-04-12 17:29:26 -05: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
dbae4b78e0
2 planks are needed to craft rolling pin
2016-04-11 22:41:03 +01:00
249a81dd15
Update sheet_types.dm
...
changed planks required from 10 to 1 to make rolling pin
2016-04-11 22:37:46 +01:00
b2eea7769f
Added rolling pin recipe datum to wooden plank
2016-04-11 21:40:44 +01: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
5329bbf60c
Fixes gravity in new areas
2016-04-11 07:54:28 -05: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
a1eb2d459b
Merge pull request #16729 from RemieRichards/holomap_port
...
Station blueprints improvements
2016-04-10 13:40:34 -05:00
af01ed7e00
Golem ship tweaks and additions
2016-04-09 21:19:38 -07:00
4f108b6913
Merge pull request #16745 from coiax/muh-ore-box
...
Ore box changes
2016-04-09 15:43:02 -05:00
84ae3dd731
...
2016-04-09 12:33:32 -04:00
870208e7e4
Made ore boxes cost 4 wood instead of 20
2016-04-09 15:53:38 +01:00
022d9e573f
okay mr.phil man
2016-04-09 10:43:35 -04:00
07aafedcac
Added making ore boxes out of 20 wood planks
...
Did you know ore boxes were made of wood? It's in the description
for them and everything.
2016-04-08 15:45:03 +01:00
927e08d271
Flasks!
2016-04-08 06:26:30 -04:00
9d80fb06a7
fixes a potential minor issue with swapping the blueprint's user
2016-04-08 06:42:29 +01:00
95d2f9a848
Ports the functionality of the /vg/ holomap to the Station Blueprints, you can now see a layout of cables/pipes/atmos/power machinery as it was at roundstart to assist in repairs
2016-04-08 01:02:41 +01:00
13bb58dbc0
orange prisoner ids now show up in wallets
2016-04-07 19:27:17 -04:00
2420e43d1d
Merge pull request #16671 from bgobandit/copydocs
...
Secret documents can now be copied.
2016-04-07 13:00:57 -05:00
Joan Lung
PKPenguin321
Cheridan
coiax
AnturK
Shadowlight213
KorPhaeron
c0
erwgd
KorPhaeron
RandomMarine
TrustyGun
Remie Richards