Commit Graph

10676 Commits

Author SHA1 Message Date
TrilbySpaceClone 82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
TrilbySpaceClone 40a47bb4e9 Merge branch 'Cargo_MKII' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into Cargo_MKII 2019-11-03 17:26:38 -05:00
TrilbySpaceClone bd4501e11c the last touches? 2019-11-03 17:26:28 -05:00
Trilbyspaceclone 3ab70cbc26 Update sheets.dm 2019-11-03 13:04:48 -05:00
Trilbyspaceclone 50b4e76764 Update bottle.dm 2019-11-03 12:58:31 -05:00
TrilbySpaceClone a8248c68f4 perhaps 2019-11-03 12:53:02 -05:00
Ghommie 543df8822e .len 2019-11-03 18:17:34 +01:00
Ghommie efbcce023a Oh yea it won't work otherwise. 2019-11-03 18:16:19 +01:00
Ghommie 431ab8fc0b better be safe than sorry. 2019-11-03 17:56:30 +01:00
Ghommie 4b667743b9 Regenerating limbs won't no longer gib dullahans. 2019-11-03 17:50:03 +01:00
Ghommie 76294cf162 oh flak. 2019-11-03 17:29:53 +01:00
Ghommie 286b78c84c Minor ninja tweaks and stealth nerf. 2019-11-03 17:14:55 +01:00
Trilbyspaceclone 4fa6c4d5c0 Apply suggestions from code review
Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
2019-11-03 11:10:30 -05:00
TrilbySpaceClone 5c4cd15762 Hmm 2019-11-03 11:05:45 -05: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 3cf056ed93 Also fixing jacqueen... wrong tools.dmi 2019-11-03 15:26:16 +01: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 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 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
kappa-sama 3e95a66513 Update energy_gun.dm 2019-11-02 23:04:06 -04:00
Ghommie 592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Ghommie 401f21d746 Fixing broken fixes. Testing. 2019-11-03 01:19:45 +01:00
Ghommie 2653a2965d How about we only check the living? 2019-11-02 20:46:33 +01:00
Ghommie 065fbdf0cb Fixing gibspawner runtimes, how gruesome... 2019-11-02 19:37:35 +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
Ghommie ad0e8ec4be Yea, all good now. 2019-11-02 13:41:20 +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
Anonymous 537ac0f6ca Merge branch 'master' into assu 2019-11-01 19:05:53 +03:00
Winter Flare eb5f014382 Travis is mean. 2019-11-01 05:24:20 -04:00
kevinz000 4f9f8f98bf Update wizard.dm 2019-10-31 22:58:24 -07:00
Winter Flare 7a9f48302d Reworked a bit of bounty stuff. 2019-11-01 01:38:27 -04: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