diff --git a/GainStation13/icons/obj/smooth_structures/plasma_window.dmi b/GainStation13/icons/obj/smooth_structures/plasma_window.dmi new file mode 100644 index 0000000000..941d332ae4 Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/plasma_window.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/plastitanium_window.dmi b/GainStation13/icons/obj/smooth_structures/plastitanium_window.dmi new file mode 100644 index 0000000000..82ac030615 Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/plastitanium_window.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/reinforced_window.dmi b/GainStation13/icons/obj/smooth_structures/reinforced_window.dmi new file mode 100644 index 0000000000..d1e72b5527 Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/reinforced_window.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/rice_window.dmi b/GainStation13/icons/obj/smooth_structures/rice_window.dmi new file mode 100644 index 0000000000..f5e7a6dd57 Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/rice_window.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/rplasma_window.dmi b/GainStation13/icons/obj/smooth_structures/rplasma_window.dmi new file mode 100644 index 0000000000..8ef523bdb7 Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/rplasma_window.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/tinted_window.dmi b/GainStation13/icons/obj/smooth_structures/tinted_window.dmi new file mode 100644 index 0000000000..85e27e09a6 Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/tinted_window.dmi differ diff --git a/GainStation13/icons/obj/smooth_structures/window.dmi b/GainStation13/icons/obj/smooth_structures/window.dmi new file mode 100644 index 0000000000..f184eb8d3c Binary files /dev/null and b/GainStation13/icons/obj/smooth_structures/window.dmi differ diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 0d470673e6..6dbb077031 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -573,7 +573,7 @@ duration = 1 MINUTES status_type = STATUS_EFFECT_REPLACE alert_type = /atom/movable/screen/alert/status_effect/regenerative_core - var/heal_amount = 25 + var/heal_amount = 60 /datum/status_effect/regenerative_core/on_apply() . = ..() diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 59852c47bb..b5e4296bad 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -687,7 +687,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) /* Full Tile Windows (more obj_integrity) */ /obj/structure/window/fulltile - icon = 'icons/obj/smooth_structures/window.dmi' + icon = 'GainStation13/icons/obj/smooth_structures/window.dmi' //GS13 - bunch of icon path edits here and below icon_state = "window" dir = FULLTILE_WINDOW_DIR max_integrity = 50 @@ -701,7 +701,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) anchored = FALSE /obj/structure/window/plasma/fulltile - icon = 'icons/obj/smooth_structures/plasma_window.dmi' + icon = 'GainStation13/icons/obj/smooth_structures/plasma_window.dmi' icon_state = "plasmawindow" dir = FULLTILE_WINDOW_DIR max_integrity = 300 @@ -715,7 +715,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) anchored = FALSE /obj/structure/window/plasma/reinforced/fulltile - icon = 'icons/obj/smooth_structures/rplasma_window.dmi' + icon = 'GainStation13/icons/obj/smooth_structures/rplasma_window.dmi' icon_state = "rplasmawindow" dir = FULLTILE_WINDOW_DIR max_integrity = 1000 @@ -728,7 +728,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) anchored = FALSE /obj/structure/window/reinforced/fulltile - icon = 'icons/obj/smooth_structures/reinforced_window.dmi' + icon = 'GainStation13/icons/obj/smooth_structures/reinforced_window.dmi' icon_state = "r_window" dir = FULLTILE_WINDOW_DIR max_integrity = 100 @@ -743,7 +743,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) anchored = FALSE /obj/structure/window/reinforced/tinted/fulltile - icon = 'icons/obj/smooth_structures/tinted_window.dmi' + icon = 'GainStation13/icons/obj/smooth_structures/tinted_window.dmi' icon_state = "tinted_window" dir = FULLTILE_WINDOW_DIR fulltile = TRUE diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index efc00159ea..60263284b1 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -59,6 +59,14 @@ new /obj/item/gun/magic/wand/book/healing(src) if(10) new /obj/item/guardiancreator(src) + if(11) + new /obj/item/book/granter/spell/fattening(src) + new /obj/item/grenade/chem_grenade/lipoifier_weak(src) + if(12) + new /obj/item/book/granter/spell/fattening/transfer(src) + new /obj/item/book/granter/spell/fattening/steal (src) + if(13) + new /obj/item/gun/magic/wand/food(src) /obj/structure/closet/crate/necropolis/tendril/weapon_armor/PopulateContents() var/loot = rand(1,10) @@ -77,13 +85,25 @@ new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) if(7) - new /obj/item/grenade/clusterbuster/inferno(src) - if(8) new /obj/item/gun/magic/wand/book/shock(src) - if(9) + if(8) new /obj/item/gun/magic/wand/book/page(src) - if(10) + if(9) new /obj/item/gun/magic/wand/book/spark(src) + if(10) + new /obj/item/book/granter/spell/fattening(src) + new /obj/item/grenade/chem_grenade/lipoifier_weak(src) + if(11) + new /obj/item/book/granter/spell/fattening/transfer(src) + new /obj/item/book/granter/spell/fattening/steal (src) + if(12) + new /obj/item/gun/energy/fatoray(src) + if(13) + new /obj/item/gun/energy/fatoray/cannon(src) + if(14) + new /obj/item/gun/magic/wand/food(src) + if(15) + new /obj/item/karl_pickaxe(src) /obj/structure/closet/crate/necropolis/tendril/misc/PopulateContents() var/loot = rand(1,12) @@ -113,6 +133,20 @@ new /obj/item/clothing/suit/space/hardsuit/cult(src) if(12) new /obj/item/katana/lavaland(src) + if(13) + new /obj/item/book/granter/spell/fattening(src) + new /obj/item/grenade/chem_grenade/lipoifier_weak(src) + if(14) + new /obj/item/book/granter/spell/fattening/transfer(src) + new /obj/item/book/granter/spell/fattening/steal (src) + if(15) + new /obj/item/gun/energy/fatoray(src) + if(16) + new /obj/item/gun/energy/fatoray/cannon(src) + if(17) + new /obj/item/gun/magic/wand/food(src) + if(18) + new /obj/item/karl_pickaxe(src) /obj/structure/closet/crate/necropolis/tendril/all/PopulateContents() var/loot = rand(1,28) @@ -148,34 +182,47 @@ new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) if(15) - new /obj/item/grenade/clusterbuster/inferno(src) - if(16) new /obj/item/gun/magic/wand/book/shock(src) - if(17) + if(16) new /obj/item/gun/magic/wand/book/page(src) - if(18) + if(17) new /obj/item/gun/magic/wand/book/spark(src) - if(19) + if(18) new /obj/item/soulstone/anybody(src) - if(20) + if(19) new /obj/item/rod_of_asclepius(src) - if(21) + if(20) new /obj/item/organ/heart/cursed/wizard(src) - if(22) + if(21) new /obj/item/book/granter/spell/summonitem(src) - if(23) + if(22) new /obj/item/borg/upgrade/modkit/lifesteal(src) new /obj/item/bedsheet/cult(src) - if(24) + if(23) new /obj/item/clothing/neck/necklace/memento_mori(src) - if(25) + if(24) new /obj/item/warp_cube/red(src) - if(26) + if(25) new /obj/item/immortality_talisman(src) - if(27) + if(26) new /obj/item/gun/magic/wand/book/healing(src) - if(28) + if(27) new /obj/item/guardiancreator(src) +//GS13 stuff + if(28) + new /obj/item/book/granter/spell/fattening(src) + new /obj/item/grenade/chem_grenade/lipoifier_weak(src) + if(29) + new /obj/item/book/granter/spell/fattening/transfer(src) + new /obj/item/book/granter/spell/fattening/steal (src) + if(30) + new /obj/item/gun/energy/fatoray(src) + if(31) + new /obj/item/gun/energy/fatoray/cannon(src) + if(32) + new /obj/item/gun/magic/wand/food(src) + if(33) + new /obj/item/karl_pickaxe(src) //KA modkit design discs /obj/item/disk/design_disk/modkit_disc @@ -354,6 +401,23 @@ if(do_after(owner, 40, target = owner)) MM.mori() +//Karl's pickaxe +/obj/item/karl_pickaxe //GS13 addition + name = "karl's pickaxe" + desc = "You can never dig too deep" + icon = 'GainStation13/icons/obj/mining.dmi' + icon_state = "karlpick" + flags_1 = CONDUCT_1 + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK + force = 30 + throwforce = 20 + w_class = WEIGHT_CLASS_SMALL + tool_behaviour = TOOL_MINING + toolspeed = 0.01 + usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg') + attack_verb = list("hit", "pierced", "sliced", "attacked", "rocked", "stoned", "power attacked") + + //Wisp Lantern /obj/item/wisp_lantern name = "spooky lantern"