4ec99a38e2
merge fixes
2020-02-07 15:28:05 +08:00
3f5805a9e8
Merge pull request #10798 from necromanceranne/secmainsrejoice
...
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
d0cd33a5ea
Merge pull request #10899 from Trilbyspaceclone/vender-hate
...
Almost all venders now can be restocked
2020-02-05 23:44:30 -07:00
d0100345fd
done hopefully
2020-02-05 17:00:38 +08:00
6cc6aa12be
yeehaw it's done
2020-02-05 16:54:57 +08:00
f05d37b7fd
Merge pull request #10855 from Trilbyspaceclone/patch-274
...
The Syndicats are run by aliens - Fixes Alien cargo crate to be correction emag
2020-02-05 01:10:21 -07:00
06fd6645b3
And it wokrs
2020-02-04 16:01:22 -05:00
8458340541
Update science.dm
2020-02-04 14:38:24 -05:00
e237fefbf4
Update science.dm
2020-02-04 06:45:37 -05:00
275b1f73e0
Merge pull request #10849 from Ghommie/Ghommie-cit547
...
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
97be223b0b
Merge pull request #10799 from Seris02/goldentoolboxfix
...
makes the golden ""plastitanium"" toolbox actually plastitanium
2020-02-02 19:08:16 +01:00
e7ddfdd8d8
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
c94b5688db
Merge pull request #10810 from YakumoChen/ring
...
Adds ring jewelry
2020-02-02 03:16:01 -07:00
6b2a8d49c9
Update science.dm
2020-02-02 01:39:25 -05:00
18489e5b65
merge fixes
2020-02-02 11:51:26 +08:00
8de11845d5
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-02 03:39:49 +01:00
3337181cac
Merge pull request #10352 from Seris02/smchanges
...
Changes to the way SM handles power related to integrity and max integrity damage
2020-02-01 18:46:10 +01:00
6c3069e944
less empty line
2020-01-31 14:15:13 +00:00
32f3b31127
adds two crates
2020-01-31 08:54:07 -05:00
81039b131b
fixes
2020-01-31 09:49:08 +08:00
43c4debb4f
Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits.
2020-01-31 11:54:18 +11:00
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
d937ded07c
Fixes points
2020-01-30 18:54:39 +01:00
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
e45cc4933c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
2020-01-27 08:33:38 +08:00
6619ac41c8
*PANIC*
2020-01-25 22:07:57 +02:00
e360ac1d36
Conflict fix
2020-01-24 23:06:32 +01: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
74be93a8cc
hasSiliconAccessInArea vars change
2020-01-21 11:44:49 +08:00
c2bcbe868e
merge conflicts + getting rid of commented code for now
2020-01-21 11:23:33 +08:00
89bb60ac16
Update parts.dm
2020-01-20 16:12:40 -05:00
Seris02