Putnam3145
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
kevinz000
96df844aa3
Merge pull request #10754 from MalricB/Virgomangood
...
Reunites Shaggy (hair from virgo) with Scooby Terrowin
2020-01-28 17:56:11 -07:00
kevinz000
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
kevinz000
9dfcef68ed
Merge branch 'master' into duke_moxley
2020-01-28 17:53:08 -07:00
kevinz000
9cf02ac96f
moth sounds
2020-01-28 17:36:10 -07:00
KeRSe
9c18d4fdad
makes stimulants no longer purchasable by gangs
2020-01-28 15:53:29 -05: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
Putnam
cfd65d812a
Makes gender change potion not work on people with pref
2020-01-27 19:13:50 -08: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
Ghommie
5875f2578c
demodularize and removes lot of unused clothing with missing sprites.
2020-01-28 02:32:46 +01: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
kevinz000
54f9df9f88
;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS
2020-01-27 13:19:53 -07: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
CygnusB
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
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
74fb726b8d
Update traitor_bro.dm
2020-01-27 03:27:09 -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
kevinz000
d5d0a7d7ba
Update capture_the_flag.dm
2020-01-26 22:16:18 -07:00
kevinz000
2c1b63cdb9
Update capture_the_flag.dm
2020-01-26 22:07:49 -07:00
kevinz000
f9ee9bdadf
Update capture_the_flag.dm
2020-01-26 21:54:23 -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
Ghom
7b49d4842a
Fire alarms.
2020-01-27 05:05:08 +01:00
necromanceranne
52b1f63941
Literally just kills spinfusors
2020-01-27 12:32:40 +11:00
ShadeAware
92398ae354
Why am I having such trouble with a fucking SPAN CLASS
2020-01-26 19:46:30 -05:00
ShadeAware
f7373ae40d
WHY DID THE INDENTATION NOT SHOW IT WAS FUCKED UP BEFORE
...
WEBEDIT CHANGE WEBEDIT CHANGE REEEEEEEEEEEEEE
2020-01-26 19:42:21 -05:00
ShadeAware
fffea32a59
Lets the user know they improved their switchblade.
...
Confusion is bad. Lets make it not confusing.
2020-01-26 19:26:58 -05: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
ShadeAware
2cd6ed5f26
REEEE STRAY SLASHES
...
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
2020-01-26 16:31:00 -05:00
ShadeAware
732dd8a3bb
Hmm, today I will forget quotes on my strings.
...
Thank you Putnam.
2020-01-26 16:11:22 -05:00
kevinz000
f59a9d0009
aight bet
2020-01-26 14:05:15 -07:00
