Commit Graph

9386 Commits

Author SHA1 Message Date
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
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
Poojawa 2b2bdb37ba Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 23:26:20 -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
Cebutris df136ab96c lactation is now a preference 2019-08-10 23:28:16 -04:00
lolman360 da61b66f5c ban me? 2019-08-11 11:11:30 +10:00
lolman360 92c7ae8732 yea i use webgit what ya gonna do 2019-08-11 11:07:17 +10:00
Poojawa a3cd143131 whaccky github hijinks 2019-08-10 19:28:47 -05:00
Poojawa 57835e2f81 head announce datums 2019-08-10 19:20:05 -05:00
Poojawa d496e16dde Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 19:14:41 -05:00
Cebutris d77360c794 gives tea aspera proper reagents 2019-08-10 19:32:12 -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 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
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 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 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
TrilbySpaceClone ab13b62bdd fruits of labor 2019-08-08 16:14:04 -04:00
Fermi 1fb07e286a Removing reviewer comments incase of fullmerge. 2019-08-08 19:53:07 +01: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 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
Sishen f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -04:00
Ghommie df5366e911 Removes a redunant Remove() from high luminosity eyes. 2019-08-08 05:06:53 +02:00
BurgerLUA f33b9fa480 Merge branch 'master' into Actual-War-Ops 2019-08-07 19:50:47 -07:00
kevinz000 65473dc4ba s 2019-08-07 13:18:45 -07:00
Ghommie 9e41731ed1 Fixes cult runes teleporting you from the source turf to the source turf. 2019-08-07 21:35:15 +02:00
Fermi 99e95dcedf Guess who forgot message admins 2019-08-07 18:57:38 +01:00
Ghommie 00bca0dd39 raise priority. 2019-08-07 19:20:14 +02:00
Fermi 10b2cec485 Adds a analyse function for advanced chems 2019-08-07 16:52:58 +01:00
Thalpy 2256bbb63c Merge branch 'master' into master 2019-08-07 09:30:53 +01:00
kevinz000 a845b5ae0c Merge pull request #8986 from Ghommie/Ghommie-cit163
reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code.
2019-08-07 00:49:23 -07:00
kevinz000 27667d467b Merge pull request #8673 from Trilbyspaceclone/patch-179
Makes upgraded prostics worth getting - Re-balances robotic lims
2019-08-07 00:45:34 -07:00
Ghommie 2f65700913 Fixes clock cult Abscond. 2019-08-07 06:12:14 +02:00
Cebutris d0b8e054fd Added hug gloves as their own item, removing the feature from regular GotNS 2019-08-06 16:42:35 -04:00
Fermi ee1b04eefb Fixes potential "trapped as ghost" problems and examine+scanner text 2019-08-06 19:54:07 +01:00
Cebutris 564aa9b4cb Gloves of the north star now work for hugging and patting 2019-08-06 13:01:49 -04:00