Merge pull request #9692 from Ghommie/Ghommie-cit309

Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
This commit is contained in:
kevinz000
2019-11-14 15:48:34 -07:00
committed by GitHub
9 changed files with 23 additions and 40 deletions
@@ -1,11 +0,0 @@
/obj/machinery/computer/cargo
req_access = list(ACCESS_CARGO)
/obj/machinery/computer/cargo/request
req_access = list()
/obj/machinery/computer/cargo/ui_act(action, params, datum/tgui/ui)
if(!allowed(usr))
to_chat(usr, "<span class='notice'>Access denied.</span>")
return
. = ..()
@@ -1,26 +0,0 @@
/datum/map_template/ruin/lavaland/alien_nest
name = "Alien Nest"
id = "alien-nest"
description = "Not even Necropolis is safe from alien infestation. The competition for hosts has locked the legion and aliens in an endless conflict that can only be resolved by a PKA."
suffix = "lavaland_surface_alien_nest.dmm"
cost = 20
//Aliens for the alien nest space ruin.
/obj/effect/mob_spawn/alien/corpse/humanoid/drone
mob_type = /mob/living/carbon/alien/humanoid/drone
death = TRUE
name = "alien drone"
mob_name = "alien drone"
/obj/effect/mob_spawn/alien/corpse/humanoid/queen
mob_type = /mob/living/carbon/alien/humanoid/royal/queen
death = TRUE
name = "alien queen"
mob_name = "alien queen"
/obj/item/reagent_containers/syringe/alien
name = "Hive's Blessing"
desc = "A syringe filled with a strange viscous liquid. It might be best to leave it alone."
amount_per_transfer_from_this = 1
volume = 1
list_reagents = list("xenomicrobes" = 1)
@@ -1,7 +0,0 @@
/obj/machinery/light
bulb_colour = "#FFEEDD"
bulb_power = 0.75
/obj/machinery/light/small
bulb_colour = "#FFDDBB"
bulb_power = 0.75
@@ -1,6 +0,0 @@
/obj/machinery/disposal/bin/alt_attack_hand(mob/user)
if(can_interact(usr))
flush = !flush
update_icon()
return TRUE
return FALSE