diff --git a/GainStation13/code/mechanics/wand.dm b/GainStation13/code/mechanics/wand.dm index dc4485cb..e9fbf8cb 100644 --- a/GainStation13/code/mechanics/wand.dm +++ b/GainStation13/code/mechanics/wand.dm @@ -24,6 +24,8 @@ /obj/item/reagent_containers/food/snacks/donut/plain, /obj/item/reagent_containers/food/snacks/donut/glaze, /obj/item/reagent_containers/food/snacks/store/cake/cheese, + /obj/item/reagent_containers/food/snacks/store/cake/bscc, + /obj/item/reagent_containers/food/snacks/store/cake/bsvc, /obj/item/reagent_containers/food/snacks/store/cake/chocolate, /obj/item/reagent_containers/food/snacks/hotdog, /obj/item/reagent_containers/food/snacks/pizza/margherita, diff --git a/GainStation13/code/modules/vending/mealdor.dm b/GainStation13/code/modules/vending/mealdor.dm index 22e71a91..4973fc1c 100644 --- a/GainStation13/code/modules/vending/mealdor.dm +++ b/GainStation13/code/modules/vending/mealdor.dm @@ -8,9 +8,10 @@ products = list( /obj/item/reagent_containers/food/snacks/store/cake/cheese = 10, - /obj/item/reagent_containers/food/snacks/store/cake/birthday = 10, /obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice = 10, /obj/item/reagent_containers/food/snacks/store/cake/pound_cake = 8, + /obj/item/reagent_containers/food/snacks/cakeslice/bsvc = 5, + /obj/item/reagent_containers/food/snacks/cakeslice/bscc = 5, // /obj/item/reagent_containers/food/snacks/donut/purefat = 10, /obj/item/reagent_containers/food/snacks/fries = 10, /obj/item/reagent_containers/food/snacks/donut = 20, diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm new file mode 100644 index 00000000..d4b37a73 --- /dev/null +++ b/GainStation13/code/obj/items/minor_items.dm @@ -0,0 +1,13 @@ +/////GS13 - miscellanous items + +/obj/item/trash/fatoray_scrap1 + name = "raygun scraps" + icon = 'GainStation13/icons/obj/fatoray_scrap.dmi' + icon_state = "fatoray_scrap1" + desc = "Small parts that seemingly one belonged to some sort of a raygun." + +/obj/item/trash/fatoray_scrap2 + name = "raygun scraps" + icon = 'GainStation13/icons/obj/fatoray_scrap.dmi' + icon_state = "fatoray_scrap2" + desc = "Small parts that seemingly one belonged to some sort of a raygun." diff --git a/GainStation13/code/obj/weapons/fatoray.dm b/GainStation13/code/obj/weapons/fatoray.dm index acb19959..182a660f 100644 --- a/GainStation13/code/obj/weapons/fatoray.dm +++ b/GainStation13/code/obj/weapons/fatoray.dm @@ -36,7 +36,7 @@ icon = 'GainStation13/icons/obj/fatoray.dmi' /// REPLACE THESE LATER WITH UNIQUE SPRITES - Sono icon_state = "fatoray_cannon" recoil = 3 - can charge = 0 + can_charge = 0 slowdown = 1 // charge_sections = 3 weapon_weight = WEAPON_HEAVY diff --git a/GainStation13/icons/obj/fatoray_scrap.dmi b/GainStation13/icons/obj/fatoray_scrap.dmi new file mode 100644 index 00000000..efde51f3 Binary files /dev/null and b/GainStation13/icons/obj/fatoray_scrap.dmi differ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm index d587d19b..0f907471 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm @@ -13,6 +13,7 @@ /area/ruin/powered/gluttony) "f" = ( /obj/item/reagent_containers/syringe/gluttony, +/obj/item/reagent_containers/glass/bottle/weightgain, /turf/open/floor/plasteel/freezer, /area/ruin/powered/gluttony) "g" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 416e62a8..4528671a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -439,7 +439,7 @@ "aiA" = (/obj/structure/pool/ladder{dir = 2; pixel_y = 24},/turf/open/pool,/area/crew_quarters/fitness/recreation) "aiB" = (/turf/open/pool,/area/crew_quarters/fitness/recreation) "aiD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/bed,/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) -"aiE" = (/obj/structure/closet/crate{name = "Asshole Containment"},/obj/item/banhammer,/turf/open/floor/plating/asteroid/airless,/area/space) +"aiE" = (/obj/structure/closet/crate{name = "Asshole Containment"},/obj/item/banhammer,/turf/open/floor/mineral/calorite/dance,/area/space) "aiF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel/yellowsiding{dir = 8},/area/crew_quarters/fitness/recreation) "aiG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) "aiH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{dir = 4; name = "Holodeck Door"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) @@ -3601,8 +3601,8 @@ "brI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plasteel,/area/engine/break_room) "brJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/effect/turf_decal/stripes/corner{dir = 1},/turf/open/floor/plasteel,/area/engine/break_room) "brK" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-4"},/turf/open/floor/plasteel,/area/engine/break_room) -"brL" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable/yellow{icon_state = "2-8"},/obj/structure/cable/yellow{icon_state = "0-8"},/turf/open/floor/plasteel,/area/engine/break_room) -"brM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plasteel,/area/engine/break_room) +"brL" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/obj/structure/cable/yellow{icon_state = "2-8"},/obj/structure/cable/yellow{icon_state = "0-8"},/obj/item/stack/tile/plasteel{pixel_y = 14; pixel_x = 5},/turf/open/floor/plating,/area/engine/break_room) +"brM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable{icon_state = "0-4"},/obj/item/stack/tile/plasteel{pixel_y = 12},/turf/open/floor/plating,/area/engine/break_room) "brN" = (/obj/machinery/door/poddoor/preopen{id = "transittube"; name = "Transit Tube Blast Door"},/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/engine/break_room) "brO" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/hatch{name = "MiniSat Access"; req_one_access_txt = "32;19"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/engine/break_room) "brP" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/engine/break_room) @@ -3617,8 +3617,8 @@ "brY" = (/obj/structure/lattice/catwalk,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/space,/area/space/nearstation) "brZ" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/lattice/catwalk,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/turf/open/space,/area/space/nearstation) "bsa" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/transit_tube/station{dir = 4},/turf/open/floor/plasteel/dark,/area/aisat) -"bsb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable{icon_state = "0-8"},/turf/open/floor/plasteel/dark,/area/aisat) -"bsc" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/structure/cable/yellow{icon_state = "2-4"},/obj/structure/cable/yellow{icon_state = "0-4"},/turf/open/floor/plasteel/dark,/area/aisat) +"bsb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable{icon_state = "0-8"},/obj/item/stack/tile/plasteel{pixel_y = 16; pixel_x = 9},/turf/open/floor/plating,/area/aisat) +"bsc" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/structure/cable/yellow{icon_state = "2-4"},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/item/stack/tile/plasteel{pixel_y = 14; pixel_x = -6},/turf/open/floor/plating,/area/aisat) "bsd" = (/obj/machinery/holopad,/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/dark,/area/aisat) "bse" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/aisat) "bsf" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/ai_slipper{uses = 10},/turf/open/floor/plasteel/dark,/area/aisat) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 2600612c..24425a4e 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -3082,6 +3082,7 @@ "dgX" = (/obj/structure/dresser,/turf/open/floor/wood,/area/crew_quarters/dorms) "dhM" = (/obj/machinery/conveyor_switch/oneway{dir = 8; id = "garbage"; name = "disposal conveyor"},/turf/open/floor/plating,/area/maintenance/disposal) "die" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/white{icon_state = "1-2"},/obj/machinery/door/airlock/maintenance{req_one_access_txt = "8;12"},/obj/effect/mapping_helpers/airlock/cyclelink_helper,/turf/open/floor/plating,/area/science/mixing) +"dil" = (/obj/item/trash/fatoray_scrap1,/turf/open/floor/plating/asteroid,/area/asteroid/nearstation) "diG" = (/turf/open/floor/plasteel,/area/engine/atmos) "diQ" = (/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating,/area/science/mixing) "djN" = (/turf/open/floor/plasteel/stairs/medium{dir = 4},/area/crew_quarters/bar/atrium) @@ -4059,7 +4060,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaadaadaadaadaadaadaadaadaadaadaadaadaaaaacaadaadaadaadaadaadaaaaaaaaaaaeaaaaayaazaaAaaBaaCaaDaaEaaFaaGaaHaaIaaJaaKaaLaayaaasObaaaaaaaaaaaaaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaacaaaaacaadaadaadaadaadaadaahaaeaaeaafaaeaakaaMaaNaaOaaPaaQaaRaaRaaRaaQaaSaaOaaTaaUaakaaksOraakaafaaeaaeaahaadaadaadaadaadaadaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaacaaaaaaaaaaaaaaaaaaaacaadaadaadaadaadaadaadaaVaaWaadaadaadaadaadaacaaaaacaadaadaadaadaadaadaadaadaaaaafaaaaamaaXaaYaaZabaacXabcabdabcoKzabeabfabgabhabnsOtsOuaakaaaaaaaadaadaadaadaadaadaadaadaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaacaaaaaaaaaaaaaaaaacaadaadaadaadaadaadaadaadabiabjabiaadaadaadaadaacaaaaadaadaadaadaadaadaadaadaadaaeaaeaaeaakabkablaakabmaboggqabpggqswywkOaakabqabraaksOvsOwaakaaeabsabsabsbxZbxZbxZbxZbxZbvgaacaadaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaacaaaaaaaaaaaaaaaaacaadaadaadaadaadaadaadaadabidilabiaadaadaadaadaacaaaaadaadaadaadaadaadaadaadaadaaeaaeaaeaakabkablaakabmaboggqabpggqswywkOaakabqabraaksOvsOwaakaaeabsabsabsbxZbxZbxZbxZbxZbvgaacaadaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaacaacaaaaaaaaaaacaacaadaadaadaadaadaadaaVabjabjckmaaWabiaadaadaadaaaaadabvabvabvbyeabwabwabwabwabxabxabwabwabyabzabAabBabCabDabEabDabFabGabAabHabIabsabsabsabsabsabsabKabsabLabMbyfbygbyfbvgbvgaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaahaacaacaacabRabRaacaacaahaadaadaadaadabiaaWabjabSabutcQabiabTabTabvabUabvabvabVabvabOabwabXabYabZacaacbaccabwacdaceacfacgachaciacjaciackaclacfacmacnabsacoacpacqacracsactabsacubyibyjbykbylbvgaadaadaadaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaadaadaadaacaacaacaacaacaadaadaadaadaadaadabiabjabSacDacEacFacGacHabTacIacJacKacLacMabvacNabwacOacPacQacRacSacTabwacUacVabQswJacYacZadaadbadcswKaczadeadfabsadgadhadiadjadkadlabsadmadnadnadnadnadnadnadnadoadpadqadoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index d965faf6..551c7c81 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -111,6 +111,8 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/storage/daki = 3, //VERY IMPORTANT CIT CHANGE - adds bodypillows to maint /obj/item/storage/pill_bottle/penis_enlargement = 2, /obj/item/storage/pill_bottle/breast_enlargement = 2, + /obj/item/trash/fatoray_scrap1 = 2, //GS13 - added for researching fat guns + /obj/item/trash/fatoray_scrap2 = 2, /obj/item/clothing/shoes/wheelys = 1, /obj/item/clothing/shoes/kindleKicks = 1, /obj/item/autosurgeon/penis = 1, diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index ddd3864d..f2ec6288 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -74,6 +74,8 @@ /obj/item/cigbutt = 1, /obj/item/trash/cheesie = 1, /obj/item/trash/candy = 1, + /obj/item/trash/fatoray_scrap1 = 1, + /obj/item/trash/fatoray_scrap2 = 1, /obj/item/trash/chips = 1, /obj/item/reagent_containers/food/snacks/deadmouse = 1, /obj/item/trash/pistachios = 1, diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index f0beb447..7c772c4e 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -65,6 +65,8 @@ new /obj/item/circuitboard/machine/plantgenes/vault if(23) new /obj/item/grenade/clusterbuster/soap(src) + new /obj/item/grenade/chem_grenade/glitter/pink(src) + new /obj/item/grenade/chem_grenade/glitter/blue(src) if(24) new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/miner(src) @@ -79,7 +81,7 @@ new /obj/item/clothing/neck/necklace/memento_mori(src) if(29) new /obj/item/book/granter/spell/fattening(src) - new /obj/item/reagent_containers/glass/bottle/weightgain(src) + new /obj/item/grenade/chem_grenade/lipoifier_weak(src) if(30) new /obj/item/book/granter/spell/fattening/transfer(src) new /obj/item/book/granter/spell/fattening/steal (src) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 907b9be7..0d64858b 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1156,9 +1156,9 @@ display_name = "Nutritional Technology" description = "Ending world hunger was never made easier!" prereq_ids = list("biotech") //remember to add "engineering" - design_ids = list("alien_scalpel") + design_ids = list("calorite_collar") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10) //REMEMBER TO TWEAK VALUES! - boost_item_paths = list(/obj/item/gun/energy/fatoray) + boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) export_price = 5000 hidden = TRUE @@ -1166,7 +1166,9 @@ id = "nutritech_tools" display_name = "Nutri-Tech Tools" description = "Ever wanted to reach your daily caloric intake in just 5 seconds?" - prereq_ids = list("nutritech") //remember to add "adv_engi" and weapons - design_ids = list("fatoray_weak") + prereq_ids = list("biotech") //remember to add "adv_engi" and weapons + design_ids = list("fatoray_weak", "fatoray_cannon") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 20) + boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2) export_price = 10000 + hidden = TRUE diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 2aea3fb1..07078b97 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -83,7 +83,7 @@ /obj/effect/gluttony/CanPass(atom/movable/mover, turf/target)//So bullets will fly over and stuff. if(ishuman(mover)) var/mob/living/carbon/human/H = mover - if(H.nutrition >= FATNESS_LEVEL_FAT) + if(H.fatness >= 1000) H.visible_message("[H] pushes through [src]!", "You've seen and eaten worse than this.") return TRUE else diff --git a/tgstation.dme b/tgstation.dme index 241491c4..32b33cd7 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -914,7 +914,6 @@ #include "code\game\machinery\syndicatebomb.dm" #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\transformer.dm" -#include "code\game\objects\items\dyekit.dm" #include "code\game\machinery\washing_machine.dm" #include "code\game\machinery\wishgranter.dm" #include "code\game\machinery\camera\camera.dm" @@ -1104,6 +1103,7 @@ #include "code\game\objects\items\dice.dm" #include "code\game\objects\items\dna_injector.dm" #include "code\game\objects\items\documents.dm" +#include "code\game\objects\items\dyekit.dm" #include "code\game\objects\items\eightball.dm" #include "code\game\objects\items\extinguisher.dm" #include "code\game\objects\items\flamethrower.dm" @@ -3389,9 +3389,9 @@ #include "hyperstation\code\modules\cargo\sweatshop\sweatshop.dm" #include "hyperstation\code\modules\cargo\sweatshop\wooden.dm" #include "hyperstation\code\modules\client\loadout\glasses.dm" -#include "hyperstation\code\modules\client\loadout\tablet.dm" -#include "hyperstation\code\modules\client\loadout\neck.dm" #include "hyperstation\code\modules\client\loadout\gloves.dm" +#include "hyperstation\code\modules\client\loadout\neck.dm" +#include "hyperstation\code\modules\client\loadout\tablet.dm" #include "hyperstation\code\modules\clothing\gloves.dm" #include "hyperstation\code\modules\clothing\head.dm" #include "hyperstation\code\modules\clothing\sizeaccessories.dm"