Commit Graph

12087 Commits

Author SHA1 Message Date
Ghom
2bf27e84e6 Merge pull request #10709 from Seris02/mammaltoxin
Adds mammal mutation toxin to green slime extract recipes
2020-01-28 04:06:01 +01:00
Putnam3145
209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530
...? ...? (masked human mob examine pet peeve)
2020-01-27 19:02:13 -08:00
Ghom
f1197c8618 Merge pull request #10743 from necromanceranne/SHAZBOT
Spinfusors are no longer purchasable from cargo
2020-01-28 02:18:32 +01:00
kevinz000
5110a08817 Merge pull request #10737 from Ghommie/Ghommie-cit531
Refactoring APTFT altclick/verb options into flags
2020-01-27 17:44:20 -07:00
kevinz000
3055c2b4c1 Merge pull request #10742 from Ghommie/Ghommie-cit532
Fixes det revolver being risky to use.
2020-01-27 17:43:46 -07:00
Ghom
5dc92f3968 Merge pull request #10733 from Hatterhat/fine-i'll-do-it-myself
the zombie powder nerf - tgstation#46931
2020-01-27 17:34:58 +01:00
Ghom
1eb3c09bf8 Merge pull request #10703 from Hatterhat/drake-suit-buff-question-mark
drake armor goliath resistance
2020-01-27 05:45:03 +01:00
Ghom
9ee208dd4f Merge pull request #10722 from Putnam3145/fix-relief
Relief valve fixes
2020-01-27 05:37:53 +01:00
necromanceranne
52b1f63941 Literally just kills spinfusors 2020-01-27 12:32:40 +11:00
Ghommie
b6998a0b56 Fixes det revolver being riiiisky. 2020-01-27 00:44:25 +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
Ghommie
41ee00b7df Refactoring APTFT altclick/verb options into flags 2020-01-26 18:53:16 +01:00
kevinz000
97c65aac89 Update kinetic_accelerator.dm 2020-01-26 03:06:31 -07:00
Hatterhat
ff2785f24b boy i hope this fucking compiles 2020-01-26 02:47:41 -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
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
Putnam
6df56a2cf8 properly fixed flags, also made it close on one side's pressure 2020-01-25 18:31:53 -08:00
Putnam
aba40056b3 relief valve tweaks 2020-01-25 17:10:40 -08: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
kevinz000
c74a6eaf4c Update capture_the_flag.dm 2020-01-25 09:20:41 -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
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
Seris02
15874ea50f mammal mutation toxin 2020-01-25 17:16:13 +08:00
Ghommie
58c7c0291b ...? ...? 2020-01-25 05:22:05 +01:00
Hatterhat
4db9eadaf1 drake armor deserves to be good 2020-01-24 18:16:40 -06:00
kevinz000
ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
2020-01-24 16:15:44 -07:00
kevinz000
147c0d8852 Merge pull request #10680 from Ghommie/Ghommie-cit518
snowflake-friendly towels.
2020-01-24 16:15:27 -07: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
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
Ghommie
6fe0c57c42 run-extra-times fixes. 2020-01-24 20:48:32 +01:00
Ghom
d5daae98c7 Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
2020-01-24 18:46:25 +01:00
Putnam
0493db0ac6 allowed dojo banning, made dojo mobs dust upon leaving 2020-01-24 09:11:33 -08:00
Ghom
f5d8e447eb Merge pull request #10676 from Kraseo/virgohairs
Reorganises/fixes virgo hairs
2020-01-24 16:39:10 +01:00
Seris02
10ef39d1e3 maybe it'll work 2020-01-24 16:33:20 +08:00
kevinz000
f626322fbd Merge pull request #10650 from Arturlang/patch-5
[READY]Adds cheap modular computers to the loadout
2020-01-24 00:32:57 -07:00
kevinz000
831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
2020-01-24 00:25:53 -07:00
kevinz000
7cd6490e86 Merge pull request #10526 from Seris02/bowmanupgrade
allows headsets to be bowmanized and adds a traitor item for that
2020-01-24 00:21:34 -07:00
kevinz000
6ffdc1642b Merge pull request #10632 from Commandersand/nerd
buffs some wiz spell cooldonws and changes some incantation phrases
2020-01-24 00:18:41 -07:00