Nadyr
46ff42c250
Merge pull request #4371 from CHOMPStation2/upstream-merge-13103
...
[MIRROR] [MIRROR-FIX] Cooking QOL V2
2022-06-22 21:55:19 -04:00
Novacat
47c92f2581
[MIRROR-FIX] Cooking QOL V2
2022-06-18 14:45:56 +00:00
Casey
c1187d1942
Various Fixes
2022-06-18 00:02:11 +00:00
Nadyr
96b9b449fc
powder that makes you say yes
2022-05-27 15:54:25 -04:00
Casey
4aa0977f19
A couple more engineering QoL changes.
2022-05-22 18:24:54 +00:00
Novacat
4b4ba32e03
Merge pull request #12968 from Heroman3003/RUNTIME-FIX-END-ME
...
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NO…
2022-05-14 13:05:43 +00:00
Tasald
9962272e51
Exploration upgread ( #4137 )
...
* Add pathfinder to drop pouches
adds pathfinder to drop pouches so they can have them to.
* Revert "Add pathfinder to drop pouches"
* Revert "Revert "Add pathfinder to drop pouches""
* Exploration gear update
Adds missing standard items to exploration lockers so they arn't gimped.
* Update misc.dm
* PF locker update
Adds the plate carrier and exploration bags to pathfinder locker
* PF bags
Lets the pathfinder spawn with exploration bags instead of generic ones
* Binocs
Adds binocs to the list of items that can be stored in the belt
* Ecig addition
Adds the standard and alternative ecigs to the base load out. dun know if setting the price of the alt one two 2 is good or not.
* removes sharp things
takes out the duplicate knife and machete
* removes macete holster
* Update outfit_vr.dm
* Update misc.dm
* Update belt_vr.dm
* Update misc_vr.dm
* Update misc_vr.dm
* Update loadout_accessories.dm
* Update loadout_smoking.dm
* Update misc.dm
2022-04-21 23:45:03 -07:00
Casey
0a447ad26f
Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean
...
Xenobio Upgrades
2022-04-11 19:24:32 +00:00
Nadyr
a121954e24
Merge pull request #3992 from CHOMPStation2/upstream-merge-12592
...
[MIRROR] The Grand /TG Port - Part 6
2022-04-04 17:52:53 -04:00
Nadyr
6fe5e8c1e1
Merge pull request #3991 from CHOMPStation2/upstream-merge-12579
...
[MIRROR] The Grand /TG Port - Part 5
2022-04-04 17:37:57 -04:00
Casey
de0be34c99
The Grand /TG Port - Part 6
2022-04-03 03:32:03 +00:00
Casey
60b1eeff99
Merge pull request #12579 from GhostActual/tg-port-5
...
The Grand /TG Port - Part 5
2022-04-03 03:30:56 +00:00
Casey
3ea4c8b9ea
Merge pull request #12577 from GhostActual/tg-port-3
...
The Grand /TG Port - Part 3
2022-04-03 03:28:43 +00:00
Razgriz
390bca0ec1
powder that makes you say yes
2022-03-27 00:18:25 -07:00
Casey
51bd77e5c2
Firearms 1
2022-03-26 03:56:42 +00:00
Nadyr
6cecc1762a
powder that makes you say yes
2022-03-20 18:52:03 -04:00
Casey
8e0552a788
Colts, Revolvers, and Tasers
2022-03-20 03:10:23 +00:00
Casey
de6e5c4932
Merge pull request #12382 from BonniePandora/Atmosia-Improvements
...
Minor Atmos-tech QoL & new hazard vest
2022-03-07 08:36:25 +00:00
Nadyr
3fe87a33ed
Merge pull request #3711 from CHOMPStation2/upstream-merge-12253
...
[MIRROR] Donk Co. Toys
2022-02-19 19:55:19 -05:00
Casey
3d6510f3ea
Donk Co. Toys
2022-02-19 04:27:50 +00:00
Casey
e723ed2118
Heavy-duty Engineer's Gloves
2022-02-14 21:32:19 +00:00
Nadyr
33403c6445
Merge branch 'master' into upstream-merge-12164
2022-02-06 21:38:32 -05:00
Nadyr
03bae00061
Merge pull request #3616 from CHOMPStation2/upstream-merge-12151
...
[MIRROR] adds a catslug crate to cargo
2022-02-06 20:40:53 -05:00
Nadyr
4efce5f15f
Merge pull request #3615 from CHOMPStation2/upstream-merge-12146
...
[MIRROR] skimpy cap "dress" probably more like a leotard idk
2022-02-06 20:36:30 -05:00
Casey
80e943716f
talon miner
2022-02-06 23:21:47 +00:00
Casey
b77383ecce
Merge pull request #12151 from PastelPrinceDan/catslugcrate
...
adds a catslug crate to cargo
2022-02-06 14:16:18 +00:00
Casey
86ca5e5d49
Merge pull request #12146 from Hatterhat/formal-in-the-loosest-sense
...
skimpy cap "dress" probably more like a leotard idk
2022-02-06 14:15:06 +00:00
Casey
7f3da20187
Talon Improvements, Take 2
2022-02-06 14:07:23 +00:00
Casey
5cefa8d4e3
department berets (mostly heads tbh)
2021-12-12 04:20:38 -05:00
Casey
3d3fc07d0e
Merge pull request #11877 from Heroman3003/glovening
...
Adds leather gloves to (xeno)botanist lockers
2021-12-10 06:12:10 +00:00
Chompstation Bot
60de9a473c
Stellar Delight!
2021-10-30 13:34:04 +00:00
Aronai Sieyes
f2702c5455
Merge pull request #11544 from VOREStation/upstream-merge-8230
...
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
2021-10-22 18:24:49 +00:00
Nadyr
53c15bd4f3
powder that makes you say yes
2021-09-28 23:41:35 -04:00
Chompstation Bot
a7365de5be
Eng/Med Belts
2021-09-29 02:41:07 +00:00
Chompstation Bot
ad57dfbb92
Adds more clothing from Polaris and various sources
2021-09-27 18:31:54 +00:00
Nadyr
be5b7f3644
Merge pull request #2895 from CHOMPStationBot/upstream-merge-11466
...
[MIRROR] Expanding Clothing Options
2021-08-26 20:50:04 -04:00
Chompstation Bot
3a63117151
Expanding Clothing Options
2021-08-26 15:44:22 +00:00
Chompstation Bot
af0d7a0f6b
Make stack amount var private
2021-08-26 15:39:04 +00:00
Nadyr
67eaef4886
Merge branch 'master' into upstream-merge-11464
2021-08-25 23:32:47 -04:00
Nadyr
0d3076d6b4
Merge pull request #2867 from cadyn/upstream-merge-11408
...
Merge Upstream Pull Request 11408
2021-08-25 21:59:52 -04:00
Nadyr
ad5441a144
powder that makes you say yes
2021-08-25 21:25:20 -04:00
Nadyr
835c587224
Merge pull request #2866 from cadyn/upstream-merge-11404
...
Merge Upstream Pull Request 11404
2021-08-25 21:23:07 -04:00
Aronai Sieyes
e19a87e44a
Upstream-11408
2021-08-24 21:09:43 -07:00
Aronai Sieyes
ed4e55f811
Merge pull request #11404 from VOREStation/Arokha/fridge
...
Fridge/wall locker animation fixes
2021-08-24 21:09:22 -07:00
Nadyr
88ea62510a
Merge branch 'master' into upstream-merge-11459
2021-08-24 23:23:57 -04:00
Nadyr
a7af370a6d
powder that makes you say yes
2021-08-24 23:17:52 -04:00
Aronai Sieyes
c1632a1c71
Merge pull request #11439 from PastelPrinceDan/rdlabcoat
...
Ports RD labcoat from CitRP
2021-08-24 23:06:09 -04:00
Chompstation Bot
e209b4cfb2
Adds winter coats to their respective lockers/vendors
2021-08-24 23:59:02 +00:00
Chompstation Bot
593dd3ea79
Stun Revolver Fix
2021-08-24 23:58:41 +00:00
Chompstation Bot
f5212e0053
Fix Salamanders and Wall-lockers
2021-08-13 15:40:58 +00:00
