shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,064 Commits 5 Branches 0 Tags
06e312b2088fcbd824649e22b0abe6dd86d41449
Commit Graph

15088 Commits

Author SHA1 Message Date
kevinz000
06e312b208 Merge pull request #9032 from Ghommie/Ghommie-cit178 
Ports plasmaman departmental envirosuits and tweaks.
 2019-10-08 00:28:06 -07:00
kevinz000
f405cd1be3 Merge pull request #8937 from Ghommie/Ghommie-cit153 
darkmode/lightmode fixes and tweaks.
 2019-10-08 00:25:51 -07:00
kevinz000
76ede7a473 Merge pull request #9406 from Poojawa/carpet-colors 
More Carpet colors and liquid carpet varients
 2019-10-07 23:39:52 -07:00
kevinz000
dcb37bfd0e Merge pull request #9418 from Ghommie/Ghommie-cit216 
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
 2019-10-07 23:36:11 -07:00
kevinz000
7c94029006 Merge pull request #9431 from Ghommie/Ghommie-cit221 
Ports "Makes the illegal tech node harder to unlock"
 2019-10-07 23:35:18 -07:00
kevinz000
d3f29c4084 Merge pull request #9413 from Poojawa/sprays-obey-fashion 
Makes Medsprays align with patches
 2019-10-07 23:32:48 -07:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
nik707
de117afd8b Merge pull request #9410 from Poojawa/cryopod-tweaks 
Fixes Cryopod quirks, makes the menu not complete shit
 2019-10-07 18:24:38 -05:00
nik707
6803338df2 Merge pull request #9384 from jakeramsay007/Moar-Bugfixes 
Fixes the Trek uniform/suit sprites
 2019-10-07 18:19:59 -05:00
Ghommie
99e9280eaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178 2019-10-07 21:41:04 +02:00
kevinz000
dd46509597 Merge pull request #9377 from Thalpy/Fixes_melting_grenades 
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
 2019-10-06 21:37:50 -07:00
Ghommie
8228e52f43 Ports "Makes the illegal tech node harder to unlock" 2019-10-07 06:19:48 +02:00
kevinz000
4fd31bce32 Merge pull request #9382 from jakeramsay007/Cyborg-chair-unbuckling 
Borgs are now capable of unbuckling people from chairs, beds and themselves
 2019-10-05 08:27:00 -07:00
kevinz000
356755d710 Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE 
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
 2019-10-05 08:26:40 -07:00
kevinz000
22f9c9f711 Merge pull request #9401 from Poojawa/patch-2 
APC UI autoupdates properly
 2019-10-05 08:23:22 -07:00
kevinz000
a923ea984a Merge pull request #9388 from Sishen1542/dynamicadminfix 
Dynamic now auto-deadmin friendly
 2019-10-05 08:22:47 -07:00
kevinz000
b691da0bca Merge pull request #9407 from Poojawa/cryo-qol 
Adds Cryo QoL with hotkeys
 2019-10-05 08:22:01 -07:00
Ghommie
e31c441b3d rogue tabbing 2019-10-05 07:52:52 +02:00
Ghommie
367789fda4 yes 2019-10-05 07:16:17 +02:00
Ghommie
3d22f4ec60 Porting a load of disease/symptoms code updates. 2019-10-05 07:14:25 +02:00
Poojawa
9f88a72142 Makes Medsprays align with patches 
Also ensures you can't spray it on ghosts, ai eyes, etc.
 2019-10-04 16:06:07 -05:00
Poojawa
9d2d84f53d Update table_frames.dm 2019-10-04 15:49:25 -05:00
Poojawa
35d33b4f3b mob_occupant 2019-10-04 10:05:08 -05:00
Poojawa
cda97faaa5 UI and proper deletion stuff 2019-10-04 09:52:42 -05:00
Poojawa
209b195822 this probably doesn't fix the shitty console, but 2019-10-04 07:31:31 -05:00
Poojawa
0716b48a99 unmodularize it 2019-10-04 06:56:57 -05:00
Poojawa
e52652f8c8 Differing carpet reactions 2019-10-03 23:19:52 -05:00
Poojawa
9c4a808e7e Adds Cryo QoL with hotkeys 
Ctrl click to swap power, Alt click to close/open machine. This is how you do a "QoL" PR.
 2019-10-03 23:14:46 -05:00
Fermi
7f74a98372 .9 2019-10-04 04:55:36 +01:00
Fermi
62737884f0 lye was 13 oops 2019-10-04 04:55:16 +01:00
Poojawa
6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Fermi
79e85e2cfa Fixes some runtimes 2019-10-04 03:53:02 +01:00
Fermi
10f5fc3b47 Buffer fix 2019-10-04 03:22:53 +01:00
deathride58
2058cbd09f Merge pull request #9390 from Ghommie/Ghommie_cit212 
Ensuring altdisarm() works as intended.
 2019-10-03 20:16:05 -04:00
deathride58
6e9a2553af Merge pull request #9393 from jakeramsay007/Even-More-Bugfixes 
Fixes AIs being unable to talk through holopads
 2019-10-03 20:12:59 -04:00
Poojawa
a8e16ce27e APC UI autoupdates properly 2019-10-03 14:00:17 -05:00
BlackMajor
02f0e4dd84 Ghosts stop stealing my paper work 2019-10-03 19:16:00 +13:00
Chayse Ramsay
8cbd7d6c06 Fixes AIs being unable to talk through holopads 2019-10-02 21:14:11 +01:00
Ghommie
4855474955 Making sure altdisarm() works as intended. 2019-10-02 19:39:23 +02:00
Chayse Ramsay
68ca8a5ac0 whoops 2019-10-02 11:55:38 +01:00
kevinz000
08ed166c08 Merge pull request #9365 from Ghommie/Ghommie-cit211 
Fixing an issue with DNA scanners maintenance hatches with sleeper code updates.
 2019-10-02 00:06:13 -07:00
kevinz000
1aac0942e9 Merge pull request #9373 from Trilbyspaceclone/beepalm 
Beebalm and Honeybalm plants
 2019-10-02 00:02:05 -07:00
kevinz000
af9336edde Merge pull request #9366 from Raptorizer/MelonSeedBuff 
Equalized the power of the melon seed.
 2019-10-02 00:01:05 -07:00
kevinz000
a177e5a457 Merge pull request #9364 from Ghommie/Ghommie-cit206 
Fixing the blood cult radial menu unholy flask option's icon.
 2019-10-01 23:59:49 -07:00
Sishen
fbaa8d355f Update dynamic.dm 2019-10-02 02:39:58 -04:00
Chayse Ramsay
5c827ed8ed Fixes the Trek uniform/suit sprites 
Not having mutant additions was causing the update_icons code to null out the alternate_worn_icon variable
 2019-10-02 04:08:25 +01:00
Chayse Ramsay
bf6575c67d Borgs are now capable of unbuckling people from chairs, beds, and themselves. 2019-10-02 02:38:39 +01:00
Ghommie
d245a9d28d addendum 2019-10-02 00:42:19 +02:00
Ghommie
2a84162c59 incorrect number of macro arguments 2019-10-02 00:38:58 +02:00
Ghommie
81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00