Commit Graph

16414 Commits

Author SHA1 Message Date
Ghommie
b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 2019-10-30 14:46:42 +01:00
Anonymous
5930389cb6 Merge branch 'master' into assu 2019-10-30 15:18:39 +03:00
Ghommie
b86c5059d5 [s] modkit uninstall() calling forceMove() calling loc.Exited() calling modkit.uninstall() calling f... 2019-10-30 13:17:12 +01:00
Putnam
bb197c2251 allows heal viruses not to hurt slimes 2019-10-30 01:34:03 -07:00
deathride58
18f1dc53cc Merge pull request #9532 from MrJWhit/stam-cost-reduction
Reduces stamloss of melee weapons by 20%
2019-10-30 00:46:38 -04:00
kevinz000
be752c1fb0 Merge pull request #9531 from Ghommie/Ghommie-cit246
Little stunbaton nerf (split off from #9500)
2019-10-29 21:43:45 -07:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
kevinz000
fb936a5319 Merge pull request #9598 from deathride58/runtimefixpass
various runtime fixes - plasmaman tongues no longer have a maxHealth of "alien" and more
2019-10-29 21:41:11 -07:00
kevinz000
e6046d62d6 Merge pull request #9528 from Ghommie/Ghommie-cit244
Fixes some peculiarities with hands layer overlapping stuff
2019-10-29 21:38:24 -07:00
kevinz000
631961121f Merge pull request #9521 from MrJWhit/cult-robe-change
Increases bomb resistance in blood cult robes
2019-10-29 21:38:00 -07:00
kevinz000
a7039c2d89 Merge pull request #9500 from Ghommie/Ghommie-cit237
teleprods works on non-carbons too now.
2019-10-29 21:37:41 -07:00
kevinz000
5aee9b0142 Merge pull request #9494 from Ghommie/Ghommie-cit235
Fixes the "gear" harness.
2019-10-29 21:37:11 -07:00
kevinz000
05a84985d4 Merge pull request #9469 from deathride58/vampyawn
Small vampire balance tweaks - Bat ventcrawling requires starvation, chapel is no longer instant death
2019-10-29 21:36:21 -07:00
kevinz000
5ba86d2fc3 Merge pull request #9423 from Poojawa/NPC-Run-levels
Boosts NPC runtime priority
2019-10-29 21:35:17 -07:00
kevinz000
66faef41f8 Merge pull request #9350 from Tupinambis/UIChanges
Cyborg UI Beautification and Improvements
2019-10-29 21:33:34 -07:00
kevinz000
b172c5f691 Merge pull request #9501 from deathride58/stronksecborgs
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
2019-10-29 21:29:12 -07:00
kevinz000
754bb888dc Merge pull request #9533 from JTGSZ/rpd-fix
RPD flipping works again
2019-10-29 21:28:10 -07:00
kevinz000
ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262
Porting movespeed modification system updates.
2019-10-29 21:27:53 -07:00
kevinz000
0064529362 Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
2019-10-29 21:26:03 -07:00
kevinz000
d64d1752b4 Merge pull request #9616 from deathride58/post512jukeboxes
Makes jukeboxes work again after 512.1459's changes to SOUND_UPDATE (and other small fixes/tweaks)
2019-10-29 21:25:12 -07:00
kevinz000
86aafd016b Merge pull request #9652 from Ghommie/Ghommie-cit289
sofa sprites armrest improvements.
2019-10-29 21:24:07 -07:00
kevinz000
9998a2c898 Merge pull request #9651 from Thalpy/Thalpy-patch-1
[Upstream migration] Fixes widescreen tooltips
2019-10-29 21:23:55 -07:00
kevinz000
df715d6cbc Merge pull request #9650 from Hatterhat/patch-3
<b>hey did you guys hear about that one cursed image with the skylar ahegao</b>
2019-10-29 21:23:26 -07:00
kevinz000
2ca3cedaed Merge pull request #9648 from Ghommie/Ghommie-cit288
Random plush spawner tweaks and fixes.
2019-10-29 21:22:46 -07:00
kevinz000
5cb19d9973 Merge pull request #9646 from Ghommie/Ghommie-cit286
Fixing nuke ops / adminspawn combat mechs having tracking beacons.
2019-10-29 21:22:06 -07:00
kevinz000
96364ea075 Merge pull request #9645 from Ghommie/Ghommie-cit285
Fixing invisible blackberry n strawberry chocolate cake slices.
2019-10-29 21:21:54 -07:00
kevinz000
fc073748ec Merge pull request #9644 from Ghommie/Ghommie-cit284
Fixes a few issues with PKA mods.
2019-10-29 21:21:42 -07:00
kevinz000
bc3dd51db3 Merge pull request #9626 from Ghommie/Ghommie-cit278
Unmodularize space kiwis and banana spiders.
2019-10-29 21:21:14 -07:00
kappa-sama
9c30672bf0 nerfs miasma points from 120 to 6
wtf
2019-10-29 23:03:47 -04:00
BlackMajor
852a405ab8 Merge pull request #9631 from Citadel-Station-13/kevinz000-patch-98
Medibots now ACTUALLY heal slimes, rather than just not killing them (or how I learned binary logic the hard way)
2019-10-30 15:55:29 +13:00
Ghommie
c6022518a7 Shameless late game crew nerf. 2019-10-30 03:25:50 +01:00
Trilbyspaceclone
bbd3c55fbc Update halloween.dm 2019-10-29 21:37:44 -04:00
Ghommie
005c87bdf6 I'm making a joke title, don't ban me github. 2019-10-30 01:31:29 +01:00
Trilbyspaceclone
ec4b94c3c0 Update embalming.dm 2019-10-29 20:22:44 -04:00
kevinz000
0fb5687a0a Update RCD.dm 2019-10-29 16:53:15 -07:00
Ghommie
1b8bda7040 Fixes some average runtimes, how null... 2019-10-30 00:48:51 +01:00
kevinz000
0746d782d7 Update RCD.dm 2019-10-29 16:43:59 -07:00
kevinz000
39030b8fb0 Update RCD.dm 2019-10-29 16:37:36 -07:00
Ghommie
30fb851abd damn 2019-10-30 00:09:29 +01:00
Ghommie
54f8c29005 Fixing riding component runtimes, how drifting... 2019-10-29 23:33:35 +01:00
Ghommie
9f00423bbd Fixing the deep space gorilla. 2019-10-29 21:51:00 +01:00
Ghommie
6a64647ee8 Fixing dogborg sleepers runtimes, how atrocious... 2019-10-29 19:45:10 +01:00
Anonymous
23202e8524 Merge branch 'master' into assu 2019-10-29 17:53:16 +03:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
a5086d5813 3 seconds penalties fix 2019-10-29 13:16:36 +01:00
BlackMajor
edfa1d0bae Merge pull request #9649 from Thalpy/JacqFixes
[Expedite][Halloween] Damnit Jacq stop bothering the AI
2019-10-29 21:48:35 +13:00
Fermi
be470c2d18 Oranges are high 2019-10-29 08:07:11 +00:00
Fermi
5356afa9e6 Barthhhh 2019-10-29 06:14:31 +00:00
Putnam
df3d5ab51f always gotta be one, at least 2019-10-28 23:05:22 -07:00
Putnam
cb88fd1a44 added dynamic antag injection to config 2019-10-28 22:58:35 -07:00