Razgriz
4aaf01a5bb
Merge pull request #5714 from Cyrelius/Weapons/Armour
...
Energy Weapons Balance Pass.
2023-06-23 23:44:04 -07:00
Heroman3003
fd81098e66
Merge pull request #15067 from Runa-Dacino/miningfix
...
Fixes mining explosives no longer spawning mhydrogen/platinum
2023-06-22 21:17:10 +00:00
Heroman3003
db38ed93c0
Spell Fixes
2023-06-19 04:40:45 +00:00
Heroman3003
2281afdf24
More 515 Compatibility
2023-06-05 21:21:35 +00:00
Cyrelius
bcb623da6e
Update survey_vendor.dm
...
Reduced cost of Frontier Phaser weapons, making them more viable.
2023-06-02 10:58:19 -07:00
Heroman3003
257b2e9a71
Merge pull request #14907 from KillianKirilenko/kk-fashion
...
Martian Miner Coat & Hammer rarity
2023-05-28 10:19:42 +00:00
Aroliacue
382eeec503
Adds shield generators to cargo and explo/mining vendors
2023-05-12 21:41:30 +10:00
Heroman3003
d10da6fb22
Merge pull request #14767 from KillianKirilenko/kk-shockmaul
...
Concussion Maul
2023-04-14 22:38:34 +00:00
Heroman3003
025fac4bf9
[MIRROR] /tg/ era language pass
2023-03-13 05:23:57 +00:00
Heroman3003
8fa41aa7b6
Merge pull request #14543 from Heroman3003/ore-pieces
...
Allows ore processors to start collecting ore pieces again
2023-02-25 03:02:59 +00:00
Novacat
10cc3d8829
Merge pull request #14373 from Cyantime/patch-3
...
Fixes #14268
2023-01-23 14:36:46 +00:00
Razgriz
0a20fcd5b7
Add frontier marksman rifle to vendor, increase frontier costs
...
-Added the frontier marksman rifle to vendor
-Increased frontier phaser costs
2023-01-20 18:15:29 -07:00
Casey
5ff3d93601
Merge pull request #14129 from Screemonster/whatsinthebox
...
Makes lootboxes a hell of a lot more random
2022-11-27 18:01:16 +00:00
Razgriz
edc64dcbdf
Merge pull request #4143 from Tasald/Explorationedits
...
Explorationedits
2022-11-14 23:54:29 -07:00
Nadyr
f0e281b4f7
powder that makes you say yes
2022-11-07 17:32:52 -05:00
Casey
aa860598a2
remove xenoarch tools from mining vender
2022-11-06 17:13:44 +00:00
C.L
0853131f66
Merge pull request #13809 from Heroman3003/abandon-crate-fix
...
Adjusts abandoned crate content self-destruct
2022-09-25 22:42:28 +00:00
Nadyr
f847203a61
powder that makes you say yes
2022-09-25 17:29:00 -04:00
Nadyr
dd731c7474
powder that makes you say yes
2022-09-25 17:25:07 -04:00
Nadyr
a527ae97e4
powder that makes you say yes
2022-09-25 17:21:44 -04:00
Casey
1550c3bee5
Mining adjustments
2022-09-25 20:47:34 +00:00
Tasald
199ce43be6
renamed riot shield to riot shield
2022-09-22 22:50:46 -07:00
Casey
524cd2e671
Adds personal shield generators. [READY FOR MERGE]
2022-09-23 00:53:41 +00:00
Casey
ac204e7749
Replaces some old code w/ IsAdvancedToolUser and fixes twohanded weapons for simple_mobs
2022-07-29 20:48:29 +00:00
Nadyr
c5a0f8fb24
Merge pull request #4584 from CHOMPStation2/upstream-merge-13371
...
[MIRROR] Fixes in-chat icons being broken in oldchat
2022-07-20 21:12:22 -04:00
Casey
48f835f41f
Fixes in-chat icons being broken in oldchat
2022-07-20 17:24:27 +00:00
Casey
65c56f646d
Merge pull request #13348 from Heroman3003/abandoned-safe
...
Makes abandoned crates destroy contents when tamper is detected
2022-07-17 09:32:45 +00:00
Nadyr
a2d9c8b58a
Merge branch 'master' into upstream-merge-13122
2022-06-22 22:37:44 -04:00
Casey
b0802ce267
More TGUI Input Conversions
2022-06-19 11:09:42 +00:00
Casey
928a321b5f
TGUI Input Conversions
2022-06-19 03:59:14 +00:00
Casey
501bb21152
Plating can be built on most ground turfs.
2022-05-22 18:30:08 +00:00
Casey
be7e0a3c87
Merge pull request #12879 from Runa-Dacino/belt_dagger
...
Adds belt slot flag to proto-kinetic machete and subtypes
2022-05-08 09:42:24 +00:00
Tasald
1abc973117
edit and removal
...
Increased the price of the phasers and removed the new armor and denecrotizer from the vendor
2022-05-01 11:47:26 -07:00
Tasald
6544a74295
Update code/modules/mining/ore_redemption_machine/survey_vendor.dm
...
Co-authored-by: Rykka Stormheart <54187424+Rykka-Stormheart@users.noreply.github.com >
2022-04-28 16:33:55 -07:00
Tasald
df53e85e90
Update survey_vendor.dm
2022-04-23 13:34:41 -07:00
Tasald
d740295aab
Update survey_vendor.dm
2022-04-23 13:33:43 -07:00
Tasald
75f416d104
i am durp
...
added exploration shield and added price to small pouches
2022-04-23 13:32:43 -07:00
Tasald
1821451f44
comma
2022-04-23 13:23:17 -07:00
Tasald
2475a1d9c4
missed some commas
2022-04-23 13:17:47 -07:00
Tasald
54c90cbc1a
vendor additions and new armor
2022-04-23 12:55:26 -07:00
Rykka
c4488bac04
Fixes 6 year old bug with icon filepaths being override in update_icon
...
Specific to mining turfs, but I imagine others might have this.
The reason we don't directly pull from 'icon' is to allow turf making folk to have some fun to play with it, make the icon change only on update, etc.
If preferred, icon_path var can just be set to grab the turf's base icon path, but I prefer the var imo.
2022-04-10 10:54:44 -06: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
3ea4c8b9ea
Merge pull request #12577 from GhostActual/tg-port-3
...
The Grand /TG Port - Part 3
2022-04-03 03:28:43 +00:00
Nadyr
34c742b55e
powder that makes you say yes
2022-02-19 20:39:18 -05:00
Casey
592777ba9b
Merge Fixes for 8222
2022-02-19 22:04:54 +00:00
Nadyr
6e44bb7876
Merge branch 'master' into upstream-merge-12165
2022-02-06 21:53:14 -05:00
Nadyr
4b2b0c85bc
Merge pull request #3614 from CHOMPStation2/upstream-merge-12150
...
[MIRROR] mining vendor 1000 thaler reward
2022-02-06 20:35:33 -05:00
Casey
e6f02c05a6
The final Item Bank patch?
2022-02-06 23:29:28 +00:00
Casey
e5665c54cf
Merge pull request #12150 from PastelPrinceDan/moni
...
mining vendor 1000 thaler reward
2022-02-06 14:13:55 +00:00
