Commit Graph
23031 Commits
Author SHA1 Message Date
kevinz000andGitHub 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
CitadelStationBot 0dcd3a2688 Automatic changelog generation for PR #9062 [ci skip] 2019-08-11 12:08:47 -05:00
kevinz000andGitHub 69884d1abe Merge pull request #9062 from Trilbyspaceclone/patch-207
Makes smile not as horrable.
2019-08-11 10:08:45 -07:00
kevinz000andGitHub 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
CitadelStationBot ffd4edffe6 Automatic changelog generation for PR #9079 [ci skip] 2019-08-11 12:01:12 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 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
CitadelStationBot aa4e20c6b3 Automatic changelog generation for PR #9101 [ci skip] 2019-08-11 11:59:32 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 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
BlackMajorandGitHub 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
CitadelStationBot c200c5eeec Automatic changelog generation for PR #9078 [ci skip] 2019-08-10 00:22:31 -05:00
kevinz000andGitHub 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
CitadelStationBot 74b6bc79fd Automatic changelog generation for PR #9064 [ci skip] 2019-08-10 00:20:20 -05:00
kevinz000andGitHub b3b22029a6 Merge pull request #9064 from cebutris/hugloves
Hugs of the North Star
2019-08-09 22:20:18 -07:00
CitadelStationBot af73ee78b1 Automatic changelog generation for PR #9070 [ci skip] 2019-08-10 00:18:42 -05:00
kevinz000andGitHub 8cdb33c3a2 Merge pull request #9070 from Linzolle/rainbow-knife
adds rainbow knife inhands icon, also normalises knife colour
2019-08-09 22:18:40 -07:00
kevinz000andGitHub 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
CitadelStationBot 2aad4f28e2 Automatic changelog generation for PR #9083 [ci skip] 2019-08-10 00:16:36 -05:00
kevinz000andGitHub f516fcf539 Merge pull request #9083 from Trilbyspaceclone/fruit
Strawbarries, and more
2019-08-09 22:16:34 -07:00
CitadelStationBot 86b0819994 Automatic changelog generation for PR #9084 [ci skip] 2019-08-10 00:16:11 -05:00
kevinz000andGitHub b213b0ed2b Merge pull request #9084 from Ghommie/Ghommie-cit185
Fixes clock cult mass recall.
2019-08-09 22:16:09 -07:00
CitadelStationBot 4dda79cde2 Automatic changelog generation for PR #9085 [ci skip] 2019-08-10 00:15:58 -05:00
kevinz000andGitHub 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
CitadelStationBot b1df6c1c07 Automatic changelog generation for PR #9081 [ci skip] 2019-08-09 13:20:19 -05:00
kevinz000andGitHub 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
kappa-samaandGitHub a8e4ce1f77 Merge branch 'master' into moth1 2019-08-08 18:27:34 -04:00
TrilbySpaceClone 5bd6f88226 Falsehoods 2019-08-08 18:27:01 -04:00
kappa-samaandGitHub 1853dc185c Merge pull request #1 from Ghommie/Ghommie-cit185
Uncalibrated teleporters can now turn furries, scalies & co into flypeople.
2019-08-08 18:25:24 -04:00
TrilbySpaceClone 893c9c9c63 A correction? 2019-08-08 17:45:58 -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
kevinz000andGitHub 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