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
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
66114f9c37
Removed Power Tools, Tweaked EF Crate
...
Removed Power Tool Crate
Made exotic footwear non-contraband, and increased price.
2019-11-30 00:49:14 -05:00
a524ca6f18
Spellchecking and Crate balance.
...
Integrated #9939 spellchecking.
Rebalanced Emergency Medical Supplies, EMS Lite, and advanced janitorial crate. (Also added to Advanced Janitorial and Power Tools crate that they require access.)
2019-11-29 16:54:04 -05:00
e6484a22a8
Ports tgstation loom changes, and durathred golems.
2019-11-29 05:34:17 +01:00
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
ee55170b3f
Fixed Meat Crates
2019-11-28 18:30:43 -05:00
e884f606c4
wait, what the fuck!
2019-11-28 05:41:49 +01:00
6194dddf42
I'll hold on this until I port the conveyor_construct conversion to stacks.
2019-11-28 05:40:26 +01:00
0ad89bd9de
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
2019-11-28 05:34:56 +01:00
5988e4558c
> to add injury to someone you just fragged
2019-11-27 02:32:23 +01:00
4e05c27cdb
Updating supply pods code.
2019-11-27 01:54:10 +01:00
6a4c959b0a
Added more crates.
2019-11-24 19:05:03 -05:00
eee8c8c108
Shields Bounty is now 2 for 3000
2019-11-23 03:11:00 -05:00
03dae580a9
Minor QoL and Wardrobe Updates
2019-11-22 14:08:12 -05:00
386dd6aa8a
Made Medical Emergency Crate Drop-Pod only.
...
Trill made me do it.
2019-11-22 06:44:59 -05:00
05b22caaa3
Added 12 new crates, fixed issues raised in #9901
...
Remake of previous PR that I broke due to inexperiance.
Added 12 new crates to cargo.
Re-ordered some some of the crates.
2019-11-22 02:37:57 -05:00
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
178aedc5cc
Merge pull request #9754 from Ghommie/Ghommie-cit330
...
porting "global to static"
2019-11-14 16:38:27 -07:00
4c89b8c33f
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2019-11-14 16:00:45 -07:00
2f4562a63b
Merge pull request #9656 from Ghommie/Ghommie-cit290
...
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
d15a1b0e6b
Merge pull request #9680 from Owai-Seek/extendedbounties
...
Reworked a bit of bounty stuff.
2019-11-14 15:53:07 -07:00
617b0db310
Merge pull request #9692 from Ghommie/Ghommie-cit309
...
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
2019-11-14 15:48:34 -07:00
f1612f6619
Merge pull request #9791 from kappa-sama/revolverports
...
ports TG's nicer revolver sprites for russian revolvers, normal .357 revolvers, and golden .357
2019-11-14 01:39:21 -07:00
6ad9c7fef0
no shotgun i guess
...
shit guess i gotta add this to traumas too
2019-11-13 17:01:30 -05:00
73661cfe52
more fixing+ chem selling tweaks
2019-11-13 09:39:42 -05:00
de1ce4afc8
more crates and explote fixing
2019-11-13 09:15:44 -05:00
ec57e28c17
Merge branch 'master' into Cargo_MKII
2019-11-13 08:00:24 -05:00
63da5ffb13
ID console fixes and other tweaks.
2019-11-11 17:10:14 +01:00
Lin