shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,157 Commits 5 Branches 0 Tags
d71f37167f896b57e77dcac15f4462e3efdf1be3
Commit Graph

5120 Commits

Author SHA1 Message Date
Poojawa d71f37167f I'm about to go fucking APE 
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
 2019-08-16 04:58:16 -05:00
Poojawa 264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa 0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Poojawa 2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
kevinz000 a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals 
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
 2019-08-11 10:15:49 -07:00
kevinz000 123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151 
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
 2019-08-11 10:12:20 -07:00
kevinz000 3b5600b81d Merge pull request #9092 from Sishen1542/emp-beacons 
crew combat mechs are now spawned in with a tracking beacon
 2019-08-11 10:00:36 -07:00
kevinz000 a576e71a01 Merge pull request #9101 from Sishen1542/stealthy-surgery 
obfuscates specific surgeries, gives generalized areas to anybody in viewing range
 2019-08-11 09:59:29 -07:00
Sishen 23d4b9827d fix, yadda yadda 2019-08-11 01:19:37 -04:00
Poojawa dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
BlackMajor 5dcd419d8a Merge pull request #8356 from Thalpy/master 
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
 2019-08-11 16:09:23 +12:00
Sishen 234d058cc2 Update mecha_control_console.dm 2019-08-10 07:28:35 -04:00
kevinz000 40b89f49cc Merge pull request #9078 from kappa-sama/moth1 
Changes teleporter machines to apply flyperson (more) equally
 2019-08-09 22:22:29 -07:00
kevinz000 b3b22029a6 Merge pull request #9064 from cebutris/hugloves 
Hugs of the North Star
 2019-08-09 22:20:18 -07:00
kevinz000 74008beb8f Merge pull request #9066 from Ghommie/Ghommie-cit181 
Two lines fixes for invisible zipties and borked legcuffs.
 2019-08-09 22:17:31 -07:00
kevinz000 14033d9876 Merge pull request #9085 from Ghommie/Ghommie-cit186 
underwear colors fix 2: The revenge of the crunch.
 2019-08-09 22:15:55 -07:00
Sishen b8907c2f97 fixing what i forgot to do 2019-08-09 13:47:36 -04:00
Fermi 02b5100be7 Made scans advanced. 2019-08-09 13:01:14 +01:00
Fermi 6e0303fdba Actual fix for #9091 2019-08-09 12:48:26 +01:00
Fermi 34cfd2c1e3 Fix for #9091 2019-08-09 12:12:25 +01:00
Ghommie ee57720ee3 underwear colors fix 2: The revenge of the crunch. 2019-08-09 05:11:12 +02:00
Ghommie 12c4fc139d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 2019-08-09 04:00:23 +02:00
kappa-sama a8e4ce1f77 Merge branch 'master' into moth1 2019-08-08 18:27:34 -04:00
Poojawa 283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Ghommie a7287ed4d1 Merge branch 'moth1' of https://github.com/kappa-sama/Citadel-Station-13 into Ghommie-cit185 2019-08-08 23:11:58 +02:00
Ghommie a9eeb28fff Uncalibrated teleporters can now turn furries, scalies & co into flypeople too. 2019-08-08 21:09:11 +02:00
kappa-sama 2dc15b3fc0 Update teleporter.dm 2019-08-08 15:05:48 -04:00
kevinz000 290dfb8bbd Merge pull request #9071 from YakumoChen/cloningnerf 
Nerfs Autocloning
 2019-08-08 02:00:37 -07:00
kevinz000 ad7189a211 Merge pull request #9061 from deathride58/fuckfemurbreakers 
Makes the femur breaker use the proper scream emote and makes the femur breaker guarantee the victim falls into crit
 2019-08-08 01:59:51 -07:00
kappa-sama 73e31aba04 Revert "Update teleporter.dm" 
This reverts commit 5fcb94d8d6.
 2019-08-08 02:55:27 -04:00
kappa-sama 42c37d9de3 Revert "Update teleporter.dm" 
This reverts commit 2b3e53d7d6.
 2019-08-08 02:55:24 -04:00
kappa-sama 85dc61f84d Revert "Update teleporter.dm" 
This reverts commit c963f5e43e.
 2019-08-08 02:55:14 -04:00
kappa-sama c963f5e43e Update teleporter.dm 2019-08-08 02:40:51 -04:00
kappa-sama 2b3e53d7d6 Update teleporter.dm 2019-08-08 02:23:59 -04:00
kappa-sama 5fcb94d8d6 Update teleporter.dm 2019-08-08 02:12:31 -04:00
kappa-sama f38ac0dfbf possibly makes teleporter hate all races equally 
let's go
 2019-08-08 01:49:06 -04:00
Fermi 7391581a26 2 small fixes. 2019-08-07 11:33:53 +01:00
Fermi 2a049e3485 Should fix the locker conflict! (untested) 2019-08-07 09:40:13 +01:00
Thalpy 2256bbb63c Merge branch 'master' into master 2019-08-07 09:30:53 +01:00
YakumoChen deeda9ebdb Update cloning.dm 2019-08-07 07:53:14 +00:00
Ghommie de8137d6c8 One line fix for invisible zipties. 2019-08-06 23:19:28 +02:00
Cebutris 3e6112fec0 adds the hug gloves to the arcade reward pool 2019-08-06 16:48:49 -04:00
Fermi ee1b04eefb Fixes potential "trapped as ghost" problems and examine+scanner text 2019-08-06 19:54:07 +01:00
deathride58 ddb29551fc paren 2019-08-06 11:28:01 -04:00
deathride58 ee0d7a4ed3 Fixes issues with femur breaker by replacing the forced speech with a proper scream emote and making it guarantee landing in crit 2019-08-06 07:43:28 -04:00
Sishen decbd37ced Update closets.dm 2019-08-06 03:49:08 -04:00
Thalpy 5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000 aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee 
Abductor Replication Lab space ruin - take 2
 2019-08-05 00:55:40 -07:00
kevinz000 9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142 
Fixes Zelus flasks a bit.
 2019-08-05 00:54:43 -07:00
kevinz000 b292bc7187 Merge pull request #9007 from Ghommie/Ghommie-cit168 
Fixes and standarizes sword sheaths/scabbards overlays.
 2019-08-05 00:49:49 -07:00