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

15203 Commits

Author SHA1 Message Date
kevinz000
fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger 
[READY] Blind quirk without anger
 2019-10-10 02:19:17 -07:00
kevinz000
89747a3a6e Merge pull request #9368 from Seris02/master 
Fixes luminescent dark blue major effect and changes the "autoprocess" button to "autoclone"
 2019-10-10 02:18:25 -07:00
kevinz000
6e029c3360 Merge pull request #9415 from Ghommie/Ghommie-cit214 
Removes the minimum player cap for the war ops in favour or a more proportional telecrystal bonus.
 2019-10-10 02:13:25 -07:00
kevinz000
fb028b7997 Merge pull request #9432 from Putnam3145/pandemic-qol 
Made PanD.E.M.I.C beaker stuff more like ChemMaster
 2019-10-10 02:12:41 -07:00
kevinz000
f791b399a0 Merge pull request #9446 from Sishen1542/ung 
abscond can no longer be cast from inside a locker
 2019-10-10 02:11:17 -07:00
kevinz000
c4f8956985 Merge pull request #9433 from Poojawa/hoss-tails 
Corrects a missing tail state
 2019-10-10 02:10:31 -07:00
kevinz000
236dcc4d63 Merge pull request #9452 from Ghommie/Ghommie-cit225 
Stops non-alphanumeric graffiti decals from being named "letter".
 2019-10-10 02:10:08 -07:00
kevinz000
f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45 
Virtual reality componentization.
 2019-10-10 02:09:51 -07:00
kevinz000
0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11 
Refactoring Implants' loc n°3
 2019-10-10 02:09:37 -07:00
Ghommie
2ac24b2ac6 Fixing head rev blebs 2019-10-09 18:18:49 +02:00
Ghommie
cfccacafbf Stops all graffiti decals from being named "letter". 2019-10-09 01:54:38 +02:00
Ghommie
50ad5f269b unrandomizes mind names. 2019-10-09 01:30:31 +02:00
Ghommie
735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Poojawa
cbefe95ade Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into hoss-tails 2019-10-08 13:50:29 -05:00
Sishen1542
14823d3452 Update code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-10-08 14:05:39 -04:00
Sishen
5df84d6ab5 Update scripture_drivers.dm 2019-10-08 11:36:38 -04: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
Ghommie
159d2a188d peeve. 2019-10-07 17:38:36 +02:00
Poojawa
93ad7f1066 Corrects a missing tail state 2019-10-07 04:30:23 -05:00
Putnam
caf9bc56da Make replacement update icon 2019-10-07 01:34:22 -07:00
Putnam
b452de12ff Made PanD.E.M.I.C beaker stuff more like ChemMaster 2019-10-07 01:23:17 -07: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