Commit Graph

17813 Commits

Author SHA1 Message Date
kevinz000 58900797ae Update game_mode.dm 2019-11-06 18:55:54 -07:00
Putnam 3bdbb04ea2 Made hijack require threat threshold, spend threat 2019-11-06 17:31:39 -08:00
Putnam 33f7663008 this is probably required for compile 2019-11-06 17:20:56 -08:00
Putnam a83901a8b0 and finished the wizard change merge 2019-11-06 16:30:07 -08:00
Putnam aacb928def Merge branch 'wizard-dynamic' into super-special-awesome-dynamic 2019-11-06 16:29:42 -08:00
Putnam 1c4256f28f actually fuck this config's its own file now 2019-11-06 16:28:28 -08:00
Fermi a0539c79e9 Fixa da goof 2019-11-07 00:03:46 +00:00
Putnam f3afc5de1b Merge branch 'malf-dynamic' into super-special-awesome-dynamic 2019-11-06 16:03:04 -08:00
Ghommie 3c6b1109f1 I'm tired. 2019-11-07 00:40:39 +01:00
Ghommie ae6e50b081 resprited delivery packages. 2019-11-06 18:27:33 +01:00
Putnam b9359de02f Made the curve make more sense with dichotomic voting. 2019-11-06 05:01:00 -08:00
Putnam c532bcd484 makes all enemy-required rulesets require more enemies 2019-11-06 02:13:13 -08:00
Putnam 97493690d3 hmm, also important 2019-11-06 01:34:36 -08:00
Putnam 708f1e4731 Actually added stuff to the config. 2019-11-06 01:31:43 -08:00
Putnam 8e38a6a9ba WOW THIS IS IMPORTANT 2019-11-06 01:26:58 -08:00
Putnam 39bdbde067 Makes summon (X) cost threat in dynamic 2019-11-06 01:26:30 -08:00
Putnam a5b3d49fac actually it's gotta be delayed 2019-11-06 01:03:43 -08:00
Putnam b240956c4c Okay, just peace vs chaos. 2019-11-06 00:21:47 -08:00
Putnam c354b17afe Also deobfuscates dynamic vote 2019-11-06 00:13:39 -08:00
Putnam 401bbbd8ab Reduced vote to just extended vs calm vs chaos. 2019-11-06 00:07:52 -08:00
Putnam 13bc121306 Makes sure that actually works. 2019-11-05 23:52:26 -08:00
Putnam e3b901fd23 Makes malf AI its own ruleset in dynamic. 2019-11-05 23:45:59 -08:00
kevinz000 b6af62e994 Update kinetic_crusher.dm 2019-11-05 18:07:46 -07:00
BlackMajor 026f9758b9 Actually wait that's way simpler 2019-11-06 12:55:25 +13:00
BlackMajor 960de09a96 Oh there's even more 2019-11-06 12:49:50 +13:00
BlackMajor 9efddbe580 thank you dark souls 2019-11-06 12:47:21 +13:00
Ghommie 97dd0bd70c Yes. 2019-11-05 23:13:10 +01:00
Ghommie 892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
rosko cc8423ac45 adds a lizzard plushie
yet another player plushie....this one comes with a real fake maxcap
2019-11-05 20:38:44 +02:00
Ghommie ae9ff92d33 Fixes free real estate paraplegic trait and bolas. 2019-11-05 18:03:50 +01:00
Anonymous 0849ea365f Merge branch 'master' into assu 2019-11-05 15:45:04 +03:00
Winter Flare 4b6d9848ff Update assistant.dm 2019-11-05 01:44:15 -05:00
Winter Flare 74b5961a8d Removed an unneeded line, added gas masks 2019-11-05 01:43:38 -05:00
Ghommie 43014a8729 Riding component fix and hacky mood runtimes workaround. 2019-11-05 07:33:43 +01:00
Winter Flare 87695c0a21 Moved some stuff around, added some more.
Moved Strange Objects and Sunglasses into silly.dm, modified a few of the bounty prices.
2019-11-05 00:22:22 -05:00
Ghommie 98f5eb7265 Umodularize saycode and meat slabs. 2019-11-05 06:11:54 +01:00
kevinz000 f4fc3a5a1a Update beams.dm 2019-11-04 21:48:33 -07:00
Ghommie 9cac543a2b Unmodularize secway and turfs 2019-11-05 05:47:25 +01:00
Ghommie a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
kevinz000 b9ee75bd3f Update _production.dm 2019-11-04 20:03:40 -07:00
Trilbyspaceclone 09cd439f85 so dumb that github suggestions brake " 2019-11-04 17:24:37 -05:00
Ghommie 4ab3512dda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-04 23:15:12 +01:00
Ghommie b7364a1e8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-04 23:10:54 +01:00
Trilbyspaceclone 061579decb no fun allowed 2019-11-04 17:08:55 -05:00
Trilbyspaceclone 28b96494e6 huh 2019-11-04 17:03:00 -05:00
Ghommie 29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
Ghommie 8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01:00
Ghommie 1a2901f197 Ports CEV-Eris matchbox respriting, also respriting cigar boxes. 2019-11-04 16:14:12 +01:00
Trilbyspaceclone cb215be40d Apply suggestions from code review
dap the hero

Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
2019-11-04 07:21:30 -05:00
TrilbySpaceClone ae8b43e1c0 Update tea_coffee.dm 2019-11-04 06:05:10 -05:00