Commit Graph

10377 Commits

Author SHA1 Message Date
Putnam
2120526525 Merged upstream dynamic fixes ported by Ghommie. 2019-11-10 18:48:59 -08:00
Ghommie
c6e44a7fed That's it: #46027, (a little bit of) #46132, #47100, #47341, #47351, #47395, #47457, #47491. 2019-11-10 17:59:40 +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
Putnam
fdcc4af303 mm, yes, compile BEFORE committing 2019-11-09 04:40:25 -08:00
Putnam
6de835f5e3 Assassination is less likely at lower threats. 2019-11-09 04:39:14 -08:00
Putnam
68e18ea92f m o r e 2019-11-09 04:07:38 -08:00
Putnam
428ea5e5e1 Nuke disk being still now generates threat 2019-11-09 03:12:36 -08:00
Putnam
d0d469a45a Better roundend logging 2019-11-09 01:00:35 -08:00
Putnam
be464a38b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-08 20:37:29 -08:00
Putnam
cfcf89ebf1 Dynamic controls lots of events now (when active)! 2019-11-08 15:44:38 -08:00
Putnam
825ef80b9d started transferring some events from events to dynamic antags 2019-11-08 06:33:31 -08:00
Putnam
912ca97d29 Added a preference that auto-votes at extremely low weight. 2019-11-08 03:44:22 -08:00
Putnam
d795df1150 made warops part of the dynamic system, in dynamic 2019-11-07 23:39:17 -08:00
Putnam
aab2c4cd3c Added logging to wizard/traitor extra threat spending. 2019-11-07 20:34:02 -08: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
Putnam
34015969e8 changed misleading message 2019-11-07 16:35:40 -08:00
Putnam
58603140f9 wow, .len, very cool 2019-11-06 22:03:18 -08:00
Putnam
eb9c8c9aca made glorious death spend threat 2019-11-06 18:07:39 -08:00
Putnam
3bdbb04ea2 Made hijack require threat threshold, spend threat 2019-11-06 17:31:39 -08:00
Putnam
aacb928def Merge branch 'wizard-dynamic' into super-special-awesome-dynamic 2019-11-06 16:29:42 -08:00
Putnam
f3afc5de1b Merge branch 'malf-dynamic' into super-special-awesome-dynamic 2019-11-06 16:03:04 -08:00
Putnam
97493690d3 hmm, also important 2019-11-06 01:34:36 -08:00
Putnam
39bdbde067 Makes summon (X) cost threat in dynamic 2019-11-06 01:26:30 -08: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