Commit Graph

25268 Commits

Author SHA1 Message Date
Ghommie
17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
Ghommie
8c21fac476 513 compatibility 2019-10-30 22:24:00 +01:00
CitadelStationBot
d249a38489 Automatic changelog generation for PR #9532 [ci skip] 2019-10-29 23:46:41 -05: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
CitadelStationBot
a728f3f577 Automatic changelog generation for PR #9531 [ci skip] 2019-10-29 23:43:47 -05: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
CitadelStationBot
1a5a3dcd6b Automatic changelog generation for PR #9578 [ci skip] 2019-10-29 23:42:35 -05: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
CitadelStationBot
b66b85e416 Automatic changelog generation for PR #9598 [ci skip] 2019-10-29 23:41:13 -05: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
CitadelStationBot
fbfceb2fce Automatic changelog generation for PR #9500 [ci skip] 2019-10-29 23:37:43 -05: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
CitadelStationBot
0ebda43c79 Automatic changelog generation for PR #9494 [ci skip] 2019-10-29 23:37:13 -05:00
kevinz000
5aee9b0142 Merge pull request #9494 from Ghommie/Ghommie-cit235
Fixes the "gear" harness.
2019-10-29 21:37:11 -07:00
CitadelStationBot
fff4cc9112 Automatic changelog generation for PR #9469 [ci skip] 2019-10-29 23:36:23 -05: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
CitadelStationBot
ee60b62574 Automatic changelog generation for PR #9423 [ci skip] 2019-10-29 23:35:19 -05:00
kevinz000
5ba86d2fc3 Merge pull request #9423 from Poojawa/NPC-Run-levels
Boosts NPC runtime priority
2019-10-29 21:35:17 -07:00
CitadelStationBot
0ec2780a08 Automatic changelog generation for PR #9350 [ci skip] 2019-10-29 23:33:36 -05:00
kevinz000
66faef41f8 Merge pull request #9350 from Tupinambis/UIChanges
Cyborg UI Beautification and Improvements
2019-10-29 21:33:34 -07:00
CitadelStationBot
acf9638b9b Automatic changelog generation for PR #9501 [ci skip] 2019-10-29 23:29:14 -05: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
CitadelStationBot
15e87a10d0 Automatic changelog generation for PR #9533 [ci skip] 2019-10-29 23:28:12 -05:00
kevinz000
754bb888dc Merge pull request #9533 from JTGSZ/rpd-fix
RPD flipping works again
2019-10-29 21:28:10 -07:00
CitadelStationBot
ce7e675c08 Automatic changelog generation for PR #9592 [ci skip] 2019-10-29 23:27:55 -05: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
8d1707f837 Merge pull request #9602 from Ghommie/Ghommie-cit266
Offsets the new linen bin sprites 6 pixels up.
2019-10-29 21:26:21 -07:00
CitadelStationBot
58702b8aa5 Automatic changelog generation for PR #9610 [ci skip] 2019-10-29 23:26:06 -05: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
CitadelStationBot
d012e792fd Automatic changelog generation for PR #9615 [ci skip] 2019-10-29 23:25:31 -05:00
kevinz000
303175c1b8 Merge pull request #9615 from Ghommie/Ghommie-cit274
Resprited wooden and critter crates.
2019-10-29 21:25:29 -07:00
CitadelStationBot
201cd6f9b7 Automatic changelog generation for PR #9616 [ci skip] 2019-10-29 23:25:14 -05: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
CitadelStationBot
bcbf2de7f7 Automatic changelog generation for PR #9652 [ci skip] 2019-10-29 23:24:09 -05:00
kevinz000
86aafd016b Merge pull request #9652 from Ghommie/Ghommie-cit289
sofa sprites armrest improvements.
2019-10-29 21:24:07 -07:00
CitadelStationBot
d410556df6 Automatic changelog generation for PR #9651 [ci skip] 2019-10-29 23:23:57 -05: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
CitadelStationBot
046d3aab62 Automatic changelog generation for PR #9648 [ci skip] 2019-10-29 23:22:48 -05: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
CitadelStationBot
022fbc09ab Automatic changelog generation for PR #9647 [ci skip] 2019-10-29 23:22:28 -05:00
kevinz000
cf89cfdd2d Merge pull request #9647 from Ghommie/Ghommie-cit287
Arcade machine directional sprites.
2019-10-29 21:22:26 -07:00
CitadelStationBot
e1954e3474 Automatic changelog generation for PR #9646 [ci skip] 2019-10-29 23:22:08 -05: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
CitadelStationBot
e16c08f42a Automatic changelog generation for PR #9645 [ci skip] 2019-10-29 23:21:56 -05: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
CitadelStationBot
f8c240aae2 Automatic changelog generation for PR #9644 [ci skip] 2019-10-29 23:21:44 -05: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