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
fdf3871cb7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
2020-01-18 18:30:51 +08:00
04b34ec8ed
hijack implant
2020-01-18 18:04:31 +08: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
472d18403c
Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties
2020-01-16 11:38:09 +02: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
8b8a112d2c
Ohkay
2020-01-15 09:41:33 +02: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
c0bc53ea81
more
2019-12-31 01:43:42 -05:00
970814adbc
it begins
2019-12-31 01:42:07 -05:00
2ca4c2e66a
tiny fixes
2019-12-30 18:53:00 +08:00
714f76c8aa
more changes
2019-12-30 18:48:29 +08:00
8aee20cdf3
Ready
2019-12-28 17:55:20 -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
ddd3676903
Merge branch 'master' into glassware
2019-12-17 15:18:30 -05: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
67d3d19cb9
correctiosn
...
and movement
2019-12-07 13:43:34 -05:00
e5c8f7bf06
Merge branch 'master' into glassware
2019-12-07 12:50:32 -05: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
Winter Flare