diff --git a/GainStation13/code/machinery/fattening_turret.dm b/GainStation13/code/machinery/fattening_turret.dm new file mode 100644 index 00000000..899bcf59 --- /dev/null +++ b/GainStation13/code/machinery/fattening_turret.dm @@ -0,0 +1,31 @@ + +/obj/machinery/porta_turret/fattening + name = "Fatoray Turret" + installation = null + always_up = 1 + use_power = NO_POWER_USE + has_cover = 0 + scan_range = 9 + req_access = list(ACCESS_SYNDICATE) + mode = TURRET_LETHAL + lethal_projectile = /obj/item/projectile/energy/fattening + lethal_projectile_sound = 'sound/weapons/laser.ogg' + icon_state = "turretCover" + base_icon_state = "standard" + faction = list(ROLE_SYNDICATE) + desc = "A laser turret with calorite focusing lens." + +/obj/machinery/porta_turret/fattening/heavy + name = "Heavy Fatoray Turret" + lethal_projectile = /obj/item/projectile/energy/fattening/cannon + shot_delay = 30 + +/obj/machinery/porta_turret/fattening/ComponentInitialize() + . = ..() + AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) + +/obj/machinery/porta_turret/fattening/setup() + return + +/obj/machinery/porta_turret/fattening/assess_perp(mob/living/carbon/human/perp) + return 10 //fattening turrets shoot everything except the syndicate diff --git a/GainStation13/code/mechanics/wand.dm b/GainStation13/code/mechanics/wand.dm index e9fbf8cb..d345ca00 100644 --- a/GainStation13/code/mechanics/wand.dm +++ b/GainStation13/code/mechanics/wand.dm @@ -1,6 +1,8 @@ /obj/item/gun/magic/wand/food name = "Wand of Gluttony" desc = "Summons delicious fattening foods" + icon = 'GainStation13/icons/obj/magic.dmi' + icon_state = "food_wand" max_charges = 15 ammo_type = /obj/item/ammo_casing/magic/food diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index 328b43c9..1226d120 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -75,6 +75,8 @@ else return ..() +// calorite blessing chem, used in the golem ability + /datum/reagent/consumable/caloriteblessing name = "Calorite blessing" description = "A strange, viscous liquid derived from calorite. It is said to have physically enhancing properties surprisingly unrelated to weight gain when consumed" diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm b/GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm index 79ed2dc7..7d1c83fd 100644 --- a/GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm +++ b/GainStation13/code/modules/reagents/chemistry/recipes/fatchem.dm @@ -23,4 +23,4 @@ name = "extilphite" id = /datum/reagent/consumable/extilphite results = list(/datum/reagent/consumable/extilphite = 3) - required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/sodium = 2, /datum/reagent/carbon = 2) + required_reagents = list(/datum/reagent/consumable/sugar = 1, /datum/reagent/hydrogen = 2, /datum/reagent/carbon = 2) diff --git a/GainStation13/icons/obj/magic.dmi b/GainStation13/icons/obj/magic.dmi new file mode 100644 index 00000000..663352ac Binary files /dev/null and b/GainStation13/icons/obj/magic.dmi differ diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index 8bec1d4a..1ef56b6e 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -3,10 +3,9 @@ "aM" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/structure/reagent_dispensers/keg/mead,/obj/machinery/light{dir = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "aQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal{dir = 4},/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "ba" = (/obj/structure/rack/shelf,/obj/item/storage/fancy/donut_box{pixel_y = -4},/obj/item/storage/fancy/donut_box,/obj/item/storage/fancy/donut_box{pixel_y = 4},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"bj" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "feederden_north"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "bo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "bx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/public/glass{name = "Cell 4"; id_tag = "feederden_cell4"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) -"bU" = (/obj/structure/chair/sofa/left,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"bU" = (/obj/structure/chair/sofa/left,/obj/machinery/button/door{name = "Window Shutters North"; id = "feederden_north"; pixel_y = 25},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "bW" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/structure/window/reinforced/tinted{dir = 8},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "bX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/meter,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "cd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -56,7 +55,7 @@ "jS" = (/obj/structure/rack/shelf,/obj/item/electropack/shockcollar,/obj/item/clothing/neck/petcollar,/obj/item/melee/baton/stunsword,/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs/cable/zipties,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "ka" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red,/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "kd" = (/obj/structure/table,/obj/item/kitchen/rollingpin,/obj/item/kitchen/knife/butcher,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"kg" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/preopen{id = "feederden_south"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"kg" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_south"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "ko" = (/obj/machinery/space_heater,/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "kC" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "kK" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) @@ -182,7 +181,7 @@ "Hp" = (/obj/structure/closet/crate/secure/loot,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "HQ" = (/obj/structure/sign/poster/contraband/chonk,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "Iq" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"It" = (/obj/machinery/cryopod{dir = 8},/obj/machinery/button{pixel_y = 28; id = "feederden_north"},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) +"It" = (/obj/machinery/cryopod{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "IC" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "IS" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) "Jh" = (/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -200,7 +199,7 @@ "LM" = (/obj/vehicle/ridden/wheelchair,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "LN" = (/obj/machinery/processor,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Ma" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -24},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) -"Md" = (/obj/structure/table,/obj/machinery/microwave,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/machinery/button{pixel_y = -28; id = "feederden_south"; name = "Shutters Control"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"Md" = (/obj/structure/table,/obj/machinery/microwave,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/machinery/button/door{name = "Window Shutters South"; id = "feederden_south"; pixel_y = -25},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Mi" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/closed/wall/r_wall/syndicate/nodiagonal,/area/ruin/space/has_grav/feedersden) "Mq" = (/obj/structure/lattice/catwalk,/obj/machinery/light/small{brightness = 2; dir = 8},/turf/template_noop,/area/ruin/space/has_grav/feedersden) "MV" = (/obj/item/trash/boritos,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) @@ -216,6 +215,7 @@ "Oc" = (/turf/open/floor/wood{icon_state = "wood-broken"},/area/ruin/space/has_grav/feedersden) "Ow" = (/obj/effect/turf_decal/sand/plating,/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden) "OE" = (/obj/item/trash/can,/obj/effect/mob_spawn/human/feeders_den/victim{dir = 8},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) +"OM" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_north"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Pg" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 8},/obj/structure/medkit_cabinet{pixel_y = 27},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "PI" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/monkey,/obj/item/reagent_containers/food/snacks/meat/slab/spider,/obj/item/reagent_containers/food/snacks/meat/slab/spider,/obj/structure/window/reinforced/tinted{dir = 8},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "PL" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) @@ -266,8 +266,8 @@ FEFEFEFEFEebebebebqFBrBrBrBrBrBrFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEeb FEFEFEFEFEFEFEebebqFBrBrBrBrBrBrBrFEFEFEFEFEFEFEqFebebebebebebebebqFBrFEFEFEFEebFEFEebFEFEFEFEBrBrBrBrFEFEFEFE FEFEFEFEFEFEFEFEBrBrBrxgjIdGBzBrBrFEFEFEFEFEBrBrBrZCFEFEFEFEFEFEFEfmBrBrBrFEFEebFEFEebFEBrBrBrBrBrBrBrFEFEFEFE FEFEFEFEFEFEFEBrBrBrBzOwPVOwjInEBrBrBrFEFEBrBrBrBrfmVefmFEFEFEfmfmISBrBrBrBrBrqFBrFEebBrBrBrBrBrBrBrBrFEFEFEFE -FEFEFEFEFEFEFEBrBrDcnrnrqCnrDcCcjIBrBrBrBrBrBrBrISxZfmbjbjbjbjbjeEfmwwBrBrBrBrBrBrBrqFBrDcnrnrnrnrDcBrBrFEFEFE -FEFEFEFEFEFEBrBrBrnrzLgaQVlRnrnrnrnrDcBrBrBrBrBreEnrbjbjmJKRivbjbjnrZCBrBrBrBrBrDcnrnrnrnrcyFfdelRnrBrBrFEFEFE +FEFEFEFEFEFEFEBrBrDcnrnrqCnrDcCcjIBrBrBrBrBrBrBrISxZfmOMOMOMOMOMeEfmwwBrBrBrBrBrBrBrqFBrDcnrnrnrnrDcBrBrFEFEFE +FEFEFEFEFEFEBrBrBrnrzLgaQVlRnrnrnrnrDcBrBrBrBrBreEnrOMOMmJKRivOMOMnrZCBrBrBrBrBrDcnrnrnrnrcyFfdelRnrBrBrFEFEFE FEFEFEFEFEFEBrBrBrnrLzUEUEEnqDGZzyuynrBrBrBrBrDcnrDcEkfCzSKRoSphKuDcnrDcBrBrBrBrnrmfzyuyqDsqUEUEOEnrBrBrFEFEFE FEFEFEFEFEFEBrBrBrnrNAsqsqsqHQHiUEaqnrBrBrDcnrDcsIaMrWndNvKRKRTHpcCuItnrnrDcBrBrnrhgpfUEHQMVsqsqTlnrBrBrFEFEFE FEFEFEebebebqFBrBrnrfMsqelzCnrLMelZwnrBrDcnrgoNzPLExwAvvtfOcrSSpDMoKrtDUbUnrDcBrnrLMelZwnrelZwCHfMnrBrBrFEFEFE diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 8bb9425e..2cb7eb6b 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -26,7 +26,7 @@ if(6) new /obj/item/reagent_containers/glass/bottle/potion/flight(src) if(7) - new /obj/item/pickaxe/diamond(src) + new /obj/item/karl_pickaxe(src) //GS13 if(8) if(prob(50)) new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) @@ -80,7 +80,7 @@ if(28) new /obj/item/clothing/neck/necklace/memento_mori(src) if(29) - new /obj/item/book/granter/spell/fattening(src) + new /obj/item/book/granter/spell/fattening(src) //GS13 STUFF new /obj/item/grenade/chem_grenade/lipoifier_weak(src) if(30) new /obj/item/book/granter/spell/fattening/transfer(src) @@ -91,8 +91,6 @@ new /obj/item/gun/energy/fatoray/cannon(src) if(33) new /obj/item/gun/magic/wand/food(src) - if(34) - new /obj/item/karl_pickaxe(src) // if(29) // new /obj/item/clothing/gloves/gauntlets(src) diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index cf2fd945..012e0994 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 6514b7c4..96980b3e 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 1230bc60..8f63a30f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3322,6 +3322,7 @@ #include "GainStation13\code\clothing\calorite_collar.dm" #include "GainStation13\code\game\sound.dm" #include "GainStation13\code\game\area\ruins.dm" +#include "GainStation13\code\machinery\fattening_turret.dm" #include "GainStation13\code\machinery\feeding_tube.dm" #include "GainStation13\code\mechanics\fatness.dm" #include "GainStation13\code\mechanics\spells.dm"