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

2730 Commits

Author SHA1 Message Date
nik707
dd7907c3d7 Merge pull request #9057 from EgoSumStultus/male-AI-vox 
Adds the Male AI vox voice.
 2019-09-02 18:27:03 -05:00
nik707
e943cf0ae8 Merge pull request #9219 from Trilbyspaceclone/patch-219 
Ports "Fixes slimes not feeding #44760"
 2019-08-31 02:09:15 -05:00
Trilbyspaceclone
9c9e1b1da3 Update life.dm 2019-08-30 09:24:58 -04:00
kevinz000
931527ff7c Update mob.dm 2019-08-29 22:54:41 -07:00
nik707
36a07f134b Merge pull request #9208 from Ghommie/Ghommie-cit190 
Socks uncolorability fix.
 2019-08-29 19:28:01 -05:00
nik707
2f7402f591 Merge pull request #9184 from Ghommie/Ghommie-cit188 
Removes an obnoxious temporary overlay var.
 2019-08-29 18:19:44 -05:00
kevinz000
bea4349056 Merge pull request #9180 from deathride58/buffspoly 
grants poly the ability to automatically speak through the TGS relay (with a 0.01% chance)
 2019-08-27 20:50:59 -07:00
Ghommie
0ffeb704af Socks color fix. 2019-08-28 05:33:36 +02:00
BlackMajor
4d6b9f5da1 Merge pull request #8537 from Ghommie/Ghommie-cit28 
Fixes emags wasting charges on un-emaggable stuff.
 2019-08-28 13:54:03 +12:00
kevinz000
f07cdc0665 Merge pull request #9177 from JTGSZ/fix 
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
 2019-08-26 19:42:15 -07:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Ghommie
2ce01b3bda Removes an obnoxious temporary overlay var. 2019-08-23 19:57:57 +02:00
Linzolle
62a51d8df5 infinite sword exploit 2019-08-23 01:25:46 -05:00
Linzolle
7a481f4354 TABS 2019-08-23 01:08:53 -05:00
deathride58
9a32d437a5 grants poly the ability to speak through the TGS relay (with a 0.01% chance) 2019-08-22 20:33:12 -04:00
JTGSZ
e6dbaf8473 this should work 2019-08-22 13:02:01 -04:00
kevinz000
25a7d3af51 Merge pull request #8968 from Trilbyspaceclone/patch-199 
Fixes dead/used face huggers from still infecting
 2019-08-21 08:16:06 -07:00
BlackMajor
13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting 
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
 2019-08-18 15:33:08 +12: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
kevinz000
97306ff53c Merge pull request #9107 from deathride58/fixesarest 
Fixes handcuffs being impossible to actually resist out of
 2019-08-16 16:57:36 -07:00
Poojawa
017a3111ec Yeah this is a much, much better way of doing it. 2019-08-15 08:37:10 -05:00
Poojawa
3de3f511cf Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes 2019-08-15 08:24:55 -05:00
deathride58
5f6a110f73 Merge pull request #9052 from Citadel-Station-13/kevinz000-patch-71 
Hmm, today the Hierophant will go sicko mode on shaft miners.
 2019-08-14 15:43:51 -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
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
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
deathride58
5dddb11773 Fixes handcuffs being impossible to actually resist out of 2019-08-11 08:37:00 -04: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
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
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
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
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
Sishen
582b355224 Update guardian.dm 2019-08-08 11:00:23 -04:00
Ghommie
00bca0dd39 raise priority. 2019-08-07 19:20:14 +02:00
Fermi
ee1b04eefb Fixes potential "trapped as ghost" problems and examine+scanner text 2019-08-06 19:54:07 +01:00
Fermi
f4c5e6fd2f Attempts to deal with the potential future problem of people stunlocking 2019-08-06 16:43:55 +01:00
Thalpy
53e9c140cf Merge pull request #22 from Citadel-Station-13/master 
YARR
 2019-08-06 16:08:16 +01:00
BlackMajor
030b5f6bca Merge pull request #8989 from Citadel-Station-13/kevinz000-patch-66 
[SPEEDMERGE] I BROKE SUBTLER
 2019-08-06 21:45:45 +12:00
Sishen
9f5b54940c adds in a memento mori check 2019-08-05 21:31:17 -04:00
EgoSumStultus
d9a6be301a more fixes 2019-08-05 07:47:47 -07:00
EgoSumStultus
55b39a9cc6 male AI vox 2019-08-05 05:01:43 -07:00
Sishen
e3c3742aec Update guardian.dm 2019-08-05 06:27:10 -04:00
kevinz000
48db0b129e Update hierophant.dm 2019-08-05 01:55:05 -07:00
kevinz000
58f8920008 Update hierophant.dm 2019-08-05 01:51:51 -07:00
kevinz000
fb4709f6db Update hierophant.dm 2019-08-05 01:49:28 -07:00