mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] Simultaneous map definitions (#10295)
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2StaffMirrorBot
committed by
GitHub
GitHub
parent
79d8693a6f
commit
651c8bc1af
@@ -10,8 +10,15 @@
|
||||
drop_sound = 'sound/items/drop/device.ogg'
|
||||
|
||||
/obj/item/emergency_beacon/Initialize(mapload)
|
||||
. = ..()
|
||||
gps = new/obj/item/gps/emergency_beacon(src)
|
||||
for(var/i in 1 to length(levels_for_distress))
|
||||
var/current = levels_for_distress[i]
|
||||
if(isnum(current))
|
||||
continue
|
||||
levels_for_distress[i] = GLOB.map_templates_loaded[current]
|
||||
if(!levels_for_distress)
|
||||
levels_for_distress = list(1)
|
||||
return ..()
|
||||
|
||||
/obj/item/gps/emergency_beacon
|
||||
gps_tag = "EMERGENCY BEACON"
|
||||
@@ -42,8 +49,6 @@
|
||||
Per the Interplanetary Convention on Space SAR, those receiving this message must attempt rescue, \
|
||||
or relay the message to those who can."
|
||||
|
||||
if(!levels_for_distress)
|
||||
levels_for_distress = list(1)
|
||||
for(var/zlevel in levels_for_distress)
|
||||
priority_announcement.Announce(message, new_title = "Automated Personal Distress Signal", new_sound = 'sound/AI/sos.ogg', zlevel = zlevel)
|
||||
else
|
||||
|
||||
@@ -1,204 +0,0 @@
|
||||
/obj/item/grenade/spawnergrenade/casino
|
||||
|
||||
desc = "It is set to detonate in 5 seconds. It will release a goose that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Goose)"
|
||||
icon = 'icons/obj/grenade_ch.dmi'
|
||||
icon_state = "casino"
|
||||
item_state = "casino"
|
||||
origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2)
|
||||
spawner_type = /mob/living/simple_mob/animal/space/goose/domesticated
|
||||
|
||||
|
||||
// Detonate now just handles the two loops that query for people in lockers and people who can see it.
|
||||
/obj/item/grenade/spawnergrenade/casino/detonate()
|
||||
|
||||
if(spawner_type && deliveryamt)
|
||||
var/turf/T = get_turf(src)
|
||||
playsound(T, 'sound/effects/phasein.ogg', 100, 1)
|
||||
|
||||
for(var/i=1, i<=deliveryamt, i++)
|
||||
var/atom/movable/x = new spawner_type(T)
|
||||
if(prob(50))
|
||||
for(var/j = 1, j <= rand(1, 3), j++)
|
||||
step(x, pick(NORTH,SOUTH,EAST,WEST))
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/goat
|
||||
desc = "It is set to detonate in 5 seconds. It will release a goat that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Goat)"
|
||||
spawner_type = /mob/living/simple_mob/animal/goat
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/armadillo
|
||||
desc = "It is set to detonate in 5 seconds. It will release a armadillo that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Armadillo)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/armadillo
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/cat
|
||||
desc = "It is set to detonate in 5 seconds. It will release a cat that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Cat)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/cat
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/chicken
|
||||
desc = "It is set to detonate in 5 seconds. It will release a chicken that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Chicken)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/chicken
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/cow
|
||||
desc = "It is set to detonate in 5 seconds. It will release a cow that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Cow)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/cow
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/corgi
|
||||
desc = "It is set to detonate in 5 seconds. It will release a corgi that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Corgi)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/dog/corgi
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/fox
|
||||
desc = "It is set to detonate in 5 seconds. It will release a fox that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Fox)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/fox
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/lizard
|
||||
desc = "It is set to detonate in 5 seconds. It will release a lizard that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Lizard)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/lizard
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/penguin
|
||||
desc = "It is set to detonate in 5 seconds. It will release a penguin that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Penguin)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/penguin
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/snake
|
||||
desc = "It is set to detonate in 5 seconds. It will release a snake that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Snake)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/snake
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/yithian
|
||||
desc = "It is set to detonate in 5 seconds. It will release a yithian that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Yithian)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/yithian
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/tindalos
|
||||
desc = "It is set to detonate in 5 seconds. It will release a tindalos that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Tindalos)"
|
||||
spawner_type = /mob/living/simple_mob/animal/passive/tindalos
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/fennec
|
||||
desc = "It is set to detonate in 5 seconds. It will release a fennec that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Fennec)"
|
||||
spawner_type = /mob/living/simple_mob/vore/fennec
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/redpanda
|
||||
desc = "It is set to detonate in 5 seconds. It will release a red panda that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Red panda)"
|
||||
spawner_type = /mob/living/simple_mob/vore/redpanda
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/horse
|
||||
desc = "It is set to detonate in 5 seconds. It will release a horse that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Horse)"
|
||||
spawner_type = /mob/living/simple_mob/vore/horse
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/otie
|
||||
desc = "It is set to detonate in 5 seconds. It will release a otie that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Otie)"
|
||||
spawner_type = /mob/living/simple_mob/vore/otie/friendly
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/otie/chubby
|
||||
desc = "It is set to detonate in 5 seconds. It will release a chonker otie that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Well feed Otie)"
|
||||
spawner_type = /mob/living/simple_mob/vore/otie/friendly/chubby
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/zorgoia
|
||||
desc = "It is set to detonate in 5 seconds. It will release a zorgoia that has been won from the golden goose casino!"
|
||||
name = "Casino Creature Container (Zorgoia)"
|
||||
spawner_type = /mob/living/simple_mob/vore/zorgoia/tamed
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax
|
||||
desc = "You feel great power inside this small round sphere, with great powers comes great responsibilities!"
|
||||
name = "Mysterious Grenade"
|
||||
spawner_type = /obj/mecha/combat/gygax/dark
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/mining
|
||||
name = "Casino Mech Container (Mining Ripley)"
|
||||
spawner_type = /obj/mecha/working/ripley/mining
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/firefighter
|
||||
name = "Casino Mech Container (Firefighter Ripley)"
|
||||
spawner_type = /obj/mecha/working/ripley/firefighter
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/serenity
|
||||
name = "Casino Mech Container (Serenity)"
|
||||
spawner_type = /obj/mecha/combat/gygax/serenity
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/Odysseus
|
||||
name = "Casino Mech Container (Odysseus)"
|
||||
spawner_type = /obj/mecha/medical/odysseus/loaded
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/scree
|
||||
name = "Casino Mech Container (Phazon Scuttlebug)"
|
||||
spawner_type = /obj/mecha/combat/phazon/scree
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/janus
|
||||
name = "Casino Mech Container (Phazon Janus)"
|
||||
spawner_type = /obj/mecha/combat/phazon/janus
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/scarab
|
||||
name = "Casino Mech Container (Scarab)"
|
||||
spawner_type = /obj/mecha/combat/scarab
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/gorilla
|
||||
name = "Casino Mech Container (Gorilla)"
|
||||
spawner_type = /obj/mecha/combat/gorilla
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/shuttlepod
|
||||
name = "Casino Mech Container (Shuttlepod)"
|
||||
spawner_type = /obj/mecha/working/hoverpod/shuttlepod
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/gygax/shuttlecraft
|
||||
name = "Casino Mech Container (Shuttlecraft)"
|
||||
spawner_type = /obj/mecha/working/hoverpod/shuttlecraft
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/infinitycake
|
||||
desc = "Some say a gouda in his hubris made a cake to rival the gods. Sometimes it appears where it is least expected, only to vanish a few hours later.."
|
||||
name = "Mysterious Grenade"
|
||||
spawner_type = null
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/infinitycake/detonate()
|
||||
|
||||
var/turf/T = get_turf(src)
|
||||
playsound(T, 'sound/effects/phasein.ogg', 100, 1)
|
||||
|
||||
new /obj/structure/thecake(T)
|
||||
new /obj/item/thecake_layer(T)
|
||||
new /obj/item/thecake_layer/three(T)
|
||||
new /obj/item/thecake_layer/four(T)
|
||||
new /obj/item/thecake_layer/five(T)
|
||||
new /obj/item/thecake_layer/six(T)
|
||||
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/universal_technomancer
|
||||
name = "Mysterious Grenade (Tell an admin on server or discord before playing with!)"
|
||||
desc = "Sometimes one wishes upon a lucky star and obtains by pure chance great power! (TELL AN ADMIN ON DISCORD OR SERVER BEFORE PLAYING WITH)"
|
||||
|
||||
/obj/item/grenade/spawnergrenade/casino/universal_technomancer/detonate()
|
||||
var/turf/T = get_turf(src)
|
||||
playsound(T, 'sound/effects/phasein.ogg', 100, 1)
|
||||
|
||||
new /obj/item/technomancer_catalog/universal(T)
|
||||
new /obj/item/technomancer_core/universal(T)
|
||||
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/item/grenade/spawnergrenade/clustaur
|
||||
desc = "It is set to detonate in 5 seconds. It will release a cluster of hydration."
|
||||
name = "clustaur grenade"
|
||||
icon = 'icons/obj/grenade_ch.dmi'
|
||||
icon_state = "clustaur"
|
||||
item_state = "clustaur"
|
||||
banglet = 1
|
||||
deliveryamt = 10
|
||||
spawner_type = /obj/item/reagent_containers/food/drinks/cans/waterbottle/wataur
|
||||
@@ -234,7 +234,6 @@
|
||||
desc = "Miniature medical robots that swiftly restore bodily damage."
|
||||
starts_with = list(/obj/item/reagent_containers/pill/healing_nanites = 14)
|
||||
|
||||
/*CHOMPStation removal begin
|
||||
/obj/item/storage/pill_bottle/sleevingcure
|
||||
name = "pill bottle (" + REAGENT_SLEEVINGCURE + ")"
|
||||
desc = "A rare cure provided by Vey-Medical that helps counteract negative side effects of using imperfect resleeving machinery."
|
||||
@@ -242,7 +241,6 @@
|
||||
|
||||
/obj/item/storage/pill_bottle/sleevingcure/full
|
||||
starts_with = list(/obj/item/reagent_containers/pill/sleevingcure = 14)
|
||||
*/ //CHOMPStation removal end
|
||||
|
||||
/obj/item/storage/mrebag/pill
|
||||
name = "vacuum-sealed pill"
|
||||
|
||||
Reference in New Issue
Block a user