shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,073 Commits 5 Branches 0 Tags
19729ee706cd06404aaba5823857e9f033fe09d4
Commit Graph

776 Commits

Author SHA1 Message Date
nik707
187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1 
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
 2019-10-25 22:16:02 -05:00
kevinz000
2426849d4b this is a pretty bad idea 2019-10-22 02:19:33 -07:00
Poojawa
7e27c46c78 Fuck components 2019-10-22 00:33:58 -05:00
Poojawa
7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58
2742c86723 Merge pull request #9072 from Poojawa/gen-poppers 
Genpop for security
 2019-10-21 21:15:01 -04:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -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
d9cb2792e5 Merge pull request #9516 from Ghommie/Ghommie-cit242 
Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc."
 2019-10-17 13:04:15 -07:00
Poojawa
66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-17 05:45:06 -05:00
Ghommie
57794421e3 Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc." 2019-10-16 23:57:31 +02: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
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes 
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
 2019-10-16 12:44:34 -07:00
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
Fermi
7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Ghommie
e969e89ce5 Well, byond quirks. 2019-10-14 03:09:15 +02:00
Ghommie
22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000
b56563fcfe Merge pull request #9374 from kappa-sama/walktime 
ashwalkers now have more messages telling them to not go on station
 2019-10-11 12:13:49 -07:00
Poojawa
d7ab97dffc does some of the television's demands 2019-10-08 04:02:20 -05:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05: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
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
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
a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") 2019-10-06 19:16:13 +02:00
Poojawa
9d2d84f53d Update table_frames.dm 2019-10-04 15:49:25 -05:00
Poojawa
6d9aa8de70 More carpet options and ways to get them 2019-10-03 22:54:10 -05:00
Poojawa
b589565398 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-03 15:05:26 -05:00
Ghommie
81fc0c1b32 more foolproofing. 2019-10-02 00:37:02 +02:00
Ghommie
e635a05d16 errors. 2019-10-01 23:43:38 +02:00
Ghommie
d2300765b2 adjacency checks. 2019-10-01 23:16:47 +02:00
Ghommie
cfcd325778 reworking the shoving people action. 2019-10-01 23:13:08 +02:00
Fermi
89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
Poojawa
117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
kappa-sama
c42d5b31a1 ok justin 2019-09-30 20:13:31 -04:00
kevinz000
0febc1977a Merge pull request #9191 from Linzolle/fireman 
Ports fireman carrying from /tg/
 2019-09-28 00:38:08 -07:00
Poojawa
f14272e445 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-27 23:30:05 -05:00
Poojawa
f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
Ghommie
33c3f0834e Prevents sofas being wielded and thus transformed into normal chairs. 2019-09-21 20:01:42 +02:00
Fermi
587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa
fa364bbad0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers 2019-09-13 13:00:29 -05:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
kevinz000
eab0b8934f Merge pull request #9279 from Ghommie/Ghommie-cit192 
Fixing undergarments color preferences resetting each round.
 2019-09-13 10:43:43 -07:00
Poojawa
65a89030eb reverts the bleed changes till they can be better tuned 2019-09-12 00:14:26 -05:00
Ghommie
e0a29ec001 Fixing undergarments color resetting each round. 2019-09-12 02:48:26 +02:00
Linzolle
64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
kevinz000
09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice 
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
 2019-09-07 11:35:09 -07:00
Dap
19678119c5 Merge branch 'plasmatables' into plasmaglass-tables-spears 2019-08-28 14:55:01 -06:00
Poojawa
9558252b93 Revert/replaces a lot of #8024 with bleed_rate 
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood.  Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
 2019-08-26 14:22:17 -05:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00