diff --git a/code/WorkInProgress/Cael_Aislinn/BirdMan/bird_transformation.dm b/code/WorkInProgress/Cael_Aislinn/BirdMan/bird_transformation.dm deleted file mode 100644 index 7e8f8e98733..00000000000 --- a/code/WorkInProgress/Cael_Aislinn/BirdMan/bird_transformation.dm +++ /dev/null @@ -1,64 +0,0 @@ -//don't use this -/mob/living/carbon/human/proc/Birdize() - if (monkeyizing) - return - for(var/obj/item/W in src) - drop_from_slot(W) - update_clothing() - monkeyizing = 1 - canmove = 0 - icon = null - invisibility = 101 - - var/atom/movable/overlay/animation = new /atom/movable/overlay( loc ) - animation.icon_state = "blank" - animation.icon = 'mob.dmi' - animation.master = src - flick("h2monkey", animation) - sleep(48) - //animation = null - var/mob/living/carbon/human/birdman/O = new /mob/living/carbon/human/birdman( loc ) - del(animation) - O.organs.Cut() - O.organs = organs - for(var/name in O.organs) - var/datum/organ/external/organ = O.organs[name] - organ.owner = O - for(var/obj/item/weapon/implant/implant in organ.implant) - implant.imp_in = O - - O.real_name = real_name - O.name = name - O.dna = dna - updateappearance(O,O.dna.uni_identity) - O.loc = loc - O.viruses = viruses - viruses = list() - for(var/datum/disease/D in O.viruses) - D.affected_mob = O - O.flavor_text = flavor_text - O.universal_speak = 1 //hacky fix until someone can figure out how to make them only understand humans - - if (client) - client.mob = O - if(mind) - mind.transfer_to(O) - O.update_body() - O.update_face() - O.update_clothing() - O << "You are now a Birdman." - spawn(0)//To prevent the proc from returning null. - del(src) - return - -/client/proc/make_birdman(mob/living/carbon/human/H as mob) - set category = "Fun" - set name = "Make Birdman" - set desc = "Make (mob) into a birdman." - - if (!holder) - src << "Only administrators may use this command." - return - - if(istype(H)) - H:Birdize() \ No newline at end of file diff --git a/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dm b/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dm deleted file mode 100644 index 34872f32851..00000000000 --- a/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dm +++ /dev/null @@ -1,180 +0,0 @@ -//these are bugged as fuck. dont use them if you like runtimes. -//was testing some icon overlays. might actually fix them up one day - -/mob/living/carbon/human/birdman - name = "birdman" - real_name = "birdman" - voice_name = "birdman" - icon = 'birdman.dmi' - icon_state = "m_none" - // - universal_speak = 1 //hacky fix until someone can figure out how to make them only understand humans - voice_message = "chirps" - examine_text = "some kind of placeholder text for a birdman.." - -/mob/living/carbon/human/birdman/New() - var/g = "m" - if (gender == FEMALE) - g = "f" - - spawn (1) - if(!stand_icon) - stand_icon = new /icon('birdman.dmi', "body_[g]_s") - if(!lying_icon) - lying_icon = new /icon('birdman.dmi', "body_[g]_l") - icon = stand_icon - update_clothing() - src << "\blue Your icons have been generated!" - -/mob/living/carbon/human/birdman/update_body() - if(stand_icon) - del(stand_icon) - if(lying_icon) - del(lying_icon) - - if (mutantrace) - return - - var/g = "m" - if (gender == MALE) - g = "m" - else if (gender == FEMALE) - g = "f" - - stand_icon = new /icon('birdman.dmi', "torso_[g]_s") - lying_icon = new /icon('birdman.dmi', "torso_[g]_l") - - - - var/husk = (HUSK in mutations) - //var/obese = (FAT in mutation) - - stand_icon.Blend(new /icon('birdman.dmi', "chest_[g]_s"), ICON_OVERLAY) - lying_icon.Blend(new /icon('birdman.dmi', "chest_[g]_l"), ICON_OVERLAY) - - var/datum/organ/external/head = organs["head"] - if(!head.destroyed) - stand_icon.Blend(new /icon('birdman.dmi', "head_[g]_s"), ICON_OVERLAY) - lying_icon.Blend(new /icon('birdman.dmi', "head_[g]_l"), ICON_OVERLAY) - - for(var/name in organs) - var/datum/organ/external/part = organs[name] - if(!istype(part, /datum/organ/external/groin) \ - && !istype(part, /datum/organ/external/chest) \ - && !istype(part, /datum/organ/external/head) \ - && !part.destroyed) - var/icon/temp = new /icon('birdman.dmi', "[part.icon_name]_s") - if(part.robot) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0)) - stand_icon.Blend(temp, ICON_OVERLAY) - temp = new /icon('birdman.dmi', "[part.icon_name]_l") - if(part.robot) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0)) - lying_icon.Blend(temp , ICON_OVERLAY) - - stand_icon.Blend(new /icon('birdman.dmi', "groin_[g]_s"), ICON_OVERLAY) - lying_icon.Blend(new /icon('birdman.dmi', "groin_[g]_l"), ICON_OVERLAY) - - if (husk) - var/icon/husk_s = new /icon('birdman.dmi', "husk_s") - var/icon/husk_l = new /icon('birdman.dmi', "husk_l") - - for(var/name in organs) - var/datum/organ/external/part = organs[name] - if(!istype(part, /datum/organ/external/groin) \ - && !istype(part, /datum/organ/external/chest) \ - && !istype(part, /datum/organ/external/head) \ - && part.destroyed) - husk_s.Blend(new /icon('dam_mask.dmi', "[part.icon_name]"), ICON_SUBTRACT) - husk_l.Blend(new /icon('dam_mask.dmi', "[part.icon_name]2"), ICON_SUBTRACT) - - stand_icon.Blend(husk_s, ICON_OVERLAY) - lying_icon.Blend(husk_l, ICON_OVERLAY) - /*else if(obese) - stand_icon.Blend(new /icon('human.dmi', "fatbody_s"), ICON_OVERLAY) - lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)*/ - - // Skin tone - if (s_tone >= 0) - stand_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD) - lying_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD) - else - stand_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT) - lying_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT) - - if (underwear > 0) - //if(!obese) - stand_icon.Blend(new /icon('birdman.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY) - lying_icon.Blend(new /icon('birdman.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY) - - -/mob/living/carbon/human/birdman/update_face() - if(organs) - var/datum/organ/external/head = organs["head"] - if(head) - if(head.destroyed) - del(face_standing) - del(face_lying) - return - - //if(!facial_hair_style || !hair_style) return//Seems people like to lose their icons, this should stop the runtimes for now - del(face_standing) - del(face_lying) - - if (mutantrace) - return - - var/g = "m" - if (gender == MALE) - g = "m" - else if (gender == FEMALE) - g = "f" - - var/icon/eyes_s = new/icon("icon" = 'birdman_face.dmi', "icon_state" = "eyes_s") - var/icon/eyes_l = new/icon("icon" = 'birdman_face.dmi', "icon_state" = "eyes_l") - eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD) - eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD) - - //var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") - //var/icon/hair_l = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_l") - //hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD) - //hair_l.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD) - - //var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") - //var/icon/facial_l = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_l") - //facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD) - //facial_l.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD) - - var/icon/mouth_s = new/icon("icon" = 'birdman_face.dmi', "icon_state" = "mouth_[g]_s") - var/icon/mouth_l = new/icon("icon" = 'birdman_face.dmi', "icon_state" = "mouth_[g]_l") - - // if the head or mask has the flag BLOCKHAIR (equal to 5), then do not apply hair - //if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR))) - //eyes_s.Blend(hair_s, ICON_OVERLAY) - //eyes_l.Blend(hair_l, ICON_OVERLAY) - - eyes_s.Blend(mouth_s, ICON_OVERLAY) - eyes_l.Blend(mouth_l, ICON_OVERLAY) - - // if BLOCKHAIR, do not apply facial hair - //if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR))) - //eyes_s.Blend(facial_s, ICON_OVERLAY) - //eyes_l.Blend(facial_l, ICON_OVERLAY) - - - face_standing = new /image() - face_lying = new /image() - face_standing.icon = eyes_s - face_standing.layer = MOB_LAYER - face_lying.icon = eyes_l - face_lying.layer = MOB_LAYER - - del(mouth_l) - del(mouth_s) - //del(facial_l) - //del(facial_s) - //del(hair_l) - //del(hair_s) - del(eyes_l) - del(eyes_s) - -/mob/living/carbon/human/birdman/co2overloadtime = null -/mob/living/carbon/human/birdman/temperature_resistance = T0C+70 diff --git a/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dmi b/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dmi index e3ebfa128ce..e205840400f 100644 Binary files a/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dmi and b/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dmi differ diff --git a/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman_face.dmi b/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman_face.dmi deleted file mode 100644 index 440983184db..00000000000 Binary files a/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman_face.dmi and /dev/null differ diff --git a/code/WorkInProgress/Cael_Aislinn/meteor_battery.dm b/code/WorkInProgress/Cael_Aislinn/meteor_battery.dm index c06260144d7..b374bf2c0bd 100644 --- a/code/WorkInProgress/Cael_Aislinn/meteor_battery.dm +++ b/code/WorkInProgress/Cael_Aislinn/meteor_battery.dm @@ -11,7 +11,7 @@ density = 1 desc = "It's sparking and shaking slightly." -/obj/item/projectile/missile/fired(var/turf/newtarget) +/obj/item/projectile/missile/process(var/turf/newtarget) target = newtarget dir = get_dir(src.loc, target) walk_towards(src, target, MISSILE_SPEED) @@ -179,7 +179,7 @@ A.tracking = tracking_missiles fired_missiles.Add(A) spawn(0) - A.fired(U) + A.process(U) return diff --git a/code/game/machinery/scanner.dm b/code/game/machinery/records_scanner.dm similarity index 97% rename from code/game/machinery/scanner.dm rename to code/game/machinery/records_scanner.dm index 6eb79664598..e5ec4bdb762 100644 --- a/code/game/machinery/scanner.dm +++ b/code/game/machinery/records_scanner.dm @@ -71,7 +71,7 @@ obj/machinery/scanner/attack_hand(mob/living/carbon/human/user) Black Marks:
"} for(var/A in marks) text += "\red[A]
" - user << "\blue You feel a sting as the scanner sucks all your information out of you and sticks it in it's database." + user << "\blue You feel a sting as the scanner extracts some of your blood." var/turf/T = get_step(src,outputdir) var/obj/item/weapon/paper/print = new(T) print.name = "[mname] Report"