Commit Graph

3910 Commits

Author SHA1 Message Date
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 98f5eb7265 Umodularize saycode and meat slabs. 2019-11-05 06:11:54 +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
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
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 efbcce023a Oh yea it won't work otherwise. 2019-11-03 18:16:19 +01:00
Ghommie 4b667743b9 Regenerating limbs won't no longer gib dullahans. 2019-11-03 17:50:03 +01:00
Ghommie ab4c69486d It works. 2019-11-03 16:04:28 +01:00
kevinz000 c4423004a1 Update medbot.dm 2019-11-03 06:51:16 -08:00
Ghommie 7bd905e6b2 Mistakes were made. 2019-11-03 15:13:18 +01:00
kevinz000 65f9ad49bb Update medbot.dm 2019-11-03 05:39:11 -08: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 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 02935c062d Fixing more issues. 2019-11-03 05:37:10 +01:00
Ghommie 7e4aef46d9 Unmodularize and update pAI/Intellicards very slighty. 2019-11-03 04:23:31 +01:00
Ghommie 401f21d746 Fixing broken fixes. Testing. 2019-11-03 01:19:45 +01:00
Ghommie 065fbdf0cb Fixing gibspawner runtimes, how gruesome... 2019-11-02 19:37:35 +01:00
Ghommie 986c4e11c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245 2019-11-02 02:32:23 +01:00
Ghommie edfdcce52f INITIALIZED_1 4 life 2019-11-01 20:54:22 +01:00
Ghommie e08da877a5 whops. 2019-11-01 18:56:55 +01:00
Ghommie a204fddc4b Fixing some issues with dullahans. 2019-11-01 18:51:06 +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 6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01: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 17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
Ghommie b3ef41a10f Fixing living being unable to pull anything. 2019-10-30 14:02:17 +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 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 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 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
Ghommie a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie 5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie a5086d5813 3 seconds penalties fix 2019-10-29 13:16:36 +01:00
Ghommie f54449bc7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-28 16:41:50 +01:00
BlackMajor 4806c7c788 Dogborg time 2019-10-29 02:05:43 +13: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
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
Ghommie 4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00