From 4705efa6da2efedc80c3003f706398dcd07199be Mon Sep 17 00:00:00 2001 From: TechnoAlchemist Date: Wed, 11 May 2016 20:19:47 -0700 Subject: [PATCH] Adds new items to the mining vendors. (#17362) * Adds new items to the mining vendors, also adds tracking implanter since that didn't exist before. * woops * Fixes tracking implants for miners, makes medipens not OD you on tricord. * Actually doesn't OD on tricord now * Chemical changes. * Upgraded the jaunter into the wormhole lifebelt :cl: coiax rscadd: The Free Golems have developed the jaunter into the wormhole lifebelt, which automatically teleports the user when they fall in a chasm or suffer a major medical emergency. Must be worn on the belt to work. /:cl: Please don't mistake a random teleportation in crit for saving a user's life, the Supply channel gets a notification, but suit sensors are required to find them, and there's no guarantee the location picked is safe (for example, the Toxins Test Site is a valid jaunt destination, along with in the middle of the slime cages in Xenobiology). * Adds modification kit. * Golem ship now has its own /area And a bluespace beacon. * 5 tick medijaunt, no radio, golem jaunters + areas The number of ticks before a medical emergency jaunt happens is now five. No radio message is produced. Free Golems now have no restrictions on what they can purchase. Wormhole jaunters now specifically drop golems near their ship. * Modkits remove the race restrictions from KAs. * Buffs buffs buffs I'd say something, but I'm sure I'd regret it later. * Advanced lifebelts, golem superiority * Removes modkit from minervendors, adds modkit to RnD! * COMPILE DAMN YOU!! * I made it compile * Honor to my country, not to you :( * fuck * h-haha? * Kor you know I would never actually ban you * i could personally care less for HBls adminning style --- .../LavaRuins/lavaland_surface_golem_ship.dmm | 75 +++++++++--------- code/__DEFINES/combat.dm | 10 +++ .../objects/items/devices/modificationkit.dm | 23 ++++++ .../items/weapons/implants/implant_track.dm | 7 ++ .../objects/items/weapons/storage/boxes.dm | 13 +++ code/modules/mining/equipment_locker.dm | 63 +++++++-------- code/modules/mining/mine_turfs.dm | 2 +- code/modules/projectiles/gun.dm | 8 -- .../reagents/reagent_containers/hypospray.dm | 8 ++ code/modules/research/designs.dm | 10 +++ code/modules/ruins/ruin_areas.dm | 5 +- code/modules/telesci/gps.dm | 7 +- icons/obj/objects.dmi | Bin 96603 -> 96777 bytes tgstation.dme | 1 + 14 files changed, 147 insertions(+), 85 deletions(-) create mode 100644 code/game/objects/items/devices/modificationkit.dm diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index 0a2280a5a53..d41cfaa3a68 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -1,34 +1,35 @@ "a" = (/turf/template_noop,/area/template_noop) -"b" = (/turf/closed/wall/shuttle/smooth/nodiagonal{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"c" = (/obj/structure/closet/crate,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/storage/bag/ore,/obj/item/device/mining_scanner,/obj/item/device/flashlight/lantern,/obj/item/weapon/card/id/mining,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"d" = (/obj/structure/closet/crate,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/storage/bag/ore,/obj/item/device/mining_scanner,/obj/item/device/flashlight/lantern,/obj/item/weapon/card/id/mining,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"e" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"f" = (/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"g" = (/obj/structure/reagent_dispensers/watertank,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"h" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered) -"i" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 8},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered) -"j" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"k" = (/obj/machinery/computer/arcade/battle,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"l" = (/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"m" = (/obj/effect/mob_spawn/human/golem/adamantine,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"n" = (/obj/machinery/mineral/equipment_vendor/golem,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"o" = (/obj/item/weapon/resonator,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"p" = (/obj/machinery/mineral/ore_redemption,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"q" = (/obj/structure/statue/gold/rd,/obj/structure/window/reinforced{dir = 4; name = "shrine of the liberator"; pixel_x = 0},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"r" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"s" = (/obj/structure/extinguisher_cabinet{pixel_y = 30},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"t" = (/obj/structure/table/wood,/obj/item/weapon/bedsheet/rd{desc = "Majestic."; layer = 3; name = "Royal Cape of the Liberator"; pixel_x = 5; pixel_y = 9},/obj/item/weapon/book/manual/research_and_development{name = "Sacred Text of the Liberator"; pixel_x = -4; pixel_y = 3},/obj/structure/window/reinforced{dir = 4; name = "shrine of the liberator"; pixel_x = 0},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"u" = (/obj/item/weapon/resonator/upgraded,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"v" = (/obj/machinery/autolathe,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"w" = (/obj/structure/table/wood,/obj/machinery/reagentgrinder,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"x" = (/obj/machinery/computer/arcade/orion_trail,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"y" = (/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"z" = (/obj/structure/table/wood,/obj/item/weapon/surgical_drapes{pixel_x = 15},/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"A" = (/obj/item/weapon/storage/firstaid/fire,/obj/structure/table/wood,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"B" = (/obj/item/weapon/storage/firstaid/brute,/obj/structure/table/wood,/obj/item/weapon/storage/firstaid/brute,/obj/item/areaeditor/blueprints{desc = "Use to build new structures in the wastes."; name = "land claim"},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"C" = (/obj/item/weapon/storage/firstaid/brute,/obj/structure/table/wood,/obj/item/weapon/storage/firstaid/brute,/obj/item/weapon/disk/design_disk/golem_shell,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"D" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) -"E" = (/obj/structure/ore_box,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered) +"b" = (/turf/closed/wall/shuttle/smooth/nodiagonal{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"c" = (/obj/structure/closet/crate,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/storage/bag/ore,/obj/item/device/mining_scanner,/obj/item/device/flashlight/lantern,/obj/item/weapon/card/id/mining,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"d" = (/obj/structure/closet/crate,/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/storage/bag/ore,/obj/item/device/mining_scanner,/obj/item/device/flashlight/lantern,/obj/item/weapon/card/id/mining,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"e" = (/obj/item/weapon/storage/toolbox/mechanical,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"f" = (/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"g" = (/obj/structure/reagent_dispensers/watertank,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"h" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered/golem_ship) +"i" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 8},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered/golem_ship) +"j" = (/obj/machinery/door/airlock/shuttle,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"k" = (/obj/machinery/computer/arcade/battle,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"l" = (/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"m" = (/obj/effect/mob_spawn/human/golem/adamantine,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"n" = (/obj/machinery/mineral/equipment_vendor/golem,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"o" = (/obj/item/weapon/resonator,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"p" = (/obj/machinery/mineral/ore_redemption,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"q" = (/obj/structure/statue/gold/rd,/obj/structure/window/reinforced{dir = 4; name = "shrine of the liberator"; pixel_x = 0},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"r" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"s" = (/obj/machinery/bluespace_beacon,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"t" = (/obj/structure/extinguisher_cabinet{pixel_y = 30},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"u" = (/obj/structure/table/wood,/obj/item/weapon/bedsheet/rd{desc = "Majestic."; layer = 3; name = "Royal Cape of the Liberator"; pixel_x = 5; pixel_y = 9},/obj/item/weapon/book/manual/research_and_development{name = "Sacred Text of the Liberator"; pixel_x = -4; pixel_y = 3},/obj/structure/window/reinforced{dir = 4; name = "shrine of the liberator"; pixel_x = 0},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"v" = (/obj/item/weapon/resonator/upgraded,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"w" = (/obj/machinery/autolathe,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"x" = (/obj/structure/table/wood,/obj/machinery/reagentgrinder,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"y" = (/obj/machinery/computer/arcade/orion_trail,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"z" = (/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"A" = (/obj/structure/table/wood,/obj/item/weapon/surgical_drapes{pixel_x = 15},/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"B" = (/obj/item/weapon/storage/firstaid/fire,/obj/structure/table/wood,/obj/item/weapon/storage/firstaid/fire,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"C" = (/obj/item/weapon/storage/firstaid/brute,/obj/structure/table/wood,/obj/item/weapon/storage/firstaid/brute,/obj/item/areaeditor/blueprints{desc = "Use to build new structures in the wastes."; name = "land claim"},/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"D" = (/obj/item/weapon/storage/firstaid/brute,/obj/structure/table/wood,/obj/item/weapon/storage/firstaid/brute,/obj/item/weapon/disk/design_disk/golem_shell,/turf/open/floor/plasteel/shuttle/purple{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"E" = (/obj/structure/reagent_dispensers/fueltank,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) +"F" = (/obj/structure/ore_box,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/powered/golem_ship) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaa @@ -40,14 +41,14 @@ aabbbbjjbbbbjjbbbbbb aabkllllmmbllllllnhi aabllllloojlllllllhi bbbjjbbbbbblllllpbbb -bqrllllllljlllllljsj -btlllllllljlllllljlj -bbbjjbbbbbblllluvbbb -aabllllloojllllllwhi -aabxllllmmbyllzABChi +bqrllllllljlslllljtj +bulllllllljlllllljlj +bbbjjbbbbbbllllvwbbb +aabllllloojllllllxhi +aabyllllmmbzllABCDhi aabbbbjjbbbbjjbbbbbb -aaaaabfffffffffffDhi -aaaaabEEEEEEEefffDhi +aaaaabfffffffffffEhi +aaaaabFFFFFFFefffEhi aaaaabbbbbbbbbbbbbbb aaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaa diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 0cbd606660e..04e5a8fbf0d 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -70,3 +70,13 @@ #define UNARMED_ATTACK 2 #define PROJECTILE_ATTACK 3 #define THROWN_PROJECTILE_ATTACK 4 + + +//Gun Stuff + #define SAWN_INTACT 0 + #define SAWN_OFF 1 + #define SAWN_SAWING -1 + + #define WEAPON_LIGHT 0 + #define WEAPON_MEDIUM 1 + #define WEAPON_HEAVY 2 \ No newline at end of file diff --git a/code/game/objects/items/devices/modificationkit.dm b/code/game/objects/items/devices/modificationkit.dm new file mode 100644 index 00000000000..aefc9aca26d --- /dev/null +++ b/code/game/objects/items/devices/modificationkit.dm @@ -0,0 +1,23 @@ +/obj/item/modkit + name = "modification kit" + desc = "A one-use kit, which enables kinetic accelerators to be fired with only one hand, as well as allowing less dextrous races to use the tool." + icon = 'icons/obj/objects.dmi' + icon_state = "modkit" + origin_tech = "programming=2;materials=2;magnets=4" + var/uses = 1 + +/obj/item/modkit/afterattack(obj/item/weapon/gun/energy/kinetic_accelerator/C, mob/user) + ..() + if(!uses) + qdel(src) + return + if(!istype(C)) + user << "This kit can only modify kinetic accelerators!" + return ..() + user <<"You modify the [C], making it less unwieldy." + C.name = "compact [C.name]" + C.weapon_weight = WEAPON_LIGHT + C.trigger_guard = TRIGGER_GUARD_ALLOW_ALL + uses -- + if(!uses) + qdel(src) \ No newline at end of file diff --git a/code/game/objects/items/weapons/implants/implant_track.dm b/code/game/objects/items/weapons/implants/implant_track.dm index 7443a22ab3e..a0d58369614 100644 --- a/code/game/objects/items/weapons/implants/implant_track.dm +++ b/code/game/objects/items/weapons/implants/implant_track.dm @@ -13,6 +13,13 @@ ..() tracked_implants -= src +/obj/item/weapon/implanter/tracking/New() + imp = new /obj/item/weapon/implant/tracking( src ) + ..() +/obj/item/weapon/implanter/tracking/gps/New() + imp = new /obj/item/device/gps/mining/internal( src ) + ..() + /obj/item/weapon/implant/tracking/get_data() var/dat = {"Implant Specifications:
Name: Tracking Beacon
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 6538bba7f06..64fa803eb9a 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -231,6 +231,19 @@ new /obj/item/weapon/implantpad(src) new /obj/item/weapon/locator(src) +/obj/item/weapon/storage/box/minertracker + name = "boxed tracking implant kit" + desc = "For finding those who have died on the accursed lavaworld." + icon_state = "implant" + +/obj/item/weapon/storage/box/minertracker/New() + ..() + for(var/i in 1 to 3) + new /obj/item/weapon/implantcase/tracking(src) + new /obj/item/weapon/implanter(src) + new /obj/item/weapon/implantpad(src) + new /obj/item/weapon/locator(src) + /obj/item/weapon/storage/box/chemimp name = "boxed chemical implant kit" desc = "Box of stuff used to implant chemicals." diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 9503ed2808b..5726f1f1880 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -296,14 +296,17 @@ new /datum/data/mining_equipment("Shelter Capsule", /obj/item/weapon/survivalcapsule , 400), new /datum/data/mining_equipment("GAR scanners", /obj/item/clothing/glasses/meson/gar, 500), new /datum/data/mining_equipment("Explorer Belt", /obj/item/weapon/storage/belt/mining, 500), + new /datum/data/mining_equipment("Survival Medipen", /obj/item/weapon/reagent_containers/hypospray/medipen/survival, 500), new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600), - new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 600), + new /datum/data/mining_equipment("Tracking Implant Kit",/obj/item/weapon/storage/box/minertracker, 600), + new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 750), new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 750), new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 800), new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000), new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1000), - new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/hardsuit_jetpack , 2000), + new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/hardsuit_jetpack, 2000), new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), + new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), new /datum/data/mining_equipment("Super Resonator", /obj/item/weapon/resonator/upgraded, 2500), new /datum/data/mining_equipment("Super Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator/super, 3000), @@ -1124,44 +1127,32 @@ /obj/machinery/mineral/equipment_vendor/golem name = "golem ship equipment vendor" - desc = "A modified mining equipment vendor. It seems a few selections were replaced." - prize_list = list( - new /datum/data/mining_equipment("Stimpack", /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack, 50), - new /datum/data/mining_equipment("Stimpack Bundle", /obj/item/weapon/storage/box/medipens/utility, 200), - new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 100), - new /datum/data/mining_equipment("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe/premium,100), - new /datum/data/mining_equipment("Soap", /obj/item/weapon/soap/nanotrasen, 200), - new /datum/data/mining_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250), - new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 300), - new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300), - new /datum/data/mining_equipment("Monkey Cube", /obj/item/weapon/reagent_containers/food/snacks/monkeycube, 300), - new /datum/data/mining_equipment("Toolbelt", /obj/item/weapon/storage/belt/utility, 350), - new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/weapon/hivelordstabilizer, 400), - new /datum/data/mining_equipment("Shelter Capsule", /obj/item/weapon/survivalcapsule, 400), - new /datum/data/mining_equipment("GAR scanners", /obj/item/clothing/glasses/meson/gar, 500), - new /datum/data/mining_equipment("Sulphuric Acid", /obj/item/weapon/reagent_containers/glass/beaker/sulphuric, 500), - new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600), - new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 800), - new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 800), - new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000), - new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1000), - new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), - new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), - new /datum/data/mining_equipment("Super Resonator", /obj/item/weapon/resonator/upgraded, 2500), - new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500), - new /datum/data/mining_equipment("Mining Drone", /mob/living/simple_animal/hostile/mining_drone, 800), - new /datum/data/mining_equipment("Drone Melee Upgrade", /obj/item/device/mine_bot_ugprade, 400), - new /datum/data/mining_equipment("Drone Health Upgrade", /obj/item/device/mine_bot_ugprade/health, 400), - new /datum/data/mining_equipment("Drone Ranged Upgrade", /obj/item/device/mine_bot_ugprade/cooldown, 600), - new /datum/data/mining_equipment("Drone AI Upgrade", /obj/item/slimepotion/sentience/mining, 1000), - new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/weapon/storage/box/rndboards, 2000), - ) /obj/machinery/mineral/equipment_vendor/golem/New() ..() - var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/mining_equipment_vendor/golem(null) - B.apply_default_parts(src) + desc += "\nIt seems a few selections have been added." + prize_list += list( + new /datum/data/mining_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250), + new /datum/data/mining_equipment("Monkey Cube", /obj/item/weapon/reagent_containers/food/snacks/monkeycube, 300), + new /datum/data/mining_equipment("Toolbelt", /obj/item/weapon/storage/belt/utility, 350), + new /datum/data/mining_equipment("Sulphuric Acid", /obj/item/weapon/reagent_containers/glass/beaker/sulphuric, 500), + new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600), + new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), + new /datum/data/mining_equipment("Modification Kit", /obj/item/modkit, 1700), + new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/weapon/storage/box/rndboards, 2000), + + ) + + + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/machine/mining_equipment_vendor/golem(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + RefreshParts() /obj/item/weapon/circuitboard/machine/mining_equipment_vendor/golem name = "circuit board (Golem Ship Equipment Vendor)" build_path = /obj/machinery/mineral/equipment_vendor/golem + diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index f90b1caa4e1..663eea55a28 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -706,4 +706,4 @@ turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface initial_gas_mix = "o2=14;n2=23;TEMP=300" - defer_change = 1 + defer_change = 1 \ No newline at end of file diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 25a8fa2a00b..69d6b980422 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1,11 +1,3 @@ - #define SAWN_INTACT 0 - #define SAWN_OFF 1 - #define SAWN_SAWING -1 - - #define WEAPON_LIGHT 0 - #define WEAPON_MEDIUM 1 - #define WEAPON_HEAVY 2 - /obj/item/weapon/gun name = "gun" desc = "It's a gun. It's pretty terrible, though." diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 090942bf0e6..e8d1aebe14a 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -120,3 +120,11 @@ volume = 60 amount_per_transfer_from_this = 30 list_reagents = list("atropine" = 10, "epinephrine" = 10, "salbutamol" = 20, "spaceacillin" = 20) + +/obj/item/weapon/reagent_containers/hypospray/medipen/survival + name = "survival medipen" + desc = "A medipen for surviving in the harshest of environments, heals and protects from environmental hazards. " + icon_state = "stimpen" + volume = 80 + amount_per_transfer_from_this = 80 + list_reagents = list("salbutamol" = 10, "coffee" = 20, "leporazine" = 20, "tricordrazine" = 15, "epinephrine" = 10, "omnizine" = 5) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 02b9a48b25a..60869979e71 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -177,6 +177,16 @@ other types of metals and chemistry for reagents). build_path = /obj/item/weapon/pickaxe/drill/jackhammer category = list("Mining Designs") +/datum/design/modkit + name = "Modification Kit" + desc = "A device which allows kinetic accelerators to be wielded with one hand, and by any organism." + id = "modkit" + req_tech = list("materials" = 5, "powerstorage" = 4, "engineering" = 4, "magnets" = 4, "combat" = 3) + build_type = PROTOLATHE + materials = list(MAT_METAL = 8000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000) + build_path = /obj/item/modkit + category = list("Mining Designs") + /datum/design/superaccelerator name = "Super-Kinetic Accelerator" desc = "An upgraded version of the proto-kinetic accelerator, with superior damage, speed and range." diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm index ad9688b1625..c6953575bb2 100644 --- a/code/modules/ruins/ruin_areas.dm +++ b/code/modules/ruins/ruin_areas.dm @@ -17,16 +17,17 @@ + //Areas /area/ruin/unpowered/no_grav/way_home name = "\improper Salvation" icon_state = "away" - - /area/ruin/powered/snow_biodome +/area/ruin/powered/golem_ship + name = "Free Golem Ship" // Ruins of "onehalf" ship /area/ruin/onehalf/hallway diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 139a8530357..a05819054e7 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -104,4 +104,9 @@ var/list/GPS_list = list() flags = ABSTRACT gpstag = "Eerie Signal" desc = "Report to a coder immediately." - invisibility = INVISIBILITY_MAXIMUM \ No newline at end of file + invisibility = INVISIBILITY_MAXIMUM + +/obj/item/device/gps/mining/internal + icon_state = "gps-m" + gpstag = "MINER" + desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life." \ No newline at end of file diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 9a3e8194f4b3e58550ad07779e4c708993e01b28..76f5bfe7ebea83d91f66c56efec3fb76d32339ab 100644 GIT binary patch delta 4779 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 FV1g0%q-FpB delta 4603 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 diff --git a/tgstation.dme b/tgstation.dme index c33fc2d2edd..786ab440ca6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -578,6 +578,7 @@ #include "code\game\objects\items\devices\laserpointer.dm" #include "code\game\objects\items\devices\lightreplacer.dm" #include "code\game\objects\items\devices\megaphone.dm" +#include "code\game\objects\items\devices\modificationkit.dm" #include "code\game\objects\items\devices\multitool.dm" #include "code\game\objects\items\devices\paicard.dm" #include "code\game\objects\items\devices\pipe_painter.dm"