shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,836 Commits 5 Branches 0 Tags
6d6cc93e50ed1ab15fa4040739f64efef7eec6a0
Commit Graph

10561 Commits

Author SHA1 Message Date
Ghommie c569da5713 Fixes PDA skin preference not saving up. 2019-06-30 17:17:23 +02:00
kevinz000 4d39d28f74 Update output.dm 2019-06-30 03:55:03 -07:00
deathride58 4b83110db7 fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck. 2019-06-30 05:02:51 -04:00
deathride58 1efd1b2634 oh, and lets add a length check real quick to make sure the sleeper actually has shit in it 2019-06-30 04:35:34 -04:00
deathride58 cb5ed2d2cd Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar 2019-06-30 04:29:48 -04:00
kevinz000 09c8a45fe2 Merge pull request #8770 from Arturlang/Carp_Deflecting 
Carp now deflects the bullets instead of making them dissapear.
 2019-06-29 20:08:47 -07:00
Thalpy 538e0fad29 Oops 2019-06-30 02:06:30 +01:00
TrilbySpaceClone 688fabfffc Honk 2019-06-29 21:03:38 -04:00
Thalpy e09f189895 WELCOME TO PH'S HELL RIDE 2019-06-30 01:56:10 +01:00
Thalpy 696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Sishen 3aaed75a95 Update smelting_designs.dm 2019-06-29 04:49:29 -04:00
Thalpy 7be7f05228 Reduced pent, tweaked pH, tweaked MK, added beaker tally. 2019-06-29 08:50:20 +01:00
Thalpy f8a93a035f Tweaking pH based on user feedback. 2019-06-29 07:32:00 +01:00
Ghommie ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Ghommie 0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
kevinz000 c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain 
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
 2019-06-28 20:32:15 -07:00
kevinz000 a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79 
Ports "Removes SSreligion"
 2019-06-28 20:30:44 -07:00
kevinz000 7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42 
[Ready]Reskinnable PDAs.
 2019-06-28 20:30:05 -07:00
Trilbyspaceclone 75fa9d633c Update autolathe_designs_tools.dm 2019-06-28 21:56:17 -04:00
Thalpy b6309d5a31 Fixes explosion bug, tweaks hypo and fiddles pH. 2019-06-29 02:47:32 +01:00
Ghommie d93e63af53 we just want the trauma to be niche, not unachievable. 2019-06-28 23:21:10 +02:00
Ghommie 3291b9c47a Porting in donut fixes, beepsky smash and Neurotoxin reworks. 2019-06-28 23:17:12 +02:00
deathride58 7e943c0f42 Merge pull request #8737 from Ghommie/Ghommie-cit85 
Fixes CWC construct shells being visible as ghost role to latejoiners.
 2019-06-28 16:03:53 -04:00
Thalpy a4edb0b69a Trying alternative fix for pH. 2019-06-28 18:50:28 +01:00
kevinz000 d4b9b52f10 Merge pull request #8728 from Sishen1542/JESUSFUCKFIXDISPENSERSALREADYGODDAMN 
Dispensers now act like tg counterparts! Tweak to available chems in chem/soda/booze dispensers.
 2019-06-28 10:16:25 -07:00
Thalpy b8028242c0 Compile fixes 2019-06-28 17:16:21 +01:00
Thalpy 9ee17e4045 [TEST] redo pH on reaction. 2019-06-28 16:58:08 +01:00
Thalpy 4b7ac0be79 More fun ssblackbox tallies. 2019-06-28 16:50:48 +01:00
Ghommie d782f24395 change 2019-06-28 17:30:28 +02:00
Sishen 1459ada045 adds customization options for podweak 2019-06-28 10:22:09 -04:00
Sishen 92f530eed1 left the , for diethyl when i removed saltpetre whoops 2019-06-28 08:34:35 -04:00
Sishen 84e60b1cd2 Update chem_dispenser.dm 2019-06-28 08:32:56 -04:00
kevinz000 6c77443887 Merge pull request #8720 from Ghommie/Ghommie-cit76 
Sort of porting MRE rations from Yogstation.
 2019-06-28 05:28:35 -07:00
kevinz000 83f84b01a1 Merge pull request #8700 from Sishen1542/trenchcloak 
Adds a reskin option for HoS tenchcoat, the trenchcloak!
 2019-06-28 05:24:11 -07:00
kevinz000 f7bbca8918 Merge pull request #8731 from Ghommie/Ghommie-cit81 
Ports in microwave updates and its radial menu.
 2019-06-28 05:19:04 -07:00
kevinz000 f76737dc04 Merge pull request #8708 from Trilbyspaceclone/patch-185 
Corrects the "Durasteel" to be plastitanium tool boxes
 2019-06-28 05:18:35 -07:00
kevinz000 a103611d1b Merge pull request #8760 from Trilbyspaceclone/LoudnProud 
Makes ling's adrendals have a loudness 2
 2019-06-28 05:12:43 -07:00
kevinz000 33a972529c Update wheelchair.dm 2019-06-28 04:42:55 -07:00
Arturlang 442c21fdba For the actual deflecting! 2019-06-28 11:41:01 +03:00
Arturlang 8160da6a6a Reviewer suggestions 2019-06-28 11:06:33 +03:00
deathride58 d979dfef59 Merge pull request #8738 from Ghommie/Ghommie-cit86 
porting pizza fixes.
 2019-06-28 00:53:23 -04:00
deathride58 8f168727c5 Merge pull request #8730 from Ghommie/Ghommie-cit80 
Port in alt click to eject beaker and swapping beakers for chem machines, grinder radial menu.
 2019-06-28 00:52:59 -04:00
deathride58 fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78 
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
 2019-06-28 00:47:09 -04:00
deathride58 3cd5b1d180 Merge pull request #8741 from Ghommie/Ghommie-cit88 
ports "Stockings"
 2019-06-28 00:38:27 -04:00
deathride58 2ed69c8b46 Merge pull request #8753 from Sishen1542/siliconmanbad 
[PORT] Non-station AI can no longer interact off their z-level.
 2019-06-28 00:29:32 -04:00
deathride58 720d4ee4c8 Merge pull request #8745 from Sishen1542/CASfix 
Port of tg pull #44158, the fix of Cards Against Space!
 2019-06-28 00:25:32 -04:00
deathride58 db6e8ecd4c Merge pull request #8755 from Poojawa/the-balls-should-be-inert 
Fixes errant ball behaviour
 2019-06-28 00:23:37 -04:00
deathride58 229c7c75f2 Merge pull request #8766 from Ghommie/Ghommie-cit92 
Fixing "You can Alt click paper with TK to teleport it to you."
 2019-06-28 00:08:27 -04:00
Trilbyspaceclone 227dd82daa just adrinals 2019-06-27 17:57:58 -04:00
Ghommie a90ef6faa3 and it's gone. 2019-06-27 15:06:04 +02:00