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

14437 Commits

Author SHA1 Message Date
Trilbyspaceclone
32d70bbb6a >_< 2019-08-11 19:10:34 -04:00
Trilbyspaceclone
d30df526f7 Update berries.dm 2019-08-11 19:05:36 -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
d3b3836d33 Merge pull request #9010 from BurgerLUA/Actual-War-Ops 
War Ops now informs the crew where the Nuclear Device is located when activated.
 2019-08-11 10:13:02 -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
b75c82b4ee Merge pull request #9054 from Sishen1542/stando 
stands now remove trait_nodeath from their user if given by memento mori
 2019-08-11 10:11:11 -07:00
kevinz000
69884d1abe Merge pull request #9062 from Trilbyspaceclone/patch-207 
Makes smile not as horrable.
 2019-08-11 10:08:45 -07:00
kevinz000
96842ed1c3 Merge pull request #9075 from Ghommie/Ghommie-cit184 
Removes a redunant Remove() from high luminosity eyes.
 2019-08-11 10:05:58 -07:00
kevinz000
cba8d3478a Merge pull request #9079 from Sishen1542/lingblade 
gives ling armblade 20 armor pen to make it more in line with eswords
 2019-08-11 10:01:10 -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
kevinz000
b2eda962d1 Merge pull request #9093 from MrJWhit/Change-IAA-Text 
Adds a line in the spawntext for IAA
 2019-08-11 08:34:21 -07:00
Sishen
23d4b9827d fix, yadda yadda 2019-08-11 01:19:37 -04: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
Sishen
51011ccf97 Update guardian.dm 2019-08-10 07:05:53 -04:00
Sishen
15dbb7ff32 Update guardian.dm 2019-08-10 07:03:45 -04:00
Sishen
b0a28d1a29 Update mutations.dm 2019-08-10 02:16:07 -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
f516fcf539 Merge pull request #9083 from Trilbyspaceclone/fruit 
Strawbarries, and more
 2019-08-09 22:16:34 -07:00
kevinz000
b213b0ed2b Merge pull request #9084 from Ghommie/Ghommie-cit185 
Fixes clock cult mass recall.
 2019-08-09 22:16:09 -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
kevinz000
0329a80086 Merge pull request #9081 from BurgerLUA/Meteor-Fair-Warning 
Central Command informs you when a Meteor Storm is about to hit 5 to 10 minutes before it happens
 2019-08-09 11:20:16 -07:00
MrJWhit
77e0551616 Adds a line in the spawntext for IAA 
Adds "By no means reveal that you, or any other NT employees, are undercover agents." at the spawntext
 2019-08-09 13:56:07 -04: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
eb9e6a041d Ghommie's fix. 2019-08-09 12:17:54 +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
eb3ae1d61a Fixes clock cult mass recall. 2019-08-09 04:05:06 +02:00
Sishen
1fc69a13a4 okay fixed 2019-08-08 22:02:12 -04: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
TrilbySpaceClone
ab13b62bdd fruits of labor 2019-08-08 16:14:04 -04: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
Fermi
1fb07e286a Removing reviewer comments incase of fullmerge. 2019-08-08 19:53:07 +01:00
kevinz000
ce064522fe Merge pull request #9076 from BurgerLUA/Proper-Fix 
Fixes end of round voting unintentionally showing map votes and not gamemode votes
 2019-08-08 11:25:02 -07:00
BurgerLua
9566caa527 Added 2019-08-08 09:25:04 -07:00
Sishen
582b355224 Update guardian.dm 2019-08-08 11:00:23 -04:00
Fermi
004b79d4cd Vodka is alkaline 2019-08-08 15:31:07 +01: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
kevinz000
8b20413676 Merge pull request #9069 from Ghommie/Ghommie-cit183 
Fixes cults teleportations.
 2019-08-08 01:58:48 -07:00
Sishen
1f05123816 ook ook 2019-08-08 03:04:51 -04:00
kappa-sama
73e31aba04 Revert "Update teleporter.dm" 
This reverts commit 5fcb94d8d6.
 2019-08-08 02:55:27 -04:00