shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,742 Commits 5 Branches 0 Tags
bce4ce31ab2d407697fef8c6587612b024ee628b
Commit Graph

8460 Commits

Author SHA1 Message Date
kevinz000
bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00
kevinz000
75f1dca544 Merge pull request #8773 from Sishen1542/podgang 
Podweak now have all customization options.
 2019-07-03 13:46:08 -07:00
kevinz000
10a584c71f Merge pull request #8776 from Ghommie/Ghommie-cit96 
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
 2019-07-03 13:45:02 -07:00
kevinz000
ab217e81e6 Merge pull request #8781 from Sishen1542/plasteel 
Adds plasteel to medical and security techfabs.
 2019-07-03 13:42:22 -07:00
kevinz000
9654308a94 Merge pull request #8809 from Ghommie/Ghommie-cit103 
Quickfixing latejoin ghost roles, I'm sorry.
 2019-07-03 09:52:14 -07:00
kevinz000
948bba1274 Merge pull request #8799 from Trilbyspaceclone/Cargo_lewds 
Adds Promiscuous Organs crate to cargo
 2019-07-03 09:51:47 -07:00
kevinz000
0f0d5323a3 Merge pull request #8797 from Sishen1542/rotate-emitters 
Emitters can be rotated instead of only flipped
 2019-07-03 05:20:37 -07:00
Ghommie
1fd50cc15a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96 2019-07-03 04:52:57 +02:00
Ghommie
33687dc2bc I'm an idiot, I need to pick an element within the list, not the list itself!! 2019-07-01 22:53:42 +02:00
Ghommie
d0a001f663 Quickfixing latejoin ghost roles, I'm sorry. 2019-07-01 22:47:51 +02:00
TrilbySpaceClone
9d6c930b2c owo 
Wat dis?
 2019-06-30 15:47:45 -04:00
Sishen
2047d86095 Update emitter.dm 2019-06-30 15:33:34 -04:00
Ghommie
c569da5713 Fixes PDA skin preference not saving up. 2019-06-30 17:17:23 +02: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
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
Sishen
3aaed75a95 Update smelting_designs.dm 2019-06-29 04:49:29 -04: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
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
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
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
Arturlang
442c21fdba For the actual deflecting! 2019-06-28 11:41:01 +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
Ghommie
d7028b0059 Fixes "Bubbles ate my Cohiba Robusto!" 2019-06-27 05:32:08 +02:00
Ghommie
f118edad1d Fixing "You can Alt click paper with TK to teleport it to you." 2019-06-27 04:42:14 +02:00
TrilbySpaceClone
9cab7b960c web-editless 2019-06-26 18:10:13 -04:00
Poojawa
00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Sishen
65d05f7df0 Goodbye golem AI 2019-06-26 00:08:42 -04:00