Commit Graph

29024 Commits

Author SHA1 Message Date
Ghommie
20e08d992f Removing unused vore files and commented out code. 2020-01-29 06:38:09 +01:00
Ghom
27cd7745ed Merge pull request #10714 from Citadel-Station-13/kevinz000-patch-9
is_ctf_target now checks for innate faction var rather than clothing
2020-01-27 00:14:32 +01:00
kevinz000
f59a9d0009 aight bet 2020-01-26 14:05:15 -07:00
kevinz000
b4ee518945 Merge pull request #10725 from Putnam3145/fix-rotation
made engine rotation properly blacklist 0-weighted ones
2020-01-26 14:04:31 -07:00
Ghom
50236d7b29 Merge pull request #10734 from Citadel-Station-13/kevinz000-patch-11
5164643 runtimes from premium accelerators with negative cooldown
2020-01-26 17:14:25 +01:00
kevinz000
97c65aac89 Update kinetic_accelerator.dm 2020-01-26 03:06:31 -07:00
Ghom
98c8b6c5c8 Merge pull request #10648 from Citadel-Station-13/kevinz000-patch-19
Sprinting in general is now a config
2020-01-26 05:53:53 +01:00
CitadelStationBot
016c46c8a4 Automatic changelog generation for PR #10466 [ci skip] 2020-01-25 22:50:17 -06:00
Ghom
9aca79a640 Merge pull request #10466 from Citadel-Station-13/kevinz000-patch-10
Makes monkey gorrilize on radiation easier to achieve
2020-01-26 05:50:15 +01:00
Ghom
a7d698df8e Merge pull request #10707 from Citadel-Station-13/kevinz000-patch-5
Raises damage precision to two decimal places
2020-01-26 05:47:53 +01:00
CitadelStationBot
cd2863febd Automatic changelog generation for PR #10717 [ci skip] 2020-01-25 22:45:57 -06:00
Ghom
5fd81c5233 Merge pull request #10717 from Putnam3145/meow-mix-fix
Makes "Meow Mix" bar sign actually appear
2020-01-26 05:45:55 +01:00
Putnam
52e473ba07 argh 2020-01-25 19:42:36 -08:00
kevinz000
603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
CitadelStationBot
45ad9bc77d Automatic changelog generation for PR #10718 [ci skip] 2020-01-25 16:31:14 -06:00
Putnam3145
a08cd7c046 Merge pull request #10718 from r4d6/HE-Fix
Fix HE Manifold's sprites
2020-01-25 14:31:11 -08:00
r4d6
d5c09f11bc Fix 2020-01-25 17:23:00 -05:00
Putnam
b36d2dc277 Makes "Meow Mix" bar sign actually appear 2020-01-25 13:56:25 -08:00
kevinz000
c74a6eaf4c Update capture_the_flag.dm 2020-01-25 09:20:41 -07:00
CitadelStationBot
f7cee23a25 Automatic changelog generation for PR #10691 [ci skip] 2020-01-25 09:08:34 -06:00
kevinz000
c0b7541e62 Merge pull request #10691 from Seris02/mentorfix
very very tentative fix for the make mentor button
2020-01-25 08:08:32 -07:00
CitadelStationBot
510ea88ae6 Automatic changelog generation for PR #10688 [ci skip] 2020-01-25 08:32:24 -06:00
Ghom
db8abcd7fb Merge pull request #10688 from Citadel-Station-13/kevinz000-patch-1
Fixes SOME of the problems with hilbert hotel
2020-01-25 15:32:21 +01:00
Ghom
4b6a601af7 Merge pull request #10646 from Poojawa/blindvorefixnumber244
Resolves Minor issues with vore code
2020-01-25 15:27:12 +01:00
CitadelStationBot
a71aed638a Automatic changelog generation for PR #10698 [ci skip] 2020-01-25 08:25:29 -06:00
Ghom
00667eeecd Merge pull request #10698 from Putnam3145/ghost-dojo-ban
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
2020-01-25 15:25:26 +01:00
kevinz000
2acb52fb56 Merge pull request #10690 from Ghommie/Ghommie-cit525
Additional runtime fixes.
2020-01-25 05:54:35 -07:00
kevinz000
f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
kevinz000
a5404f6063 Merge pull request #10687 from Ghommie/Ghommie-cit523
A few more, ported, runtime fixes.
2020-01-25 05:54:03 -07:00
kevinz000
72cfd35438 Merge pull request #10684 from Ghommie/Ghommie-cit521
fix for hypospray jank.
2020-01-25 05:53:42 -07:00
CitadelStationBot
0d1dbedf56 Automatic changelog generation for PR #10683 [ci skip] 2020-01-25 06:53:29 -06:00
kevinz000
72a8096137 Merge pull request #10683 from Ghommie/Ghommie-cit520
A few consistencies for those "shoes" that don't actually cover feet.
2020-01-25 05:53:26 -07:00
CitadelStationBot
d6c7e1122d Automatic changelog generation for PR #10682 [ci skip] 2020-01-25 06:53:10 -06:00
kevinz000
26459a156d Merge pull request #10682 from Ghommie/Ghommie-cit519
Ports "Makes falsewall hide pipes and wires"
2020-01-25 05:53:07 -07:00
Putnam3145
b8a0d0545f Merge pull request #10708 from Citadel-Station-13/kevinz000-patch-7
rogue infinite loop eating performance yeehaw
2020-01-25 01:13:15 -08:00
kevinz000
a4c5975b7d Update fail2topic.dm 2020-01-25 02:03:39 -07:00
kevinz000
30188359c6 Update combat.dm 2020-01-24 21:51:26 -07:00
CitadelStationBot
9181a4aee0 Automatic changelog generation for PR #10693 [ci skip] 2020-01-24 21:08:13 -06:00
Ghom
8983f89a75 Merge pull request #10693 from Seris02/conveyorbetterness
makes conveyor directions a bit easier to see
2020-01-25 04:08:11 +01:00
CitadelStationBot
7c11218553 Automatic changelog generation for PR #10670 [ci skip] 2020-01-24 17:16:06 -06:00
kevinz000
d502f6d6a8 Merge pull request #10670 from Seris02/sneezingnope
stops sneezing, sniffing, coughing, etc from doing anything if the affected person doesn't breathe
2020-01-24 16:16:03 -07:00
kevinz000
ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
2020-01-24 16:15:44 -07:00
CitadelStationBot
518345843d Automatic changelog generation for PR #10680 [ci skip] 2020-01-24 17:15:30 -06:00
kevinz000
147c0d8852 Merge pull request #10680 from Ghommie/Ghommie-cit518
snowflake-friendly towels.
2020-01-24 16:15:27 -07:00
CitadelStationBot
8ee31d2686 Automatic changelog generation for PR #10677 [ci skip] 2020-01-24 17:14:52 -06:00
kevinz000
afe8e00bdf Merge pull request #10677 from Ghommie/Ghommie-cit515
Fixes dead malf AIs being able to doomsday, plus a few ported updates.
2020-01-24 16:14:49 -07:00
CitadelStationBot
e3e849fc68 Automatic changelog generation for PR #10674 [ci skip] 2020-01-24 17:14:35 -06:00
kevinz000
ea9513864d Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
2020-01-24 16:14:32 -07:00
Ghom
2884bbdc23 I'm exiting this code. 👀 2020-01-24 22:15:33 +01:00
Ghom
ba50b4a851 Risky web edit, disgusting contents. 2020-01-24 22:13:55 +01:00