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
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
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
d17472b8f2
Update species.dm
2020-01-26 22:00:19 -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
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
necromanceranne
5e7b7143de
Additional adjustments, added more damage to the mini ebow becaues I forgot to do that originally and made large ebows bulky and heavy weapons
2020-01-27 11:48:56 +11:00
Ghommie
b6998a0b56
Fixes det revolver being riiiisky.
2020-01-27 00:44:25 +01:00
necromanceranne
8e489a7726
Hopefully I put in the override correctly
2020-01-27 10:41:27 +11: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
r4d6
2c8d12aa37
Make people actually able to speak dwarf
2020-01-26 15:50:13 -05:00
kevinz000
41f9669a83
Update other_reagents.dm
2020-01-26 13:29:55 -07:00
kevinz000
9292ff1972
Update damage_procs.dm
2020-01-26 13:27:54 -07:00
r4d6
31dd1bc69f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarven_Language
2020-01-26 14:23:16 -05:00
r4d6
ac84ad803a
Add dwarf language
2020-01-26 14:22:21 -05:00
Ghommie
41ee00b7df
Refactoring APTFT altclick/verb options into flags
2020-01-26 18:53:16 +01:00
Ghom
17ea82afd6
Update vr_sleeper.dm
2020-01-26 17:25:24 +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
necromanceranne
5ce066a21e
Altering the effects of the ebow to hopefully make it not terrible
2020-01-26 17:18:09 +11:00
kevinz000
f842a249a4
Update meteor_wave.dm
2020-01-25 22:11:49 -07:00
kevinz000
d7ba4134e1
Update meteor_wave.dm
2020-01-25 22:10:39 -07:00
kevinz000
8b4a050ad3
ok
2020-01-25 22:03:53 -07: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
