shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,940 Commits 5 Branches 0 Tags
cf8db59649ac0d3d7eb6cb675198d353d43fc0ef
Commit Graph
5219 Commits
Author SHA1 Message Date
Sishen dc66446064 dab dab 2019-08-09 03:19:02 -04:00
Sishen 4ba3d851ed IT JUST WORKS 2019-08-09 00:46:14 -04:00
Ghommie ee57720ee3 underwear colors fix 2: The revenge of the crunch. 2019-08-09 05:11:12 +02:00
Poojawa f76bb27127 Fixes some runtimes and removes a holodeck exploit 
and a cleanup >.>;
 2019-08-08 21:33:42 -05: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-samaandGitHub a8e4ce1f77 Merge branch 'master' into moth1 2019-08-08 18:27:34 -04: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
kevinz000andGitHub 290dfb8bbd Merge pull request #9071 from YakumoChen/cloningnerf 
Nerfs Autocloning
 2019-08-08 02:00:37 -07:00
kevinz000andGitHub 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-samaandGitHub f38ac0dfbf possibly makes teleporter hate all races equally 
let's go
 2019-08-08 01:49:06 -04:00
Sishen f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -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
ThalpyandGitHub 2256bbb63c Merge branch 'master' into master 2019-08-07 09:30:53 +01:00
YakumoChenandGitHub deeda9ebdb Update cloning.dm 2019-08-07 07:53:14 +00:00
kevinz000andGitHub df60e21449 Update misc_walls.dm 2019-08-07 00:20:28 -07: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
deathride58andGitHub 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
ThalpyandGitHub 5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000andGitHub aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee 
Abductor Replication Lab space ruin - take 2
 2019-08-05 00:55:40 -07:00
kevinz000andGitHub 9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142 
Fixes Zelus flasks a bit.
 2019-08-05 00:54:43 -07:00
kevinz000andGitHub b292bc7187 Merge pull request #9007 from Ghommie/Ghommie-cit168 
Fixes and standarizes sword sheaths/scabbards overlays.
 2019-08-05 00:49:49 -07:00
kevinz000andGitHub a105ba4bb6 Merge pull request #8774 from Sishen1542/monkeycult 
Removes the human check from cap/chap mind on cult conversion.
 2019-08-05 00:47:04 -07:00
kevinz000andGitHub 86a2d917e5 Merge pull request #8913 from Trilbyspaceclone/clockstoles 
Makes brass/bronze bar stools and stools - Same as normal ones
 2019-08-05 00:45:56 -07:00
kevinz000andGitHub 9852084200 Merge pull request #9019 from Ghommie/Ghommie-cit172 
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
 2019-08-05 00:44:15 -07:00
kevinz000andGitHub f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146 
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
 2019-08-04 22:41:49 -07:00
kevinz000andGitHub c92e8b43bf Merge pull request #9042 from EgoSumStultus/femur-breaker 
[ THE FEMUR BREAKER ]
 2019-08-04 22:27:42 -07:00
EgoSumStultus 5bfe4492a1 huhhh... huhu.... 2019-08-04 22:15:10 -07:00
kevinz000andGitHub 8fa888f408 Merge pull request #8995 from Ghommie/Ghommie-cit165 
Fixes jogging on wet tiles actually slipping you if you have less than 20 stamloss
 2019-08-04 19:21:38 -07:00
kevinz000andGitHub 489b4c78dc Merge pull request #8996 from Ghommie/Ghommie-cit166 
Adds in worn overlays for different types of cuffs.
 2019-08-04 19:19:19 -07:00
kevinz000andGitHub 5f87927b0a Merge pull request #9030 from CameronWoof/iv-drip-fix 
Fixes a visual glitch with beakers containing water attached to IV stands
 2019-08-04 19:18:00 -07:00
kevinz000andGitHub 7a3d895997 Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes 
Tweaks cakes, adds in more of them as well as a few more tarts - All hidden
 2019-08-04 19:15:18 -07:00
kevinz000andGitHub 8452cf3b8a Merge pull request #9014 from Ghommie/Ghommie-cit170 
undergarment fixes.
 2019-08-04 19:13:21 -07:00
kevinz000andGitHub 4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock 
Adds the ability to construct and deconstruct locker locks
 2019-08-04 19:07:35 -07:00
kevinz000andGitHub 27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171 
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
 2019-08-04 19:04:59 -07:00
Chayse Ramsay f9d829b111 Proc to define 2019-08-04 05:48:08 +01:00
Chayse Ramsay 46e4023ba9 Monkey business 2019-08-04 05:07:24 +01:00
Sishen 1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00