From 6afa1b44e7c6766ede092ad37b4102b0d19852cd Mon Sep 17 00:00:00 2001 From: Kirie Saito <77302679+Kitsunemitsu@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:52:01 -0500 Subject: [PATCH] [CF/COL] Prosthetics Clinic, and 5 new Prosthetics (#2481) * updates minor things couple of prosthetics Update ModularTegustation/tegu_items/prosthetics/mantis.dm Update ModularTegustation/tegu_items/prosthetics/chainsword.dm Update extra_arm_implant.dm Update vending.dm Update extra_arm_implant.dm Update extra_arm_implant.dm Update chainsword.dm adds more shit adds prosthetic clinic continues Update zippyarm.dm Co-Authored-By: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> * Update extra_arm_implant.dm * asd * Update rats.dm * Update extra_arm_implant.dm * Update ModularTegustation/tegu_items/prosthetics/extrarm.dm Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> * Update ModularTegustation/tegu_items/prosthetics/extrarm.dm Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> * Update ModularTegustation/tegu_items/prosthetics/extrarm.dm Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> * Update ModularTegustation/tegu_items/prosthetics/extra_arm_implant.dm Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> * Update ModularTegustation/tegu_items/prosthetics/extra_arm_implant.dm Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> * Update ModularTegustation/tegu_items/prosthetics/extrarm.dm Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> --------- Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> --- .../ego_weapons/melee/non_abnormality/rats.dm | 2 +- .../tegu_items/associations/vending.dm | 55 +- .../tegu_items/prosthetics/chainsword.dm | 52 + .../tegu_items/prosthetics/explosivearm.dm | 31 + .../prosthetics/extra_arm_implant.dm | 70 + .../tegu_items/prosthetics/extrarm.dm | 40 + .../prosthetics/icons/explosivearm.dmi | Bin 0 -> 762 bytes .../tegu_items/prosthetics/icons/generic.dmi | Bin 0 -> 770 bytes .../tegu_items/prosthetics/icons/speedleg.dmi | Bin 0 -> 544 bytes .../tegu_items/prosthetics/mantis.dm | 54 + .../tegu_items/prosthetics/zippyarm.dm | 11 + _maps/map_files/Event/city.dmm | 649 +++-- _maps/map_files/Event/city_fixer.dmm | 2317 +++++++++-------- .../modules/jobs/job_types/city/prosthetic.dm | 50 + code/modules/jobs/jobs.dm | 1 + code/modules/surgery/bodyparts/parts.dm | 7 + lobotomy-corp13.dme | 6 + 17 files changed, 1848 insertions(+), 1497 deletions(-) create mode 100644 ModularTegustation/tegu_items/prosthetics/chainsword.dm create mode 100644 ModularTegustation/tegu_items/prosthetics/explosivearm.dm create mode 100644 ModularTegustation/tegu_items/prosthetics/extra_arm_implant.dm create mode 100644 ModularTegustation/tegu_items/prosthetics/extrarm.dm create mode 100644 ModularTegustation/tegu_items/prosthetics/icons/explosivearm.dmi create mode 100644 ModularTegustation/tegu_items/prosthetics/icons/generic.dmi create mode 100644 ModularTegustation/tegu_items/prosthetics/icons/speedleg.dmi create mode 100644 ModularTegustation/tegu_items/prosthetics/mantis.dm create mode 100644 ModularTegustation/tegu_items/prosthetics/zippyarm.dm create mode 100644 code/modules/jobs/job_types/city/prosthetic.dm diff --git a/ModularTegustation/ego_weapons/melee/non_abnormality/rats.dm b/ModularTegustation/ego_weapons/melee/non_abnormality/rats.dm index 3e3270a3f140..089c5cc389ee 100644 --- a/ModularTegustation/ego_weapons/melee/non_abnormality/rats.dm +++ b/ModularTegustation/ego_weapons/melee/non_abnormality/rats.dm @@ -91,7 +91,7 @@ return ..() if(prob(50)) to_chat(user,span_warning("You pinch your fingers in the weapon.")) - user.apply_damage(10, RED_DAMAGE, null, user.run_armor_check(null, BLACK_DAMAGE)) + user.apply_damage(5, RED_DAMAGE, null, user.run_armor_check(null, RED_DAMAGE)) return FALSE return ..() diff --git a/ModularTegustation/tegu_items/associations/vending.dm b/ModularTegustation/tegu_items/associations/vending.dm index 47861c58cc02..51cdd2617a06 100644 --- a/ModularTegustation/tegu_items/associations/vending.dm +++ b/ModularTegustation/tegu_items/associations/vending.dm @@ -216,64 +216,41 @@ icon_state = "robotics" icon_deny = null products = list( - /obj/item/stock_parts/cell/high = 100, - /obj/item/bodypart/head/robot = 100, - /obj/item/bodypart/chest/robot = 100, - /obj/item/bodypart/l_arm/robot = 100, - /obj/item/bodypart/r_arm/robot = 100, - /obj/item/bodypart/l_leg/robot = 100, - /obj/item/bodypart/r_leg/robot = 100, + //Healing shit /obj/item/weldingtool = 100, /obj/item/stack/cable_coil = 100, - /obj/item/organ/stomach/cybernetic/tier2 = 100, - /obj/item/organ/heart/cybernetic/tier2 = 100, - /obj/item/organ/lungs/cybernetic/tier2 = 100, - /obj/item/organ/liver/cybernetic/tier2 = 100, - /obj/item/organ/eyes/robotic/glow = 100, - /obj/item/organ/ears/cybernetic = 100, - ) - - premium = list( - /obj/item/shears = 1, - ) - - default_price = 300 - extra_price = 500 - input_display_header = "Prosthetic plus" - - - -//cityvending -/obj/machinery/vending/prosthetic - name = "\improper Prosthetic plus vending" - desc = "A machine used to purchase new prosthetic limbs" - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF - product_slogans = "Looking good!" - product_ads = "You need it!" - icon_state = "robotics" - icon_deny = null - products = list( /obj/item/stock_parts/cell/high = 100, + + //Regular shit /obj/item/bodypart/head/robot = 100, - /obj/item/bodypart/chest/robot = 100, + //obj/item/bodypart/chest/robot = 100, //currently broken /obj/item/bodypart/l_arm/robot = 100, /obj/item/bodypart/r_arm/robot = 100, /obj/item/bodypart/l_leg/robot = 100, /obj/item/bodypart/r_leg/robot = 100, - /obj/item/weldingtool = 100, - /obj/item/stack/cable_coil = 100, /obj/item/organ/stomach/cybernetic/tier2 = 100, /obj/item/organ/heart/cybernetic/tier2 = 100, /obj/item/organ/lungs/cybernetic/tier2 = 100, /obj/item/organ/liver/cybernetic/tier2 = 100, /obj/item/organ/eyes/robotic/glow = 100, /obj/item/organ/ears/cybernetic = 100, + /obj/item/organ/cyberimp/arm/zippy = 100, ) premium = list( /obj/item/shears = 1, + /obj/item/bodypart/l_arm/robot/explosive = 100, + /obj/item/bodypart/r_arm/robot/explosive = 100, + /obj/item/organ/cyberimp/arm/mantis = 100, + /obj/item/organ/cyberimp/arm/mantis/black = 100, + /obj/item/organ/cyberimp/arm/chainsword = 100, + /obj/item/organ/cyberimp/arm/surgery = 100, + /obj/item/extra_arm = 100, + /obj/item/extra_arm/double = 100, ) default_price = 300 - extra_price = 500 + extra_price = 700 input_display_header = "Prosthetic plus" + + diff --git a/ModularTegustation/tegu_items/prosthetics/chainsword.dm b/ModularTegustation/tegu_items/prosthetics/chainsword.dm new file mode 100644 index 000000000000..d760b2f07cfa --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/chainsword.dm @@ -0,0 +1,52 @@ +/obj/item/organ/cyberimp/arm/chainsword + name = "chainsword implant" + desc = "A chainsword that can be retracted into your arm.." + contents = newlist(/obj/item/ego_weapon/city/handchainsword) + syndicate_implant = TRUE + +/obj/item/organ/cyberimp/arm/chainsword/l + zone = BODY_ZONE_L_ARM + + +/obj/item/ego_weapon/city/handchainsword + name = "chainsword" + desc = "This weapon attacks many times, grafted to your hand." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/generic.dmi' + icon_state = "hand_chainsword" + hitsound = 'sound/weapons/bladeslice.ogg' + flags_1 = CONDUCT_1 + force = 15 + attack_speed = 2 + damtype = RED_DAMAGE + w_class = WEIGHT_CLASS_NORMAL + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") + + +/obj/item/ego_weapon/city/handchainsword/equipped(mob/user, slot, initial) + . = ..() + if(slot != ITEM_SLOT_HANDS) + return + var/side = user.get_held_index_of_item(src) + + if(side == LEFT_HANDS) + transform = null + else + transform = matrix(-1, 0, 0, 0, 1, 0) + //little bit of stam loss + var/mob/living/carbon/human/H = user + H.adjustStaminaLoss(H.maxHealth*0.5, TRUE, TRUE) + + +/obj/item/ego_weapon/city/handchainsword/attack(mob/living/target, mob/living/user) + if(!..()) + return + user.Immobilize(15) + for(var/i = 1 to 3) + sleep(2) + if(target in view(reach,user)) + playsound(loc, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0) + user.do_attack_animation(target) + target.attacked_by(src, user) + log_combat(user, target, pick(attack_verb_continuous), src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])") + diff --git a/ModularTegustation/tegu_items/prosthetics/explosivearm.dm b/ModularTegustation/tegu_items/prosthetics/explosivearm.dm new file mode 100644 index 000000000000..b9becb8071b2 --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/explosivearm.dm @@ -0,0 +1,31 @@ +/obj/item/bodypart/l_arm/robot/explosive + name = "explosive left arm" + desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case. This arm explodes upon being disabled, blowing itself off and dealing massive damage to anyone nearby." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/explosivearm.dmi' + icon_state = "explosive_l_arm" + max_damage = 20 + brute_reduction = 0 + burn_reduction = 0 + + +/obj/item/bodypart/l_arm/robot/explosive/on_disabled() + explosion(owner,0,0,5,8) + for(var/mob/living/H in view(5, get_turf(src))) + H.adjustBruteLoss(H.maxHealth*0.8, TRUE, TRUE) + + +/obj/item/bodypart/r_arm/robot/explosive + name = "explosive right arm" + desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case. This arm explodes upon being disabled, blowing itself off and dealing massive damage to anyone nearby." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/explosivearm.dmi' + icon_state = "explosive_r_arm" + max_damage = 20 + brute_reduction = 0 + burn_reduction = 0 + + +/obj/item/bodypart/r_arm/robot/explosive/on_disabled() + explosion(owner,0,0,5,8) + for(var/mob/living/H in view(5, get_turf(src))) + H.adjustBruteLoss(H.maxHealth*0.8, TRUE, TRUE) + diff --git a/ModularTegustation/tegu_items/prosthetics/extra_arm_implant.dm b/ModularTegustation/tegu_items/prosthetics/extra_arm_implant.dm new file mode 100644 index 000000000000..8a7608713632 --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/extra_arm_implant.dm @@ -0,0 +1,70 @@ +GLOBAL_LIST_EMPTY(threearmed_fucks) +//This is temporary + +/obj/item/extra_arm + name = "\improper Extra Arm Implant" + desc = "An extremely expensive implant allowing a fixer to gain newly found dexterity and handiness. However, this slows you down." + icon = 'icons/obj/device.dmi' + icon_state = "autoimplanter" + var/uses = 1 + var/arms_added = 1 + custom_premium_price = 1400 + +/obj/item/extra_arm/attack_self(mob/user) + if(!uses) + to_chat(user, span_alert("[src] has already been used. The tools are dull and won't reactivate.")) + return + if(user in GLOB.threearmed_fucks) //not letting people get 6 arms + to_chat(user, span_alert("You already have an extra arm.")) + return + var/limbs = user.held_items.len + user.change_number_of_hands(limbs+1) + GLOB.threearmed_fucks += user + user.visible_message(span_alert("[user] presses a button on [src], and you hear a short mechanical noise."), span_alert("You feel a sharp sting as [src] plunges into your body.")) + to_chat(user, span_notice("Your extra arm whirrs with life")) + playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, TRUE) + user.add_movespeed_modifier(/datum/movespeed_modifier/armimplant) + if(uses >= 1) + uses-- + if(!uses) + desc = "[initial(desc)] Looks like it's been used up." + + +/datum/movespeed_modifier/armimplant + variable = TRUE + multiplicative_slowdown = 0.30 + + + +/obj/item/extra_arm/double + name = "\improper Double Arms Implant" + desc = "An extremely expensive implant allowing a fixer to gain newly found dexterity and handiness. However, this slows you down greatly." + icon = 'icons/obj/device.dmi' + icon_state = "autoimplanter" + arms_added = 2 + custom_premium_price = 1800 + + +/datum/movespeed_modifier/doublearmimplant + variable = TRUE + multiplicative_slowdown = 0.50 + + +/obj/item/extra_arm/double/attack_self(mob/user) + if(!uses) + to_chat(user, span_alert("[src] has already been used. The tools are dull and won't reactivate.")) + return + if(user in GLOB.threearmed_fucks) //not letting people get 6 arms + to_chat(user, span_alert("You already have an extra arm.")) + return + var/limbs = user.held_items.len + user.change_number_of_hands(limbs+2) + GLOB.threearmed_fucks += user + user.visible_message(span_notice("[user] presses a button on [src], and you hear a short mechanical noise."), span_alert("You feel a sharp sting as [src] plunges into your body.")) + to_chat(user, span_notice("Your extra arm whirrs with life")) + playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, TRUE) + user.add_movespeed_modifier(/datum/movespeed_modifier/doublearmimplant) + if(uses >= 1) + uses-- + if(!uses) + desc = "[initial(desc)] Looks like it's been used up." diff --git a/ModularTegustation/tegu_items/prosthetics/extrarm.dm b/ModularTegustation/tegu_items/prosthetics/extrarm.dm new file mode 100644 index 000000000000..8f0d77b9cc3e --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/extrarm.dm @@ -0,0 +1,40 @@ + +/obj/item/bodypart/chest/robot/extraarm + name = "extra arms torso" + desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell." + inhand_icon_state = "buildpipe" + icon = 'icons/mob/augmentation/augments.dmi' + custom_premium_price = 1400 + +/obj/item/bodypart/chest/robot/extraarm/set_owner(new_owner) + ..() + playsound(get_turf(owner), 'sound/weapons/circsawhit.ogg', 50, TRUE) + var/limbs = owner.held_items.len + owner.change_number_of_hands(limbs+1) + + +//Mechandrites for the Mechanicus + +/obj/item/mechandrites + name = "\improper Mechandrite Implanter" + desc = "An implanter for mechandrites, allowing a follower of the Omnissiah to gain newly found dexterity and handiness" + icon = 'icons/obj/device.dmi' + icon_state = "autoimplanter" + var/uses = 1 + +/obj/item/mechandrites/attack_self(mob/user) + if(!uses) + to_chat(user, span_notice("[src] has already been used. The tools are dull and won't reactivate.")) + return + var/limbs = user.held_items.len + if(limbs >= 4) + to_chat(user, span_alert("You already have an extra arm.")) + return + user.change_number_of_hands(limbs+1) + user.visible_message(span_notice("[user] presses a button on [src], and you hear a short mechanical noise."), span_notice("You feel a sharp sting as [src] plunges into your body.")) + to_chat(user, span_notice("Your mechandrites whirr with life")) + playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, TRUE) + if(uses == 1) + uses-- + if(!uses) + desc = "[initial(desc)] Looks like it's been used up." diff --git a/ModularTegustation/tegu_items/prosthetics/icons/explosivearm.dmi b/ModularTegustation/tegu_items/prosthetics/icons/explosivearm.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f5bb444016d2ff27a8d6964adceb56965d2740a3 GIT binary patch literal 762 zcmV004jp0{{R3ySrrKNy? zfLU2_Cg>UJ00001bW%=J06^y0W&i*HlzLQHbVOxyV{&P5bZKvH004NLQ&wD*Bjhr}IX%IHAwi zoiazny{2fG(C5oML7dR|$(=T)Cf$qD8U`%L_evPUf_2OeFK3QAVBTGo*KD z>>HFtljL0V^fCkigDdZ{7L6*LFTq2GSKehEJi*oG6A=*+5fKr6wXIvgN@{8Wql*U! zuTQZ8FVXFNkooHY(ORt9`>?48v}i^A`~P$rOk9t;CUN!v2ROlPoeUP9><(~SC(a!u z;KpPC74vEp?h2d(6|-}@WPyB|uwp*a2{saj0hfq~h=_=Yh=}NjQbm}!0WHh9pq-Kd zR?LkHTQ4jXaKuB3`aRGO{tj`&m^UD?CgX_f;i417Cl#4pC{pAV^?R|+ED4E-h=_=Y z{<}-%`qs=fo#1j^<1fAy%q^Mla=q;x(3oUEllTvJcJ!KOl>VNoC*+QMtLe7*ho==A zQGostPmo?W&)olD8}-CHGx{@mECzhU0;b-6-p-tWvQR+9H>BSFY-j8<+V&TQOJ7I% s#+4=B{%qsIXSA8c&!cc35fL524_RCbxq%`67ytkO07*qoM6N<$g6UjXp#T5? literal 0 HcmV?d00001 diff --git a/ModularTegustation/tegu_items/prosthetics/icons/generic.dmi b/ModularTegustation/tegu_items/prosthetics/icons/generic.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7452fa98a4ae1e4f011b577c296fdbf838d69733 GIT binary patch literal 770 zcmV+d1O5DoP)fO~ov92piB6$uClrk*xRf|05zI7Zny+S63)p z#2ODC%f`VC3=AhGCLSFgz`(#uOg(RKTP`jsu(6emj&)>&KYjoJ00DGTPE!Ct=GbNc z004w~R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;Zh zDainGjE%TBGg33tGfE(w;*!LYR3K9+H!-gyvsj6XGbOXA7${)K#hF%=n41b=qbWVrWw`}Z)v@L^ ze=6!?3#j<{u|o(-FPleRsZ$ArE#S=84T86#>vw=gu6ZQ~B!^P1kq3E}nUCT2lZ>=@B-J z+JJo5M970ybKn&F7BD6~jpJBp(!r94CecV;5*A=XHHBpi;ov2Y4rqX$!a_jAL0IU3 z?BVI4f8&6h;!+}1h&cGkA55`rv4R0T;Q;c(@Nhs|XoYB5a6lPgY`9(rwm6^xrfm&d z9FPEYyD4_$0Ol929o0Y}sP#)^iYp~%;3cq!IN-fL^pFK8>NvpA&u~j9jsWlV&_i7R zi~8UouRi=WM}8;YqW}2Vu*~HFoSSph%-#JwCwp+#-9esVVa7-XVErrup!Z0ysUyJo zr9T5_XYUnjbpL_iQ~l50214@rb5I!x zsd_y79zN-BAP_7Pk^w6rUB3`=^hn6l|Ht3OH>XV^wfyZvV*mgE07*qoM6N<$g5beb AIsgCw literal 0 HcmV?d00001 diff --git a/ModularTegustation/tegu_items/prosthetics/icons/speedleg.dmi b/ModularTegustation/tegu_items/prosthetics/icons/speedleg.dmi new file mode 100644 index 0000000000000000000000000000000000000000..9b5ed1b0a4bafc975276bc3c0401d45f8d3a884c GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?I3?vN&YJLDI-2k5u*8>L*0Ga;&{%UG!>gwv@ z;o)g%X--Z~c6N3lAt72?S~@y9Qc_Z;rlw3xObN0t+<>YXOM?7@862M7NCR@JszM@4 zTvCgZi!uvJGV}8o7%JujhZPi+e*Y3&@bT*tEpJ_|b7#&6ZwNKGX#C)j&UqirlMF>Y zy*n(7gN!d5dnwF$H0j8s5QSh(bvt#_*v@Wa)y*p;mH_Fs8iwYgN6cJSXeoJx2Gs>t z*%Y!hO?_k<8hP;QdDb_o47y%+(z-V6vOfpTg*tftu?enA zDF4N>e23RB$LQEaCM{FsHRKuMJ$^NQV*Jp$1jsoc_qRd7=^yVoehd4GLq8dT28z#- gFQ`k{H%s1zA-*J$@#8%wP?R%xy85}Sb4q9e06|C2ga7~l literal 0 HcmV?d00001 diff --git a/ModularTegustation/tegu_items/prosthetics/mantis.dm b/ModularTegustation/tegu_items/prosthetics/mantis.dm new file mode 100644 index 000000000000..26f072f24503 --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/mantis.dm @@ -0,0 +1,54 @@ +/obj/item/organ/cyberimp/arm/mantis + name = "Mantis blade implants" + desc = "Mantis blades designed by some sicko in district." + contents = newlist(/obj/item/ego_weapon/city/mantis) + syndicate_implant = TRUE + +/obj/item/organ/cyberimp/arm/mantis/l + zone = BODY_ZONE_L_ARM + +/obj/item/ego_weapon/city/mantis + name = "mantis blade" + desc = "A blade designed to be hidden just beneath the skin. The brain is directly linked to this bad boy, allowing it to spring into action. Deals red damage when equipped." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/generic.dmi' + icon_state = "mantis" + hitsound = 'sound/weapons/bladeslice.ogg' + flags_1 = CONDUCT_1 + force = 30 + damtype = RED_DAMAGE + w_class = WEIGHT_CLASS_NORMAL + attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") + attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") + + +/obj/item/ego_weapon/city/mantis/equipped(mob/user, slot, initial) + . = ..() + if(slot != ITEM_SLOT_HANDS) + return + var/side = user.get_held_index_of_item(src) + + if(side == LEFT_HANDS) + transform = null + else + transform = matrix(-1, 0, 0, 0, 1, 0) + //little bit of stam loss + var/mob/living/carbon/human/H = user + H.adjustStaminaLoss(H.maxHealth*0.5, TRUE, TRUE) + + +/obj/item/organ/cyberimp/arm/mantis/black + name = "Mantis blade (B) implants" + desc = "Mantis blades designed by some sicko in district." + contents = newlist(/obj/item/ego_weapon/city/mantis/black) + syndicate_implant = TRUE + +/obj/item/organ/cyberimp/arm/mantis/black/l + zone = BODY_ZONE_L_ARM + syndicate_implant = TRUE + +/obj/item/ego_weapon/city/mantis/black + name = "mantis blade (B)" + desc = "A blade designed to be hidden just beneath the skin. The brain is directly linked to this bad boy, allowing it to spring into action. Deals black damage when equipped." + icon_state = "mantisblack" + damtype = BLACK_DAMAGE + diff --git a/ModularTegustation/tegu_items/prosthetics/zippyarm.dm b/ModularTegustation/tegu_items/prosthetics/zippyarm.dm new file mode 100644 index 000000000000..93caa2627148 --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/zippyarm.dm @@ -0,0 +1,11 @@ +/obj/item/organ/cyberimp/arm/zippy + name = "Zippy 3000 implant" + desc = "A cheap pistol implant made by XX corp. May or may not be recommended for use." + contents = newlist(/obj/item/ego_weapon/ranged/pistol/rats) + syndicate_implant = TRUE + //Doesn't need a nerf, the gun's kinda shit lmao + +/obj/item/organ/cyberimp/arm/zippy/l + zone = BODY_ZONE_L_ARM + syndicate_implant = TRUE + diff --git a/_maps/map_files/Event/city.dmm b/_maps/map_files/Event/city.dmm index b862c6e63922..ea2d47eb2bc5 100644 --- a/_maps/map_files/Event/city.dmm +++ b/_maps/map_files/Event/city.dmm @@ -46,11 +46,6 @@ /obj/structure/flora/tree/jungle/small, /turf/open/floor/plating/grass, /area/city) -"aZ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, -/area/city) "bd" = ( /obj/machinery/griddle, /turf/open/floor/oldshuttle, @@ -101,13 +96,6 @@ }, /turf/open/floor/carpet/black, /area/city/fixers) -"bz" = ( -/obj/item/storage/backpack/duffelbag/med/surgery{ - pixel_y = 5 - }, -/obj/structure/table/glass, -/turf/open/indestructible/white, -/area/space) "bB" = ( /obj/structure/fluff/arc/angela, /turf/open/floor/plating/grass, @@ -144,13 +132,6 @@ }, /turf/open/floor/wood, /area/city/fixers) -"bV" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, -/area/city) "bW" = ( /obj/machinery/door/airlock/grunge{ name = "syndicate hideout"; @@ -203,6 +184,17 @@ /obj/item/clothing/under/mercenary/rus_army, /turf/open/floor/carpet/black, /area/city/house) +"cl" = ( +/obj/machinery/door/airlock/medical{ + hackProof = 1; + integrity_failure = 0.1; + max_integrity = 1e+009; + name = "Secure medical room"; + normal_integrity = 1e+009; + req_access_txt = "9" + }, +/turf/open/indestructible/white, +/area/city) "cq" = ( /obj/machinery/vending/weaving, /turf/closed/indestructible/reinforced, @@ -314,10 +306,6 @@ }, /turf/open/indestructible/hoteltile, /area/city/house) -"dz" = ( -/obj/structure/bookcase/random/adult, -/turf/open/floor/wood, -/area/city) "dC" = ( /obj/structure/sink/kitchen{ dir = 1; @@ -479,25 +467,6 @@ }, /turf/open/floor/plating/ashplanet/rocky, /area/city) -"fV" = ( -/obj/structure/fireplace, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/city) -"fX" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled{ - name = "Saito-brand wine"; - pixel_x = 4; - pixel_y = 14 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = -6; - pixel_y = 12 - }, -/obj/item/food/spaghetti/beefnoodle, -/turf/open/floor/wood, -/area/city) "fZ" = ( /obj/machinery/vending/city_clothing, /obj/machinery/light/small, @@ -515,6 +484,12 @@ }, /turf/open/floor/plating, /area/city) +"gc" = ( +/obj/machinery/computer/operating{ + dir = 4 + }, +/turf/open/indestructible/white, +/area/city) "gg" = ( /obj/machinery/telecomms/server/presets/engineering, /obj/effect/turf_decal/bot, @@ -754,9 +729,6 @@ }, /turf/open/floor/wood, /area/city/fixers) -"iO" = ( -/turf/closed/indestructible/fakeglass, -/area/space) "iP" = ( /obj/machinery/door/airlock/wood{ name = "bistro chef entrance"; @@ -1031,16 +1003,21 @@ /obj/structure/closet/crate/trashcart/filled, /turf/open/floor/plating/ashplanet/rocky, /area/city) +"mx" = ( +/obj/machinery/door/airlock/public{ + name = "prosthetic surgery clinic" + }, +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "outside" + }, +/turf/open/indestructible/white, +/area/city) "my" = ( /obj/structure/chair/plastic{ dir = 8 }, /turf/open/floor/plating/beach/sand, /area/city) -"mR" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall/bathhouse, -/area/city) "mV" = ( /obj/item/folder, /obj/item/folder, @@ -1139,6 +1116,12 @@ /obj/item/pen, /turf/open/floor/facility/dark, /area/city/backstreets_room) +"nN" = ( +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "outside" + }, +/turf/closed/indestructible/fakeglass, +/area/city) "nQ" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -1245,12 +1228,6 @@ }, /turf/open/floor/plating/ashplanet/rocky, /area/city) -"oY" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/indestructible/white, -/area/space) "pc" = ( /obj/effect/spawner/randomsnackvend, /turf/open/floor/facility, @@ -1274,6 +1251,13 @@ /obj/item/ego_weapon/city/molar/olga, /turf/open/floor/wood, /area/city/shop) +"ph" = ( +/obj/structure/table/optable, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/indestructible/white, +/area/city) "px" = ( /obj/machinery/light/small{ dir = 1 @@ -1344,6 +1328,34 @@ /obj/structure/window/reinforced/survival_pod, /turf/open/floor/mineral/silver, /area/city/shop) +"qj" = ( +/obj/structure/rack, +/turf/open/indestructible/white, +/area/city) +"ql" = ( +/obj/structure/table/glass, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/cable_coil{ + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/indestructible/white, +/area/city) +"qn" = ( +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 5 + }, +/obj/structure/table/glass, +/turf/open/indestructible/white, +/area/city) "qu" = ( /obj/machinery/light{ dir = 1 @@ -1481,6 +1493,13 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/city/shop) +"rM" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/closet/crate/freezer/surplus_limbs, +/turf/open/floor/plasteel/white, +/area/city) "rO" = ( /obj/effect/turf_decal/tile{ color = "#333333"; @@ -1548,6 +1567,17 @@ }, /turf/open/floor/wood, /area/city/shop) +"sl" = ( +/obj/machinery/door/airlock/medical{ + hackProof = 1; + integrity_failure = 0.1; + max_integrity = 1e+009; + name = "Secure medical room"; + normal_integrity = 1e+009; + req_access_txt = "9" + }, +/turf/open/floor/plasteel/white, +/area/city) "sm" = ( /obj/effect/turf_decal/bot, /obj/machinery/telecomms/receiver/preset_left, @@ -1585,6 +1615,15 @@ }, /turf/open/floor/plasteel, /area/city/shop) +"sJ" = ( +/obj/machinery/button/door{ + id = "outside"; + name = "prosthetics clinic shutters"; + pixel_y = 26; + req_access_txt = "9" + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city) "sL" = ( /obj/machinery/door/airlock/wood{ name = "bistro chef entrance"; @@ -1636,12 +1675,6 @@ }, /turf/open/floor/wood, /area/city/shop) -"tA" = ( -/obj/machinery/door/airlock/freezer{ - name = "bathouse airlock" - }, -/turf/open/floor/mineral/titanium/white, -/area/city) "tC" = ( /turf/open/indestructible/hoteltile, /area/city/fixers) @@ -1693,12 +1726,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/black, /area/city/shop) -"tM" = ( -/obj/machinery/light, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/cityloot, -/turf/open/floor/wood, -/area/city) "tO" = ( /obj/machinery/vending/medical, /obj/machinery/light{ @@ -1842,6 +1869,10 @@ /obj/structure/rack, /turf/open/floor/wood, /area/city/fixers) +"vb" = ( +/obj/structure/table/glass, +/turf/open/indestructible/white, +/area/city) "vc" = ( /obj/effect/mine/shrapnel, /obj/structure/barricade/wooden, @@ -1871,13 +1902,6 @@ /obj/item/flashlight/lamp, /turf/open/floor/carpet/donk, /area/city/house) -"vm" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, -/area/city) "vn" = ( /obj/machinery/door/airlock/medical{ name = "Pre-Operation"; @@ -1938,17 +1962,6 @@ /obj/structure/bed, /turf/open/floor/carpet/donk, /area/city/house) -"vQ" = ( -/obj/structure/table/greyscale, -/obj/item/stack/medical/aloe{ - desc = "A healing paste you can apply on wounds. It smells amazing." - }, -/obj/item/clothing/shoes/sneakers/white{ - name = "white slippers" - }, -/obj/item/clothing/under/misc/pj/blue, -/turf/open/floor/plasteel/white, -/area/city) "vR" = ( /obj/machinery/telecomms/relay/preset/telecomms, /obj/structure/emergency_shield, @@ -2248,11 +2261,6 @@ /obj/item/clothing/under/pants/blackjeans, /turf/open/floor/carpet/black, /area/city/house) -"xR" = ( -/obj/structure/rack, -/obj/item/weldingtool/largetank, -/turf/open/indestructible/white, -/area/space) "xT" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/wood, @@ -2319,10 +2327,6 @@ /obj/item/kitchen/spoon, /turf/open/floor/plasteel/checker, /area/city/house) -"yr" = ( -/obj/structure/curtain, -/turf/open/floor/plasteel/white, -/area/city) "ys" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/landmark/cityloot, @@ -2347,6 +2351,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/city/backstreets_checkpoint) +"yI" = ( +/obj/structure/chair/office/light, +/turf/open/floor/plasteel/white, +/area/city) "yJ" = ( /obj/structure/table/wood/bar, /obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ @@ -2385,18 +2393,10 @@ }, /turf/open/floor/plasteel/grimy, /area/city/house) -"yX" = ( -/obj/structure/curtain, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, -/area/city) "yY" = ( /obj/effect/landmark/cityloot, /turf/open/floor/wood, /area/city) -"yZ" = ( -/turf/open/indestructible/white, -/area/space) "zd" = ( /obj/machinery/light/broken{ dir = 8 @@ -2495,6 +2495,13 @@ /obj/effect/turf_decal/siding/thinplating/light/end, /turf/open/indestructible/white, /area/city/shop) +"zL" = ( +/obj/structure/reagent_dispensers/fueltank/large, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/indestructible/white, +/area/city) "zN" = ( /obj/effect/turf_decal/bot, /obj/machinery/telecomms/processor/preset_two, @@ -2715,13 +2722,6 @@ }, /turf/open/floor/plasteel/grimy, /area/city/house) -"Bp" = ( -/obj/structure/table/optable, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/indestructible/white, -/area/space) "Bq" = ( /obj/structure/chair/sofa/corp{ dir = 1 @@ -2895,16 +2895,6 @@ /obj/item/choice_beacon/ingredient, /turf/open/floor/facility, /area/city/shop) -"Cl" = ( -/obj/structure/chair/office/light, -/turf/open/indestructible/white, -/area/space) -"Cn" = ( -/obj/machinery/door/airlock/public{ - name = "prosthetic surgery clinic" - }, -/turf/open/indestructible/white, -/area/space) "Co" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -2931,9 +2921,6 @@ /obj/item/food/meat/slab, /turf/open/floor/facility, /area/city/shop) -"Cx" = ( -/turf/closed/indestructible/reinforced, -/area/space) "Cz" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/grass, @@ -2983,6 +2970,11 @@ /obj/machinery/seed_extractor, /turf/open/indestructible/white, /area/city/shop) +"CP" = ( +/obj/structure/rack, +/obj/item/weldingtool/experimental, +/turf/open/indestructible/white, +/area/city) "CS" = ( /turf/open/floor/plasteel, /area/city/shop) @@ -3146,23 +3138,6 @@ /obj/machinery/processor, /turf/open/floor/plasteel, /area/city/shop) -"Ev" = ( -/obj/structure/table/glass, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/stack/cable_coil{ - pixel_x = -3; - pixel_y = 3 - }, -/turf/open/indestructible/white, -/area/space) "Ew" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -3265,6 +3240,13 @@ }, /turf/open/floor/plasteel, /area/city/shop) +"EU" = ( +/obj/structure/rack, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/indestructible/white, +/area/city) "Fb" = ( /obj/structure/table/wood, /turf/open/floor/eighties, @@ -3389,6 +3371,15 @@ }, /turf/open/floor/wood, /area/city/shop) +"Gk" = ( +/obj/machinery/button/door{ + id = "outside"; + name = "prosthetics clinic shutters"; + pixel_y = 26; + req_access_txt = "9" + }, +/turf/open/floor/plasteel/white, +/area/city) "Go" = ( /obj/structure/table/wood/bar, /turf/open/floor/wood, @@ -3582,13 +3573,6 @@ /obj/item/flashlight/lamp, /turf/open/floor/carpet, /area/city/house) -"Hp" = ( -/obj/structure/reagent_dispensers/fueltank/large, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/indestructible/white, -/area/space) "Hq" = ( /obj/structure/table/wood/bar, /obj/machinery/chem_dispenser/drinks{ @@ -3682,11 +3666,6 @@ /obj/structure/bed, /turf/open/floor/carpet, /area/city/house) -"Ig" = ( -/obj/structure/bed/pod, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/wood, -/area/city) "Ii" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/landmark/cityloot, @@ -3748,12 +3727,6 @@ /obj/item/screwdriver, /turf/open/floor/plasteel/showroomfloor, /area/city/shop) -"IK" = ( -/obj/machinery/computer/operating{ - dir = 8 - }, -/turf/open/indestructible/white, -/area/space) "IN" = ( /obj/item/bedsheet/dorms, /obj/structure/bed, @@ -3766,10 +3739,6 @@ "IQ" = ( /turf/closed/indestructible/fakeglass, /area/city/fixers) -"IU" = ( -/obj/machinery/vending/prosthetic, -/turf/open/indestructible/white, -/area/space) "IW" = ( /obj/item/bodypart/chest/robot, /obj/item/bodypart/head/robot, @@ -3809,17 +3778,6 @@ /obj/effect/decal/cleanable/garbage, /turf/open/floor/plating/ashplanet/rocky, /area/city) -"Jt" = ( -/obj/machinery/door/airlock/medical{ - hackProof = 1; - integrity_failure = 0.1; - max_integrity = 1e+009; - name = "Secure medical room"; - normal_integrity = 1e+009; - req_access_txt = "5" - }, -/turf/open/indestructible/white, -/area/space) "Ju" = ( /obj/effect/mine/shrapnel, /obj/effect/landmark/cityloot, @@ -3831,10 +3789,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/wood, /area/city/house) -"Jw" = ( -/obj/structure/table/glass, -/turf/open/indestructible/white, -/area/space) "Jy" = ( /obj/item/bodypart/chest/robot, /obj/item/bodypart/head/robot, @@ -3894,6 +3848,9 @@ /obj/machinery/vending/fixer, /turf/open/floor/facility/white, /area/city/fixers) +"JY" = ( +/turf/open/indestructible/white, +/area/city) "JZ" = ( /obj/structure/table/reinforced, /turf/open/floor/oldshuttle, @@ -4119,6 +4076,12 @@ }, /turf/open/floor/plasteel/checker, /area/city/house) +"LE" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/city) "LK" = ( /obj/structure/rack, /obj/item/ego_weapon/city/rats/knife, @@ -4254,11 +4217,6 @@ /obj/effect/landmark/cityloot, /turf/open/floor/plating/beach/sand, /area/city) -"Ni" = ( -/obj/structure/table/glass, -/obj/item/weldingtool/experimental, -/turf/open/indestructible/white, -/area/space) "Nk" = ( /obj/item/kirbyplants/random{ pixel_y = 10 @@ -4305,6 +4263,19 @@ /obj/machinery/door/poddoor/shutters/indestructible, /turf/open/floor/plating/ashplanet/rocky, /area/city/shop) +"NX" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/item/ego_weapon/city/carnival_spear, +/obj/item/paper/fluff/silk_guide, +/obj/item/paper/fluff/silk_guide, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) "NY" = ( /obj/machinery/computer/arcade/battle, /turf/open/floor/eighties, @@ -4427,6 +4398,10 @@ /obj/effect/landmark/cityloot, /turf/open/floor/wood, /area/city) +"Px" = ( +/obj/machinery/vending/prosthetic, +/turf/open/indestructible/white, +/area/city) "PB" = ( /mob/living/simple_animal/mouse/brown, /obj/effect/spawner/lootdrop/maintenance, @@ -4480,11 +4455,6 @@ /obj/effect/landmark/cityloot, /turf/open/floor/wood, /area/city/house) -"Qy" = ( -/obj/structure/table/greyscale, -/obj/item/soap, -/turf/open/floor/plasteel/white, -/area/city) "QL" = ( /obj/effect/turf_decal/bot, /obj/machinery/ntnet_relay, @@ -4509,10 +4479,6 @@ }, /turf/open/floor/wood, /area/city/shop) -"QU" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, -/area/city) "QV" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, @@ -4524,9 +4490,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) -"Rh" = ( -/turf/closed/wall/bathhouse, -/area/city) "Rm" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/laptop/preset/fixer, @@ -4715,19 +4678,6 @@ }, /turf/open/floor/facility/white, /area/city/fixers) -"TQ" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/item/ego_weapon/city/carnival_spear, -/obj/item/paper/fluff/silk_guide, -/obj/item/paper/fluff/silk_guide, -/turf/open/floor/facility/dark, -/area/city/backstreets_room) "TS" = ( /obj/structure/rack, /obj/item/reagent_containers/hypospray/medipen/mental, @@ -4814,10 +4764,6 @@ }, /turf/open/floor/facility/dark, /area/city/backstreets_room) -"Uz" = ( -/obj/structure/rack, -/turf/open/indestructible/white, -/area/space) "UC" = ( /obj/machinery/computer/communications{ dir = 8 @@ -4911,14 +4857,6 @@ /obj/machinery/hydroponics, /turf/open/floor/wood, /area/city/house) -"VD" = ( -/obj/machinery/shower{ - pixel_y = 16; - reagent_id = /datum/reagent/water/holywater - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/white, -/area/city) "VK" = ( /obj/machinery/light{ dir = 1 @@ -5315,13 +5253,6 @@ /obj/effect/turf_decal/trimline/yellow/line, /turf/open/floor/plasteel, /area/city/shop) -"Zz" = ( -/obj/structure/rack, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/indestructible/white, -/area/space) "ZH" = ( /obj/structure/chair/comfy/black, /obj/machinery/light{ @@ -27338,7 +27269,7 @@ qF Ov ay ay -TQ +NX Xs XQ Oq @@ -28350,11 +28281,11 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq +zr +zr +zr +zr +zr zr kG RZ @@ -28607,11 +28538,11 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq +zr +gc +qn +ql +vb zr RZ RZ @@ -28860,15 +28791,15 @@ Oq Oq Oq Oq -Oq -zr -zr -zr zr zr zr zr zr +ph +JY +JY +JY zr RZ kG @@ -29115,17 +29046,17 @@ Oq Oq Oq Oq -Oq -Oq -Oq zr -VD -yX -bV -vQ zr -dz -Ig +zr +rM +CP +Px +zr +vb +JY +JY +JY zr RZ RZ @@ -29372,17 +29303,17 @@ Oq Oq Oq Oq -Oq -Oq -Oq zr -mR -Rh -QU -Qy +zL +sl +Qm +Qm +Qm +zr zr -fV -tM +cl +zr +cl zr Ua RZ @@ -29629,17 +29560,17 @@ Oq Oq Oq Oq -Oq -Oq -Oq zr -VD -yr -aZ -QU -tA -VV -fX +zr +zr +qj +JY +Qm +zr +LE +Qm +vb +Qm zr zr zr @@ -29888,16 +29819,16 @@ Oq Oq Oq Oq -Oq zr -Rh -Rh -QU +qj +JY Qm -zr -zr -zr -zr +cl +Qm +yI +vb +Qm +mx Hm Hm Hm @@ -30145,16 +30076,16 @@ Oq Oq Oq Oq -Oq zr -VD -yr -vm -QU -QU -QU -QU -tA +EU +JY +Qm +zr +Gk +Qm +vb +Qm +nN Hm zr zr @@ -30402,7 +30333,6 @@ Oq Oq Oq Oq -Oq zr zr zr @@ -30412,7 +30342,8 @@ zr zr zr zr -Hm +zr +sJ zr ap WX @@ -56893,15 +56824,15 @@ Oq Oq Oq Oq -Cx -Cx -Cx -Cx -Cx -Cx -Cx -Cx -Cx +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -57150,15 +57081,15 @@ Oq Oq Oq Oq -Cx -Hp -xR -IU -Cx -oY -Jw -yZ -iO +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -57407,15 +57338,15 @@ Oq Oq Oq Oq -Cx -yZ -yZ -yZ -Cx -Cl -Jw -yZ -Cn +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -57664,15 +57595,15 @@ Oq Oq Oq Oq -Cx -yZ -yZ -yZ -Jt -yZ -Jw -yZ -Cx +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -57921,15 +57852,15 @@ Oq Oq Oq Oq -Cx -Uz -yZ -Cx -Cx -Jt -Cx -Jt -Cx +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -58178,15 +58109,15 @@ Oq Oq Oq Oq -Cx -Uz -yZ -Cx -Bp -yZ -yZ -yZ -Cx +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -58435,15 +58366,15 @@ Oq Oq Oq Oq -Cx -Zz -yZ -Cx -IK -bz -Ev -Ni -Cx +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -58692,15 +58623,15 @@ Oq Oq Oq Oq -Cx -Cx -Cx -Cx -Cx -Cx -Cx -Cx -Cx +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq diff --git a/_maps/map_files/Event/city_fixer.dmm b/_maps/map_files/Event/city_fixer.dmm index b61109a30216..50ee07285c17 100644 --- a/_maps/map_files/Event/city_fixer.dmm +++ b/_maps/map_files/Event/city_fixer.dmm @@ -3,6 +3,44 @@ /obj/machinery/vending/coffee, /turf/open/floor/plating/ashplanet/rocky, /area/city) +"ac" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/item/storage/box/papersack{ + pixel_x = -6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/shop) "ar" = ( /obj/machinery/vending/cigarette, /turf/open/floor/plating/ashplanet/rocky, @@ -40,32 +78,17 @@ }, /turf/open/floor/carpet/black, /area/city/house) +"aO" = ( +/obj/structure/fishshrine{ + anchored = 1 + }, +/turf/open/floor/plating/grass, +/area/city) "aV" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/open/floor/carpet/black, /area/city/house) -"bd" = ( -/obj/structure/rack, -/obj/item/tresmetal, -/obj/item/tresmetal, -/obj/item/tresmetal, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/turf/open/floor/facility/dark, -/area/city/shop) -"be" = ( -/obj/structure/rack, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/item/toy/crayon/spraycan/infinite, -/obj/item/toy/crayon/spraycan/infinite, -/turf/open/floor/facility/dark, -/area/city/shop) "bp" = ( /obj/machinery/telecomms/server/presets/command{ name = "Command Server" @@ -73,13 +96,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) -"bv" = ( -/obj/structure/closet/crate/bin, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "by" = ( /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -106,20 +122,6 @@ /obj/structure/bed, /turf/open/floor/carpet/black, /area/city/house) -"bF" = ( -/obj/structure/rack, -/obj/effect/turf_decal/siding/thinplating/dark/end{ - dir = 4 - }, -/obj/item/paper_bin, -/turf/open/floor/facility/dark, -/area/city/shop) -"bH" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "bM" = ( /obj/structure/itemselling, /turf/open/floor/plating/ashplanet/rocky, @@ -142,6 +144,10 @@ /obj/structure/potential, /turf/open/floor/plating/ashplanet/rocky, /area/city/backstreets_checkpoint) +"bX" = ( +/obj/structure/fluff/beach_umbrella/security, +/turf/open/floor/plating/beach/sand, +/area/city) "ce" = ( /obj/structure/closet/secure_closet/freezer/fridge/open, /turf/open/floor/facility, @@ -150,10 +156,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating/airless, /area/city/fixers) -"cm" = ( -/mob/living/simple_animal/hostile/shrimp, -/turf/open/floor/plating/beach/sand, -/area/city) +"cl" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/closet/crate/freezer/surplus_limbs, +/turf/open/floor/plasteel/white, +/area/city/shop) "cq" = ( /obj/structure/table, /obj/machinery/button/door/indestructible{ @@ -193,10 +202,6 @@ /obj/structure/fluff/beach_umbrella/cap, /turf/open/floor/plating/beach/sand, /area/city) -"cS" = ( -/obj/structure/chair/wood, -/turf/open/floor/carpet/black, -/area/city/house) "cX" = ( /obj/structure/table/reinforced, /turf/open/indestructible/hoteltile, @@ -205,10 +210,13 @@ /obj/machinery/griddle, /turf/open/indestructible/hoteltile, /area/city/house) -"dl" = ( -/obj/machinery/fish_market, -/turf/open/floor/wood, -/area/city) +"do" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/loading_area/red, +/turf/open/floor/facility/dark, +/area/city/shop) "dp" = ( /obj/machinery/light{ dir = 1 @@ -225,37 +233,12 @@ /obj/item/clothing/under/pants/blackjeans, /turf/open/floor/carpet/black, /area/city/house) -"dP" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 6 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "dS" = ( /obj/structure/chair/plastic{ dir = 4 }, /turf/open/floor/plating/ashplanet/rocky, /area/city/backstreets_checkpoint) -"dU" = ( -/obj/effect/turf_decal/siding/wideplating/dark, -/turf/open/floor/facility/dark, -/area/city/shop) -"dV" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/structure/closet/crate, -/obj/item/clothing/mask/carnival_mask, -/obj/item/clothing/mask/carnival_mask, -/obj/item/clothing/mask/carnival_mask, -/obj/item/clothing/mask/carnival_mask, -/turf/open/floor/facility/dark, -/area/city/shop) -"ec" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/turf/open/floor/facility/dark, -/area/city/shop) "ed" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft, @@ -265,15 +248,6 @@ "ef" = ( /turf/closed/indestructible/reinforced, /area/facility_hallway/north) -"el" = ( -/obj/structure/table/wood, -/obj/item/candle{ - pixel_x = -9; - pixel_y = 3 - }, -/obj/item/modular_computer/laptop/preset/fixer, -/turf/open/floor/carpet/black, -/area/city/house) "ep" = ( /obj/structure/sink/kitchen{ dir = 1; @@ -281,10 +255,25 @@ }, /turf/open/indestructible/hoteltile, /area/city/house) +"eE" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/shop) "eG" = ( /obj/machinery/biogenerator, /turf/open/indestructible/white, /area/city/shop) +"eL" = ( +/obj/structure/rack, +/obj/effect/turf_decal/siding/thinplating/dark/end{ + dir = 4 + }, +/obj/item/paper_bin, +/turf/open/floor/facility/dark, +/area/city/shop) "eM" = ( /obj/structure/closet/cabinet, /obj/item/reagent_containers/glass/bowl, @@ -307,82 +296,12 @@ /obj/structure/mineral_door/wood, /turf/open/floor/carpet/black, /area/city/house) -"fe" = ( -/turf/open/floor/plating/ashplanet/rocky, -/area/city/backstreets_alley) -"fl" = ( -/obj/structure/table/anvil, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 - }, -/turf/open/floor/facility/dark, -/area/city/shop) -"fp" = ( -/obj/machinery/button/door/indestructible{ - id = "extraction"; - name = "Office Access Shutters"; - pixel_x = -22; - pixel_y = 3 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 10 - }, -/turf/open/floor/facility/dark, -/area/city/shop) -"ft" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "fw" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright, /obj/machinery/door/window/westleft, /turf/open/floor/facility, /area/city/fixers) -"fF" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/structure/closet/crate, -/obj/item/stack/sheet/silk/amber_simple, -/obj/item/stack/sheet/silk/amber_simple, -/obj/item/stack/sheet/silk/amber_simple, -/obj/item/stack/sheet/silk/amber_simple, -/obj/item/stack/sheet/silk/amber_simple, -/obj/item/stack/sheet/silk/amber_simple, -/obj/item/stack/sheet/silk/amber_simple, -/obj/item/stack/sheet/silk/amber_simple, -/obj/item/stack/sheet/silk/steel_simple, -/obj/item/stack/sheet/silk/steel_simple, -/obj/item/stack/sheet/silk/steel_simple, -/obj/item/stack/sheet/silk/steel_simple, -/obj/item/stack/sheet/silk/steel_simple, -/obj/item/stack/sheet/silk/steel_simple, -/obj/item/stack/sheet/silk/steel_simple, -/obj/item/stack/sheet/silk/steel_simple, -/obj/item/stack/sheet/silk/green_simple, -/obj/item/stack/sheet/silk/green_simple, -/obj/item/stack/sheet/silk/green_simple, -/obj/item/stack/sheet/silk/green_simple, -/obj/item/stack/sheet/silk/green_simple, -/obj/item/stack/sheet/silk/green_simple, -/obj/item/stack/sheet/silk/green_simple, -/obj/item/stack/sheet/silk/green_simple, -/obj/item/stack/sheet/silk/indigo_simple, -/obj/item/stack/sheet/silk/indigo_simple, -/obj/item/stack/sheet/silk/indigo_simple, -/obj/item/stack/sheet/silk/indigo_simple, -/obj/item/stack/sheet/silk/indigo_simple, -/obj/item/stack/sheet/silk/indigo_simple, -/obj/item/stack/sheet/silk/indigo_simple, -/obj/item/stack/sheet/silk/indigo_simple, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "fI" = ( /obj/structure/chair/plastic{ dir = 4 @@ -393,6 +312,15 @@ /obj/structure/fluff/beach_umbrella/engine, /turf/open/floor/plating/beach/sand, /area/city) +"fL" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "fM" = ( /obj/machinery/hydroponics, /obj/machinery/light{ @@ -425,11 +353,6 @@ }, /turf/open/floor/plasteel, /area/city/shop) -"fW" = ( -/obj/structure/table/reinforced, -/obj/structure/fishcooker/fishfrier, -/turf/open/floor/wood, -/area/city) "fZ" = ( /obj/machinery/griddle, /obj/effect/turf_decal/tile/red{ @@ -456,6 +379,23 @@ /obj/machinery/seed_extractor, /turf/open/indestructible/white, /area/city/shop) +"gz" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/structure/closet/crate, +/obj/item/silkknife, +/obj/item/silkknife, +/obj/item/silkknife, +/obj/item/silkknife, +/obj/item/silkknife, +/obj/item/silkknife, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "gF" = ( /obj/machinery/computer/communications{ dir = 8 @@ -618,6 +558,10 @@ /obj/machinery/cryopod, /turf/open/floor/facility/dark, /area/city/shop) +"iP" = ( +/obj/machinery/vending/prosthetic, +/turf/open/indestructible/white, +/area/city/shop) "iU" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -627,6 +571,12 @@ }, /turf/open/floor/plasteel, /area/city/shop) +"iV" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/city) "iX" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -634,27 +584,29 @@ }, /turf/open/floor/plasteel, /area/city/shop) -"jH" = ( +"jn" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 }, -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, /turf/open/floor/facility/dark, /area/city/shop) -"jI" = ( +"jp" = ( /obj/structure/rack, -/obj/item/price_tagger, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, +/obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/facility/dark, /area/city/shop) +"jx" = ( +/obj/structure/table/wood, +/obj/item/candle{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/item/modular_computer/laptop/preset/fixer, +/turf/open/floor/carpet/black, +/area/city) "jJ" = ( /obj/structure/rack{ pixel_x = -1 @@ -682,6 +634,17 @@ /obj/item/clothing/suit/apron, /turf/open/indestructible/white, /area/city/shop) +"jN" = ( +/obj/structure/rack, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/item/hand_labeler, +/obj/item/hand_labeler_refill, +/obj/item/hand_labeler_refill, +/turf/open/floor/facility/dark, +/area/city/shop) "jO" = ( /turf/closed/indestructible/fakeglass, /area/city/house) @@ -699,17 +662,6 @@ /obj/item/modular_computer/laptop/preset/civilian, /turf/open/floor/wood, /area/city/house) -"ki" = ( -/obj/structure/rack, -/obj/item/workshop_mod/regular/white, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 10 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "kk" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) @@ -749,6 +701,23 @@ /obj/item/reagent_containers/glass/beaker, /turf/open/floor/plasteel, /area/city/shop) +"kE" = ( +/obj/structure/rack, +/obj/item/clothing/under/rank/cargo/miner{ + name = "Workshop's jumpsuit" + }, +/obj/item/clothing/under/rank/cargo/miner{ + name = "Workshop's jumpsuit" + }, +/obj/item/clothing/under/rank/cargo/miner{ + name = "Workshop's jumpsuit" + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/facility/dark, +/area/city/shop) "kG" = ( /obj/structure/table, /obj/item/kitchen/knife, @@ -772,6 +741,10 @@ /obj/item/price_tagger, /turf/open/indestructible/white, /area/city/shop) +"kL" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/turf/open/floor/facility/dark, +/area/city/shop) "kQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft, @@ -804,6 +777,13 @@ /obj/machinery/vending/cigarette/beach, /turf/open/floor/plating/ashplanet/rocky, /area/city/backstreets_checkpoint) +"lk" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/machinery/vending/weaving/cheap, +/turf/open/floor/facility/dark, +/area/city/shop) "ll" = ( /obj/machinery/light, /turf/open/floor/wood{ @@ -816,6 +796,25 @@ }, /turf/open/floor/wood, /area/city/shop) +"lt" = ( +/obj/structure/rack, +/obj/item/workshop_mod/regular/white, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/turf/open/floor/facility/dark, +/area/city/shop) +"lu" = ( +/obj/structure/chair/office/light, +/turf/open/floor/plasteel/white, +/area/city/shop) +"ly" = ( +/obj/item/book/granter/action/skill/alignment2, +/turf/open/floor/plating/beach/sand, +/area/city) "lD" = ( /obj/item/folder, /obj/item/folder, @@ -843,10 +842,25 @@ /obj/machinery/telecomms/bus/preset_two, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) +"mh" = ( +/obj/effect/decal/cleanable/blood/drip{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/facility/dark, +/area/city/shop) "mi" = ( /obj/structure/bonfire/dense, /turf/open/floor/plating/beach/sand, /area/city) +"mp" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/shop) "mr" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -864,6 +878,23 @@ }, /turf/open/floor/plasteel, /area/city/shop) +"mJ" = ( +/obj/structure/rack, +/obj/structure/lootcrate/tres, +/obj/structure/lootcrate/tres, +/obj/structure/lootcrate/tres, +/obj/structure/lootcrate/tres, +/obj/structure/lootcrate/tres, +/obj/item/crowbar/red, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "mV" = ( /obj/machinery/vending/hydronutrients, /turf/open/indestructible/white, @@ -873,13 +904,9 @@ /obj/item/potential_tester, /turf/open/floor/facility/white, /area/city/fixers) -"ng" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/facility/dark, -/area/city/shop) +"nj" = ( +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_alley) "nl" = ( /obj/machinery/light{ dir = 1 @@ -921,23 +948,17 @@ /obj/machinery/light, /turf/open/indestructible/white, /area/city/shop) -"nK" = ( -/obj/machinery/vending/city, -/turf/open/floor/facility, -/area/city/shop) -"nO" = ( -/obj/item/storage/secure/safe{ - pixel_x = -22 - }, -/obj/structure/table, -/obj/machinery/light{ - dir = 1 - }, +"nH" = ( +/obj/structure/forge, /obj/effect/turf_decal/siding/wideplating/dark{ - dir = 9 + dir = 1 }, /turf/open/floor/facility/dark, /area/city/shop) +"nK" = ( +/obj/machinery/vending/city, +/turf/open/floor/facility, +/area/city/shop) "nQ" = ( /obj/machinery/door/airlock/grunge{ name = "storage"; @@ -949,6 +970,9 @@ /obj/structure/itemselling, /turf/open/floor/facility, /area/city/shop) +"nU" = ( +/turf/open/floor/plasteel/white, +/area/city/shop) "oc" = ( /obj/machinery/light{ dir = 1 @@ -980,6 +1004,19 @@ }, /turf/open/floor/facility/dark, /area/city/shop) +"oM" = ( +/obj/item/storage/secure/safe{ + pixel_x = -22 + }, +/obj/structure/table, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 9 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "oP" = ( /obj/structure/table/reinforced, /turf/open/floor/plasteel, @@ -1034,14 +1071,6 @@ /obj/machinery/vending/fixer, /turf/open/floor/facility/white, /area/city/fixers) -"pJ" = ( -/obj/effect/decal/cleanable/blood/drip{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/facility/dark, -/area/city/shop) "pQ" = ( /obj/machinery/door/airlock/wood{ name = "general store" @@ -1072,6 +1101,12 @@ }, /turf/open/floor/wood, /area/city/shop) +"qB" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "qF" = ( /obj/structure/itemselling, /turf/open/floor/facility/white, @@ -1134,57 +1169,25 @@ /obj/machinery/telecomms/relay/preset/telecomms, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) -"si" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/obj/structure/closet/crate, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/item/storage/box/papersack{ - pixel_x = -6 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/facility/dark, -/area/city/shop) "sj" = ( /obj/structure/fluff/beach_umbrella/syndi, /turf/open/floor/plating/beach/sand, /area/city) -"sl" = ( -/obj/item/book/granter/action/skill/planet2, -/turf/open/floor/plating/beach/sand, -/area/city) "sm" = ( /obj/effect/turf_decal/bot, /obj/machinery/telecomms/receiver/preset_left, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) +"sr" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/book/granter/crafting_recipe/carnival/human_replacements, +/obj/item/book/granter/crafting_recipe/carnival/weaving_advanced_converstion, +/obj/item/book/granter/crafting_recipe/carnival/weaving_basic_converstion, +/turf/open/floor/facility/dark, +/area/city/shop) "sz" = ( /obj/effect/landmark/cityspawner, /turf/open/floor/plating/ashplanet/rocky, @@ -1210,24 +1213,18 @@ }, /turf/open/floor/plasteel/dark, /area/city) -"sM" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/structure/table/reinforced, -/obj/item/ego_weapon/city/carnival_spear/weak, -/obj/item/ego_weapon/city/carnival_spear/weak{ - pixel_x = 8 +"tb" = ( +/obj/structure/chair/wood, +/obj{ + name = "---Merge conflict marker---" }, -/obj/item/ego_weapon/city/carnival_spear/weak{ - pixel_x = 16 +/obj/machinery/button/door{ + id = "outside"; + name = "prosthetics clinic shutters"; + pixel_y = 26; + req_access_txt = "9" }, -/turf/open/floor/facility/dark, -/area/city/shop) -"ta" = ( -/obj/effect/turf_decal/weather/sand, -/obj/structure/fishcooker/fishstove, -/turf/open/floor/wood, +/turf/open/floor/carpet/black, /area/city) "td" = ( /obj/effect/turf_decal/stripes/line, @@ -1240,13 +1237,6 @@ }, /turf/open/floor/plasteel/dark, /area/city) -"tp" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/loading_area/red, -/turf/open/floor/facility/dark, -/area/city/shop) "tt" = ( /obj/docking_port/stationary{ dheight = 10; @@ -1281,6 +1271,12 @@ /obj/structure/chair/plastic, /turf/open/indestructible/white, /area/city/shop) +"tO" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 6 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "tQ" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 32 @@ -1324,24 +1320,9 @@ }, /turf/open/indestructible/white, /area/city/shop) -"up" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/structure/closet/crate, -/obj/item/book/granter/crafting_recipe/carnival/weaving_armor, -/obj/item/book/granter/crafting_recipe/carnival/weaving_armor, -/turf/open/floor/facility/dark, -/area/city/shop) "us" = ( /turf/open/floor/plating/ashplanet/rocky, /area/city/backstreets_checkpoint) -"ut" = ( -/obj/structure/rack, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 5 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/facility/dark, -/area/city/shop) "uu" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -1358,23 +1339,6 @@ }, /turf/open/indestructible/white, /area/city/shop) -"ux" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/obj/structure/closet/crate, -/obj/item/silkknife, -/obj/item/silkknife, -/obj/item/silkknife, -/obj/item/silkknife, -/obj/item/silkknife, -/obj/item/silkknife, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "uz" = ( /obj/structure/table/glass, /obj/item/storage/box/medipens, @@ -1388,14 +1352,6 @@ }, /turf/open/floor/wood, /area/city/shop) -"uM" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table/reinforced, -/obj/item/paper/fluff/silk_guide, -/obj/item/paper/fluff/silk_guide, -/turf/open/floor/facility/dark, -/area/city/shop) "uO" = ( /obj/structure/filingcabinet/medical, /obj/structure/filingcabinet/employment{ @@ -1420,37 +1376,6 @@ /obj/item/clothing/neck/stethoscope, /turf/open/floor/plasteel/showroomfloor, /area/city/shop) -"uT" = ( -/obj/effect/light_emitter{ - light_power = 4; - light_range = 25; - set_cap = 3; - set_luminosity = 24 - }, -/turf/open/water/deep/saltwater, -/area/city) -"uU" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 - }, -/obj/structure/closet/crate, -/obj/item/storage/bag/silk, -/obj/item/storage/bag/silk, -/obj/item/storage/bag/silk, -/obj/item/storage/bag/silk, -/turf/open/floor/facility/dark, -/area/city/shop) -"uZ" = ( -/obj/structure/rack, -/obj/effect/turf_decal/siding/thinplating/dark/end{ - dir = 8 - }, -/obj/item/pen/blue, -/obj/item/pen/charcoal, -/obj/item/pen/fountain, -/obj/item/pen/fourcolor, -/turf/open/floor/facility/dark, -/area/city/shop) "vc" = ( /obj/machinery/door/airlock/public, /turf/open/indestructible/white, @@ -1531,17 +1456,6 @@ }, /turf/open/indestructible/white, /area/city/shop) -"vA" = ( -/obj/structure/rack, -/obj/item/forginghammer, -/obj/item/forginghammer, -/obj/item/forginghammer, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/facility/dark, -/area/city/shop) "vD" = ( /obj/machinery/computer/med_data{ dir = 4 @@ -1565,10 +1479,21 @@ /obj/item/storage/firstaid/emergency, /turf/open/indestructible/white, /area/city/shop) +"wp" = ( +/obj/structure/rack, +/turf/open/indestructible/white, +/area/city/shop) "wr" = ( /obj/structure/chair/stool, /turf/open/floor/eighties, /area/city/fixers) +"ws" = ( +/obj/structure/table/anvil, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "wt" = ( /obj/machinery/vending/medical, /obj/machinery/light{ @@ -1638,6 +1563,11 @@ }, /turf/open/indestructible/white, /area/city/shop) +"xb" = ( +/obj/effect/turf_decal/weather/sand, +/obj/structure/fishcooker/fishstove, +/turf/open/floor/wood, +/area/city) "xe" = ( /obj/structure/table/greyscale, /obj/item/folder/white{ @@ -1732,6 +1662,10 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/indestructible/white, /area/city/shop) +"xX" = ( +/obj/effect/turf_decal/siding/wideplating/dark/end, +/turf/open/floor/facility/dark, +/area/city/shop) "xY" = ( /obj/structure/rack, /obj/item/storage/backpack{ @@ -1814,6 +1748,12 @@ }, /turf/open/floor/facility, /area/city/shop) +"xZ" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "yc" = ( /obj/machinery/computer/arcade/battle, /turf/open/floor/eighties, @@ -1842,6 +1782,17 @@ /obj/structure/curtain, /turf/open/indestructible/white, /area/city/shop) +"yy" = ( +/obj/structure/rack, +/obj/effect/turf_decal/siding/thinplating/dark/end{ + dir = 8 + }, +/obj/item/pen/blue, +/obj/item/pen/charcoal, +/obj/item/pen/fountain, +/obj/item/pen/fourcolor, +/turf/open/floor/facility/dark, +/area/city/shop) "yE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/window/preopen{ @@ -1849,13 +1800,6 @@ }, /turf/open/floor/plating/airless, /area/city/shop) -"yI" = ( -/obj/machinery/vending/forge, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "yJ" = ( /obj/structure/table/greyscale, /obj/item/flashlight/lamp/green, @@ -1868,31 +1812,12 @@ /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) -"yL" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "yT" = ( /obj/machinery/computer/operating{ dir = 4 }, /turf/open/indestructible/white, /area/city/shop) -"yW" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/structure/table/reinforced, -/obj/item/storage/box/bodybags{ - pixel_x = -5; - pixel_y = -4 - }, -/obj/item/storage/firstaid{ - pixel_x = 9; - pixel_y = -7 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "yX" = ( /obj/structure/table/optable, /obj/machinery/light{ @@ -1960,11 +1885,39 @@ /obj/effect/landmark/cityloot, /turf/open/floor/plating/ashplanet/rocky, /area/city) +"zH" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/clothing/mask/carnival_mask, +/obj/item/clothing/mask/carnival_mask, +/obj/item/clothing/mask/carnival_mask, +/obj/item/clothing/mask/carnival_mask, +/turf/open/floor/facility/dark, +/area/city/shop) +"zK" = ( +/obj/machinery/vending/forge, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "zN" = ( /obj/effect/turf_decal/bot, /obj/machinery/telecomms/processor/preset_two, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) +"zQ" = ( +/obj/structure/rack, +/obj/item/weldingtool/experimental, +/turf/open/indestructible/white, +/area/city/shop) +"zR" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/shop) "zS" = ( /obj/effect/light_emitter{ light_power = 4; @@ -1986,17 +1939,6 @@ /obj/structure/closet, /turf/open/indestructible/white, /area/city/shop) -"Af" = ( -/obj/structure/rack, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/item/hand_labeler, -/obj/item/hand_labeler_refill, -/obj/item/hand_labeler_refill, -/turf/open/floor/facility/dark, -/area/city/shop) "Ag" = ( /obj/machinery/smartfridge/organ, /turf/closed/indestructible/reinforced, @@ -2023,10 +1965,6 @@ /obj/structure/table/greyscale, /turf/open/indestructible/white, /area/city/shop) -"An" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/facility/dark, -/area/city/shop) "Aq" = ( /obj/structure/table, /obj/item/organ/ears/cybernetic, @@ -2079,6 +2017,10 @@ }, /turf/open/floor/wood, /area/city/shop) +"AF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/shop) "AH" = ( /obj/machinery/roulette, /turf/open/floor/eighties, @@ -2152,6 +2094,18 @@ }, /turf/open/floor/wood, /area/city/shop) +"BB" = ( +/obj/machinery/button/door/indestructible{ + id = "extraction"; + name = "Office Access Shutters"; + pixel_x = -22; + pixel_y = 3 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 10 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "BU" = ( /obj/structure/fluff/beach_umbrella/engine, /turf/open/floor/plating/grass, @@ -2189,10 +2143,6 @@ }, /turf/open/water/deep/freshwater, /area/city) -"Cr" = ( -/obj/structure/fluff/beach_umbrella/security, -/turf/open/floor/plating/beach/sand, -/area/city) "Cz" = ( /obj/machinery/door/airlock/medical{ name = "Operating Room"; @@ -2206,44 +2156,48 @@ }, /turf/open/floor/facility/white, /area/city/fixers) -"CV" = ( -/obj/structure/rack, -/obj/item/clothing/under/rank/cargo/miner{ - name = "Workshop's jumpsuit" - }, -/obj/item/clothing/under/rank/cargo/miner{ - name = "Workshop's jumpsuit" - }, -/obj/item/clothing/under/rank/cargo/miner{ - name = "Workshop's jumpsuit" - }, -/obj/effect/turf_decal/siding/thinplating/dark{ +"CL" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/closet/crate, +/obj/item/stack/sheet/silk/human_simple, +/obj/item/stack/sheet/silk/human_simple, +/obj/item/stack/sheet/silk/human_simple, +/obj/item/stack/sheet/silk/human_simple, /turf/open/floor/facility/dark, /area/city/shop) "CX" = ( /obj/machinery/light/small, /turf/open/floor/facility/dark, /area/city/fixers) -"Dt" = ( +"Do" = ( +/obj/machinery/door/airlock/public{ + name = "prosthetic surgery clinic" + }, +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "outside" + }, +/turf/closed/indestructible/reinforced, +/area/city/house) +"Dq" = ( /obj/structure/rack, -/obj/structure/lootcrate/tres, -/obj/structure/lootcrate/tres, -/obj/structure/lootcrate/tres, -/obj/structure/lootcrate/tres, -/obj/structure/lootcrate/tres, -/obj/item/crowbar/red, +/obj/item/price_tagger, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/siding/thinplating/dark{ - dir = 9 + dir = 5 }, /turf/open/floor/facility/dark, /area/city/shop) +"Du" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/city/shop) "Dy" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/eastright, @@ -2258,22 +2212,6 @@ /obj/effect/landmark/fixerbase, /turf/open/floor/facility/dark, /area/city/fixers) -"Eh" = ( -/obj/effect/turf_decal/siding/wideplating/dark/end, -/turf/open/floor/facility/dark, -/area/city/shop) -"Ek" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 5 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "El" = ( /obj/item/bedsheet/dorms, /obj/structure/bed, @@ -2311,41 +2249,81 @@ }, /turf/open/floor/facility, /area/city/shop) +"Fg" = ( +/obj/structure/table/reinforced, +/obj/structure/fishcooker/fishfrier, +/turf/open/floor/wood, +/area/city) +"Fl" = ( +/turf/open/floor/wood, +/area/city) "Fw" = ( /obj/machinery/vending/cola, /turf/open/floor/plating/ashplanet/rocky, /area/city) +"Fy" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/closet/crate, +/obj/item/book/granter/crafting_recipe/carnival/weaving_armor, +/obj/item/book/granter/crafting_recipe/carnival/weaving_armor, +/turf/open/floor/facility/dark, +/area/city/shop) "FC" = ( /obj/effect/turf_decal/tile/red{ dir = 4 }, /turf/open/floor/plasteel, /area/city/shop) +"FP" = ( +/obj/structure/table/glass, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/stack/cable_coil{ + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/indestructible/white, +/area/city/shop) "FY" = ( /obj/machinery/telecomms/message_server/preset, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) -"FZ" = ( -/obj/structure/rack, -/obj/item/workshop_mod/regular/red, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 +"Gn" = ( +/obj/machinery/door/airlock/medical{ + hackProof = 1; + integrity_failure = 0.1; + max_integrity = 1e+009; + name = "Secure medical room"; + normal_integrity = 1e+009; + req_access_txt = "9" }, -/turf/open/floor/facility/dark, +/turf/open/floor/plasteel/white, /area/city/shop) -"Gm" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 5 +"Gp" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 }, /obj/structure/table/reinforced, -/turf/open/floor/wood, -/area/city) -"Gt" = ( +/obj/item/ego_weapon/city/carnival_spear/weak, +/obj/item/ego_weapon/city/carnival_spear/weak{ + pixel_x = 8 + }, +/obj/item/ego_weapon/city/carnival_spear/weak{ + pixel_x = 16 + }, +/turf/open/floor/facility/dark, +/area/city/shop) +"Gr" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/facility/dark, /area/city/shop) "GE" = ( @@ -2367,55 +2345,46 @@ /obj/effect/turf_decal/bot, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) +"GW" = ( +/obj/structure/reagent_dispensers/fueltank/large, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/indestructible/white, +/area/city/shop) "Hh" = ( /obj/structure/fluff/beach_umbrella, /turf/open/floor/plating/beach/sand, /area/city) -"Hj" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 4 - }, -/turf/open/floor/facility/dark, -/area/city/shop) "Hm" = ( /turf/open/floor/plating/ashplanet/rocky, /area/city) -"HA" = ( -/turf/closed/indestructible/reinforced, -/area/city/fixers) -"HG" = ( -/obj/machinery/telecomms/server/presets/common, -/turf/open/floor/circuit/telecomms/mainframe, -/area/facility_hallway/north) -"HR" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 4 - }, -/obj/structure/table/reinforced, -/turf/open/floor/wood, -/area/city) -"HX" = ( +"Hn" = ( /obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 + dir = 6 }, /obj/structure/closet/crate, -/obj/item/book/granter/crafting_recipe/carnival/human_replacements, -/obj/item/book/granter/crafting_recipe/carnival/weaving_advanced_converstion, -/obj/item/book/granter/crafting_recipe/carnival/weaving_basic_converstion, +/obj/item/storage/bag/silk, +/obj/item/storage/bag/silk, +/obj/item/storage/bag/silk, +/obj/item/storage/bag/silk, /turf/open/floor/facility/dark, /area/city/shop) -"Ig" = ( -/obj/structure/rack, -/obj/item/workshop_mod/regular/black, -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, +"Hu" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/reinforced, +/obj/item/paper/fluff/silk_guide, +/obj/item/paper/fluff/silk_guide, /turf/open/floor/facility/dark, /area/city/shop) +"HA" = ( +/turf/closed/indestructible/reinforced, +/area/city/fixers) +"HG" = ( +/obj/machinery/telecomms/server/presets/common, +/turf/open/floor/circuit/telecomms/mainframe, +/area/facility_hallway/north) "Iq" = ( /obj/machinery/vending/dinnerware, /obj/effect/turf_decal/tile/red{ @@ -2430,6 +2399,10 @@ }, /turf/open/floor/plasteel, /area/city/shop) +"IF" = ( +/obj/item/book/granter/action/skill/planet2, +/turf/open/floor/plating/beach/sand, +/area/city) "IG" = ( /obj/machinery/door/airlock/wood{ name = "workshop fixer access"; @@ -2441,6 +2414,48 @@ /obj/machinery/vending/cigarette, /turf/open/floor/facility, /area/city/shop) +"IL" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/structure/closet/crate, +/obj/item/stack/sheet/silk/amber_simple, +/obj/item/stack/sheet/silk/amber_simple, +/obj/item/stack/sheet/silk/amber_simple, +/obj/item/stack/sheet/silk/amber_simple, +/obj/item/stack/sheet/silk/amber_simple, +/obj/item/stack/sheet/silk/amber_simple, +/obj/item/stack/sheet/silk/amber_simple, +/obj/item/stack/sheet/silk/amber_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/green_simple, +/obj/item/stack/sheet/silk/green_simple, +/obj/item/stack/sheet/silk/green_simple, +/obj/item/stack/sheet/silk/green_simple, +/obj/item/stack/sheet/silk/green_simple, +/obj/item/stack/sheet/silk/green_simple, +/obj/item/stack/sheet/silk/green_simple, +/obj/item/stack/sheet/silk/green_simple, +/obj/item/stack/sheet/silk/indigo_simple, +/obj/item/stack/sheet/silk/indigo_simple, +/obj/item/stack/sheet/silk/indigo_simple, +/obj/item/stack/sheet/silk/indigo_simple, +/obj/item/stack/sheet/silk/indigo_simple, +/obj/item/stack/sheet/silk/indigo_simple, +/obj/item/stack/sheet/silk/indigo_simple, +/obj/item/stack/sheet/silk/indigo_simple, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "IN" = ( /obj/structure/bookcase/random, /turf/open/floor/wood, @@ -2450,6 +2465,10 @@ /obj/item/reagent_containers/borghypo/borgshaker, /turf/open/floor/wood, /area/city/shop) +"Je" = ( +/mob/living/simple_animal/hostile/shrimp_soldier, +/turf/open/floor/plating/beach/sand, +/area/city) "JC" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -2475,35 +2494,27 @@ /obj/item/food/meat/slab, /turf/open/floor/facility, /area/city/shop) -"JW" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 +"KL" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 4 }, -/obj/machinery/vending/weaving/cheap, -/turf/open/floor/facility/dark, -/area/city/shop) -"KH" = ( -/obj/structure/fishcooker/fishoven, +/obj/structure/table/reinforced, /turf/open/floor/wood, /area/city) -"KW" = ( -/obj/effect/turf_decal/trimline/red/filled/line, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/facility/dark, -/area/city/shop) "KZ" = ( /obj/machinery/telecomms/server/presets/medical, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) -"LD" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 1 - }, +"LS" = ( +/obj/structure/fishcooker/fishoven, /turf/open/floor/wood, /area/city) -"LL" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 +"MP" = ( +/obj/structure/rack, +/obj/item/workshop_mod/regular/red, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 }, /turf/open/floor/facility/dark, /area/city/shop) @@ -2538,10 +2549,26 @@ }, /turf/open/floor/wood, /area/city/shop) -"NB" = ( -/obj/item/book/granter/action/skill/alignment2, -/turf/open/floor/plating/beach/sand, +"Nr" = ( +/obj/structure/closet/crate/bin, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/shop) +"NA" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 5 + }, +/obj/structure/table/reinforced, +/turf/open/floor/wood, /area/city) +"NE" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "NG" = ( /obj/structure/table, /turf/open/floor/wood, @@ -2550,6 +2577,10 @@ /obj/item/toy/seashell, /turf/open/floor/plating/beach/sand, /area/city) +"On" = ( +/obj/effect/turf_decal/siding/wideplating/dark, +/turf/open/floor/facility/dark, +/area/city/shop) "Oo" = ( /obj/structure/chair{ dir = 8 @@ -2573,19 +2604,22 @@ "Ot" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_checkpoint) +"Ow" = ( +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "outside" + }, +/turf/closed/indestructible/reinforced, +/area/city/house) "OT" = ( /turf/closed/indestructible/reinforced, /area/city/shop) -"OV" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 4 +"OX" = ( +/obj/structure/rack, +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/facility/dark, +/turf/open/indestructible/white, /area/city/shop) -"Pa" = ( -/mob/living/simple_animal/hostile/shrimp_soldier, -/turf/open/floor/plating/beach/sand, -/area/city) "Pd" = ( /obj/machinery/vending/custom/unbreakable, /turf/open/floor/plasteel, @@ -2598,37 +2632,64 @@ }, /turf/open/floor/plasteel, /area/city/shop) +"Pr" = ( +/obj/structure/rack, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/facility/dark, +/area/city/shop) "PI" = ( /turf/closed/indestructible/fakeglass, /area/city/shop) +"PR" = ( +/mob/living/simple_animal/hostile/shrimp, +/turf/open/floor/plating/beach/sand, +/area/city) "Qb" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/misc/pj/blue, /obj/item/clothing/under/suit/blacktwopiece, /turf/open/floor/wood, /area/city/house) -"Qr" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ +"QD" = ( +/obj/machinery/door/airlock/medical{ + hackProof = 1; + integrity_failure = 0.1; + max_integrity = 1e+009; + name = "Secure medical room"; + normal_integrity = 1e+009; + req_access_txt = "9" + }, +/turf/open/indestructible/white, +/area/city/shop) +"QF" = ( +/obj/structure/rack, +/obj/item/tresmetal, +/obj/item/tresmetal, +/obj/item/tresmetal, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, -/obj/structure/closet/crate, -/obj/item/stack/sheet/silk/human_simple, -/obj/item/stack/sheet/silk/human_simple, -/obj/item/stack/sheet/silk/human_simple, -/obj/item/stack/sheet/silk/human_simple, /turf/open/floor/facility/dark, /area/city/shop) -"QB" = ( -/obj/structure/fishshrine{ - anchored = 1 - }, -/turf/open/floor/plating/grass, -/area/city) "QL" = ( /obj/effect/turf_decal/bot, /obj/machinery/ntnet_relay, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) +"QN" = ( +/obj/structure/table/glass, +/turf/open/indestructible/white, +/area/city/shop) +"QV" = ( +/obj/machinery/fish_market, +/turf/open/floor/wood, +/area/city) "QZ" = ( /obj/machinery/telecomms/server/presets/science, /obj/effect/turf_decal/bot, @@ -2637,37 +2698,16 @@ "Rh" = ( /turf/open/floor/carpet/black, /area/city/house) -"Rj" = ( -/obj/effect/turf_decal/weather/sand, -/turf/open/floor/wood, -/area/city) -"Rp" = ( +"Rv" = ( /obj/effect/turf_decal/siding/wideplating/dark{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 8 }, -/turf/open/floor/facility/dark, -/area/city/shop) -"Rz" = ( -/turf/open/floor/facility/dark, -/area/city/shop) -"RK" = ( -/obj/structure/forge, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 +/obj/effect/turf_decal/loading_area{ + dir = 4 }, /turf/open/floor/facility/dark, /area/city/shop) -"RM" = ( -/obj/structure/rack, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, +"Rz" = ( /turf/open/floor/facility/dark, /area/city/shop) "Sc" = ( @@ -2682,12 +2722,40 @@ /obj/machinery/telecomms/hub/preset, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) +"Sx" = ( +/obj/structure/rack, +/obj/item/workshop_mod/regular/black, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/shop) +"SA" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, +/obj/structure/table/reinforced, +/obj/structure/sushimat, +/turf/open/floor/wood, +/area/city) "Tl" = ( /turf/open/floor/plasteel, /area/city/shop) "Tm" = ( /turf/open/floor/facility/white, /area/city/fixers) +"TB" = ( +/obj/structure/rack, +/obj/item/forginghammer, +/obj/item/forginghammer, +/obj/item/forginghammer, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/facility/dark, +/area/city/shop) "TC" = ( /obj/effect/turf_decal/bot, /obj/machinery/telecomms/processor/preset_four, @@ -2707,6 +2775,18 @@ }, /turf/open/floor/plating/ashplanet/rocky, /area/city) +"TW" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 5 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "TX" = ( /obj/machinery/door/airlock/glass_large, /turf/open/floor/wood, @@ -2725,6 +2805,35 @@ /obj/structure/timelock, /turf/open/floor/plating/ashplanet/rocky, /area/city/backstreets_alley) +"Uw" = ( +/obj/effect/light_emitter{ + light_power = 4; + light_range = 25; + set_cap = 3; + set_luminosity = 24 + }, +/turf/open/water/deep/saltwater, +/area/city) +"UG" = ( +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 5 + }, +/obj/structure/table/glass, +/turf/open/indestructible/white, +/area/city/shop) +"UL" = ( +/obj/effect/turf_decal/trimline/red/filled/line, +/obj/structure/table/reinforced, +/obj/item/storage/box/bodybags{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/item/storage/firstaid{ + pixel_x = 9; + pixel_y = -7 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "UQ" = ( /obj/machinery/door/airlock/wood{ name = "workshop fixer access"; @@ -2741,30 +2850,41 @@ /obj/structure/curtain/cloth, /turf/closed/indestructible/fakeglass, /area/city/fixers) +"Vw" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating/dark/corner{ + dir = 8 + }, +/turf/open/floor/facility/dark, +/area/city/shop) "Vy" = ( /obj/structure/fence{ dir = 4 }, /turf/open/floor/plating/ashplanet/rocky, /area/city) -"VD" = ( -/obj/structure/chair/wood{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/city/house) -"VQ" = ( +"VP" = ( /obj/effect/turf_decal/weather/sand{ - dir = 6 + dir = 1 }, -/obj/structure/table/reinforced, -/obj/structure/sushimat, /turf/open/floor/wood, /area/city) "VZ" = ( /obj/effect/spawner/room/backstreet_template, /turf/closed/indestructible/rock, /area/space) +"Wd" = ( +/obj/structure/rack, +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/item/toy/crayon/spraycan/infinite, +/obj/item/toy/crayon/spraycan/infinite, +/turf/open/floor/facility/dark, +/area/city/shop) "Wv" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -2812,15 +2932,6 @@ "XK" = ( /turf/open/space/basic, /area/space) -"XM" = ( -/obj/structure/rack, -/obj/item/melee/baseball_bat, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/dark, -/turf/open/floor/facility/dark, -/area/city/shop) "XR" = ( /turf/open/indestructible/white, /area/city/shop) @@ -2857,7 +2968,8 @@ "Zc" = ( /turf/open/water/deep/polluted, /area/city) -"Zr" = ( +"Zh" = ( +/obj/effect/turf_decal/weather/sand, /turf/open/floor/wood, /area/city) "Zs" = ( @@ -2866,6 +2978,15 @@ "Zt" = ( /turf/closed/indestructible/fakeglass, /area/city/fixers) +"ZC" = ( +/obj/structure/rack, +/obj/item/melee/baseball_bat, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark, +/turf/open/floor/facility/dark, +/area/city/shop) "ZH" = ( /obj/machinery/body_preservation_unit, /turf/open/floor/facility, @@ -8798,264 +8919,7 @@ Oq Oq Oq "} -(24,1,1) = {" -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -"} -(25,1,1) = {" +(24,1,1) = {" Oq Oq Oq @@ -9312,7 +9176,7 @@ Oq Oq Oq "} -(26,1,1) = {" +(25,1,1) = {" Oq Oq Oq @@ -9569,7 +9433,7 @@ Oq Oq Oq "} -(27,1,1) = {" +(26,1,1) = {" Oq Oq Oq @@ -9826,7 +9690,7 @@ Oq Oq Oq "} -(28,1,1) = {" +(27,1,1) = {" Oq Oq Oq @@ -10083,7 +9947,7 @@ Oq Oq Oq "} -(29,1,1) = {" +(28,1,1) = {" Oq Oq Oq @@ -10340,7 +10204,7 @@ Oq Oq Oq "} -(30,1,1) = {" +(29,1,1) = {" Oq Oq Oq @@ -10597,7 +10461,7 @@ Oq Oq Oq "} -(31,1,1) = {" +(30,1,1) = {" Oq Oq Oq @@ -10854,7 +10718,7 @@ Oq Oq Oq "} -(32,1,1) = {" +(31,1,1) = {" Oq Oq Oq @@ -11111,7 +10975,7 @@ Oq Oq Oq "} -(33,1,1) = {" +(32,1,1) = {" Oq Oq Oq @@ -11368,7 +11232,7 @@ Oq Oq Oq "} -(34,1,1) = {" +(33,1,1) = {" Oq Oq Oq @@ -11625,7 +11489,7 @@ Oq Oq Oq "} -(35,1,1) = {" +(34,1,1) = {" Oq Oq Oq @@ -11882,7 +11746,7 @@ Oq Oq Oq "} -(36,1,1) = {" +(35,1,1) = {" Oq Oq Oq @@ -12139,7 +12003,7 @@ Oq Oq Oq "} -(37,1,1) = {" +(36,1,1) = {" Oq Oq Oq @@ -12396,7 +12260,7 @@ Oq Oq Oq "} -(38,1,1) = {" +(37,1,1) = {" Oq Oq Oq @@ -12653,7 +12517,7 @@ Oq Oq Oq "} -(39,1,1) = {" +(38,1,1) = {" Oq Oq Oq @@ -12910,7 +12774,7 @@ Oq Oq Oq "} -(40,1,1) = {" +(39,1,1) = {" Oq Oq Oq @@ -13167,7 +13031,7 @@ Oq Oq Oq "} -(41,1,1) = {" +(40,1,1) = {" Oq Oq Oq @@ -13424,7 +13288,7 @@ Oq Oq Oq "} -(42,1,1) = {" +(41,1,1) = {" Oq Oq Oq @@ -13681,7 +13545,7 @@ Oq Oq Oq "} -(43,1,1) = {" +(42,1,1) = {" Oq Oq Oq @@ -13938,7 +13802,7 @@ Oq Oq Oq "} -(44,1,1) = {" +(43,1,1) = {" Oq Oq Oq @@ -14195,7 +14059,7 @@ Oq Oq Oq "} -(45,1,1) = {" +(44,1,1) = {" Oq Oq Oq @@ -14452,7 +14316,7 @@ Oq Oq Oq "} -(46,1,1) = {" +(45,1,1) = {" Oq Oq Oq @@ -14709,7 +14573,7 @@ Oq Oq Oq "} -(47,1,1) = {" +(46,1,1) = {" Oq Oq Oq @@ -14966,7 +14830,7 @@ Oq Oq Oq "} -(48,1,1) = {" +(47,1,1) = {" Oq Oq Oq @@ -15223,7 +15087,7 @@ Oq Oq Oq "} -(49,1,1) = {" +(48,1,1) = {" Oq Oq Oq @@ -15480,7 +15344,7 @@ Oq Oq Oq "} -(50,1,1) = {" +(49,1,1) = {" Oq Oq Oq @@ -15737,7 +15601,7 @@ Oq Oq Oq "} -(51,1,1) = {" +(50,1,1) = {" Oq Oq Oq @@ -15994,7 +15858,7 @@ Oq Oq Oq "} -(52,1,1) = {" +(51,1,1) = {" Oq Oq Oq @@ -16251,7 +16115,7 @@ Oq Oq Oq "} -(53,1,1) = {" +(52,1,1) = {" Oq Oq Oq @@ -16508,7 +16372,7 @@ Oq Oq Oq "} -(54,1,1) = {" +(53,1,1) = {" Oq Oq Oq @@ -16765,7 +16629,7 @@ Oq Oq Oq "} -(55,1,1) = {" +(54,1,1) = {" Oq Oq Oq @@ -17022,7 +16886,7 @@ Oq Oq Oq "} -(56,1,1) = {" +(55,1,1) = {" Oq Oq Oq @@ -17279,7 +17143,7 @@ Oq Oq Oq "} -(57,1,1) = {" +(56,1,1) = {" Oq Oq Oq @@ -17536,7 +17400,7 @@ Oq Oq Oq "} -(58,1,1) = {" +(57,1,1) = {" Oq Oq Oq @@ -17793,7 +17657,7 @@ Oq Oq Oq "} -(59,1,1) = {" +(58,1,1) = {" Oq Oq Oq @@ -18050,7 +17914,7 @@ Oq Oq Oq "} -(60,1,1) = {" +(59,1,1) = {" Oq Oq Oq @@ -18307,7 +18171,7 @@ Oq Oq Oq "} -(61,1,1) = {" +(60,1,1) = {" Oq Oq Oq @@ -18564,7 +18428,7 @@ Oq Oq Oq "} -(62,1,1) = {" +(61,1,1) = {" Oq Oq Oq @@ -18821,7 +18685,7 @@ Oq Oq Oq "} -(63,1,1) = {" +(62,1,1) = {" Oq Oq Oq @@ -19078,7 +18942,7 @@ Oq Oq Oq "} -(64,1,1) = {" +(63,1,1) = {" Oq Oq Oq @@ -19335,7 +19199,7 @@ Oq Oq Oq "} -(65,1,1) = {" +(64,1,1) = {" Oq Oq Oq @@ -19592,7 +19456,7 @@ Oq Oq Oq "} -(66,1,1) = {" +(65,1,1) = {" Oq Oq Oq @@ -19849,7 +19713,7 @@ Oq Oq Oq "} -(67,1,1) = {" +(66,1,1) = {" Oq Oq Oq @@ -20106,7 +19970,7 @@ Oq Oq Oq "} -(68,1,1) = {" +(67,1,1) = {" Oq Oq Oq @@ -20363,7 +20227,7 @@ Oq Oq Oq "} -(69,1,1) = {" +(68,1,1) = {" Oq Oq Oq @@ -20620,7 +20484,7 @@ Oq Oq Oq "} -(70,1,1) = {" +(69,1,1) = {" Oq Oq Oq @@ -20877,7 +20741,7 @@ Oq Oq Oq "} -(71,1,1) = {" +(70,1,1) = {" Oq Oq Oq @@ -21134,7 +20998,7 @@ Oq Oq Oq "} -(72,1,1) = {" +(71,1,1) = {" Oq Oq Oq @@ -21391,7 +21255,7 @@ Oq Oq Oq "} -(73,1,1) = {" +(72,1,1) = {" Oq Oq Oq @@ -21648,7 +21512,7 @@ Oq Oq Oq "} -(74,1,1) = {" +(73,1,1) = {" Oq Oq Oq @@ -21905,7 +21769,7 @@ Oq Oq Oq "} -(75,1,1) = {" +(74,1,1) = {" Oq Oq Oq @@ -22162,7 +22026,7 @@ Oq Oq Oq "} -(76,1,1) = {" +(75,1,1) = {" Oq Oq Oq @@ -22419,7 +22283,7 @@ Oq Oq Oq "} -(77,1,1) = {" +(76,1,1) = {" Oq Oq Oq @@ -22676,7 +22540,7 @@ Oq Oq Oq "} -(78,1,1) = {" +(77,1,1) = {" Oq Oq Oq @@ -22933,7 +22797,7 @@ Oq Oq Oq "} -(79,1,1) = {" +(78,1,1) = {" Oq Oq Oq @@ -23190,7 +23054,7 @@ Oq Oq Oq "} -(80,1,1) = {" +(79,1,1) = {" Oq Oq Oq @@ -23447,7 +23311,7 @@ Oq Oq Oq "} -(81,1,1) = {" +(80,1,1) = {" Oq Oq Oq @@ -23704,7 +23568,7 @@ Oq Oq Oq "} -(82,1,1) = {" +(81,1,1) = {" Oq Oq Oq @@ -23961,7 +23825,13 @@ Oq Oq Oq "} -(83,1,1) = {" +(82,1,1) = {" +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -24154,12 +24024,6 @@ Oq Oq Oq Oq -ef -ef -ef -ef -ef -ef Oq Oq Oq @@ -24218,7 +24082,7 @@ Oq Oq Oq "} -(84,1,1) = {" +(83,1,1) = {" Oq Oq Oq @@ -24412,8 +24276,8 @@ Oq Oq Oq ef -KZ -FY +ef +ef ef ef ef @@ -24475,7 +24339,7 @@ Oq Oq Oq "} -(85,1,1) = {" +(84,1,1) = {" Oq Oq Oq @@ -24669,10 +24533,10 @@ Oq Oq Oq ef -zN -JC -mg -QZ +KZ +FY +ef +ef ef Oq Oq @@ -24731,8 +24595,149 @@ Oq Oq Oq Oq -"} -(86,1,1) = {" +"} +(85,1,1) = {" +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -24784,6 +24789,23 @@ Oq Oq Oq Oq +ef +zN +JC +mg +QZ +ef +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -24830,6 +24852,22 @@ Oq Oq Oq Oq +"} +(86,1,1) = {" +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -24871,6 +24909,89 @@ Oq Oq Oq Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +OT +OT +OT +OT +OT +OT +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq XK XK XK @@ -25107,12 +25228,12 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq +OT +yT +UG +FP +QN +OT Oq Oq Oq @@ -25360,16 +25481,16 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +OT +OT +OT +OT +OT +yX +XR +XR +XR +OT Oq Oq Oq @@ -25615,18 +25736,18 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +OT +OT +OT +cl +zQ +iP +OT +QN +XR +XR +XR +OT Oq Oq Oq @@ -25872,18 +25993,18 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +OT +GW +Gn +nU +nU +nU +OT +OT +QD +OT +QD +OT Oq Oq Oq @@ -26129,18 +26250,18 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +OT +OT +OT +wp +XR +nU +OT +Du +nU +QN +nU +OT Oq Oq Oq @@ -26388,16 +26509,16 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +OT +wp +XR +nU +QD +nU +lu +QN +nU +OT Oq Oq Oq @@ -26645,15 +26766,15 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +OT +OX +XR +nU +OT +nU +nU +QN +nU Oq Oq Xi @@ -26908,9 +27029,9 @@ Oq Xi Xi Xi -Xi -Xi -Xi +Ow +Ow +Do Xi Xi Xi @@ -27165,9 +27286,9 @@ Oq Xi at Xi -cS -el -VD +tb +jx +iV yr Rh Xi @@ -35128,11 +35249,11 @@ Oq Oq Oq OT -Dt -ft -ft -ft -ki +mJ +xZ +xZ +xZ +lt OT Wx XR @@ -35385,11 +35506,11 @@ Oq Oq Oq OT -CV +kE Rz -uZ +yy Rz -Ig +Sx OT Wx XR @@ -35642,11 +35763,11 @@ Oq Oq Oq OT -vA +TB Rz -be +Wd Rz -FZ +MP OT Wx XR @@ -35899,11 +36020,11 @@ Oq Oq Oq OT -XM +ZC Rz -Af +jN Rz -bd +QF OT Wx XR @@ -36156,11 +36277,11 @@ Oq Oq Oq OT -RM +Pr Rz -bF +eL Rz -ut +jp OT gb XR @@ -36413,11 +36534,11 @@ Oq Oq Oq OT -jI -bH -bH -bH -dP +Dq +NE +NE +NE +tO OT gx jJ @@ -36924,15 +37045,15 @@ Oq Oq Oq OT -fF -yL -Gt -sM +IL +Gr +mp +Gp OT -nO -LL -jH -fp +oM +jn +Rv +BB gS Cc kX @@ -37181,15 +37302,15 @@ Oq Oq Oq OT -Qr +CL Rz -pJ -yW +mh +UL OT -RK +nH Rz Rz -dU +On gS Cc lf @@ -37438,15 +37559,15 @@ Oq Oq Oq OT -HX -An +sr +AF Rz -uM +Hu OT -fl +ws Rz Rz -dU +On he Cc Cc @@ -37695,15 +37816,15 @@ Oq Oq Oq OT -si +ac Rz Rz -ec +kL OT -bv +Nr Rz Rz -dU +On hh Cc Cc @@ -37952,15 +38073,15 @@ Oq Oq Oq OT -JW +lk Rz -An -KW +AF +zR IG -tp +do Rz Rz -dU +On UQ Cc ll @@ -38209,15 +38330,15 @@ Oq Oq Oq OT -dV -pJ +zH +mh Rz -up +Fy OT -yI +zK Rz Rz -dU +On OT OT lr @@ -38466,16 +38587,16 @@ Oq Oq Oq OT -ux -ng -ng -uU +gz +eE +eE +Hn OT -Ek -OV -Hj -Rp -Eh +TW +qB +fL +Vw +xX OT us us @@ -38979,11 +39100,11 @@ Oq Oq Oq Oq -fe -fe -fe -fe -fe +nj +nj +nj +nj +nj Ut GE us @@ -39236,11 +39357,11 @@ Oq Oq Oq Oq -fe -fe -fe -fe -fe +nj +nj +nj +nj +nj Ut GE us @@ -39493,11 +39614,11 @@ Oq Oq Oq Oq -fe -fe -fe -fe -fe +nj +nj +nj +nj +nj Ut GE im @@ -39794,7 +39915,7 @@ OT OT OT OT -QB +aO BX BX TJ @@ -44919,11 +45040,11 @@ XJ XJ XJ XJ -LD -dl -KH -fW -ta +VP +QV +LS +Fg +xb OT ze zz @@ -45176,11 +45297,11 @@ XJ XJ XJ XJ -LD -Zr -Zr -Zr -Rj +VP +Fl +Fl +Fl +Zh OT OT OT @@ -45433,11 +45554,11 @@ XJ XJ XJ XJ -Gm -HR -HR -HR -VQ +NA +KL +KL +KL +SA XJ Yt XJ @@ -46198,7 +46319,7 @@ XJ XJ Ol XJ -Cr +bX XJ XJ XJ @@ -48516,7 +48637,7 @@ YC YC YC YC -uT +Uw YC YC YC @@ -51072,7 +51193,7 @@ YC YC YC YC -uT +Uw YC YC YC @@ -52364,7 +52485,7 @@ XJ XJ XJ XJ -cm +PR XJ XJ YC @@ -52399,9 +52520,9 @@ Zc Zc XJ XJ -Pa +Je XJ -Pa +Je XJ Zc Zc @@ -52618,7 +52739,7 @@ YC XJ XJ Ol -cm +PR XJ mi XJ @@ -52653,7 +52774,7 @@ Zc Zc Zc XJ -Pa +Je AO XJ AO @@ -52876,7 +52997,7 @@ XJ XJ XJ XJ -cm +PR XJ XJ XJ @@ -52913,8 +53034,8 @@ XJ XJ XJ XJ -NB -Pa +ly +Je XJ XJ XJ @@ -53169,7 +53290,7 @@ Zc XJ XJ AO -Pa +Je XJ AO XJ @@ -53389,10 +53510,10 @@ YC XJ XJ XJ -cm +PR Ol -sl -cm +IF +PR XJ XJ YC @@ -55713,7 +55834,7 @@ YC YC YC YC -uT +Uw YC YC YC diff --git a/code/modules/jobs/job_types/city/prosthetic.dm b/code/modules/jobs/job_types/city/prosthetic.dm new file mode 100644 index 000000000000..e0a6cf809ad0 --- /dev/null +++ b/code/modules/jobs/job_types/city/prosthetic.dm @@ -0,0 +1,50 @@ +/datum/job/prosdoctor + title = "Proshetics Surgeon" + faction = "Station" + total_positions = 1 + spawn_positions = 1 + selection_color = "#8888cc" + + outfit = /datum/outfit/job/prosdoctor + + access = list(ACCESS_GENETICS) + minimal_access = list(ACCESS_GENETICS) + paycheck = 700 //You need a lot of money + paycheck_department = ACCOUNT_MED + + job_attribute_limit = 0 + + liver_traits = list(TRAIT_MEDICAL_METABOLISM) + exp_requirements = 600 + + display_order = JOB_DISPLAY_ORDER_MISC + maptype = list("city", "fixers") + job_important = "You are the prosthetics surgeon, your clinic is in the Northwest alleys" + job_notice = "You are forbidden from reviving lobotomy corp employees." + +/datum/job/prosdoctor/after_spawn(mob/living/carbon/human/H, mob/M, latejoin = FALSE) + ..() + ADD_TRAIT(H, TRAIT_WORK_FORBIDDEN, JOB_TRAIT) + ADD_TRAIT(H, TRAIT_COMBATFEAR_IMMUNE, JOB_TRAIT) + +/datum/outfit/job/prosdoctor + name = "Proshetics Surgeon" + jobtype = /datum/job/prosdoctor + + belt = /obj/item/pda/medical + ears = /obj/item/radio/headset + uniform = /obj/item/clothing/under/suit/lobotomy/plain + shoes = /obj/item/clothing/shoes/sneakers/white + head = /obj/item/clothing/head/beret/tegu/mint + suit = /obj/item/clothing/suit/toggle/labcoat/roboticist + + backpack = /obj/item/storage/backpack/medic + satchel = /obj/item/storage/backpack/satchel/med + duffelbag = /obj/item/storage/backpack/duffelbag/med + box = /obj/item/storage/box/survival/medical + + +/obj/item/clothing/head/beret/tegu/mint + name = "prosthetic surgeon beret" + desc = "A lovely mint beret found across the city in the hands of prosthetics surgeons." + icon_state = "beret_mint" diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index c197704a506a..e325f43840df 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -105,6 +105,7 @@ GLOBAL_LIST_INIT(service_positions, list( "Nurse", "Paramedic", "Medical Fixer Assistant", + "Proshetics Surgeon", "HHPP Chef", "Civilian", "Backstreets Butcher", diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index bfd33287e437..f72fac37abdd 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -115,6 +115,7 @@ if(!.) if(bodypart_disabled) owner.set_usable_hands(owner.usable_hands - 1) + on_disabled() if(owner.stat < UNCONSCIOUS) to_chat(owner, span_userdanger("Your lose control of your [name]!")) if(held_index) @@ -126,6 +127,8 @@ var/atom/movable/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"] hand_screen_object?.update_icon() +/obj/item/bodypart/l_arm/proc/on_disabled() +//This is shitcode. but I need it elsewhere to shit code up less /obj/item/bodypart/l_arm/monkey icon = 'icons/mob/animal_parts.dmi' @@ -210,6 +213,7 @@ if(!.) if(bodypart_disabled) owner.set_usable_hands(owner.usable_hands - 1) + on_disabled() if(owner.stat < UNCONSCIOUS) to_chat(owner, span_userdanger("Your lose control of your [name]!")) if(held_index) @@ -221,6 +225,9 @@ var/atom/movable/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"] hand_screen_object?.update_icon() +/obj/item/bodypart/r_arm/proc/on_disabled() +//This is shitcode. but I need it elsewhere to shit code up less + /obj/item/bodypart/r_arm/monkey icon = 'icons/mob/animal_parts.dmi' diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index a7eb33437f05..ebe6abe2945d 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -2374,6 +2374,7 @@ #include "code\modules\jobs\job_types\city\doctor.dm" #include "code\modules\jobs\job_types\city\HHPP.dm" #include "code\modules\jobs\job_types\city\rat.dm" +#include "code\modules\jobs\job_types\city\prosthetic.dm" #include "code\modules\jobs\job_types\city\workshop.dm" #include "code\modules\jobs\job_types\city\fixer\east.dm" #include "code\modules\jobs\job_types\city\fixer\north.dm" @@ -4170,6 +4171,11 @@ #include "ModularTegustation\tegu_items\limbus_labs\!abno_overwrites.dm" #include "ModularTegustation\tegu_items\limbus_labs\!other_overwrites.dm" #include "ModularTegustation\tegu_items\limbus_labs\spawners.dm" +#include "ModularTegustation\tegu_items\prosthetics\chainsword.dm" +#include "ModularTegustation\tegu_items\prosthetics\explosivearm.dm" +#include "ModularTegustation\tegu_items\prosthetics\extra_arm_implant.dm" +#include "ModularTegustation\tegu_items\prosthetics\mantis.dm" +#include "ModularTegustation\tegu_items\prosthetics\zippyarm.dm" #include "ModularTegustation\tegu_items\rcorp\!abno_overwrites.dm" #include "ModularTegustation\tegu_items\rcorp\basecode.dm" #include "ModularTegustation\tegu_items\rcorp\gadgets.dm"