Commit Graph
29177 Commits
Author SHA1 Message Date
CitadelStationBot bc0297f504 Automatic changelog generation for PR #10706 [ci skip] 2020-01-27 21:02:15 -06:00
Putnam3145andGitHub 209b681db1 Merge pull request #10706 from Ghommie/Ghommie-cit530
...? ...? (masked human mob examine pet peeve)
2020-01-27 19:02:13 -08:00
Ghommie e860110771 Ruskie battle hats in box maint, get some (their armor is fairly weak) 2020-01-28 03:55:30 +01:00
GhomandGitHub 362f0e57a4 Giving a hand. 2020-01-28 03:24:39 +01:00
KathrinBailey 13d9509610 removes backup 2020-01-28 02:24:32 +00:00
KathrinBailey bc7c28a62f removes improvements
this is now solely bug fixes
2020-01-28 02:22:56 +00: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
CitadelStationBot 6877a965f6 Automatic changelog generation for PR #10743 [ci skip] 2020-01-27 19:18:35 -06:00
GhomandGitHub f1197c8618 Merge pull request #10743 from necromanceranne/SHAZBOT
Spinfusors are no longer purchasable from cargo
2020-01-28 02:18:32 +01:00
CitadelStationBot a52bfb13ad Automatic changelog generation for PR #10737 [ci skip] 2020-01-27 18:44:23 -06:00
kevinz000andGitHub 5110a08817 Merge pull request #10737 from Ghommie/Ghommie-cit531
Refactoring APTFT altclick/verb options into flags
2020-01-27 17:44:20 -07:00
CitadelStationBot ed1f9be2a8 Automatic changelog generation for PR #10742 [ci skip] 2020-01-27 18:43:49 -06:00
kevinz000andGitHub 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
kevinz000andGitHub 54f9df9f88 ;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS 2020-01-27 13:19:53 -07:00
GhomandGitHub 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
CitadelStationBot 6258e07213 Automatic changelog generation for PR #10733 [ci skip] 2020-01-27 10:35:02 -06:00
GhomandGitHub 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
TrilbySpaceClone 443239fb7c updates changlog 2020-01-27 11:16:29 -05: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
kevinz000andGitHub 74fb726b8d Update traitor_bro.dm 2020-01-27 03:27:09 -07:00
Letter NandGitHub 1c528062b5 updates readme 2020-01-27 18:05:48 +08:00
TrilbySpaceClone f145dd1730 correct door to vault being all access 2020-01-27 02:31:19 -05:00
CitadelStationBot 5e10d297e1 Automatic changelog generation for PR #10703 [ci skip] 2020-01-26 22:45:06 -06:00
GhomandGitHub 1eb3c09bf8 Merge pull request #10703 from Hatterhat/drake-suit-buff-question-mark
drake armor goliath resistance
2020-01-27 05:45:03 +01:00
CitadelStationBot 5b04936d96 Automatic changelog generation for PR #10711 [ci skip] 2020-01-26 22:39:02 -06:00
GhomandGitHub 6567f9dd0d Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8
buffs door crushing
2020-01-27 05:38:59 +01:00
CitadelStationBot 74cd89bad6 Automatic changelog generation for PR #10722 [ci skip] 2020-01-26 22:37:56 -06:00
GhomandGitHub 9ee208dd4f Merge pull request #10722 from Putnam3145/fix-relief
Relief valve fixes
2020-01-27 05:37:53 +01:00
GhomandGitHub 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
Ghommie b6998a0b56 Fixes det revolver being riiiisky. 2020-01-27 00:44:25 +01:00
GhomandGitHub 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
kevinz000andGitHub f59a9d0009 aight bet 2020-01-26 14:05:15 -07:00
kevinz000andGitHub 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
GhomandGitHub 17ea82afd6 Update vr_sleeper.dm 2020-01-26 17:25:24 +01:00
GhomandGitHub 51aaa5d406 Update areas.dm 2020-01-26 17:24:25 +01:00
GhomandGitHub 50236d7b29 Merge pull request #10734 from Citadel-Station-13/kevinz000-patch-11
5164643 runtimes from premium accelerators with negative cooldown
2020-01-26 17:14:25 +01:00
kevinz000andGitHub 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
KathrinBailey c4610fdff7 okay goodbye meta changes 2020-01-26 08:29:17 +00:00
KathrinBailey c4e7f85b17 ignore this commit
bruh I need the new meta
2020-01-26 08:26:15 +00:00
KathrinBailey 0c186d235d Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework 2020-01-26 08:21:54 +00:00
kevinz000andGitHub f842a249a4 Update meteor_wave.dm 2020-01-25 22:11:49 -07:00
kevinz000andGitHub d7ba4134e1 Update meteor_wave.dm 2020-01-25 22:10:39 -07:00