Commit Graph

10355 Commits

Author SHA1 Message Date
DeltaFire 85b0cb37b8 Little typofix
Bruh
2019-11-15 18:12:57 +01:00
DeltaFire d34ef11bac Some more changes to clock stuff
Adds some flavor for the kindle spell, changes the transgression sigil to burn cultists instead of stunning, adds belingerent debuff to spearthrow and kindle attack when used on hostile cultists
2019-11-15 18:01:42 +01:00
DeltaFire 9e9528dced Cult vs Cult changes, Ratvar side
Changes the hardstuns by kindle and spearthrow into debuffs if attacking hostile (Nar'Sian) cultists
2019-11-14 21:01:08 +01:00
BlackMajor 2c9af44ce3 Merge pull request #9724 from Ghommie/Ghommie-cit322
Fixes free real estate paraplegic trait and bolas.
2019-11-10 17:10:45 +13:00
BlackMajor aaff0bf9e7 Merge pull request #9705 from kappa-sama/patch-4
thanks major
2019-11-08 14:17:59 +13:00
BlackMajor a6bbe75c36 Merge pull request #9611 from Citadel-Station-13/supply-passive-gen
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
2019-11-08 14:17:17 +13:00
Ghommie ae9ff92d33 Fixes free real estate paraplegic trait and bolas. 2019-11-05 18:03:50 +01:00
kappa-sama 9f04cba7bf workaround 2019-11-03 18:27:47 -05:00
kevinz000 2cdbf04272 Merge pull request #9687 from Ghommie/Ghommie-cit305
Refactoring how Jacqueen teleportation destination is selected.
2019-11-03 06:24:53 -07:00
kevinz000 5e9c1901b4 Merge pull request #9659 from Ghommie/Ghommie-cit292
Fixing deep space gorilla runtimes, how ape...
2019-11-03 06:20:06 -07:00
kevinz000 0fa57f6102 Merge pull request #9660 from Ghommie/Ghommie-cit293
Fixing riding component runtimes, how drifting...
2019-11-03 06:19:56 -07:00
kevinz000 5bfcc663f5 Merge pull request #9662 from Ghommie/Ghommie-cit294
Fixes some average runtimes, how null...
2019-11-03 06:19:40 -07:00
kevinz000 0615189629 Merge pull request #9665 from Ghommie/Ghommie-cit295
Removing references to national socialism
2019-11-03 06:18:47 -07:00
kevinz000 c484a209a7 Merge pull request #9669 from Ghommie/Ghommie-cit297
modkit uninstall() calling forceMove() calling loc.Exited() calling modkit uninstall()
2019-11-03 06:17:21 -07:00
kevinz000 3a2ce8c5ce Merge pull request #9679 from Ghommie/Ghommie-cit302
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
2019-11-03 06:14:13 -07:00
Ghommie 2653a2965d How about we only check the living? 2019-11-02 20:46:33 +01:00
Ghommie f4587b4260 This is very unprofessional. Yet I'm no google architect. 2019-11-02 16:47:25 +01:00
Ghommie 50fc1004ba Actually holopads, so they won't end up in maintenance... 2019-11-02 16:46:02 +01:00
Ghommie 3193e3ce20 fix. 2019-11-02 16:12:37 +01:00
Ghommie a949f84557 missing bits. 2019-11-02 16:00:48 +01:00
Ghommie 1bf10c0435 Improving Jacqueen's teleportation area selection. 2019-11-02 15:50:54 +01:00
kevinz000 d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
2019-10-31 17:27:03 -07:00
Ghommie b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01:00
Ghommie b86c5059d5 [s] modkit uninstall() calling forceMove() calling loc.Exited() calling modkit.uninstall() calling f... 2019-10-30 13:17:12 +01: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 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 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 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 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 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
Ghommie 005c87bdf6 I'm making a joke title, don't ban me github. 2019-10-30 01:31:29 +01:00
Ghommie 1b8bda7040 Fixes some average runtimes, how null... 2019-10-30 00:48:51 +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
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
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