Commit Graph
15132 Commits
Author SHA1 Message Date
SharkmareandGitHub 878a3d7b74 Update clown_items.dm 2019-03-07 13:56:07 +01:00
SharkmareandGitHub 9119a86f0f Update suit_cooling.dm 2019-03-06 11:13:35 +01:00
SharkmareandGitHub 8d969e26a1 Update suit_cooling.dm 2019-03-06 10:41:43 +01:00
SharkmareandGitHub 98dc5056ea Adding EMAG to the cooling unit. 2019-03-06 10:40:47 +01:00
SharkmareandGitHub 30a3569509 Fixing Frostbite jelly atmos
accidentally made them suicide heat while cooling the area
2019-03-05 20:43:47 +01:00
VollyballyandGitHub 12fef0aa80 Merge pull request #470 from Sharkmare/patch-6
Preparing of the fool.
2019-03-04 23:15:06 -05:00
VollyballyandGitHub e544e4187c Merge pull request #475 from Sharkmare/patch-11
Frostbite jelly
2019-03-04 23:14:03 -05:00
VollyballyandGitHub 89d0ae24a3 Merge pull request #476 from Sharkmare/patch-12
A D V A N C E D soap
2019-03-04 23:13:47 -05:00
VollyballyandGitHub 72cc027d7c Merge pull request #478 from Razgriz1032/Razgriz1032-Action-Figure-Text-Fix
Action figure text fix
2019-03-04 23:13:20 -05:00
RazgrizandGitHub 9b7d2bdece Action figure text fix
Removed a period.
So like
The Research Director action figure says "Blowing all of the borgs!".
is now
The Research Director action figure says "Blowing all of the borgs!"
And that goes for all of them now.
2019-03-04 12:34:41 -07:00
SharkmareandGitHub 083bf4ea31 Update space.dm 2019-03-04 16:21:25 +01:00
SharkmareandGitHub 8904ab88c7 A D V A N C E D soap 2019-03-04 15:14:15 +01:00
SharkmareandGitHub 0b88f8f2e3 Update suit_cooling.dm 2019-03-04 13:38:34 +01:00
SharkmareandGitHub 02cda221f1 Update suit_cooling.dm 2019-03-04 12:46:27 +01:00
SharkmareandGitHub f8e4ed651e Update suit_cooling.dm 2019-03-04 12:42:01 +01:00
SharkmareandGitHub 1d4e781a2f Update suit_cooling.dm 2019-03-04 12:36:46 +01:00
SharkmareandGitHub b0c48dfa8c gas 2019-03-04 12:22:21 +01:00
SharkmareandGitHub c9bd87ec1f Update suit_cooling.dm 2019-03-04 12:12:58 +01:00
SharkmareandGitHub 079c8f5850 Update suit_cooling.dm 2019-03-04 12:10:28 +01:00
SharkmareandGitHub 0020ce8faa Biochemical cooling swap 2019-03-04 12:05:56 +01:00
SharkmareandGitHub 2f7cfeb34a Update suit_cooling.dm 2019-03-04 11:31:39 +01:00
SharkmareandGitHub c7d5782908 Update suit_cooling.dm 2019-03-04 11:13:12 +01:00
SharkmareandGitHub 5200b2a6a3 Update suit_cooling.dm 2019-03-04 11:00:02 +01:00
SharkmareandGitHub ebd62ab251 Update suit_cooling.dm 2019-03-04 10:59:30 +01:00
SharkmareandGitHub f9457d1ffb Update suit_cooling.dm 2019-03-04 10:46:40 +01:00
SharkmareandGitHub 2cab399c35 Frostbite jelly 2019-03-04 10:45:46 +01:00
SharkmareandGitHub b9874e00b0 Preparing of the fool.
Egg.
2019-03-04 08:42:51 +01:00
VollyballyandGitHub fcae473207 Merge pull request #468 from Razgriz1032/Razgriz1032-bounty-hunter-toy
Razgriz1032 bounty hunter toy
2019-03-03 19:37:24 -05:00
RazgrizandGitHub 08e4198cd0 Bounty hunter toy 2019-03-03 14:25:10 -07:00
Shadowfire117 da85e9fbba Fixed a typo in feeder description 2019-03-03 11:25:22 +01:00
SharkmareandGitHub 93bb5485b2 Egg 2019-03-02 23:20:58 +01:00
TheFurryFelineandGitHub ddbc662aa5 Commlink Manifest Stuff
Comments out weather, adds in visibility for Crew Manifest.
2019-02-23 15:47:27 -05:00
TheFurryFelineandGitHub 7984bc5803 New Template File Reference
Makes this refer to a .tmpl file.
2019-02-23 14:53:28 -05:00
TheFurryFelineandGitHub 10474eca70 Add Crew Manifest Display
What the title says: gives Communicator the ability to display the Crew Manifest.
2019-02-23 14:42:37 -05:00
SharkmareandGitHub ea1fc0a203 Nerfing the perpetual super cooling of this absolute unit
1 second has past, you feel a bruning sensation
2 Seconds have passed the burning rises and you are unable to move
4 seconds pass and the breath within your lungs turns to ice.
Road roller.
2019-02-22 02:05:59 +01:00
VollyballyandGitHub 8e2da2b83e Merge pull request #425 from Sharkmare/patch-35
Changing mining spawner
2019-02-21 14:42:49 -05:00
VollyballyandGitHub fc80a0229c Merge pull request #427 from Shadowfire117/master
Feeder
2019-02-21 14:42:38 -05:00
Shadowfire117 7453cb8dce Adding in a feeding pump! With this you can feed someone liquids automatic while you snuggle and bully them! 2019-02-21 13:47:57 +01:00
SharkmareandGitHub 409131afd8 Update mob_spawner_chomp.dm 2019-02-21 09:07:16 +01:00
SharkmareandGitHub 14e5ba659d Changing mining spawner
Froim Deathclaw to Deathclaw/minor
2019-02-21 08:49:37 +01:00
SharkmareandGitHub 339d0de126 Update suit_cooling.dm 2019-02-20 12:17:16 +01:00
SharkmareandGitHub 7a81058c5d A modified cooling unit, it'S definitely safe
I mean who would ever think to remove a cooling units safeties and tamper with the thermostat inside, dont be silly friend. 

It's simply **Advanced** that's why theres wires hanging from it!
2019-02-20 12:08:50 +01:00
SharkmareandGitHub 1c28f0fbc0 Update swords.dm 2019-02-19 08:33:55 +01:00
SharkmareandGitHub 9da074bfad Adding a special weapon for the chaplain 2019-02-19 08:32:42 +01:00
noah the goodra 1812fe88ee more music lines 2019-02-16 00:30:04 -06:00
RazgrizandGitHub 3001400410 Added new door 2019-02-09 04:28:43 -07:00
SharkmareandGitHub 2a33941b7f Update station_ids.dm 2019-02-06 22:03:43 +01:00
SharkmareandGitHub 754d9271d0 Spare engineering ID
In case of power outaes and APC porblems with no ENG crew aboard or for non crew to target.
2019-02-06 21:55:45 +01:00
IgnusVam b530af5858 Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation
- Reverts the polaris 1 to a working state.
2019-01-31 21:45:29 -07:00
IgnusVam 65f99b774f - Re-comments out centcom jobs until they're fixed. (seriously this needs to be fixed :v ) 2019-01-31 21:07:12 -07:00