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
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
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
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
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
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
c0bc53ea81
more
2019-12-31 01:43:42 -05:00
970814adbc
it begins
2019-12-31 01:42:07 -05:00
7837688426
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-28 23:41:10 +01:00
d562a5ba27
Merge pull request #10212 from Ghommie/Ghommie-cit471
...
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
d571bbd292
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-24 00:07:32 +01:00
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
395457f7ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
2019-12-21 17:59:32 +01:00
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
95c0eddc2a
Merge pull request #10072 from Useroth/new-tg-plants
...
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
5f95e0d5a6
Remove an extra antimatter engine shielding
2019-12-13 08:17:06 -05:00
e6282e95c2
Apply suggestions from code review
...
Ghommie fixes
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-12 21:46:31 -05:00
414d4b7a90
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
2019-12-09 00:04:22 +01:00
28ddfd29b6
Merge branch 'master' into new-tg-plants
2019-12-07 14:25:38 +01:00
c4450579ac
Why does breakfast have a timer?
...
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
2019-12-07 01:53:55 -05:00
1158c03ed7
Added bamboo.
2019-12-06 19:00:10 +01:00
6377f1b3a9
Organisation
2019-12-06 03:42:57 -05:00
8bd6c58bcd
Merge branch 'master' into cargocleanupv2boogaloo
2019-12-06 01:27:44 -05:00
b860c6e0bb
Merge branch 'master' into cargocleanupv2boogaloo
2019-12-06 01:14:44 -05:00
83b77650a8
Additional Cleanup
...
Reorganised Materials, added Bulk Cotton Crate
Removed Wooden Barrel / Toner Crates
Modified Fruit Delux Crate
Modified Cargo Supplies Crate
Moved several crates to their proper areas.
2019-12-06 01:13:54 -05:00
6a305dfe4f
Merge pull request #9955 from Ghommie/Ghommie-cit394
...
Updating supply pods code.
2019-12-05 21:54:42 -07:00
b932841adf
Merge pull request #9975 from Ghommie/Ghommie-cit404
...
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
2019-12-05 21:47:29 -07:00
5048995a58
Merge pull request #9993 from Ghommie/Ghommie-cit412
...
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
8615c0ea8f
Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394
2019-12-03 02:32:59 +01:00
c31ca96e87
Rebalanced Meat Crate
2019-12-02 16:21:48 -05:00
8d09f5a082
Merge branch 'master' into tinytweaks
2019-12-01 23:24:56 -08:00
89aa08837f
Updated Access, Bluespace Trash (again). Fixes
...
Updated Engineering and Medical hardsuits to require access for their applicable departments.
Moved Virus Containment into it's proper file.
Put Bluespace Trashbag back in the advanced sanitation crate.
Spellcheck.
2019-12-01 05:12:14 -05:00
Ghom