Commit Graph

11491 Commits

Author SHA1 Message Date
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
Seris02
99ea3f9b71 more fixes + fixes the last fixes. 2019-11-10 15:09:17 +08: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
Ghommie
279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
Ghommie
d2b1ce4181 Unused. 2019-11-09 23:05:16 +01:00
Ghommie
9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Seris02
8dfbc652cb ADDS THE NEW MARTIAL ART - RISING BASS!! 2019-11-09 21:11:36 +08: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
Ghommie
c0c130324e Some consistency tweaks. 2019-11-08 22:53:59 +01:00
Ghommie
298f2e02c6 Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron. 2019-11-08 22:33:26 +01:00
Ghommie
297ee03175 Ports "Cleans up the new alt clicking functionality" from /tg/ 2019-11-08 19:25:09 +01:00
Putnam
825ef80b9d started transferring some events from events to dynamic antags 2019-11-08 06:33:31 -08:00
Seris02
a5a483fb8a makes meteor hallucinations have an ETA now 2019-11-08 19:55:27 +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
Ghommie
b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
TrilbySpaceClone
0662245d80 corrections 2019-11-06 22:52:44 -05: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
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
ae6e50b081 resprited delivery packages. 2019-11-06 18:27:33 +01: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
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
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
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