Commit Graph

16414 Commits

Author SHA1 Message Date
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
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
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
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
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-sama
f38ac0dfbf possibly makes teleporter hate all races equally
let's go
2019-08-08 01:49:06 -04:00
Sishen
f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -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
BurgerLUA
f33b9fa480 Merge branch 'master' into Actual-War-Ops 2019-08-07 19:50:47 -07:00
Ghommie
23e3263fcb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-08 04:46:54 +02:00
kevinz000
2e71074f30 compile 2019-08-07 13:22:25 -07:00
kevinz000
65473dc4ba s 2019-08-07 13:18:45 -07:00
kevinz000
277971971f s 2019-08-07 13:07:38 -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
10b2cec485 Adds a analyse function for advanced chems 2019-08-07 16:52:58 +01:00
Poojawa
b5841c718b Genpop for security 2019-08-07 06:14:35 -05:00
Fermi
7391581a26 2 small fixes. 2019-08-07 11:33:53 +01:00
Fermi
2a049e3485 Should fix the locker conflict! (untested) 2019-08-07 09:40:13 +01:00
Thalpy
2256bbb63c Merge branch 'master' into master 2019-08-07 09:30:53 +01: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
kevinz000
df60e21449 Update misc_walls.dm 2019-08-07 00:20:28 -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
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
deathride58
ddb29551fc paren 2019-08-06 11:28:01 -04:00
Thalpy
53e9c140cf Merge pull request #22 from Citadel-Station-13/master
YARR
2019-08-06 16:08:16 +01:00