Commit Graph

15948 Commits

Author SHA1 Message Date
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
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
kevinz000
0fb5687a0a Update RCD.dm 2019-10-29 16:53:15 -07: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
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
BlackMajor
1cfc477f36 Merge pull request #9641 from Citadel-Station-13/kevinz000-patch-100
A more "fun" nerf to trashbags (and some FUCK-tier code refactoring for storage components to make it happen)
2019-10-29 17:44:35 +13:00
Ghommie
85ba7943db Less visual issues. 2019-10-29 04:58:24 +01:00
Ghommie
9d17e63314 sofa sprites armrest improvements. 2019-10-29 04:53:24 +01:00
Thalpy
2636398e60 WEBEDITS 2019-10-29 03:50:49 +00:00
Hatterhat
ebd05a3fb1 today i will make a one line fix and steal it from sishen 2019-10-28 22:39:46 -05:00
Thalpy
e71dc54594 i-- 2019-10-29 03:29:56 +00:00
Thalpy
a1e611e7aa Heck 2019-10-29 03:23:46 +00:00
Thalpy
39f7116353 Oops 2019-10-29 03:22:21 +00:00
deathride58
624d562995 Merge pull request #9637 from Citadel-Station-13/byond_513
BYOND 513 preliminary support
2019-10-28 21:17:33 -04:00
Ghommie
f725afae64 Random plush spawner tweaks and fixes. 2019-10-29 02:06:22 +01:00
BlackMajor
ba9c99644d Merge pull request #9640 from Linzolle/hat-toss
I broke hats oops
2019-10-29 10:00:52 +13:00
Ghommie
e688d37390 Fixing nuke ops / adminspawn combat mechs having tracking beacons. 2019-10-28 18:33:39 +01:00
Ghommie
3b51c3c5be Fixing invisible blackberry n strawberry chocolate cake slices. 2019-10-28 18:20:58 +01:00
Ghommie
8c4e031a1b atom/movable's Destroy() calls MoveToNullSpace() which calls Exited(), thus handle_atom_del() is redunant. 2019-10-28 17:59:32 +01:00
Ghommie
68b1583a1a Fixing PKA mod double installation et similars. 2019-10-28 17:47:29 +01:00
kevinz000
46dabe25bb Update storage.dm 2019-10-27 21:35:37 -07:00
BlackMajor
cc3eefff29 Merge pull request #9570 from Citadel-Station-13/kevinz000-patch-105
Gives peacekeeper cyborgs a megaphone
2019-10-28 17:02:34 +13:00
BlackMajor
6a7a121d56 Merge pull request #8856 from Citadel-Station-13/magrifles_again
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
2019-10-28 16:47:02 +13:00
kevinz000
d7e8b5209f Update bags.dm 2019-10-27 20:36:32 -07:00
kevinz000
d390dc30fd Update storage.dm 2019-10-27 20:35:27 -07:00
BlackMajor
5ed6de4e26 Merge pull request #9639 from Ghommie/Ghommie-cit283
Quickfixing hypospray missin icons.
2019-10-28 16:30:36 +13:00
kevinz000
1211cf43e9 Update storage.dm 2019-10-27 20:25:07 -07:00
kevinz000
84c15af767 Merge pull request #9590 from Ghommie/Ghommie-cit260
Ports "All font size spans scale" and cleans up the many browserOutput stylesheets
2019-10-27 17:22:35 -07:00
kevinz000
329f86cea0 Merge pull request #9612 from Linzolle/blood-overlay-again
fix blood overlays again
2019-10-27 17:21:55 -07:00
kevinz000
2a80c9a0a3 missed a spot redux 2019-10-27 17:10:34 -07:00
Ghommie
96e20f4769 fixing one mistake, and it's ready. 2019-10-28 01:04:31 +01:00
Linzolle
24e5905c38 fuck 2019-10-27 19:02:26 -05:00
Ghommie
2d8e383b9c Quickfixing hypospray missin icons. 2019-10-28 00:52:47 +01:00
Ghommie
80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
kevinz000
fae47c58ed Merge pull request #9635 from Thalpy/JacqFixes
[Expedite] [Halloween] A few fixes for Jacqueline and Barth.
2019-10-27 16:41:06 -07:00
kevinz000
dc0fa95bd9 missed a spot 2019-10-27 16:29:33 -07:00