kevinz000
9dfcef68ed
Merge branch 'master' into duke_moxley
2020-01-28 17:53:08 -07:00
Ghom
fa5a69523b
Merge pull request #10414 from CameronWoof/lights-booooooooooooooi
...
The Great Citadel De-Pissening of 2020
2020-01-28 18:12:30 +01:00
Ghom
fbe79edc24
Merge pull request #10752 from Owai-Seek/cargocratetglass
...
6 More Crates
2020-01-28 18:08:58 +01:00
kevinz000
a1a2d45be6
Update closets.dm
2020-01-28 02:41:04 -07:00
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
362f0e57a4
Giving a hand.
2020-01-28 03:24:39 +01:00
Winter Flare
5883124e0d
Removals.
...
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
2020-01-27 20:47:28 -05:00
Winter Flare
24388f4fc1
Reverts Path changes.
2020-01-27 20:30:06 -05: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
c665d971c0
Update misc.dm
2020-01-27 17:45:35 -07:00
kevinz000
91e8bec81a
woops
2020-01-27 17:45:13 -07: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
Winter Flare
6e7d079928
Changed Dirty Mags and Candle
2020-01-27 19:34:33 -05:00
Ghom
0ed72c7722
Merge pull request #10692 from Citadel-Station-13/TESTING
...
faster get_hearers_in_view/getallcontents i guess
2020-01-27 21:06:52 +01: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
Winter Flare
5bc590ad52
Merge branch 'master' into cargocratetglass
2020-01-27 08:03:30 -05:00
Winter Flare
21fe8be5dc
Mmmmm, more crates.
...
Fixed: Engineering Hardsuit Crate
Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)
Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate
Moved:
Grill to Service
All Vending Supplies to a new tab.
Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate
Known Issues:
I don't know how to get randomised crates to show up in the proper order.
2020-01-27 07:00:40 -05:00
kevinz000
68227dcdb1
Update misc.dm
2020-01-27 03:53:50 -07:00
kevinz000
fa2cc0cfdf
adds
2020-01-27 03:39:27 -07:00
kevinz000
1e19ec2c50
bad var
2020-01-27 02:59:27 -07:00
kevinz000
4883b36576
compile
2020-01-27 02:55:32 -07:00
kevinz000
d4d315b447
:^)
2020-01-27 02:51:01 -07: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
6567f9dd0d
Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8
...
buffs door crushing
2020-01-27 05:38:59 +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
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
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
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
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
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
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
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
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
