Poojawa
|
d496e16dde
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-08-10 19:14:41 -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 |
|
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 |
|
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 |
|
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 |
|
kevinz000
|
290dfb8bbd
|
Merge pull request #9071 from YakumoChen/cloningnerf
Nerfs Autocloning
|
2019-08-08 02:00:37 -07: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 |
|
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 |
|
kevinz000
|
2959a87892
|
Merge pull request #9022 from Ghommie/Ghommie-cit175
Ports "More robust dorfs."
|
2019-08-07 00:51:19 -07: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
|
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 |
|
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 |
|
kevinz000
|
f2c92a1bcd
|
Merge pull request #9060 from Sishen1542/lockerfix
quick fix for locker lock removal text
|
2019-08-07 00:29:49 -07: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 |
|
Cebutris
|
564aa9b4cb
|
Gloves of the north star now work for hugging and patting
|
2019-08-06 13:01:49 -04:00 |
|
deathride58
|
ddb29551fc
|
paren
|
2019-08-06 11:28:01 -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 |
|
BlackMajor
|
030b5f6bca
|
Merge pull request #8989 from Citadel-Station-13/kevinz000-patch-66
[SPEEDMERGE] I BROKE SUBTLER
|
2019-08-06 21:45:45 +12:00 |
|
Sishen
|
decbd37ced
|
Update closets.dm
|
2019-08-06 03:49:08 -04:00 |
|
kevinz000
|
d1548c7907
|
Merge pull request #9058 from Ghommie/Ghommie-cit180
Defaults the teleportation forceMove arg to TRUE.
|
2019-08-05 15:39:39 -07:00 |
|
kevinz000
|
eab07c62de
|
Merge pull request #9045 from CameronWoof/codifying-mrp-again
Officially ends the non-stop thrill ride of coating the station in your gender fluids for "fun"
|
2019-08-05 14:57:54 -07:00 |
|
Ghommie
|
8978f0ecf9
|
Defaults the teleportation forceMove arg to TRUE.
|
2019-08-05 18:19:48 +02:00 |
|
Cameron!
|
33d883367a
|
makes fluid_rate match the intended rate
|
2019-08-05 06:41:57 -07:00 |
|
kevinz000
|
aea2f6f523
|
Merge pull request #8900 from Seris02/spaceruinsyee
Abductor Replication Lab space ruin - take 2
|
2019-08-05 00:55:40 -07:00 |
|