Commit Graph
23092 Commits
Author SHA1 Message Date
kevinz000andGitHub 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
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-samaandGitHub f38ac0dfbf possibly makes teleporter hate all races equally
let's go
2019-08-08 01:49:06 -04:00
BurgerLua 810251a37c Fixed bug with voting 2019-08-07 20:47:36 -07:00
Ghommie df5366e911 Removes a redunant Remove() from high luminosity eyes. 2019-08-08 05:06:53 +02:00
BurgerLUAandGitHub f33b9fa480 Merge branch 'master' into Actual-War-Ops 2019-08-07 19:50:47 -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 b4208860d8 Spelling and a few more logs. 2019-08-07 17:45:40 +01:00
Fermi 10b2cec485 Adds a analyse function for advanced chems 2019-08-07 16:52:58 +01:00
Fermi a8e2311caf Bloomin' indents! 2019-08-07 14:53:20 +01:00
Fermi 7391581a26 2 small fixes. 2019-08-07 11:33:53 +01:00
Fermi 80fe0274aa Updated ToriSprites. 2019-08-07 09:49:00 +01:00
Fermi 2a049e3485 Should fix the locker conflict! (untested) 2019-08-07 09:40:13 +01:00
ThalpyandGitHub 2256bbb63c Merge branch 'master' into master 2019-08-07 09:30:53 +01:00
YakumoChenandGitHub deeda9ebdb Update cloning.dm 2019-08-07 07:53:14 +00:00
CitadelStationBot 8c346af693 Automatic changelog generation for PR #9022 [ci skip] 2019-08-07 02:51:21 -05:00
kevinz000andGitHub 2959a87892 Merge pull request #9022 from Ghommie/Ghommie-cit175
Ports "More robust dorfs."
2019-08-07 00:51:19 -07:00
YakumoChenandGitHub 0eb9e656a9 Merge pull request #1 from Citadel-Station-13/master
updat
2019-08-07 07:51:00 +00:00
CitadelStationBot b0f1e47af1 Automatic changelog generation for PR #8986 [ci skip] 2019-08-07 02:49:25 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 6db8d9aef4 Merge pull request #9017 from Trilbyspaceclone/patch-205
Ports "Some stealth box changes #45332" Aka nerfing Stealth boxes
2019-08-07 00:48:12 -07:00
CitadelStationBot 4fc7089189 Automatic changelog generation for PR #8673 [ci skip] 2019-08-07 02:45:37 -05:00
kevinz000andGitHub 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
kevinz000andGitHub f2c92a1bcd Merge pull request #9060 from Sishen1542/lockerfix
quick fix for locker lock removal text
2019-08-07 00:29:49 -07:00
Linzolle 9a5863a526 minor tweak 2019-08-07 00:06:10 -05:00
Linzolle 41feed5f7e adds rainbow knife inhands icon, also makes knife the same shade of grey when held in either hand. 2019-08-06 23:50:00 -05:00
Ghommie 2f65700913 Fixes clock cult Abscond. 2019-08-07 06:12:14 +02:00
Ghommie de8137d6c8 One line fix for invisible zipties. 2019-08-06 23:19:28 +02:00
Cebutris 3e6112fec0 adds the hug gloves to the arcade reward pool 2019-08-06 16:48:49 -04: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
Fermi f4c5e6fd2f Attempts to deal with the potential future problem of people stunlocking 2019-08-06 16:43:55 +01:00
deathride58andGitHub ddb29551fc paren 2019-08-06 11:28:01 -04:00
ThalpyandGitHub 53e9c140cf Merge pull request #22 from Citadel-Station-13/master
YARR
2019-08-06 16:08:16 +01:00
TrilbyspacecloneandGitHub 7a22e73a79 Update speech.dm 2019-08-06 08:47:10 -04:00
deathride58 ee0d7a4ed3 Fixes issues with femur breaker by replacing the forced speech with a proper scream emote and making it guarantee landing in crit 2019-08-06 07:43:28 -04:00
BlackMajorandGitHub 98cecb2cc7 Merge pull request #8923 from Citadel-Station-13/kevinz000-patch-53
Removes damage from *dab
2019-08-06 21:47:52 +12:00
BlackMajorandGitHub 030b5f6bca Merge pull request #8989 from Citadel-Station-13/kevinz000-patch-66
[SPEEDMERGE] I BROKE SUBTLER
2019-08-06 21:45:45 +12:00
CitadelStationBot db13295b96 Automatic changelog generation for PR #9050 [ci skip] 2019-08-06 04:28:31 -05:00
BlackMajorandGitHub d8d6fda259 Merge pull request #9050 from Ghommie/Ghommie-cit179
Fixes combatmode pushing not knocking people down against walls.
2019-08-06 21:28:29 +12:00
Sishen decbd37ced Update closets.dm 2019-08-06 03:49:08 -04:00