Removing unused files and fixing some stuff. (#12250)
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
|
||||
if(!SSmapping.empty_space)
|
||||
SSmapping.empty_space = SSmapping.add_new_zlevel("Empty Area For Pirates", list(ZTRAIT_LINKAGE = SELFLOOPING))
|
||||
|
||||
|
||||
var/datum/map_template/shuttle/pirate/default/ship = new
|
||||
var/x = rand(TRANSITIONEDGE,world.maxx - TRANSITIONEDGE - ship.width)
|
||||
var/y = rand(TRANSITIONEDGE,world.maxy - TRANSITIONEDGE - ship.height)
|
||||
@@ -159,11 +159,12 @@
|
||||
active = FALSE
|
||||
STOP_PROCESSING(SSobj,src)
|
||||
|
||||
/obj/machinery/shuttle_scrambler/update_icon_state()
|
||||
/obj/machinery/shuttle_scrambler/update_overlays()
|
||||
. = ..()
|
||||
if(active)
|
||||
icon_state = "dominator-blue"
|
||||
else
|
||||
icon_state = "dominator"
|
||||
var/mutable_appearance/M = mutable_appearance(icon, "dominator-overlay")
|
||||
M.color = "#00FFFF"
|
||||
. += M
|
||||
|
||||
/obj/machinery/shuttle_scrambler/Destroy()
|
||||
toggle_off()
|
||||
|
||||
@@ -451,7 +451,7 @@
|
||||
/obj/item/reagent_containers/food/snacks/donkpocket/initialize_cooked_food(obj/item/reagent_containers/food/snacks/donkpocket/S, cooking_efficiency = 1)
|
||||
. = ..()
|
||||
if(istype(S))
|
||||
desc = initial(desc) //reset the desc since will now cool down.
|
||||
S.desc = initial(S.desc) //reset the desc since will now cool down.
|
||||
for(var/R in S.bonus_reagents)
|
||||
LAZYSET(S.cached_reagents_amount, R, S.reagents.get_reagent_amount(R))
|
||||
S.previous_typepath = type
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
/mob/living/verb/give()
|
||||
set category = "IC"
|
||||
set name = "Give"
|
||||
set src in oview(1) //Cannot handle giving shit to mobs on your own tile, but it's a small, small loss
|
||||
|
||||
give_item(usr)
|
||||
|
||||
/mob/living/proc/give_item(mob/living/carbon/user)
|
||||
|
||||
|
||||
/mob/living/carbon/give_item(mob/living/carbon/user)
|
||||
if(!istype(user))
|
||||
return
|
||||
if(src.stat == 2 || user.stat == 2 || src.client == null)
|
||||
return
|
||||
if(src.handcuffed)
|
||||
user << "<span class='warning'>Those hands are cuffed right now.</span>"
|
||||
return //Can't receive items while cuffed
|
||||
var/obj/item/I
|
||||
if(user.get_active_held_item() == null)
|
||||
user << "You don't have anything in your [get_held_index_name(get_held_index_of_item(I))] to give to [src]."
|
||||
return
|
||||
I = user.get_active_held_item()
|
||||
if(!I)
|
||||
return
|
||||
if(src == user) //Shouldn't happen
|
||||
user << "<span class='warning'>You tried to give yourself \the [I], but you didn't want it.</span>"
|
||||
return
|
||||
if(get_empty_held_index_for_side())
|
||||
switch(alert(src, "[user] wants to give you \a [I]?", , "Yes", "No"))
|
||||
if("Yes")
|
||||
if(!I)
|
||||
return
|
||||
if(!Adjacent(user))
|
||||
user <<"<span class='warning'>You need to stay still while giving an object.</span>"
|
||||
src << "<span class='warning'>[user] moved away.</span>"//What an asshole
|
||||
|
||||
return
|
||||
if(user.get_active_held_item() != I)
|
||||
user << "<span class='warning'>You need to keep the item in your hand.</span>"
|
||||
src << "<span class='warning'>[user] has put \the [I] away!</span>"
|
||||
return
|
||||
if(!get_empty_held_index_for_side())
|
||||
user << "<span class='warning'>Your hands are full.</span>"
|
||||
user << "<span class='warning'>Their hands are full.</span>"
|
||||
return
|
||||
if(!user.dropItemToGround(I))
|
||||
src << "<span class='warning'>[user] can't let go of \the [I]!</span>"
|
||||
user << "<span class='warning'>You can't seem to let go of \the [I].</span>"
|
||||
return
|
||||
|
||||
src.put_in_hands(I)
|
||||
update_inv_hands()
|
||||
src.visible_message("<span class='notice'>[user] handed \the [I] to [src].</span>")
|
||||
if("No")
|
||||
src.visible_message("<span class='warning'>[user] tried to hand \the [I] to [src] but \he didn't want it.</span>")
|
||||
else
|
||||
user << "<span class='warning'>[src]'s hands are full.</span>"
|
||||
@@ -1,18 +0,0 @@
|
||||
/mob/living/simple_animal/hostile/creature
|
||||
name = "creature"
|
||||
desc = "A sanity-destroying otherthing."
|
||||
icon_state = "otherthing"
|
||||
icon_living = "otherthing"
|
||||
icon_dead = "otherthing-dead"
|
||||
health = 80
|
||||
maxHealth = 80
|
||||
obj_damage = 100
|
||||
melee_damage_lower = 25
|
||||
melee_damage_upper = 50
|
||||
attacktext = "chomps"
|
||||
attack_sound = 'sound/weapons/bite.ogg'
|
||||
faction = list("creature")
|
||||
speak_emote = list("screams")
|
||||
gold_core_spawnable = HOSTILE_SPAWN
|
||||
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
|
||||
minbodytemp = 0
|
||||
@@ -139,7 +139,7 @@
|
||||
id = "tool_box"
|
||||
build_type = AUTOLATHE
|
||||
materials = list(MAT_CATEGORY_RIGID = 500)
|
||||
build_path = /obj/item/storage/toolbox
|
||||
build_path = /obj/item/storage/toolbox/greyscale
|
||||
category = list("initial","Tools")
|
||||
|
||||
/datum/design/spraycan
|
||||
|
||||
Reference in New Issue
Block a user