Commit Graph

24553 Commits

Author SHA1 Message Date
Putnam 75bb0cfab2 Lowered vore priority 2020-04-13 17:15:18 -07:00
kevinz000 6d7cc834f6 Merge pull request #11379 from Ghommie/Ghommie-cit611
Polychromic element.
2020-04-13 17:10:45 -07:00
Putnam 70b771a8f2 Also made bellies only generate when needed. 2020-04-13 17:04:09 -07:00
Ghommie 39e645b018 I knew using lazy helpers wouldn't have helped much. 2020-04-14 01:55:01 +02:00
Putnam 1e8fffbf0b Replaced all the extraneous flags with bitflags 2020-04-13 16:47:43 -07:00
TrilbySpaceClone c5b1324d44 sprites and some basic code 2020-04-13 19:23:35 -04:00
Ghommie 42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +02:00
Artur 5f44d37ca0 Its no longer possible to craft multiple things at a time 2020-04-13 23:51:54 +03:00
Ghommie 616d482cf6 Deleting poly clothes copypasta. 2020-04-13 22:51:46 +02:00
Ghommie 8c995dbad9 Making things work. 2020-04-13 19:16:55 +02:00
Timothy Teakettle e024393962 secret sauce doesn't give a second moodlet because that's dumb 2020-04-13 17:12:40 +01:00
Ghommie bfa006fac1 Fixing runtime errors. 2020-04-13 17:25:13 +02:00
Ghom 25f1a83473 Merge pull request #11834 from deathride58/linuxfail2topic
adds rudimentary linux iptables support for fail2topic (and makes fail2topic disabled by default while i'm at it)
2020-04-13 16:44:15 +02:00
Ghommie db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghommie 0816512150 more work. 2020-04-13 16:09:52 +02:00
Ghom 5765ceb316 Update hardsuit.dm 2020-04-13 15:02:01 +02:00
Ghom 873e67f79c Update hardsuit.dm 2020-04-13 14:57:47 +02:00
kevinz000 9f2ed092c5 Merge pull request #11275 from Citadel-Station-13/Ghommie-patch-6
Reenables the swarmers event.
2020-04-13 05:50:24 -07:00
Ghom dfa58cb517 Merge pull request #10986 from Seris02/atomwalkers
wall walking boots for traitors
2020-04-13 14:25:43 +02:00
Ghom 8145513ba7 Actually fixed wizard garbs. 2020-04-13 14:19:13 +02:00
Ghom 6157500f25 FYI, Dropped() already handles it. 2020-04-13 14:16:48 +02:00
Seris02 468c59bf49 oops 2020-04-13 20:12:20 +08:00
kevinz000 768909020e Merge pull request #11827 from kiwedespars/nerf
nerfs immortal haste cd
2020-04-12 22:35:10 -07:00
kevinz000 105d405d2d Merge pull request #11837 from Ghommie/Ghommie-cit678
Item color removal port fixes.
2020-04-12 22:34:45 -07:00
kevinz000 d6544af144 Update status_procs.dm 2020-04-12 22:25:46 -07:00
Seris02 950038f4a7 merge fixes? 2020-04-13 11:12:16 +08:00
Seris02 f158536e59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-04-13 11:10:24 +08:00
Seris02 b9c9991a5d merge fix 2020-04-13 10:57:09 +08:00
kappa-sama efe36a02e0 bye 2020-04-12 22:19:10 -04:00
Ghommie 0d0f14d3f8 Item color removal port fixes. 2020-04-13 03:34:58 +02:00
Ghom 609eb190e0 Update area_copy.dm 2020-04-13 03:29:07 +02:00
kevinz000 e962afedfa Merge pull request #11825 from Ghommie/Ghommie-cit674
Little Holodeck refactor.
2020-04-12 17:03:11 -07:00
kevinz000 80de717dc8 Merge pull request #11824 from Ghommie/Ghommie-cit673
Fixes occasional tunnel hole in the space hermit ruin.
2020-04-12 17:02:52 -07:00
kevinz000 6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
kevinz000 8604297dcd Merge pull request #11811 from Ghommie/Ghommie-cit671
Fixes and standarizes a few liver troubles. Re-enables liver failure.
2020-04-12 17:01:50 -07:00
kevinz000 f647fe92fa Merge pull request #11810 from Citadel-Station-13/Ghommie-patch-4
Re-enables hulks.
2020-04-12 17:01:22 -07:00
Ghommie 05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghom d0af60a2d3 Merge pull request #11817 from Putnam3145/dynamic-lings-2
More dynamic tweaks + dynamic latejoin changelings
2020-04-13 01:48:12 +02:00
kevinz000 d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
deathride58 53d893a67e adds rudimentary linux iptables support for fail2topic 2020-04-12 16:21:51 -04:00
Ghom b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs
Eldritch Affairs
2020-04-12 20:47:19 +02:00
Lin 4e1079bc9a Merge pull request #11786 from Citadel-Station-13/Ghommie-patch-1
I did a oopsie and made containment bags also stop radiation internal to a contained object.
2020-04-12 16:20:08 +00:00
Seris02 1b7f34d230 yeet 2020-04-12 16:43:54 +08:00
Ghommie 4e3845da5e Clarifies the scope of the slowdown. 2020-04-12 09:53:41 +02:00
Ghommie 1afa07dad5 Improved readability. 2020-04-12 09:40:38 +02:00
Ghom 13f9c3c235 Update phantomthief.dm 2020-04-12 08:03:30 +02:00
Ghommie acb5c39b59 Fixes the phantom thief component for the Xth time. 2020-04-12 07:47:28 +02:00
Ghom 863ecf6627 Update watercloset.dm 2020-04-12 07:17:50 +02:00
Ghom ab2d458947 Update lighting.dm 2020-04-12 07:12:54 +02:00
Ghom 23b45c9cf3 Update lootdrop.dm 2020-04-12 06:54:40 +02:00