 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 |
|
Fel
|
5dc2124df0
|
Update custom_items.dm
|
2019-08-09 19:00:21 -04: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 |
|
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 |
|
Poojawa
|
98a279a6db
|
likely fixes the examine bug lol
|
2019-08-08 17:45:01 -05:00 |
|
 kappa-samaandGitHub
|
3f60d3ca1c
|
Merge pull request #2 from kappa-sama/moth1
branches
|
2019-08-08 18:27:51 -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 |
|
Poojawa
|
283b5d050e
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-08 16:51:53 -05: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 |
|
Fermi
|
9d3aa1f3b0
|
Removing a comment block I missed.
|
2019-08-08 18:28:47 +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 |
|
CitadelStationBot
|
c6562164f1
|
Automatic changelog generation for PR #9071 [ci skip]
|
2019-08-08 04:00:40 -05:00 |
|
 kevinz000andGitHub
|
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 |
|
 kevinz000andGitHub
|
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 |
|
 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 |
|