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

15143 Commits

Author SHA1 Message Date
Ghommie
cfccacafbf Stops all graffiti decals from being named "letter". 2019-10-09 01:54:38 +02:00
Fermi
10ce91c686 aaa 2019-10-08 13:45:16 +01:00
Fermi
a9ad80691e Okay this too 2019-10-08 12:57:06 +01:00
Fermi
f0e803f056 PANIC 2019-10-08 12:38:39 +01:00
kevinz000
fe1a78f413 Merge pull request #9421 from Ghommie/Ghommie-cit218 
Porting some spraycan fixes and tweaks.
 2019-10-08 00:34:58 -07:00
kevinz000
abef83f56e Merge pull request #9427 from Ghommie/Ghommie-cit219 
Skeleton and zombie tweaks/balance (featuring "makes halloween skeletons not the overpowered pirate ones")
 2019-10-08 00:34:33 -07:00
kevinz000
143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head 
QM is a head of staff, Cargo ID Console added
 2019-10-08 00:34:07 -07:00
kevinz000
8aacedaefa Merge pull request #9316 from Thalpy/Reagents_bitflats 
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
 2019-10-08 00:33:21 -07:00
kevinz000
6fc746a5af Merge pull request #9226 from Trilbyspaceclone/unmodular_2 
Unmodulars a few things + new sprite + new welder tank(unused
 2019-10-08 00:30:54 -07:00
kevinz000
3d404b6967 Merge pull request #9287 from Thalpy/Wiki 
Adds a markdown parse of all chems for use with github wiki to debug menu.
 2019-10-08 00:30:00 -07:00
kevinz000
26b076c5aa Merge pull request #9314 from Trilbyspaceclone/patch-228 
Makes blood gun take 1/4 the blood to use
 2019-10-08 00:29:41 -07:00
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
Thalpy
f592fc325e Formmating 2019-10-08 07:47:10 +01:00
Thalpy
edb26eeaeb Master of confusion 2019-10-08 07:44:32 +01:00
Thalpy
281c6e04e8 Hmm 2019-10-08 07:43:51 +01: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
Thalpy
4538c43ede Oops 2019-10-08 07:39:41 +01:00
Thalpy
f7d14ebb2c Damnit webedit 2019-10-08 07:39:19 +01: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
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01: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
Ghommie
7dfd6005d9 I hate nerfing things :( 2019-10-06 19:24:31 +02:00
Ghommie
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Ghommie
f01f00710f Porting some spraycan fixes. 2019-10-06 05:30:16 +02:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01: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