diff --git a/GainStation13/code/obj/weapons/fatoray.dm b/GainStation13/code/obj/weapons/fatoray.dm index 182a660f..d3277e8c 100644 --- a/GainStation13/code/obj/weapons/fatoray.dm +++ b/GainStation13/code/obj/weapons/fatoray.dm @@ -5,8 +5,12 @@ name = "Fatoray" desc = "An energy gun that fattens up anyone it hits." icon = 'GainStation13/icons/obj/fatoray.dmi' + lefthand_file = 'GainStation13/icons/obj/guns_lefthand.dmi' + righthand_file = 'GainStation13/icons/obj/guns_righthand.dmi' icon_state = "fatoray" + item_state = "fatoray" pin = null + fire_sound = 'sound/weapons/plasma_cutter.ogg' ammo_type = list(/obj/item/ammo_casing/energy/fattening) /obj/item/ammo_casing/energy/fattening @@ -21,6 +25,8 @@ icon_state = "ray" ricochets_max = 50 ricochet_chance = 80 + hitsound = 'sound/weapons/sear.ogg' + hitsound_wall = 'sound/weapons/effects/searwall.ogg' is_reflectable = TRUE light_range = 2 light_color = LIGHT_COLOR_ORANGE diff --git a/GainStation13/icons/obj/guns_lefthand.dmi b/GainStation13/icons/obj/guns_lefthand.dmi new file mode 100644 index 00000000..934909d2 Binary files /dev/null and b/GainStation13/icons/obj/guns_lefthand.dmi differ diff --git a/GainStation13/icons/obj/guns_righthand.dmi b/GainStation13/icons/obj/guns_righthand.dmi new file mode 100644 index 00000000..24ecfb88 Binary files /dev/null and b/GainStation13/icons/obj/guns_righthand.dmi differ diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 91f07500..6edea399 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5748,7 +5748,7 @@ "chC" = (/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/open/floor/plasteel,/area/engine/atmos) "chD" = (/obj/machinery/computer/atmos_control/tank/nitrous_tank{dir = 8},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/white/corner,/area/engine/atmos) "chE" = (/obj/machinery/air_sensor/atmos/nitrous_tank,/turf/open/floor/engine/n2o,/area/engine/atmos) -"chF" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/open/floor/engine/n2o,/area/engine/atmos) +"chF" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/atmospherics/miner/n2o,/turf/open/floor/engine/n2o,/area/engine/atmos) "chG" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/engine/n2o,/area/engine/atmos) "chH" = (/obj/structure/disposalpipe/segment{dir = 5},/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/maintenance/aft) "chI" = (/obj/machinery/smartfridge/chemistry/virology/preloaded,/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel/white,/area/medical/virology) @@ -5995,7 +5995,7 @@ "cmp" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/orange/visible,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 4},/turf/open/space,/area/space/nearstation) "cmq" = (/obj/effect/spawner/structure/window/plasma/reinforced,/obj/machinery/atmospherics/pipe/simple/yellow/visible{dir = 10},/turf/open/floor/plating/airless,/area/engine/atmos) "cmr" = (/obj/machinery/air_sensor/atmos/toxin_tank,/turf/open/floor/engine/plasma,/area/engine/atmos) -"cms" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/open/floor/engine/plasma,/area/engine/atmos) +"cms" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/machinery/atmospherics/miner/toxins,/turf/open/floor/engine/plasma,/area/engine/atmos) "cmt" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/engine/plasma,/area/engine/atmos) "cmu" = (/obj/structure/closet/l3closet/virology,/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel/white,/area/medical/virology) "cmv" = (/obj/structure/closet/secure_closet/medical1,/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel/white,/area/medical/virology) @@ -6213,7 +6213,7 @@ "cqz" = (/obj/machinery/computer/atmos_control/tank/carbon_tank{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/engine/atmos) "cqA" = (/obj/effect/spawner/structure/window/plasma/reinforced,/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/open/floor/plating/airless,/area/engine/atmos) "cqB" = (/obj/machinery/air_sensor/atmos/carbon_tank,/turf/open/floor/engine/co2,/area/engine/atmos) -"cqC" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/open/floor/engine/co2,/area/engine/atmos) +"cqC" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/machinery/atmospherics/miner/carbon_dioxide,/turf/open/floor/engine/co2,/area/engine/atmos) "cqD" = (/obj/machinery/light/small{dir = 4},/turf/open/floor/engine/co2,/area/engine/atmos) "cqE" = (/obj/machinery/light/small{dir = 1},/turf/open/floor/plating,/area/maintenance/aft) "cqF" = (/obj/structure/sign/warning/nosmoking{pixel_y = 28},/turf/open/floor/plating,/area/maintenance/aft) @@ -6770,9 +6770,9 @@ "cBk" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/plasteel,/area/engine/engineering) "cBl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/engine/engineering) "cBm" = (/turf/open/floor/engine/n2,/area/engine/atmos) -"cBn" = (/obj/machinery/atmospherics/miner/nitrogen,/turf/open/floor/engine/n2,/area/engine/atmos) +"cBn" = (/obj/machinery/atmospherics/miner/nitrogen,/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/open/floor/engine/n2,/area/engine/atmos) "cBo" = (/turf/open/floor/engine/o2,/area/engine/atmos) -"cBp" = (/obj/machinery/atmospherics/miner/oxygen,/turf/open/floor/engine/o2,/area/engine/atmos) +"cBp" = (/obj/machinery/atmospherics/miner/oxygen,/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/engine/o2,/area/engine/atmos) "cBq" = (/obj/effect/landmark/xeno_spawn,/turf/open/floor/engine/air,/area/engine/atmos) "cBr" = (/obj/machinery/portable_atmospherics/canister/air,/obj/effect/landmark/event_spawn,/turf/open/floor/engine/air,/area/engine/atmos) "cBs" = (/turf/open/floor/engine/air,/area/engine/atmos) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index b5a34385..4e4d64cc 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -45562,6 +45562,7 @@ /area/engine/atmos) "bQa" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/atmospherics/miner/n2o, /turf/open/floor/engine/n2o, /area/engine/atmos) "bQb" = ( @@ -46883,6 +46884,7 @@ /area/engine/atmos) "bSX" = ( /obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/atmospherics/miner/toxins, /turf/open/floor/engine/plasma, /area/engine/atmos) "bSY" = ( @@ -48110,6 +48112,7 @@ /area/engine/atmos) "bWf" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/machinery/atmospherics/miner/carbon_dioxide, /turf/open/floor/engine/co2, /area/engine/atmos) "bWg" = ( @@ -50147,6 +50150,7 @@ /area/engine/atmos) "cbt" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/atmospherics/miner/nitrogen, /turf/open/floor/engine/n2, /area/engine/atmos) "cbu" = ( @@ -50154,6 +50158,7 @@ /area/engine/atmos) "cbv" = ( /obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/miner/oxygen, /turf/open/floor/engine/o2, /area/engine/atmos) "cbw" = ( diff --git a/code/modules/research/xenoarch/strange_rock.dm b/code/modules/research/xenoarch/strange_rock.dm index 6802924f..d98453ae 100644 --- a/code/modules/research/xenoarch/strange_rock.dm +++ b/code/modules/research/xenoarch/strange_rock.dm @@ -122,5 +122,5 @@ mineralSpawnChanceList = list( /turf/closed/mineral/uranium/volcanic = 2, /turf/closed/mineral/diamond/volcanic = 1, /turf/closed/mineral/gold/volcanic = 4, /turf/closed/mineral/titanium/volcanic = 4, /turf/closed/mineral/silver/volcanic = 10, /turf/closed/mineral/plasma/volcanic = 15, /turf/closed/mineral/bscrystal/volcanic = 1, /turf/closed/mineral/gibtonite/volcanic = 2, - /turf/closed/mineral/iron/volcanic = 40, /turf/closed/mineral/strange = 15) + /turf/closed/mineral/iron/volcanic = 40, /obj/item/stack/ore/calorite = 1, /turf/closed/mineral/strange = 15) diff --git a/tgstation.dme b/tgstation.dme index 104053fe..1363c2f0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3328,6 +3328,7 @@ #include "GainStation13\code\mechanics\web_weaving.dm" #include "GainStation13\code\mobs\cakegolem.dm" #include "GainStation13\code\modules\client\preferences\preferences.dm" +#include "GainStation13\code\modules\food_and_drinks\drinks\drinks.dm" #include "GainStation13\code\modules\mob\living\emote.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm" #include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm" @@ -3337,7 +3338,6 @@ #include "GainStation13\code\obj\items\minor_items.dm" #include "GainStation13\code\obj\structure\scale.dm" #include "GainStation13\code\obj\weapons\fatoray.dm" -#include "GainStation13\code\modules\food_and_drinks\drinks\drinks.dm" #include "hyperstation\code\__DEFINES\economy.dm" #include "hyperstation\code\__DEFINES\wendigo.dm" #include "hyperstation\code\controllers\subsystem\economy.dm"