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

540 Commits

Author SHA1 Message Date
nik707
10de9091ec Merge pull request #9558 from Citadel-Station-13/kevinz000-patch-102 
fixes soulstones leaving behind abstract invisibility bodies
 2019-10-22 16:50:22 -05:00
deathride58
a7de466a01 Merge pull request #9534 from Linzolle/abductor-science-man 
URGENT fixes for abductors
 2019-10-21 22:30:07 -04:00
deathride58
ee0357b2c4 Merge pull request #9214 from Sishen1542/mechshit 
properly ports neovgre from hippie
 2019-10-21 21:17:57 -04:00
kevinz000
3d24d18622 Update soulstone.dm 2019-10-20 21:27:34 -07:00
Linzolle
39788c8216 fix abductors 2019-10-18 23:45:13 -05:00
kevinz000
a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241 
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
 2019-10-17 17:29:18 -07:00
kevinz000
1cc4ccee0d Merge pull request #9343 from Linzolle/dissection 
port just like a ton of surgery changes from tg also abductor too
 2019-10-17 13:13:51 -07:00
Ghommie
f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. 2019-10-16 23:39:21 +02:00
Ghommie
0cb433ba99 Ports some in operator misuse bugfixes. 2019-10-15 00:26:13 +02:00
kevinz000
4c52b7a416 Merge pull request #9339 from Ghommie/Ghommie-cit205 
Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured
 2019-10-13 14:00:52 -07:00
deathride58
0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Linzolle
b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
Ghommie
e734b36ee3 quickfixes lowpop nuclear war tc malus calculation. 2019-10-10 20:54:19 +02: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
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
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
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
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
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
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
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
Ghommie
fce6f13471 Ports "Chat Subsystem ported from TerraGov-Marine-Corps" 2019-10-07 23:58:15 +02:00
Ghommie
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Ghommie
cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Ghommie
32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +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
Ghommie
34bef911b2 macro arguments 2019-10-05 03:49:06 +02:00
Ghommie
b6cc81d097 flooring. 2019-10-05 03:13:51 +02:00
Ghommie
e4705ae5c0 Actually... let's do some scaling. 2019-10-05 02:57:50 +02:00
Ghommie
2b8fe43ef1 Removes the minimum player cap for the war ops. 2019-10-05 02:31:02 +02: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
Fermi
89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
kevinz000
426104021e Merge pull request #9321 from Linzolle/bloodrites 
some cult fixes + cult qol
 2019-09-28 00:24:15 -07:00
kevinz000
6b33e3bd0b Merge pull request #9322 from Sishen1542/cult 
blood cult conversion no longer requires consent
 2019-09-28 00:23:48 -07:00
Linzolle
0d3a2cdd57 cultist check 2019-09-27 19:15:19 -05:00
Ghommie
ce02f712ba tested. 2019-09-27 17:59:26 +02:00
kevinz000
35237066b8 Merge pull request #9341 from Ghommie/Ghommie-cit206 
Blood cult altar, forge and archives now use radial menus.
 2019-09-26 19:31:36 -07:00
Ghommie
274fdf8c06 return. 2019-09-24 01:40:48 +02:00
Ghommie
1fa40dac38 Changes. 2019-09-23 17:25:08 +02:00
Linzolle
81bb4b4c31 fix 2019-09-22 19:20:05 -05:00
Jack Edge
4b36e6263e ABDUCTOR SHIT I GUESS 2019-09-22 18:36:27 -05:00
Ghommie
f37b676a14 runtimes. 2019-09-22 23:38:48 +02:00
Ghommie
a995e161ca more. 2019-09-22 22:36:29 +02:00
Ghommie
a30dbcd721 vars and procs 2019-09-22 22:34:04 +02:00
Ghommie
5b2cc917b3 Blood cult's alter, forge and archives now use radials. 2019-09-22 22:30:44 +02:00
Ghommie
bb4e279b72 Bumping harmfulness. 2019-09-22 18:54:33 +02:00
Ghommie
75ae73dc1b u n d e f i n e d v a r 2019-09-22 18:43:44 +02:00