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

5081 Commits

Author SHA1 Message Date
Sishen
7a8e2c3f50 rebalances the lawyer heirloom briefcase while giving it a fancy new sprite 2019-08-19 17:54:16 -04:00
kevinz000
3f734d9aca Merge pull request #8763 from Trilbyspaceclone/patch-188 
Reblances bone satchles
 2019-08-18 23:39:39 -07:00
kevinz000
3ef29bbbeb Merge pull request #9097 from lolman360/durathread 
Adds durathread.
 2019-08-18 23:37:07 -07:00
TrilbySpaceClone
2b08b97f1d yay 2019-08-17 23:54:50 -04:00
lolman360
ae2ccb2686 should be done now 2019-08-17 12:20:37 +10:00
lolman360
7d12535ead thanks paxxy boi 2019-08-17 12:18:18 +10:00
lolman360
e838da8039 Merge pull request #3 from Citadel-Station-13/master 
3
 2019-08-17 11:55:56 +10:00
kevinz000
9071917e72 Merge pull request #9088 from Poojawa/blurry-runtimes 
Fixes some runtimes and removes a holodeck exploit
 2019-08-16 17:05:21 -07:00
Poojawa
3de3f511cf Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes 2019-08-15 08:24:55 -05:00
Winter Flare
04c302b08e Service Tweaks 
Makes the Janibelt a bit more useful by expanding its limited pool of allowed items. Beakers and Bottles for carrying additional space cleaner/ammonia/water.

Allows the plant DNA maniuplator to be wrenched and moved.
 2019-08-15 06:28:46 -04:00
Winter Flare
141a93236c Service QoL 
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
 2019-08-14 04:01:18 -04: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
lolman360
b283a0979c yay 2019-08-11 14:56:42 +10:00
lolman360
e2e7133eba ew things are called different things 2019-08-11 14:54:17 +10: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
lolman360
22b461c78f Merge pull request #1 from lolman360/master 
d
 2019-08-11 12:00:55 +10:00
lolman360
e4a9f2743b and gitbabby 2019-08-11 11:14:07 +10:00
lolman360
aa71a39fa8 so basically im monky 2019-08-11 11:13:38 +10:00
lolman360
2c1add5276 all my other comimits were to master 2019-08-11 11:13:02 +10:00
lolman360
f131104a73 Add files via upload 2019-08-11 10:51:38 +10: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
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-sama
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
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