Skip to content

Commit

Permalink
Removes abductors (again) (#2679)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Removes alien surgical and engineering tools from the analyzer loot
pool, removes the lost abductor spawn from ice planet portals

## Why It's Good For The Game

Abductors in general have been removed for a variety of reasons, and
these are effectively the last places you can still get their stuff.

## Changelog

:cl:
del: Removed abductor tools from the wrecked analyzer loot pool
del: Removed lost abductor from iceplanet portal loot pool
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Apogee-dev authored Feb 2, 2024
1 parent 937b017 commit 0639088
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 63 deletions.
53 changes: 5 additions & 48 deletions code/game/objects/structures/icemoon/cave_entrance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
*/
/obj/effect/collapsing_demonic_portal/proc/drop_loot()
visible_message("<span class='warning'>Something slips out of [src]!</span>")
var/loot = rand(1, 24)
var/loot = rand(1, 23)
switch(loot)
if(1)//Clown hell. God help you if you roll this.
visible_message("<span class='userdanger'>You can hear screaming and joyful honking.</span>")//now THIS is what we call a critical failure
Expand Down Expand Up @@ -965,62 +965,19 @@ GLOBAL_LIST_INIT(ore_probability, list(
new /obj/effect/mob_spawn/human/scientist(loc)
new /turf/open/floor/mineral/titanium/purple(loc)
new /mob/living/simple_animal/slime/random(loc)
if(19)//lost abductor
visible_message("<span class='userdanger'>You glimpse a frigid wreckage. A large block of something slips through the portal.</span>")
playsound(loc,'sound/effects/break_stone.ogg', 100, FALSE, 50, TRUE, TRUE)
if(prob(45))
new /obj/item/stack/sheet/mineral/abductor(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
if(prob(30))
new /obj/item/clothing/under/abductor(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
if(prob(35))
new /obj/item/weldingtool/abductor(loc)
if(prob(30))
new /obj/item/scalpel/alien(loc)
if(prob(35))
new /obj/item/circuitboard/machine/plantgenes/vault(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
if(prob(35))
new /obj/item/organ/heart/gland/heal(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
if(prob(35))
new /obj/item/organ/heart/gland/ventcrawling(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
if(prob(35))
new /obj/item/organ/heart/gland/slime(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
if(prob(10))
new /obj/item/organ/heart/gland/spiderman(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
if(prob(35))
new /obj/item/wrench/abductor(loc)
new /obj/item/screwdriver/abductor(loc)
if(prob(35))
new /obj/item/crowbar/abductor(loc)
new /obj/item/multitool/abductor(loc)
if(prob(15))
new /obj/item/abductor_machine_beacon/chem_dispenser(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
if(prob(35))
new /obj/item/clothing/suit/armor/abductor/vest(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
new /obj/structure/fluff/iced_abductor(loc)
new /mob/living/simple_animal/hostile/asteroid/polarbear(loc)
new /turf/open/floor/mineral/abductor(loc)
if(20)//hey, free elite tumor!
if(19)//hey, free elite tumor!
visible_message("<span class='userdanger'>A large, pulsating structure falls through the portal and crashes to the floor.</span>")
playsound(loc,'sound/effects/break_stone.ogg', 100, FALSE, 50, TRUE, TRUE)
new /obj/structure/elite_tumor(loc)
new /turf/open/floor/plating/asteroid/basalt(loc)
if(21)//*you flush the toilet.*
if(20)//*you flush the toilet.*
visible_message("<span class='userdanger'>You hear the faint noise of a long flush.</span>")
new /obj/structure/toilet(loc)
new /obj/effect/decal/remains(loc)
new /obj/item/newspaper(loc)
new /turf/open/floor/plastic(loc)
new /obj/item/clothing/head/papersack/smiley(loc) //welcome to the bathroom
if(22)//Research & Zombies
if(21)//Research & Zombies
visible_message("<span class='userdanger'>Flashing lights and quarantine alarms echo through the portal. You smell rotting flesh and plasma.</span>")
playsound(loc,'sound/misc/bloblarm.ogg', 120, FALSE, 50, TRUE, TRUE)
if(prob(35))
Expand Down Expand Up @@ -1065,7 +1022,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
new /obj/item/research_notes/loot/small(loc)
new/turf/open/floor/mineral/titanium/purple(loc)
new /mob/living/simple_animal/hostile/zombie(loc)
if(23)//Silverback's locker room
if(22)//Silverback's locker room
visible_message("<span class='userdanger'>You catch a glimpse of verdant green. Smells like a locker room.</span>")
playsound(loc,'sound/creatures/gorilla.ogg', 75, FALSE, 50, TRUE, TRUE)
new /mob/living/simple_animal/hostile/gorilla(loc)
Expand Down
15 changes: 0 additions & 15 deletions code/game/objects/structures/salvaging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -704,19 +704,4 @@
/obj/item/crowbar/syndie = 30,
/obj/item/wirecutters/syndie = 30,
/obj/item/multitool/syndie = 30,

/obj/item/scalpel/alien = 1,
/obj/item/hemostat/alien = 1,
/obj/item/cautery/alien = 1,
/obj/item/retractor/alien = 1,
/obj/item/circular_saw/alien = 1,
/obj/item/surgicaldrill/alien = 1,

/obj/item/wrench/abductor = 1,
/obj/item/screwdriver/abductor = 1,
/obj/item/weldingtool/abductor = 1,
/obj/item/crowbar/abductor = 1,
/obj/item/wirecutters/abductor = 1,
/obj/item/multitool/abductor = 1,

)

0 comments on commit 0639088

Please sign in to comment.