Commit Graph

22563 Commits

Author SHA1 Message Date
Poojawa
d496e16dde Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-10 19:14:41 -05:00
CitadelStationBot
c200c5eeec Automatic changelog generation for PR #9078 [ci skip] 2019-08-10 00:22:31 -05: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
CitadelStationBot
74b6bc79fd Automatic changelog generation for PR #9064 [ci skip] 2019-08-10 00:20:20 -05:00
kevinz000
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
kevinz000
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
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
CitadelStationBot
2aad4f28e2 Automatic changelog generation for PR #9083 [ci skip] 2019-08-10 00:16:36 -05:00
kevinz000
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
kevinz000
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
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
CitadelStationBot
b1df6c1c07 Automatic changelog generation for PR #9081 [ci skip] 2019-08-09 13:20:19 -05: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
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
kappa-sama
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-sama
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
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
CitadelStationBot
c6562164f1 Automatic changelog generation for PR #9071 [ci skip] 2019-08-08 04:00:40 -05:00
kevinz000
290dfb8bbd Merge pull request #9071 from YakumoChen/cloningnerf
Nerfs Autocloning
2019-08-08 02:00:37 -07:00
CitadelStationBot
1d663d69bc Automatic changelog generation for PR #9061 [ci skip] 2019-08-08 03:59:53 -05: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
CitadelStationBot
a6991e3527 Automatic changelog generation for PR #9069 [ci skip] 2019-08-08 03:58:50 -05:00
kevinz000
8b20413676 Merge pull request #9069 from Ghommie/Ghommie-cit183
Fixes cults teleportations.
2019-08-08 01:58:48 -07: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-sama
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
9e41731ed1 Fixes cult runes teleporting you from the source turf to the source turf. 2019-08-07 21:35:15 +02:00
Ghommie
00bca0dd39 raise priority. 2019-08-07 19:20:14 +02:00
YakumoChen
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
kevinz000
2959a87892 Merge pull request #9022 from Ghommie/Ghommie-cit175
Ports "More robust dorfs."
2019-08-07 00:51:19 -07:00
YakumoChen
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
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