Commit Graph

21280 Commits

Author SHA1 Message Date
kevinz000
02fe4b7630 this is a bad idea 2020-01-25 20:00:29 -07:00
kevinz000
259b992317 AAAAAAA 2020-01-25 19:56:50 -07:00
kevinz000
72e33d8832 bugfix 2020-01-25 19:46:32 -07:00
kevinz000
dc3e5e24fd Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 19:36:06 -07: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
kevinz000
c5f2eeef3b FUCK 2020-01-25 19:31:57 -07:00
Putnam
6df56a2cf8 properly fixed flags, also made it close on one side's pressure 2020-01-25 18:31:53 -08:00
kevinz000
df4ca4b503 do after 2020-01-25 19:29:03 -07:00
Putnam
aba40056b3 relief valve tweaks 2020-01-25 17:10:40 -08:00
kevinz000
3af72acfb2 compile 2020-01-25 17:26:43 -07:00
kevinz000
ebff6c9f38 compile, jump board crash to ground 2020-01-25 17:25:15 -07:00
kevinz000
19f1eba015 renames 2020-01-25 17:13:11 -07:00
kevinz000
483e1b2757 oh we needed that 2020-01-25 17:10:50 -07:00
kevinz000
443f1716e1 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 17:04:37 -07:00
kevinz000
ec69b9de4d changes 2020-01-25 17:04:07 -07: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
Putnam
37777c4cc7 Removed the wirecutting one 2020-01-25 13:37:40 -08:00
Artur
6619ac41c8 *PANIC* 2020-01-25 22:07:57 +02:00
kevinz000
c74a6eaf4c Update capture_the_flag.dm 2020-01-25 09:20:41 -07:00
kevinz000
40b479eb17 Update seeds.dm 2020-01-25 08:56:06 -07: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
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
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
Artur
6529a34dbc Reviever suggestions
HTML doesnt need compiling.
2020-01-25 15:18:18 +01:00
kevinz000
776729797d Update holder.dm 2020-01-25 05:56:32 -07: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
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
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
kevinz000
9ba6984f4f Update door.dm 2020-01-25 05:49:38 -07:00
kevinz000
b8d58ae334 Merge remote-tracking branch 'citadel/master' into revert_poojawa_blood_1 2020-01-25 03:24:37 -07:00
Seris02
15874ea50f mammal mutation toxin 2020-01-25 17:16:13 +08:00
kevinz000
a4c5975b7d Update fail2topic.dm 2020-01-25 02:03:39 -07:00
kevinz000
5e96ffb5a0 compile 2020-01-24 23:18:44 -07:00
kevinz000
ec4d990bfd don't waste memory initializing empty lists 2020-01-24 23:17:29 -07:00
kevinz000
742588c7e4 spacing 2020-01-24 23:09:26 -07:00
kevinz000
9827b15466 Unused variables wasting my memory 2020-01-24 23:05:59 -07:00
kevinz000
ad0c5d7d04 (probably) FIXES INFINITE STREAKING 2020-01-24 23:00:30 -07:00
kevinz000
b9274c63d0 define usage 2020-01-24 22:50:28 -07:00
kevinz000
8a5246c5d6 Reverts gibs being bloody. At all. It already makes splatters stop making blood. 2020-01-24 22:45:23 -07:00
kevinz000
87e7d8ead0 revert cleanable/blood amount per decal oh yeah this is why cults get all that EXTRA BLOOD. 2020-01-24 22:44:40 -07:00
kevinz000
4376434e01 woops 2020-01-24 22:31:05 -07:00
kevinz000
fec5cf1362 optimizations 2020-01-24 22:08:36 -07:00
kevinz000
798af43cae reverts accidental/undocumented voodoo doll buff 2020-01-24 22:01:52 -07:00
kevinz000
b33e6cd79e scanner fix 2020-01-24 22:00:03 -07:00