Commit Graph

14071 Commits

Author SHA1 Message Date
Sishen
c6fbb966c8 honk 2019-08-09 03:55:08 -04:00
Sishen
dc66446064 dab dab 2019-08-09 03:19:02 -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
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
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
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
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
kevinz000
9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142
Fixes Zelus flasks a bit.
2019-08-05 00:54:43 -07:00
kevinz000
ed30f9ba58 Merge pull request #9046 from Sishen1542/satdeleite
meteor sats are no longer dense objects
2019-08-05 00:50:04 -07:00
kevinz000
b292bc7187 Merge pull request #9007 from Ghommie/Ghommie-cit168
Fixes and standarizes sword sheaths/scabbards overlays.
2019-08-05 00:49:49 -07:00
kevinz000
4f0dc33d1b Merge pull request #9021 from Ghommie/Ghommie-cit174
Ports "Adds techpriest robes and adds them to the RoboDrobe"
2019-08-05 00:49:29 -07:00
kevinz000
f8cede1ca8 Merge pull request #8998 from Ghommie/Ghommie-cit167
Fixes inactive high luminosity eyes turning back on as soon as you move around.
2019-08-05 00:49:14 -07:00
kevinz000
cd6699cfed Merge pull request #8660 from Trilbyspaceclone/Unmodular
Ummodular a few files - Fixes Freelance Crate costs
2019-08-05 00:47:28 -07:00
kevinz000
a105ba4bb6 Merge pull request #8774 from Sishen1542/monkeycult
Removes the human check from cap/chap mind on cult conversion.
2019-08-05 00:47:04 -07:00
kevinz000
86a2d917e5 Merge pull request #8913 from Trilbyspaceclone/clockstoles
Makes brass/bronze bar stools and stools - Same as normal ones
2019-08-05 00:45:56 -07:00
kevinz000
9852084200 Merge pull request #9019 from Ghommie/Ghommie-cit172
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
2019-08-05 00:44:15 -07:00
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
kevinz000
c92e8b43bf Merge pull request #9042 from EgoSumStultus/femur-breaker
[ THE FEMUR BREAKER ]
2019-08-04 22:27:42 -07:00
EgoSumStultus
5bfe4492a1 huhhh... huhu.... 2019-08-04 22:15:10 -07:00
Trilbyspaceclone
3bad062c23 Merge branch 'master' into Unmodular 2019-08-05 00:04:44 -04:00
kevinz000
2654a5388e Merge pull request #9024 from Ghommie/Ghommie-cit176
Ports "Lizardwine drink crafting fix"
2019-08-04 19:22:52 -07:00
kevinz000
8fa888f408 Merge pull request #8995 from Ghommie/Ghommie-cit165
Fixes jogging on wet tiles actually slipping you if you have less than 20 stamloss
2019-08-04 19:21:38 -07:00
kevinz000
489b4c78dc Merge pull request #8996 from Ghommie/Ghommie-cit166
Adds in worn overlays for different types of cuffs.
2019-08-04 19:19:19 -07:00
kevinz000
5cfb7ef49d Merge pull request #8999 from BurgerLUA/Xeno-Nerf-part-1-out-of-20
Xenomorph larvae no longer gib and inexplicably delete your brain when hatching
2019-08-04 19:18:53 -07:00
kevinz000
5f87927b0a Merge pull request #9030 from CameronWoof/iv-drip-fix
Fixes a visual glitch with beakers containing water attached to IV stands
2019-08-04 19:18:00 -07:00
kevinz000
7a3d895997 Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes
Tweaks cakes, adds in more of them as well as a few more tarts - All hidden
2019-08-04 19:15:18 -07:00
kevinz000
afe2dd1e28 Merge pull request #9009 from BurgerLUA/Proper-Calculations
Fixed WarOps Challenge incorrectly counting players
2019-08-04 19:14:08 -07:00
kevinz000
e04547b838 Merge pull request #9015 from Trilbyspaceclone/patch-203
fixes a few snowcones being bad grammared
2019-08-04 19:13:44 -07:00
kevinz000
8452cf3b8a Merge pull request #9014 from Ghommie/Ghommie-cit170
undergarment fixes.
2019-08-04 19:13:21 -07:00
kevinz000
f8dbe71bf7 Merge pull request #9035 from Poojawa/vore-toggle-fix
Fixes a runtime with a simple mob verb
2019-08-04 19:12:57 -07:00
kevinz000
53a9f3ac51 Merge pull request #9036 from Linzolle/invisiclothes
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
2019-08-04 19:09:36 -07:00
kevinz000
de675a10e7 Merge pull request #9025 from Poojawa/patch-1
Actually fixes Vore sounds for real this time
2019-08-04 19:08:16 -07:00
kevinz000
4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock
Adds the ability to construct and deconstruct locker locks
2019-08-04 19:07:35 -07:00