Merge pull request #105 from GDLW24/fix_bundle

fattening turrets, small tweaks
This commit is contained in:
GDLW
2023-05-09 13:08:28 +02:00
committed by GitHub
14 changed files with 183 additions and 143 deletions
+5 -1
View File
@@ -101,4 +101,8 @@
/area/ruin/unpowered/caloriteshrine
name = "Calorite Shrine"
icon_state = "away"
icon_state = "away"
/area/ruin/powered/snackstore
name = "Snack Store"
icon_state = "away"
-7
View File
@@ -495,13 +495,6 @@
name = "Restaurant Employee Area"
has_gravity = TRUE
/area/lavaland/surface/snackstore
name = "Snack Store"
icon_state = "mining"
power_light = TRUE
power_equip = TRUE
power_environ = TRUE
/area/ruin/space/has_grav/feedersden
name = "Unknown Outpost"
has_gravity = TRUE
@@ -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)