Nadyr
c3374cff9f
powder that makes you say yes
2022-09-25 17:19:38 -04:00
Casey
1550c3bee5
Mining adjustments
2022-09-25 20:47:34 +00:00
Razgriz
fe47515136
Merge branch 'master' into upstream-merge-13784
2022-09-22 20:59:44 -07:00
Casey
e78a07640f
Fixes bluespace bag recursion disappearance
2022-09-23 01:00:28 +00:00
Casey
327e492548
Merge pull request #13768 from Heroman3003/runtimefix
...
Fixes runtime with sheet snatcher
2022-09-23 00:56:32 +00:00
Casey
08c0ad1753
Merge pull request #13742 from Heroman3003/moreruntimes
...
Fixes a few more runtimes.
2022-09-18 09:35:35 +00:00
Casey
4c46939600
Merge pull request #13612 from Verkister/patch-118
...
Pizza vouchers now fit inside wallets
2022-08-31 07:35:06 +00:00
Nadyr
323a57e271
Merge pull request #4747 from CHOMPStation2/upstream-merge-13536
...
[MIRROR] More casino updates
2022-08-28 18:51:48 -04:00
Casey
da9722545b
More casino updates
2022-08-21 19:38:41 +00:00
Casey
eb3f1875b2
Merge pull request #13534 from Cameron653/NEED_A_MEDIC_BAG
...
Makes the freezer able to hold more items at cost of size.
2022-08-21 19:37:35 +00:00
Casey
4a0fa06764
Merge pull request #13494 from ItsSelis/secure-briefcase-fix
...
Fixes secure briefcase AltClick
2022-08-14 19:12:29 +00:00
Nadyr
39f07b47a0
powder that makes you say yes
2022-08-07 18:38:15 -04:00
Casey
f384de2a1f
Expands mining&archeology belt storage.
2022-08-07 19:46:45 +00:00
xnqm8h
a5fef3cfbf
Update pouches.dm
2022-08-03 20:04:56 -04:00
Nadyr
ac1f228231
powder that makes you say yes
2022-08-01 22:11:09 -04:00
Poojawa
575a719688
get_random_colour() now prepends a #
2022-07-31 18:10:04 +00:00
Casey
2ad683220b
Adds light and heavy frame traits
2022-07-15 22:30:56 +00:00
Casey
8dd5039119
Fixes issues with taurs and belts/suits. Again.
2022-06-25 02:23:35 +00:00
Casey
b0802ce267
More TGUI Input Conversions
2022-06-19 11:09:42 +00:00
Casey
f958518ea9
Merge pull request #13035 from lm40/nogods
...
localizes religion and adds custom chaplain titles
2022-06-04 16:38:53 +00:00
Casey
9f6a9a4e6a
Merge pull request #12897 from FartMaster69420/cocoon
...
Cocoon Metamorphosis
2022-05-12 19:21:53 +00:00
Casey
ff911924b5
Merge pull request #12881 from TankTheBirb/master
...
Pocket pouch rebalance + obtaining method
2022-05-08 09:44:33 +00:00
BlackMajor
aeea4dfc9a
Merge branch 'master' into protean-rework
2022-04-25 13:21:53 +12: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
BlackMajor
119b70776f
Progress
2022-04-20 22:49:11 +12:00
Casey
0a447ad26f
Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean
...
Xenobio Upgrades
2022-04-11 19:24:32 +00:00
Casey
61ea8e3f3d
New Donk-pockets
2022-04-06 02:12:51 +00:00
Casey
061b177978
Mini Aurora Port
2022-04-04 18:07:58 -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
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
d552e834a1
The Grand /TG Port - Part 2
2022-04-03 03:27:36 +00:00
Nadyr
b8276c6a3e
powder that makes you say yes
2022-03-25 18:59:02 -04:00
Casey
3c36b9c16e
Allowing micros to crawl into storage items
2022-03-25 21:19:13 +00:00
Casey
da32f1ce86
Merge pull request #12422 from Verkister/patch-109
...
Fixes zaddat lunchbox adding extra hypos on loadout survival lunchbox
2022-03-12 17:28:41 +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
Razgriz
c09ad1baa9
powder that makes you say yes and hate the map changes
2022-03-04 15:23:33 -07:00
Casey
80f5298a18
Ammo Boxes
2022-03-03 21:23:43 +00:00
Nadyr
f36f32e7d8
forgot the crossbow changed too
2022-02-19 19:25:19 -05:00
Nadyr
cc600eeec0
change old crossbow ammo path
2022-02-19 19:19:26 -05:00
Casey
3d6510f3ea
Donk Co. Toys
2022-02-19 04:27:50 +00:00
Razgriz
ea5b01ad69
Merge pull request #3653 from CHOMPStation2/upstream-merge-12191
...
[MIRROR] strapless bag
2022-02-13 01:31:20 -07:00
Casey
36323b3b12
Merge pull request #12194 from ktccd0/ktccd-dev-Pouches-Fix
...
Fixes pouches
2022-02-11 22:20:28 +00:00
Casey
0319e46850
strapless bag
2022-02-11 21:36:25 +00:00
Nadyr
97e80df2a7
Merge branch 'master' into upstream-merge-12029
2022-01-09 20:18:25 -05:00
Casey
61a2292fc2
Merge pull request #12013 from Hatterhat/patch-5
...
inducer on holding belt
2022-01-09 01:52:31 +00:00
Casey
a84c109a45
more stuff fits on toolbelts of holding take 2 because i fucked up somewhere
2022-01-09 01:51:08 +00:00
Nadyr
b796814d3c
Merge pull request #3473 from CHOMPStation2/upstream-merge-11878
...
[MIRROR] Fix for issue #5643
2021-12-12 06:05:03 -05:00
CHOMPStation2
e79f88adfe
powder that makes you say yes
2021-12-09 23:40:10 -07:00
Casey
b897e76c07
Fix for issue #5643
2021-12-10 06:13:28 +00:00
Casey
e773ca01c9
Merge pull request #11832 from Hatterhat/pad-booster
...
mechaport gaming
2021-12-10 02:51:14 +00:00
