6d6c101044
Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7
...
[s] botany logging
2020-01-28 16:57:50 -08:00
3bf0e1d5c4
Merge pull request #10701 from Ghommie/Ghommie-cit527
...
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
a00d1fb05e
Merge pull request #10729 from Citadel-Station-13/kevinz000-patch-5
...
The meteor wave report time to impact is now accurate (tip you were getting 2-3 minute warnings all along)
2020-01-28 16:56:50 -08:00
96df844aa3
Merge pull request #10754 from MalricB/Virgomangood
...
Reunites Shaggy (hair from virgo) with Scooby Terrowin
2020-01-28 17:56:11 -07:00
3d3086ac23
Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3
...
An oversight with one of the new area helper procs.
2020-01-28 17:55:39 -07:00
fa5a69523b
Merge pull request #10414 from CameronWoof/lights-booooooooooooooi
...
The Great Citadel De-Pissening of 2020
2020-01-28 18:12:30 +01:00
fbe79edc24
Merge pull request #10752 from Owai-Seek/cargocratetglass
...
6 More Crates
2020-01-28 18:08:58 +01:00
a1a2d45be6
Update closets.dm
2020-01-28 02:41:04 -07:00
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
209b681db1
Merge pull request #10706 from Ghommie/Ghommie-cit530
...
...? ...? (masked human mob examine pet peeve)
2020-01-27 19:02:13 -08:00
362f0e57a4
Giving a hand.
2020-01-28 03:24:39 +01:00
5883124e0d
Removals.
...
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
2020-01-27 20:47:28 -05:00
24388f4fc1
Reverts Path changes.
2020-01-27 20:30:06 -05:00
f1197c8618
Merge pull request #10743 from necromanceranne/SHAZBOT
...
Spinfusors are no longer purchasable from cargo
2020-01-28 02:18:32 +01:00
5110a08817
Merge pull request #10737 from Ghommie/Ghommie-cit531
...
Refactoring APTFT altclick/verb options into flags
2020-01-27 17:44:20 -07:00
3055c2b4c1
Merge pull request #10742 from Ghommie/Ghommie-cit532
...
Fixes det revolver being risky to use.
2020-01-27 17:43:46 -07:00
6e7d079928
Changed Dirty Mags and Candle
2020-01-27 19:34:33 -05:00
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
675e6cb9a6
Reunites Shaggy (hair from virgo) with Scooby Terrowin
...
self-insert baby pr florida man tries to merge his hair back into citadel
2020-01-27 15:51:38 -03:00
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
5bc590ad52
Merge branch 'master' into cargocratetglass
2020-01-27 08:03:30 -05:00
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
1eb3c09bf8
Merge pull request #10703 from Hatterhat/drake-suit-buff-question-mark
...
drake armor goliath resistance
2020-01-27 05:45:03 +01:00
6567f9dd0d
Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8
...
buffs door crushing
2020-01-27 05:38:59 +01:00
9ee208dd4f
Merge pull request #10722 from Putnam3145/fix-relief
...
Relief valve fixes
2020-01-27 05:37:53 +01:00
7b49d4842a
Fire alarms.
2020-01-27 05:05:08 +01:00
52b1f63941
Literally just kills spinfusors
2020-01-27 12:32:40 +11:00
b6998a0b56
Fixes det revolver being riiiisky.
2020-01-27 00:44:25 +01:00
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
f59a9d0009
aight bet
2020-01-26 14:05:15 -07:00
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
41ee00b7df
Refactoring APTFT altclick/verb options into flags
2020-01-26 18:53:16 +01:00
17ea82afd6
Update vr_sleeper.dm
2020-01-26 17:25:24 +01:00
51aaa5d406
Update areas.dm
2020-01-26 17:24:25 +01:00
97c65aac89
Update kinetic_accelerator.dm
2020-01-26 03:06:31 -07:00
ff2785f24b
boy i hope this fucking compiles
2020-01-26 02:47:41 -06:00
f842a249a4
Update meteor_wave.dm
2020-01-25 22:11:49 -07:00
d7ba4134e1
Update meteor_wave.dm
2020-01-25 22:10:39 -07:00
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
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
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
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
52e473ba07
argh
2020-01-25 19:42:36 -08:00
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
6df56a2cf8
properly fixed flags, also made it close on one side's pressure
2020-01-25 18:31:53 -08:00
aba40056b3
relief valve tweaks
2020-01-25 17:10:40 -08:00
a08cd7c046
Merge pull request #10718 from r4d6/HE-Fix
...
Fix HE Manifold's sprites
2020-01-25 14:31:11 -08:00
d5c09f11bc
Fix
2020-01-25 17:23:00 -05:00
b36d2dc277
Makes "Meow Mix" bar sign actually appear
2020-01-25 13:56:25 -08:00
c74a6eaf4c
Update capture_the_flag.dm
2020-01-25 09:20:41 -07:00
Putnam3145