f74475a6e0
Merge pull request #10749 from kevinz000/duke_moxley
...
It's high noon...
2020-01-30 00:19:37 +01:00
cde6601c60
Merge pull request #10759 from Ghommie/Ghommie-cit534
...
demodularize and removes lot of unused clothing with missing sprites.
2020-01-29 19:58:26 +00:00
9dfcef68ed
Merge branch 'master' into duke_moxley
2020-01-28 17:53:08 -07:00
fbe79edc24
Merge pull request #10752 from Owai-Seek/cargocratetglass
...
6 More Crates
2020-01-28 18:08:58 +01: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
5875f2578c
demodularize and removes lot of unused clothing with missing sprites.
2020-01-28 02:32:46 +01:00
24388f4fc1
Reverts Path changes.
2020-01-27 20:30:06 -05:00
c665d971c0
Update misc.dm
2020-01-27 17:45:35 -07:00
91e8bec81a
woops
2020-01-27 17:45:13 -07:00
6e7d079928
Changed Dirty Mags and Candle
2020-01-27 19:34:33 -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
68227dcdb1
Update misc.dm
2020-01-27 03:53:50 -07:00
fa2cc0cfdf
adds
2020-01-27 03:39:27 -07:00
52b1f63941
Literally just kills spinfusors
2020-01-27 12:32:40 +11:00
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -05:00
14a33ee7dc
Merge pull request #10651 from r4d6/Soft-rad-suit
...
Make the radiation hardsuit a voidsuit instead
2020-01-23 19:23:09 +01:00
86a3a5dd4d
Merge pull request #10610 from Owai-Seek/bountytweaks
...
Some Bounty Tweaks
2020-01-23 15:44:00 +01:00
3d85499919
Requested Changes + Nerf
...
Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.
2020-01-23 07:20:22 -05:00
96c0a86b5f
Make the Radiation Hardsuit a Voidsuit instead
2020-01-22 13:17:29 -05:00
181984f478
Update materials.dm
2020-01-21 09:31:38 -05:00
89bb60ac16
Update parts.dm
2020-01-20 16:12:40 -05:00
afd848e45a
weh
2020-01-20 10:29:09 +08:00
c273853cff
Merge branch 'bountytweaks' of https://github.com/Owai-Seek/Citadel-Station-13 into bountytweaks
2020-01-19 15:25:23 -05:00
cf9d3977b8
Reward Fix
2020-01-19 15:25:20 -05:00
5d4732ed30
Update assistant.dm
2020-01-18 22:36:20 -05:00
703fe9399a
Some more balance and a fix.
2020-01-18 22:29:21 -05:00
bd30b44919
Bounty Reorganisation and Rebalance
...
Reorganises several bounties.
Rebalances or Buffs Skateboard, Stunprod, Shady Jims, Gas Mask, Soup, Ice Cream Sandwiches, Popcorn, Onion Rings, Night Vision Goggles, Tool Belts, possibly others.
Moves:
Khinkali to Chef Bounties
Super Bite to Chef Bounties
Poppy Pretzels to Chef Bounties
Adds:
Fiesta Skewer Bounty
Pneumatic Cannon Bounty
BBQ Ribs Bounty
Add's Trillby's Toy Sword Bounty
Fix:
Shady Jims were unobtainable, they are now obtainable.
2020-01-18 21:59:03 -05:00
2b2e694341
Update code/modules/cargo/packs/science.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-01-17 15:56:09 -05:00
e685c3fc09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
2020-01-15 17:15:21 -05:00
4b090f938c
ok
2020-01-15 20:51:36 +01:00
92dc5e61c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
2020-01-13 03:42:20 -05:00
ee33e36e6d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
2020-01-12 12:46:30 -05:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
825b4f01c2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-10 02:26:19 +01:00
6a2696f1f8
ghommie said
2020-01-07 03:10:22 -05:00
f7aa4f3050
Merge branch 'master' into glassware
2020-01-06 23:55:44 -05:00
9d21a0e000
oil blood b gone
2020-01-05 09:57:11 -05:00
bd42f20047
Update organic.dm
2020-01-04 20:11:10 -05:00
2d573c3f7a
carpets are misc
2020-01-04 20:06:54 -05:00
67afcc13db
Update misc.dm
2020-01-04 20:01:44 -05:00
c0e010c612
e
2020-01-04 16:44:11 -06:00
97242050ec
bad idea
2020-01-04 02:16:55 -06:00
7c98656939
upstream merge
2020-01-04 01:48:50 -06:00
186194418e
tg 43454+43688 port, tweaks w/ trilby, db crate
2020-01-04 01:33:32 -06:00
8b760f5f3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
2020-01-03 21:01:31 -05:00
f5b251db66
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-03 18:24:39 +01:00
2931cb6757
Merge branch 'master' into glassware
2020-01-02 20:30:20 -05:00
be62bbc96d
Lowering price and change description
2019-12-31 18:17:07 -05:00
81a39aa324
Add the space radsuit and the crate
2019-12-31 13:25:09 -05:00
Ghom