"
+ dat += " "
+ dat += " | "
+ else
+ dat += "ERR: Unable to retrieve image data for occupant."
dat += "Probe " dat += "Dissect " dat += "Analyze " diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 315e48ba983..5cfe1324849 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -68,6 +68,7 @@ projectilesound = 'sound/weapons/taser2.ogg' AIStatus = AI_OFF var/resources = 0 //Resource points, generated by consuming metal/glass + loot = list(/obj/effect/decal/cleanable/blood/gibs/robot, /obj/item/weapon/ore/bluespace_crystal/artificial) /mob/living/simple_animal/hostile/swarmer/Login() ..() @@ -91,7 +92,6 @@ /mob/living/simple_animal/hostile/swarmer/death() ..() - new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc) ghostize() qdel(src) @@ -155,30 +155,17 @@ S.DisIntegrate(src) toggle_cam(S, 0) -/obj/machinery/particle_accelerator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) +/obj/structure/particle_accelerator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") -/obj/structure/particle_accelerator/fuel_chamber/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) +/obj/machinery/particle_accelerator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) // Since the console is still parented to this to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") -/obj/structure/particle_accelerator/particle_emitter/center/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - -/obj/structure/particle_accelerator/particle_emitter/left/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - -/obj/structure/particle_accelerator/particle_emitter/right/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - -/obj/structure/particle_accelerator/particle_emitter/end_cap/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - -/obj/structure/particle_accelerator/particle_emitter/power_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - - /obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S.DisIntegrate(src) + if(!active) + S.DisIntegrate(src) + return + to_chat(S, "An inhospitable area may be created as a result of destroying this object. Aborting.") /obj/machinery/gravity_generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisIntegrate(src) @@ -233,7 +220,7 @@ /turf/simulated/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) for(var/turf/T in range(1, src)) - if(istype(T, /turf/space) || istype(T.loc, /area/space)) + if(istype(T, /turf/space) || istype(T.loc, /area/space) || istype(T, /turf/simulated/floor/plating/airless)) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") return ..() diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index dbb56523e4e..c50b4b04700 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -785,7 +785,7 @@ /obj/item/weapon/guardiancreator/tech name = "holoparasite injector" desc = "It contains alien nanoswarm of unknown origin. Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, it requires an organic host as a home base and source of fuel." - icon = 'icons/obj/syringe.dmi' + icon = 'icons/obj/hypo.dmi' icon_state = "combat_hypo" theme = "tech" mob_name = "Holoparasite" diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 6f97740f8d5..e255394e7af 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -42,6 +42,7 @@ var/cooldown = 0 var/gorecooldown = 0 var/vialspawned = FALSE + loot = list(/obj/effect/decal/cleanable/blood/innards, /obj/effect/decal/cleanable/blood, /obj/effect/gibspawner/generic, /obj/effect/gibspawner/generic, /obj/item/organ/internal/heart/demon) var/playstyle_string = "You are the Slaughter Demon, a terrible creature from another existence. You have a single desire: To kill. \ You may Ctrl+Click on blood pools to travel through them, appearing and dissaapearing from the station at will. \ Pulling a dead or critical mob while you enter a pool will pull them in with you, allowing you to feast. \ @@ -79,17 +80,14 @@ else speed = 0 +/obj/effect/decal/cleanable/blood/innards + icon = 'icons/obj/surgery.dmi' + icon_state = "innards" + name = "pile of viscera" + desc = "A repulsive pile of guts and gore." + /mob/living/simple_animal/slaughter/death() ..() - var/obj/effect/decal/cleanable/blood/innards = new (get_turf(src)) - innards.icon = 'icons/obj/surgery.dmi' - innards.icon_state = "innards" - innards.name = "pile of viscera" - innards.desc = "A repulsive pile of guts and gore." - new /obj/effect/decal/cleanable/blood(loc) - new /obj/effect/gibspawner/generic(get_turf(src)) - new /obj/effect/gibspawner/generic(get_turf(src)) - new /obj/item/organ/internal/heart/demon(loc) playsound(get_turf(src),'sound/misc/demon_dies.ogg', 200, 1) visible_message("[src] screams in anger as it collapses into a puddle of viscera, its most recent meals spilling out of it.") for(var/mob/living/M in consumed_mobs) diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm index 92b45e223a5..73876652e23 100644 --- a/code/game/gamemodes/mutiny/mutiny.dm +++ b/code/game/gamemodes/mutiny/mutiny.dm @@ -19,9 +19,6 @@ datum/game_mode/mutiny required_players = 20 ert_disabled = 1 - uplink_welcome = "Mutineers Uplink Console:" - uplink_uses = 0 - New() fluff = new(src) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index e10dce617fa..9ebd3a28ab7 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -11,9 +11,6 @@ proc/issyndicate(mob/living/M as mob) required_enemies = 5 recommended_enemies = 5 - uplink_welcome = "Corporate Backed Uplink Console:" - uplink_uses = 120 - var/const/agents_possible = 5 //If we ever need more syndicate agents. var/nukes_left = 1 // Call 3714-PRAY right now and order more nukes! Limited offer! @@ -133,6 +130,8 @@ proc/issyndicate(mob/living/M as mob) /datum/game_mode/proc/create_syndicate(var/datum/mind/synd_mind) // So we don't have inferior species as ops - randomize a human var/mob/living/carbon/human/M = synd_mind.current + var/obj/item/organ/external/head/head_organ = M.get_organ("head") + M.set_species("Human",1) M.dna.ready_dna(M) // Quadriplegic Nuke Ops won't be participating in the paralympics @@ -149,18 +148,18 @@ proc/issyndicate(mob/living/M as mob) if(prob(5)) facial_hair_style = pick(facial_hair_styles_list) - M.r_facial = hex2num(copytext(hair_c, 2, 4)) - M.g_facial = hex2num(copytext(hair_c, 4, 6)) - M.b_facial = hex2num(copytext(hair_c, 6, 8)) - M.r_hair = hex2num(copytext(hair_c, 2, 4)) - M.g_hair = hex2num(copytext(hair_c, 4, 6)) - M.b_hair = hex2num(copytext(hair_c, 6, 8)) + head_organ.r_facial = hex2num(copytext(hair_c, 2, 4)) + head_organ.g_facial = hex2num(copytext(hair_c, 4, 6)) + head_organ.b_facial = hex2num(copytext(hair_c, 6, 8)) + head_organ.r_hair = hex2num(copytext(hair_c, 2, 4)) + head_organ.g_hair = hex2num(copytext(hair_c, 4, 6)) + head_organ.b_hair = hex2num(copytext(hair_c, 6, 8)) M.r_eyes = hex2num(copytext(eye_c, 2, 4)) M.g_eyes = hex2num(copytext(eye_c, 4, 6)) M.b_eyes = hex2num(copytext(eye_c, 6, 8)) M.s_tone = skin_tone - M.h_style = hair_style - M.f_style = facial_hair_style + head_organ.h_style = hair_style + head_organ.f_style = facial_hair_style M.body_accessory = null /datum/game_mode/proc/prepare_syndicate_leader(var/datum/mind/synd_mind, var/nuke_code) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 25b3727ec3a..6ef7350e4ad 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -247,6 +247,7 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \ return 1 return 0 +/datum/objective/protect/mindslave //subytpe for mindslave implants /datum/objective/hijack martyr_compatible = 0 //Technically you won't get both anyway. @@ -804,4 +805,50 @@ var/global/vox_kills = 0 //Used to check the Inviolate. explanation_text = "Follow the Inviolate. Minimise death and loss of resources." check_completion() if(vox_kills > MAX_VOX_KILLS) return 0 - return 1 \ No newline at end of file + return 1 + +// Traders + +/datum/objective/trade // Yes, I know there's no check_completion. The objectives exist only to tell the traders what to get. +/datum/objective/trade/proc/choose_target(var/station) + return + +/datum/objective/trade/stock // Stock or spare parts. + var/target_rating = 1 +/datum/objective/trade/stock/choose_target(var/station) + var/itemname + switch(rand(1,8)) + if(1) + target = /obj/item/weapon/stock_parts/cell + target_amount = 10 + target_rating = 3 + itemname = "ten high-capacity power cells" + if(2) + target = /obj/item/weapon/stock_parts/manipulator + target_amount = 20 + itemname = "twenty micro manipulators" + if(3) + target = /obj/item/weapon/stock_parts/matter_bin + target_amount = 20 + itemname = "twenty matter bins" + if(4) + target = /obj/item/weapon/stock_parts/micro_laser + target_amount = 15 + itemname = "fifteen micro-lasers" + if(5) + target = /obj/item/weapon/stock_parts/capacitor + target_amount = 15 + itemname = "fifteen capacitors" + if(6) + target = /obj/item/weapon/stock_parts/subspace/filter + target_amount = 4 + itemname = "four hyperwave filters" + if(7) + target = /obj/item/solar_assembly + target_amount = 10 + itemname = "ten solar panel assemblies" + if(8) + target = /obj/item/device/flash + target_amount = 6 + itemname = "six flashes" + explanation_text = "We are running low on spare parts. Trade for [itemname]." \ No newline at end of file diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index fd648b05c7d..25d2807432e 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -35,7 +35,7 @@ /datum/theft_objective/hoslaser name = "the head of security's recreated antique laser gun" - typepath = /obj/item/weapon/gun/energy/hos + typepath = /obj/item/weapon/gun/energy/gun/hos protected_jobs = list("Head Of Security") /datum/theft_objective/hand_tele @@ -244,4 +244,4 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) typepath = /obj/item/stack/sheet/mineral/uranium min=10 max=30 - step=5 \ No newline at end of file + step=5 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index c7fcd59dfe4..76a47e82749 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -16,10 +16,6 @@ required_enemies = 1 recommended_enemies = 4 - - uplink_welcome = "Syndicate Uplink Console:" - uplink_uses = 20 - var/traitors_possible = 4 //hard limit on traitors if scaling is turned off var/const/traitor_scaling_coeff = 5.0 //how much does the amount of players get divided by to determine traitors @@ -370,10 +366,11 @@ traitor_mind.special_role = null traitor_mind.som = null slaved.leave_serv_hud(traitor_mind) + for(var/datum/objective/protect/mindslave/MS in traitor_mind.objectives) + traitor_mind.objectives -= MS update_traitor_icons_removed(traitor_mind) -// to_chat(world, "Removed [traitor_mind.current.name] from traitor shit") - to_chat(traitor_mind.current, "\red The fog clouding your mind clears. You remember nothing from the moment you were implanted until now.(You don't remember who implanted you)") + to_chat(traitor_mind.current, "You are no longer a mindslave; you have complete and free control of your own faculties, once more!") /datum/game_mode/proc/assign_exchange_role(var/datum/mind/owner) //set faction diff --git a/code/game/gamemodes/vampire/traitor_vamp.dm b/code/game/gamemodes/vampire/traitor_vamp.dm index e94fbfeb199..9d4cb42b545 100644 --- a/code/game/gamemodes/vampire/traitor_vamp.dm +++ b/code/game/gamemodes/vampire/traitor_vamp.dm @@ -7,6 +7,7 @@ required_enemies = 1 // how many of each type are required recommended_enemies = 3 var/protected_species_vampire = list("Machine") + var/special_job_protection = list("Chaplain") //this must exist or else Chaplain can role for Vampire. That said, we don't want to rule out him getting traitor, either /datum/game_mode/traitor/vampire/announce() to_chat(world, "The current game mode is - Traitor+Vampire!") @@ -22,6 +23,8 @@ for(var/mob/new_player/player in player_list) if((player.mind in possible_vampires) && (player.client.prefs.species in protected_species_vampire)) possible_vampires -= player.mind + if((player.mind in possible_vampires) && (player.mind.assigned_role in special_job_protection)) + possible_vampires -= player.mind if(possible_vampires.len > 0) var/datum/mind/vampire = pick(possible_vampires) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 92f08ecc586..0d5ec7afcc4 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -4,6 +4,7 @@ var/list/datum/mind/vampires = list() var/list/datum/mind/vampire_enthralled = list() //those controlled by a vampire var/list/vampire_thralls = list() //vammpires controlling somebody + /datum/game_mode/vampire name = "vampire" config_tag = "vampire" @@ -14,9 +15,6 @@ required_enemies = 1 recommended_enemies = 4 - uplink_welcome = "Syndicate Uplink Console:" - uplink_uses = 20 - var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target var/const/prob_right_murder_target_h = 50 // upper bound on probability of naimg the right assassination target @@ -353,8 +351,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha vampire_mind.som = null slaved.leave_serv_hud(vampire_mind) update_vampire_icons_removed(vampire_mind) -// to_chat(world, "Removed [vampire_mind.current.name] from vampire shit") - to_chat(vampire_mind.current, "\red The fog clouding your mind clears. You remember nothing from the moment you were enthralled until now.") + vampire_mind.current.visible_message("[vampire_mind.current] looks as though a burden has been lifted!", "The dark fog in your mind clears as you regain control of your own faculties, you are no longer a vampire thrall!") if(vampire_mind.current.hud_used) vampire_mind.current.hud_used.remove_vampire_hud() diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index bc7ba9276f5..8e04d98504b 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -267,6 +267,10 @@ W.destroy() playsound(usr.loc, 'sound/effects/creepyshriek.ogg', 100, 1) + +/proc/isvampirethrall(mob/living/M as mob) + return istype(M) && M.mind && ticker && ticker.mode && (M.mind in ticker.mode.vampire_enthralled) + /obj/effect/proc_holder/spell/vampire/targetted/enthrall name = "Enthrall (300)" desc = "You use a large portion of your power to sway those loyal to none to be loyal to you only." diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index eb1e8bce930..f2c10d7fc10 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -20,7 +20,7 @@ if(!summon_type) switch (randomizeguns) if("taser") - new /obj/item/weapon/gun/energy/advtaser(get_turf(H)) + new /obj/item/weapon/gun/energy/gun/advtaser(get_turf(H)) if("egun") new /obj/item/weapon/gun/energy/gun(get_turf(H)) if("laser") @@ -34,7 +34,7 @@ if("gyrojet") new /obj/item/weapon/gun/projectile/automatic/gyropistol(get_turf(H)) if("pulse") - new /obj/item/weapon/gun/energy/pulse_rifle(get_turf(H)) + new /obj/item/weapon/gun/energy/pulse(get_turf(H)) if("suppressed") new /obj/item/weapon/gun/projectile/automatic/pistol(get_turf(H)) new /obj/item/weapon/suppressor(get_turf(H)) @@ -71,7 +71,7 @@ if("turret") new /obj/item/weapon/gun/energy/gun/turret(get_turf(H)) if("pulsecarbine") - new /obj/item/weapon/gun/energy/pulse_rifle/carbine(get_turf(H)) + new /obj/item/weapon/gun/energy/pulse/carbine(get_turf(H)) if("decloner") new /obj/item/weapon/gun/energy/decloner(get_turf(H)) if("mindflayer") diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 32d73ff33f7..9caa009f2e6 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -8,9 +8,6 @@ required_enemies = 1 recommended_enemies = 1 - uplink_welcome = "Wizardly Uplink Console:" - uplink_uses = 20 - var/use_huds = 0 var/finished = 0 var/but_wait_theres_more = 0 diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index e3649f5e445..c1ab67a3f03 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -98,6 +98,10 @@ /var/const/access_syndicate_leader = 151//Nuke Op Leader Access /var/const/access_vox = 152//Vox Access +//Trade Stations + +var/const/access_trade_sol = 160 + //MONEY /var/const/access_crate_cash = 200 @@ -267,6 +271,8 @@ return list(access_mailsorting, access_mining, access_mining_station, access_mineral_storeroom, access_cargo, access_qm) if(REGION_COMMAND) //command return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_tcomsat, access_gateway, access_all_personal_lockers, access_heads_vault, access_blueshield, access_ntrep, access_hop, access_captain) + if(REGION_CENTCOMM) //because why the heck not + return get_all_centcom_access() + get_all_accesses() /proc/get_region_accesses_name(code) switch(code) @@ -286,6 +292,8 @@ return "Supply" if(REGION_COMMAND) //command return "Command" + if(REGION_CENTCOMM) //CC + return "CentComm" /proc/get_access_desc(A) @@ -600,4 +608,3 @@ proc/get_all_job_icons() //For all existing HUD icons return return "Unknown" //Return unknown if none of the above apply - diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 3b13ceb6b64..31c82b2a203 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -77,7 +77,7 @@ H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) // H.equip_or_collect(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) - H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store) + H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) if(H.backbag == 1) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) @@ -175,7 +175,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) H.equip_or_collect(new /obj/item/device/pda/security(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves) - H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store) + H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) if(H.backbag == 1) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) @@ -249,7 +249,7 @@ H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/security(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves) - H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store) + H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) if(H.backbag == 1) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 2475df770b3..d0281c4b7c1 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -174,10 +174,10 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(H.backbag == 1) H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H), slot_r_hand) - H.equip_or_collect(new /obj/item/weapon/gun/energy/blueshield(H), slot_l_hand) + H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H), slot_l_hand) else H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/gun/energy/blueshield(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -263,4 +263,4 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) L.imp_in = H L.implanted = 1 H.sec_hud_set_implants() - return 1 \ No newline at end of file + return 1 diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 210edd98c98..12f01822cde 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -244,6 +244,10 @@ H.equip_or_collect(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/fancy/crayons(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/reagent_containers/spray/waterflower(H), slot_in_backpack) + if(H.get_species() == "Machine") + var/obj/item/organ/internal/cyberimp/brain/clown_voice/implant + implant = new + implant.insert(H) H.mutations.Add(CLUMSY) H.dna.SetSEState(COMICBLOCK,1,1) genemutcheck(H,COMICBLOCK,null,MUTCHK_FORCED) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 238e071ebe9..31ad9f145ee 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -73,6 +73,7 @@ if(M.environment_smash) M.do_attack_animation(src) visible_message("[M.name] smashes [src] apart!") + go_out() qdel(src) return @@ -183,7 +184,10 @@ data["dialysis"] = connected.filtering if (connected.beaker) data["isBeakerLoaded"] = 1 - data["beakerFreeSpace"] = round(connected.beaker.reagents.maximum_volume - connected.beaker.reagents.total_volume) + if(connected.beaker.reagents) + data["beakerFreeSpace"] = round(connected.beaker.reagents.maximum_volume - connected.beaker.reagents.total_volume) + else + data["beakerFreeSpace"] = 0 var/chemicals[0] for (var/re in connected.injection_chems) @@ -354,15 +358,21 @@ to_chat(occupant, "You no longer feel reliant on [R.name]!") occupant.reagents.addiction_list.Remove(R) + for(var/mob/M as mob in src) // makes sure that simple mobs don't get stuck inside a sleeper when they resist out of occupant's grasp + if(M == occupant) + continue + else + M.forceMove(src.loc) + updateDialog() return /obj/machinery/sleeper/blob_act() if(prob(75)) - for(var/atom/movable/A as mob|obj in src) - A.forceMove(src.loc) - A.blob_act() + var/atom/movable/A = occupant + go_out() + A.blob_act() qdel(src) return @@ -404,11 +414,14 @@ orient = "RIGHT" dir = 4 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + return if(exchange_parts(user, G)) return - default_deconstruction_crowbar(G) + if(istype(G, /obj/item/weapon/crowbar)) + default_deconstruction_crowbar(G) + return if(istype(G, /obj/item/weapon/grab)) if(panel_open) @@ -453,24 +466,23 @@ if(1.0) for(var/atom/movable/A as mob|obj in src) A.forceMove(src.loc) - ex_act(severity) + A.ex_act(severity) qdel(src) return if(2.0) if(prob(50)) for(var/atom/movable/A as mob|obj in src) A.forceMove(src.loc) - ex_act(severity) + A.ex_act(severity) qdel(src) return if(3.0) if(prob(25)) for(var/atom/movable/A as mob|obj in src) A.forceMove(src.loc) - ex_act(severity) + A.ex_act(severity) qdel(src) return - return /obj/machinery/sleeper/emp_act(severity) if(filtering) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 45ee6e0f4c9..897e3ee51c8 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -19,6 +19,13 @@ else set_light(0) +/obj/machinery/bodyscanner/process() + for(var/mob/M as mob in src) // makes sure that simple mobs don't get stuck inside a sleeper when they resist out of occupant's grasp + if(M == occupant) + continue + else + M.forceMove(src.loc) + /obj/machinery/bodyscanner/New() ..() component_parts = list() @@ -59,11 +66,14 @@ else dir = 4 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + return if(exchange_parts(user, G)) return - default_deconstruction_crowbar(G) + if(istype(G, /obj/item/weapon/crowbar)) + default_deconstruction_crowbar(G) + return if(istype(G, /obj/item/weapon/grab)) var/obj/item/weapon/grab/TYPECAST_YOUR_SHIT = G @@ -161,39 +171,40 @@ switch(severity) if(1.0) for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - //Foreach goto(35) - //SN src = null + A.forceMove(src.loc) + A.ex_act(severity) qdel(src) return if(2.0) if (prob(50)) for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - //Foreach goto(108) - //SN src = null + A.forceMove(src.loc) + A.ex_act(severity) qdel(src) return if(3.0) if (prob(25)) for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc - ex_act(severity) - //Foreach goto(181) - //SN src = null + A.forceMove(src.loc) + A.ex_act(severity) qdel(src) return - else - return /obj/machinery/bodyscanner/blob_act() if(prob(50)) - for(var/atom/movable/A as mob|obj in src) - A.loc = src.loc + var/atom/movable/A = occupant + go_out() + A.blob_act() qdel(src) +/obj/machinery/bodyscanner/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise + if(M.environment_smash) + M.do_attack_animation(src) + visible_message("[M.name] smashes [src] apart!") + go_out() + qdel(src) + return + /obj/machinery/body_scanconsole var/obj/machinery/bodyscanner/connected var/delete @@ -249,6 +260,13 @@ if(prob(50)) qdel(src) +/obj/machinery/body_scanconsole/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise + if(M.environment_smash) + M.do_attack_animation(src) + visible_message("[M.name] smashes [src] apart!") + qdel(src) + return + /obj/machinery/body_scanconsole/proc/findscanner() var/obj/machinery/bodyscanner/bodyscannernew = null // Loop through every direction diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 873e08030a7..9aa7cfe2c7b 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -151,6 +151,9 @@ qdel(src) return else if(istype(W, /obj/item/device/analyzer) && panel_open) //XRay + if(!user.unEquip(W)) + to_chat(user, "[W] is stuck!") + return if(!isXRay()) upgradeXRay() qdel(W) @@ -158,14 +161,19 @@ else to_chat(user, "[msg2]") - else if(istype(W, /obj/item/stack/sheet/mineral/plasma) && panel_open) + else if(istype(W, /obj/item/stack/sheet/mineral/plasma) && panel_open) + if(!user.unEquip(W)) + to_chat(user, "[W] is stuck!") + return if(!isEmpProof()) upgradeEmpProof() to_chat(user, "[msg]") qdel(W) else to_chat(user, "[msg2]") - else if(istype(W, /obj/item/device/assembly/prox_sensor) && panel_open) + else if(istype(W, /obj/item/device/assembly/prox_sensor) && panel_open) + if(!user.unEquip(W)) + return if(!isMotion()) upgradeMotion() to_chat(user, "[msg]") diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 5b77c8f00fc..5b7d035d461 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -20,10 +20,9 @@ 4 = Screwdriver panel closed and is fully built (you cannot attach upgrades) */ -/obj/item/weapon/camera_assembly/attackby(obj/item/W as obj, mob/living/user as mob, params) +/obj/item/weapon/camera_assembly/attackby(obj/item/W, mob/living/user, params) switch(state) - if(0) // State 0 if(iswrench(W) && isturf(src.loc)) @@ -116,7 +115,6 @@ return else if(iswirecutter(W)) - new/obj/item/stack/cable_coil(get_turf(src), 2) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) to_chat(user, "You cut the wires from the circuits.") @@ -125,9 +123,12 @@ // Upgrades! if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already. + if(!user.unEquip(W)) + to_chat(user, "[W] is stuck!") + return to_chat(user, "You attach \the [W] into the assembly inner circuits.") upgrades += W - user.drop_item(W) + user.drop_item() W.loc = src return diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 0948c8ae3a1..d3cc5f089a0 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -967,7 +967,9 @@ name = "Spaceport Security" desc = "The Premier security forces for all spaceports found along the Orion Trail." faction = list("orion") - corpse = /obj/effect/landmark/mobcorpse/orionsecurity + loot = list(/obj/effect/landmark/mobcorpse/orionsecurity, + /obj/item/weapon/gun/projectile/automatic/c20r, + /obj/item/weapon/shield/energy) /obj/effect/landmark/mobcorpse/orionsecurity name = "Spaceport Security" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 90b415c99bf..73779c170e0 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -273,6 +273,17 @@ src.emagged = 0 setMenuState(usr,COMM_SCREEN_MAIN) + if("AcceptDocking") + to_chat(usr, "Docking request accepted!") + trade_dock_timelimit = world.time + 1200 + trade_dockrequest_timelimit = 0 + command_announcement.Announce("Docking request for trading ship approved, please dock at port bay 4.", "Docking Request") + if("DenyDocking") + to_chat(usr, "Docking requeset denied!") + trade_dock_timelimit = 0 + trade_dockrequest_timelimit = 0 + command_announcement.Announce("Docking request for trading ship denied.", "Docking request") + nanomanager.update_uis(src) return 1 @@ -358,6 +369,11 @@ data["shuttle"] = shuttle + if(trade_dockrequest_timelimit > world.time) + data["dock_request"] = 1 + else + data["dock_request"] = 0 + // update the ui if it exists, returns null if no ui is passed/found ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) if (!ui) diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index 5ac31a0f567..6817d265a0f 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -17,17 +17,20 @@ var/data[0] var/list/pods[0] for(var/obj/item/device/spacepod_equipment/misc/tracker/TR in world) - var/obj/spacepod/myPod = TR.my_atom + var/obj/spacepod/my_pod = TR.my_atom var/enabled = TR.enabled - if(myPod && enabled) - var/podname = capitalize(sanitize(myPod.name)) - var/occupant = "None" - var/occupant2 = "None" - if(myPod.occupant) - occupant = myPod.occupant.name - if(myPod.occupant2) - occupant2 = myPod.occupant2.name - pods.Add(list(list("pod" = "\ref[myPod]", "name" = podname, "occupant" = occupant, "occupant2" = occupant2, "x" = myPod.x, "y" = myPod.y, "z" = myPod.z))) + if(my_pod && enabled) + var/podname = capitalize(sanitize(my_pod.name)) + var/list/chairs = list() + if(my_pod.pilot || my_pod.passengers) + if(my_pod.pilot) + chairs += list("pilot" = my_pod.pilot.name) + var/i = 1 + for(var/mob/M in my_pod.passengers) + chairs += list("passenger [i]" = M.name) + i++ + + pods.Add(list(list("pod" = "\ref[my_pod]", "name" = podname) + chairs + list("x" = my_pod.x, "y" = my_pod.y, "z" = my_pod.z))) data["pods"] = pods diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index ccdd9b3f276..42875f58019 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -71,7 +71,7 @@ to_chat(user, "Access Denied. This robot is not linked to you.") return // Cyborgs may blow up themselves via the console - if(isrobot(user) && user != target) + if((isrobot(user) && user != target) || !is_authenticated(user)) to_chat(user, "Access Denied.") return var/choice = input("Really detonate [target.name]?") in list ("Yes", "No") diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 6b13dbe95e3..4c820d26857 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -698,6 +698,17 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/stock_parts/capacitor = 2, /obj/item/weapon/stock_parts/console_screen = 1) +/obj/item/weapon/circuitboard/teleporter_perma + name = "circuit board (Permanent Teleporter)" + build_path = /obj/machinery/teleport/perma + board_type = "machine" + origin_tech = "programming=3;engineering=5;bluespace=5;materials=4" + frame_desc = "Requires 3 Bluespace Crystals and 1 Matter Bin." + req_components = list( + /obj/item/weapon/ore/bluespace_crystal = 3, + /obj/item/weapon/stock_parts/matter_bin = 1) + var/target + /obj/item/weapon/circuitboard/telesci_pad name = "Circuit board (Telepad)" build_path = /obj/machinery/telepad diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index dedcd52164a..68ff1bf64c1 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -489,6 +489,7 @@ to_chat(M, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") occupant = M + name = "[name] ([occupant.name])" time_entered = world.time if(findtext("[M.key]","@",1,2)) @@ -581,6 +582,7 @@ to_chat(L, "[on_enter_occupant_message]") to_chat(L, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") occupant = L + name = "[name] ([occupant.name])" time_entered = world.time if(findtext("[L.key]","@",1,2)) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 26d159e959a..9c361225866 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -58,6 +58,7 @@ var/doorDeni = 'sound/machines/DeniedBeep.ogg' // i'm thinkin' Deni's var/boltUp = 'sound/machines/BoltsUp.ogg' var/boltDown = 'sound/machines/BoltsDown.ogg' + var/is_special = 0 /obj/machinery/door/airlock/command name = "Airlock" @@ -126,6 +127,7 @@ hackProof = 1 aiControlDisabled = 1 unacidable = 1 + is_special = 1 /obj/machinery/door/airlock/maintenance_hatch name = "Maintenance Hatch" @@ -304,6 +306,7 @@ desc = "A mysterious alien airlock with a complicated opening mechanism." hackProof = 1 icon = 'icons/obj/doors/Doorplasma.dmi' + is_special = 1 /obj/machinery/door/airlock/alien/bumpopen(mob/living/user as mob) if(istype(user,/mob/living/carbon/alien) || isrobot(user) || isAI(user)) @@ -1066,4 +1069,4 @@ About the new airlock wires panel: src.unlock() src.open() src.lock() - return \ No newline at end of file + return diff --git a/code/game/machinery/gameboard.dm b/code/game/machinery/gameboard.dm index b331930b325..a19f34af99b 100644 --- a/code/game/machinery/gameboard.dm +++ b/code/game/machinery/gameboard.dm @@ -2,59 +2,68 @@ name = "Virtual Gameboard" icon = 'icons/obj/stationobjs.dmi' icon_state = "gboard_on" - desc = "A holographic table allowing the crew to have fun™ on boring shifts! One player per board." + desc = "A holographic table allowing the crew to have fun(TM) on boring shifts! One player per board." density = 1 anchored = 1 use_power = 1 + var/cooling_down = 0 + light_color = LIGHT_COLOR_LIGHTBLUE /obj/machinery/gameboard/New() - ..() - component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/gameboard(null) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) - component_parts += new /obj/item/stack/cable_coil(null, 3) - component_parts += new /obj/item/stack/sheet/glass(null, 1) - RefreshParts() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/gameboard(null) + component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) + component_parts += new /obj/item/stack/cable_coil(null, 3) + component_parts += new /obj/item/stack/sheet/glass(null, 1) + RefreshParts() /obj/machinery/gameboard/power_change() - . = ..() - update_icon() + . = ..() + update_icon() + if(stat & NOPOWER) + set_light(0) + else + set_light(3, 3) /obj/machinery/gameboard/update_icon() - if(stat & NOPOWER) - icon_state = "gboard_off" - else - icon_state = "gboard_on" + if(stat & NOPOWER) + icon_state = "gboard_off" + else + icon_state = "gboard_on" /obj/machinery/gameboard/attack_hand(mob/user) - . = ..() - if(.) - return - if(src.in_use) - to_chat(user, "This gameboard is already in use!") - return - interact(user) + . = ..() + if(.) + return + if(src.in_use) + to_chat(user, "This gameboard is already in use!") + return + if(!anchored) + to_chat(user, "The gameboard is not secured!") + return + interact(user) /obj/machinery/gameboard/interact(mob/user) - . = ..() - if(.) - return + . = ..() + if(.) + return - var/dat - dat = replacetext(file2text('html/chess.html'), "\[hsrc]", "\ref[src]") - var/datum/asset/simple/chess/assets = get_asset_datum(/datum/asset/simple/chess) - assets.send(user) + var/dat + dat = replacetext(file2text('html/chess.html'), "\[hsrc]", "\ref[src]") + var/datum/asset/simple/chess/assets = get_asset_datum(/datum/asset/simple/chess) + assets.send(user) - var/datum/browser/popup = new(user, "SpessChess", name, 500, 800, src) - popup.set_content(dat) - popup.add_stylesheet("chess.css", 'html/browser/chess.css') - popup.add_script("garbochess.js", 'html/browser/garbochess.js') - //popup.add_script("boardui.js", 'html/browser/boardui.js') - popup.add_script("jquery-1.8.2.min.js", 'html/browser/jquery-1.8.2.min.js') - popup.add_script("jquery-ui-1.8.24.custom.min.js", 'html/browser/jquery-ui-1.8.24.custom.min.js') - popup.set_window_options("titlebar=0") - popup.open() - user.set_machine(src) + var/datum/browser/popup = new(user, "SpessChess", name, 500, 800, src) + popup.set_content(dat) + popup.add_stylesheet("chess.css", 'html/browser/chess.css') + popup.add_script("garbochess.js", 'html/browser/garbochess.js') + //popup.add_script("boardui.js", 'html/browser/boardui.js') + popup.add_script("jquery-1.8.2.min.js", 'html/browser/jquery-1.8.2.min.js') + popup.add_script("jquery-ui-1.8.24.custom.min.js", 'html/browser/jquery-ui-1.8.24.custom.min.js') + popup.set_window_options("titlebar=0") + popup.open() + user.set_machine(src) /obj/machinery/gameboard/proc/close_game() //yes, shamelessly copied over from arcade_base in_use = 0 @@ -65,15 +74,27 @@ return /obj/machinery/gameboard/Topic(var/href, var/list/href_list) - . = ..() - var/prize = /obj/item/stack/tickets - if (.) - return + . = ..() + var/prize = /obj/item/stack/tickets + if(.) + return - if (href_list["checkmate"]) - visible_message("[src.name] beeps, \"WINNER!\"") - new prize(get_turf(src), 80) - close_game() + if(href_list["checkmate"]) + if(cooling_down) + message_admins("Too many checkmates on chessboard, possible HREF exploits: [key_name_admin(usr)] on [src] (JMP)") + return + visible_message("[src.name] beeps, \"WINNER!\"") + new prize(get_turf(src), 80) + close_game() + cooling_down = 1 + spawn(600) + cooling_down = 0 - if (href_list["close"]) - close_game() \ No newline at end of file + if(href_list["close"]) + close_game() + +/obj/machinery/gameboard/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params) + if(istype(G, /obj/item/weapon/wrench)) + default_unfasten_wrench(user, G) + else if(istype(G, /obj/item/weapon/crowbar)) + default_deconstruction_crowbar(G, ignore_panel = 1) diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index b63307c3db8..bf1d69e7437 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -58,6 +58,9 @@ else to_chat(user, "There is already ID card inside.") +/obj/machinery/computer/guestpass/proc/get_changeable_accesses() + return giver.access + /obj/machinery/computer/guestpass/attack_ai(var/mob/user as mob) return attack_hand(user) @@ -84,7 +87,7 @@ dat += "Duration (minutes): [duration] m " dat += "Access to areas: " if (giver && giver.access) - for (var/A in giver.access) + for (var/A in get_changeable_accesses()) var/area = get_access_desc(A) if (A in accesses) area = "[area]" @@ -124,7 +127,8 @@ if (A in accesses) accesses.Remove(A) else - accesses.Add(A) + if(giver && giver.access && (A in get_changeable_accesses())) + accesses.Add(A) if (href_list["action"]) switch(href_list["action"]) if ("id") @@ -178,4 +182,12 @@ else to_chat(usr, "\red Cannot issue pass without issuing ID.") updateUsrDialog() - return \ No newline at end of file + return + +/obj/machinery/computer/guestpass/hop + name = "\improper HoP guest pass terminal" + +/obj/machinery/computer/guestpass/hop/get_changeable_accesses() + . = ..() + if(. && access_change_ids in .) + return get_all_accesses() diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index f916998e26b..fb1ef8c8740 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -99,13 +99,12 @@ one_access = 0 /obj/machinery/porta_turret/proc/setup() - var/obj/item/weapon/gun/energy/E = installation //All energy-based weapons are applicable - if(istext(installation)) E = text2path(installation) - //var/obj/item/ammo_casing/shottype = E.projectile_type + var/obj/item/weapon/gun/energy/E= new installation //All energy-based weapons are applicable + var/obj/item/ammo_casing/shottype = E.ammo_type[1] - projectile = initial(E.projectile_type) + projectile = shottype.projectile_type eprojectile = projectile - shot_sound = initial(E.fire_sound) + shot_sound = shottype.fire_sound eshot_sound = shot_sound weapon_setup(installation) @@ -519,7 +518,7 @@ var/list/turret_icons assess_and_assign(ME.occupant, targets, secondarytargets) for(var/obj/spacepod/SP in view(7,src)) - assess_and_assign(SP.occupant, targets, secondarytargets) + assess_and_assign(SP.pilot, targets, secondarytargets) for(var/obj/vehicle/T in view(7,src)) assess_and_assign(T.buckled_mob, targets, secondarytargets) @@ -561,9 +560,6 @@ var/list/turret_icons if(get_dist(src, L) > 7) //if it's too far away, why bother? return TURRET_NOT_TARGET - if(!check_trajectory(L, src)) //check if we have true line of sight - return TURRET_NOT_TARGET - if(emagged) // If emagged not even the dead get a rest return L.stat ? TURRET_SECONDARY_TARGET : TURRET_PRIORITY_TARGET @@ -670,6 +666,8 @@ var/list/turret_icons return /obj/machinery/porta_turret/proc/shootAt(var/mob/living/target) + if(!raised) //the turret has to be raised in order to fire - makes sense, right? + return //any emagged turrets will shoot extremely fast! This not only is deadly, but drains a lot power! if(!emagged) //if it hasn't been emagged, it has to obey a cooldown rate if(last_fired || !raised) //prevents rapid-fire shooting, unless it's been emagged @@ -684,10 +682,6 @@ var/list/turret_icons if(!istype(T) || !istype(U)) return - if(!raised) //the turret has to be raised in order to fire - makes sense, right? - return - - update_icon() var/obj/item/projectile/A if(emagged || lethal) @@ -698,18 +692,17 @@ var/list/turret_icons if(projectile) A = new projectile(loc) playsound(loc, shot_sound, 75, 1) - A.original = target // Lethal/emagged turrets use twice the power due to higher energy beams // Emagged turrets again use twice as much power due to higher firing rates use_power(reqpower * (2 * (emagged || lethal)) * (2 * emagged)) - //Shooting Code: + A.original = target A.current = T A.yo = U.y - T.y A.xo = U.x - T.x - spawn(1) - A.process() + A.fire() + return A /datum/turret_checks var/enabled diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 5b5a532efdb..a1559c4fb3a 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -54,8 +54,52 @@ if(src.occupant) process_occupant() + + for(var/mob/M as mob in src) // makes sure that simple mobs don't get stuck inside a sleeper when they resist out of occupant's grasp + if(M == occupant) + continue + else + M.forceMove(src.loc) return 1 +/obj/machinery/recharge_station/ex_act(severity) + switch(severity) + if(1.0) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(src.loc) + A.ex_act(severity) + qdel(src) + return + if(2.0) + if (prob(50)) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(src.loc) + A.ex_act(severity) + qdel(src) + return + if(3.0) + if (prob(25)) + for(var/atom/movable/A as mob|obj in src) + A.forceMove(src.loc) + A.ex_act(severity) + qdel(src) + return + +/obj/machinery/recharge_station/blob_act() + if(prob(50)) + var/atom/movable/A = occupant + go_out() + A.blob_act() + qdel(src) + +/obj/machinery/recharge_station/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise + if(M.environment_smash) + M.do_attack_animation(src) + visible_message("[M.name] smashes [src] apart!") + go_out() + qdel(src) + return + /obj/machinery/recharge_station/Bumped(var/mob/AM) move_inside(AM) @@ -159,7 +203,8 @@ if(istype(O,/obj/item/weapon/gun/energy/disabler/cyborg)) var/obj/item/weapon/gun/energy/disabler/cyborg/D = O if(D.power_supply.charge < D.power_supply.maxcharge) - D.power_supply.give(D.charge_cost) + var/obj/item/ammo_casing/energy/E = D.ammo_type[D.select] + D.power_supply.give(E.e_cost) D.update_icon() else D.charge_tick = 0 @@ -210,7 +255,7 @@ /obj/machinery/recharge_station/verb/move_inside(var/mob/user = usr) set category = "Object" set src in oview(1) - if(!user) + if(!user || !usr) return if (usr.stat != CONSCIOUS) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 15b8b621b0c..5d6aa95b56f 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -621,7 +621,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept //#### Sending the signal to all subspace receivers ####// for(var/obj/machinery/telecomms/receiver/R in telecomms_list) - R.receive_signal(signal) + spawn(0) + R.receive_signal(signal) if(do_sleep) sleep(rand(10,25)) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 9d9481aba04..290e3352ea8 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -387,7 +387,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() src.receive_information(signal, src) // Try sending it! - var/list/try_send = list("/obj/machinery/telecomms/server", "/obj/machinery/telecomms/hub", "/obj/machinery/telecomms/broadcaster", "/obj/machinery/telecomms/bus") + var/list/try_send = list("/obj/machinery/telecomms/server", "/obj/machinery/telecomms/hub", "/obj/machinery/telecomms/broadcaster") var/i = 0 for(var/send in try_send) if(i) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 6dd9954046b..9c1d90ce67a 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -319,17 +319,18 @@ /obj/machinery/teleport/hub/Bumped(M as mob|obj) if(z == ZLEVEL_CENTCOMM) to_chat(M, "You can't use this here.") + return if(power_station && power_station.engaged && !panel_open) //--FalseIncarnate //Prevents AI cores from using the teleporter, prints out failure messages for clarity if(istype(M, /mob/living/silicon/ai) || istype(M, /obj/structure/AIcore)) - visible_message("\red The teleporter rejects the AI unit.") + visible_message("The teleporter rejects the AI unit.") if(istype(M, /mob/living/silicon/ai)) var/mob/living/silicon/ai/T = M - var/list/TPError = list("\red Firmware instructions dictate you must remain on your assigned station!", - "\red You cannot interface with this technology and get rejected!", - "\red External firewalls prevent you from utilizing this machine!", - "\red Your AI core's anti-bluespace failsafes trigger and prevent teleportation!") + var/list/TPError = list("Firmware instructions dictate you must remain on your assigned station!", + "You cannot interface with this technology and get rejected!", + "External firewalls prevent you from utilizing this machine!", + "Your AI core's anti-bluespace failsafes trigger and prevent teleportation!") to_chat(T, "[pick(TPError)]") return else @@ -370,6 +371,80 @@ else icon_state = "tele0" +/obj/machinery/teleport/perma + name = "permanent teleporter" + desc = "A teleporter with the target pre-set on the circuit board." + icon_state = "tele0" + var/recalibrating = 0 + use_power = 1 + idle_power_usage = 10 + active_power_usage = 2000 + + var/target + var/tele_delay = 50 + +/obj/machinery/teleport/perma/RefreshParts() + for(var/obj/item/weapon/circuitboard/teleporter_perma/C in component_parts) + target = C.target + var/A = 40 + for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + A -= M.rating * 10 + tele_delay = max(A, 0) + update_icon() + +/obj/machinery/teleport/perma/Bumped(M as mob|obj) + if(stat & (BROKEN|NOPOWER)) + return + if(z == ZLEVEL_CENTCOMM) + to_chat(M, "You can't use this here.") + return + if(target && !recalibrating && !panel_open) + //--FalseIncarnate + //Prevents AI cores from using the teleporter, prints out failure messages for clarity + if(istype(M, /mob/living/silicon/ai) || istype(M, /obj/structure/AIcore)) + visible_message("The teleporter rejects the AI unit.") + if(istype(M, /mob/living/silicon/ai)) + var/mob/living/silicon/ai/T = M + var/list/TPError = list("Firmware instructions dictate you must remain on your assigned station!", + "You cannot interface with this technology and get rejected!", + "External firewalls prevent you from utilizing this machine!", + "Your AI core's anti-bluespace failsafes trigger and prevent teleportation!") + to_chat(T, "[pick(TPError)]") + return + else + do_teleport(M, target) + use_power(5000) + + if(tele_delay) + recalibrating = 1 + update_icon() + spawn(tele_delay) + recalibrating = 0 + update_icon() + //--FalseIncarnate + return + +/obj/machinery/teleport/perma/power_change() + ..() + update_icon() + +/obj/machinery/teleport/perma/update_icon() + if(panel_open) + icon_state = "tele-o" + else if(target && !recalibrating && !(stat & (BROKEN|NOPOWER))) + icon_state = "tele1" + else + icon_state = "tele0" + +/obj/machinery/teleport/perma/attackby(obj/item/W, mob/user, params) + if(default_deconstruction_screwdriver(user, "tele-o", "tele0", W)) + return + + if(exchange_parts(user, W)) + return + + default_deconstruction_crowbar(W) + /obj/machinery/teleport/station name = "station" desc = "The power control station for a bluespace teleporter." @@ -457,6 +532,11 @@ link_console_and_hub() to_chat(user, "You reconnect the station to nearby machinery.") return + if(istype(W, /obj/item/weapon/circuitboard/teleporter_perma)) + var/obj/item/weapon/circuitboard/teleporter_perma/C = W + C.target = teleporter_console.target + to_chat(user, "You copy the targeting information from \the [src] to \the [W]") + return /obj/machinery/teleport/station/attack_ai() src.attack_hand() diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index b1d92718104..f0b6ce34ef7 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -21,7 +21,7 @@ turretTargets |= Mech else if( istype(O, /obj/spacepod) ) var/obj/spacepod/Pod = O - if( Pod.occupant || Pod.occupant2 ) + if( Pod.pilot ) turretTargets |= Pod else if(istype(O,/mob/living/simple_animal)) turretTargets |= O @@ -139,7 +139,7 @@ return 1 else if( istype(T, /obj/spacepod) ) var/obj/spacepod/SP = T - if( SP.occupant || SP.occupant2 ) + if( SP.pilot ) return 1 else if(istype(T,/mob/living/simple_animal)) var/mob/living/simple_animal/A = T @@ -159,8 +159,8 @@ if(M.occupant) new_targets += M for(var/obj/spacepod/M in protected_area.turretTargets) - if(M.occupant) - new_targets += M + if(M.pilot) + new_targets += M.pilot for(var/mob/living/simple_animal/M in protected_area.turretTargets) if(!M.stat) new_targets += M @@ -227,15 +227,15 @@ if(1) A = new /obj/item/projectile/beam(loc) if(2) - A = new /obj/item/projectile/beam/heavylaser(loc) + A = new /obj/item/projectile/beam/laser/heavylaser(loc) if(3) A = new /obj/item/projectile/beam/pulse(loc) if(4) A = new /obj/item/projectile/magic/change(loc) if(5) - A = new /obj/item/projectile/lasertag/blue(loc) + A = new /obj/item/projectile/beam/lasertag/bluetag(loc) if(6) - A = new /obj/item/projectile/lasertag/red(loc) + A = new /obj/item/projectile/beam/lasertag/redtag(loc) A.original = target use_power(500) else @@ -248,8 +248,7 @@ A.current = T A.yo = U.y - T.y A.xo = U.x - T.x - spawn( 0 ) - A.process() + A.fire() return @@ -488,7 +487,7 @@ return 1 else if(istype(target, /obj/spacepod)) var/obj/spacepod/S = target - if(S.occupant || S.occupant2) + if(S.pilot) return 1 return 0 @@ -522,14 +521,12 @@ continue //Don't shoot at empty mechs. pos_targets += M for(var/obj/spacepod/M in oview(scan_range, src)) - if(M.occupant) - if(faction in M.occupant.faction) + if(M.pilot) + var/mob/P = M.pilot + if(faction in P.faction) continue - if(M.occupant2) - if(faction in M.occupant2.faction) - continue - if(!M.occupant && !M.occupant2) - continue //Don't shoot at empty mechs. + if(!M.pilot) + continue //Don't shoot at empty pods. pos_targets += M if(pos_targets.len) target = pick(pos_targets) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 29880e519ec..e022e0c6a4b 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -849,7 +849,7 @@ product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?" vend_reply = "Remember the name: Liberation Station!" products = list(/obj/item/weapon/gun/projectile/automatic/pistol/deagle/gold = 2,/obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo = 2, - /obj/item/weapon/gun/projectile/automatic/pistol/m2411 = 2,/obj/item/weapon/gun/projectile/automatic/proto = 2, + /obj/item/weapon/gun/projectile/automatic/pistol/m1911 = 2,/obj/item/weapon/gun/projectile/automatic/proto = 2, /obj/item/weapon/gun/projectile/shotgun/automatic/combat = 2,/obj/item/weapon/gun/projectile/automatic/gyropistol = 1, /obj/item/weapon/gun/projectile/shotgun = 2,/obj/item/weapon/gun/projectile/automatic/ar = 2) premium = list(/obj/item/ammo_box/magazine/smgm9mm = 2,/obj/item/ammo_box/magazine/m50 = 4,/obj/item/ammo_box/magazine/m45 = 2,/obj/item/ammo_box/magazine/m75 = 2) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index f79c43068ee..05b3dac0e63 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -384,7 +384,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun name = "Syringe Gun" desc = "Exosuit-mounted chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur. (Can be attached to: Medical Exosuits)" - icon = 'icons/obj/gun.dmi' + icon = 'icons/obj/guns/projectile.dmi' icon_state = "syringegun" item_state = "syringegun" lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi' @@ -666,4 +666,4 @@ for(var/reagent in S.processed_reagents) S.reagents.add_reagent(reagent,amount) S.chassis.use_power(energy_drain) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index d95cbaff799..ae5595d69e5 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -5,6 +5,10 @@ var/projectile var/fire_sound var/size=0 + var/projectiles_per_shot = 1 + var/variance = 0 + var/randomspread = 0 //use random spread for machineguns, instead of shotgun scatter + var/projectile_delay = 0 /obj/item/mecha_parts/mecha_equipment/weapon/can_attach(var/obj/mecha/combat/M as obj) if(..()) @@ -16,32 +20,51 @@ return 1 return 0 +/obj/item/mecha_parts/mecha_equipment/weapon/proc/get_shot_amount() + return projectiles_per_shot -/obj/item/mecha_parts/mecha_equipment/weapon/energy - name = "General Energy Weapon" - size = 2 - action(target) - if(!action_checks(target)) return - var/turf/curloc = chassis.loc - var/atom/targloc = get_turf(target) - if (!targloc || !istype(targloc, /turf) || !curloc) - return - if (targloc == curloc) - return - set_ready_state(0) - playsound(chassis, fire_sound, 50, 1) +/obj/item/mecha_parts/mecha_equipment/weapon/action(target, params) + if(!action_checks(target)) + return 0 + + var/turf/curloc = get_turf(chassis) + var/turf/targloc = get_turf(target) + if (!targloc || !istype(targloc) || !curloc) + return 0 + if (targloc == curloc) + return 0 + + set_ready_state(0) + for(var/i=1 to get_shot_amount()) var/obj/item/projectile/A = new projectile(curloc) A.firer = chassis.occupant A.original = target A.current = curloc - A.yo = targloc.y - curloc.y - A.xo = targloc.x - curloc.x - chassis.use_power(energy_drain) - A.process() - chassis.log_message("Fired from [src.name], targeting [target].") - do_after_cooldown() - return + var/spread = 0 + if(variance) + if(randomspread) + spread = round((rand() - 0.5) * variance) + else + spread = round((i / projectiles_per_shot - 0.5) * variance) + A.preparePixelProjectile(target, targloc, chassis.occupant, params, spread) + + chassis.use_power(energy_drain) + A.fire() + playsound(chassis, fire_sound, 50, 1) + + sleep(max(0, projectile_delay)) + set_ready_state(0) + log_message("Fired from [name], targeting [target].") + var/turf/T = get_turf(src) + msg_admin_attack("[key_name_admin(chassis.occupant)] fired a [src] in ([T.x], [T.y], [T.z] - JMP)") + log_game("[key_name(chassis.occupant)] fired a [src] in [T.x], [T.y], [T.z]") + do_after_cooldown() + return + +/obj/item/mecha_parts/mecha_equipment/weapon/energy + name = "General Energy Weapon" + size = 2 /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser equip_cooldown = 8 @@ -56,7 +79,7 @@ name = "CH-LC \"Solaris\" Laser Cannon" icon_state = "mecha_laser" energy_drain = 40 - projectile = /obj/item/projectile/beam/heavylaser + projectile = /obj/item/projectile/beam/laser/heavylaser fire_sound = 'sound/weapons/lasercannonfire.ogg' /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion @@ -82,25 +105,25 @@ icon_state = "pulse1_bl" var/life = 20 - Bump(atom/A) - A.bullet_act(src, def_zone) - src.life -= 10 - if(ismob(A)) - var/mob/M = A - if(istype(firer, /mob)) - M.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src]" - firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src]" - log_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]") - if(!iscarbon(firer)) - M.LAssailant = null - else - M.LAssailant = firer +/obj/item/projectile/beam/pulse/heavy/Bump(atom/A) + A.bullet_act(src, def_zone) + life -= 10 + if(ismob(A)) + var/mob/M = A + if(istype(firer, /mob)) + M.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src]" + firer.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src]" + log_attack("[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]") + if(!iscarbon(firer)) + M.LAssailant = null else - M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a [src]" - log_attack("UNKNOWN shot [M] ([M.ckey]) with a [src]") - if(life <= 0) - qdel(src) - return + M.LAssailant = firer + else + M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a [src]" + log_attack("UNKNOWN shot [M] ([M.ckey]) with a [src]") + if(life <= 0) + qdel(src) + return /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser @@ -119,89 +142,89 @@ equip_cooldown = 150 range = MELEE|RANGED - can_attach(obj/mecha/combat/honker/M as obj) - if(..()) - if(istype(M)) - return 1 +/obj/item/mecha_parts/mecha_equipment/weapon/honker/can_attach(obj/mecha/combat/honker/M as obj) + if(..()) + if(istype(M)) + return 1 + return 0 + +/obj/item/mecha_parts/mecha_equipment/weapon/honker/action(target, params) + if(!chassis) + return 0 + if(energy_drain && chassis.get_charge() < energy_drain) + return 0 + if(!equip_ready) return 0 - action(target) - if(!chassis) - return 0 - if(energy_drain && chassis.get_charge() < energy_drain) - return 0 - if(!equip_ready) - return 0 + playsound(chassis, 'sound/items/AirHorn.ogg', 100, 1) + chassis.occupant_message("HONK") + for(var/mob/living/carbon/M in ohearers(6, chassis)) + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs)) + continue + to_chat(M, "HONK") + M.sleeping = 0 + M.stuttering = 20 + M.ear_deaf = 30 + M.Weaken(3) + if(prob(30)) + M.Stun(10) + M.Paralyse(4) + else + M.Jitter(500) + ///else the mousetraps are useless + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + if(isobj(H.shoes)) + var/thingy = H.shoes + H.unEquip(H.shoes) + walk_away(thingy,chassis,15,2) + spawn(20) + if(thingy) + walk(thingy,0) + for(var/obj/mecha/combat/recitence/R in oview(6, chassis)) + R.occupant_message("\The [R] has protected you from [chassis]'s HONK at the cost of some power.") + R.use_power(R.get_charge() / 4) - playsound(chassis, 'sound/items/AirHorn.ogg', 100, 1) - chassis.occupant_message("HONK") - for(var/mob/living/carbon/M in ohearers(6, chassis)) - if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs)) - continue - to_chat(M, "HONK") - M.sleeping = 0 - M.stuttering = 20 - M.ear_deaf = 30 - M.Weaken(3) - if(prob(30)) - M.Stun(10) - M.Paralyse(4) - else - M.Jitter(500) - ///else the mousetraps are useless - if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(isobj(H.shoes)) - var/thingy = H.shoes - H.unEquip(H.shoes) - walk_away(thingy,chassis,15,2) - spawn(20) - if(thingy) - walk(thingy,0) - for(var/obj/mecha/combat/recitence/R in oview(6, chassis)) - R.occupant_message("\The [R] has protected you from [chassis]'s HONK at the cost of some power.") - R.use_power(R.get_charge() / 4) - - chassis.use_power(energy_drain) - log_message("Honked from [src.name]. HONK!") - var/turf/T = get_turf(src) - msg_admin_attack("[key_name_admin(chassis.occupant)] used a Mecha Honker in ([T.x], [T.y], [T.z] - JMP)") - log_game("[key_name(chassis.occupant)] used a Mecha Honker in [T.x], [T.y], [T.z]") - do_after_cooldown() - return + chassis.use_power(energy_drain) + log_message("Honked from [name]. HONK!") + var/turf/T = get_turf(src) + msg_admin_attack("[key_name_admin(chassis.occupant)] used a Mecha Honker in ([T.x], [T.y], [T.z] - JMP)") + log_game("[key_name(chassis.occupant)] used a Mecha Honker in [T.x], [T.y], [T.z]") + do_after_cooldown() + return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic name = "General Ballisic Weapon" var/projectiles var/projectile_energy_cost size = 2 - action_checks(atom/target) - if(..()) - if(projectiles > 0) - return 1 - return 0 +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/action_checks(atom/target) + if(..()) + if(projectiles > 0) + return 1 + return 0 - get_equip_info() - return "[..()]\[[src.projectiles]\][(src.projectiles < initial(src.projectiles))?" - Rearm":null]" +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/get_equip_info() + return "[..()]\[[projectiles]\][(projectiles < initial(projectiles))?" - Rearm":null]" - proc/rearm() - if(projectiles < initial(projectiles)) - var/projectiles_to_add = initial(projectiles) - projectiles - while(chassis.get_charge() >= projectile_energy_cost && projectiles_to_add) - projectiles++ - projectiles_to_add-- - chassis.use_power(projectile_energy_cost) - send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info()) - log_message("Rearmed [src.name].") - return +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/proc/rearm() + if(projectiles < initial(projectiles)) + var/projectiles_to_add = initial(projectiles) - projectiles + while(chassis.get_charge() >= projectile_energy_cost && projectiles_to_add) + projectiles++ + projectiles_to_add-- + chassis.use_power(projectile_energy_cost) + send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info()) + log_message("Rearmed [name].") + return - Topic(href, href_list) - ..() - if (href_list["rearm"]) - src.rearm() - return +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/Topic(href, href_list) + ..() + if (href_list["rearm"]) + rearm() + return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine name = "FNX-66 Carbine" @@ -211,41 +234,6 @@ fire_sound = 'sound/weapons/Gunshot.ogg' projectiles = 24 projectile_energy_cost = 15 - var/projectiles_per_shot = 1 - var/deviation = 0.0 - - action(atom/target) - if(!action_checks(target)) return - var/turf/targloc = get_turf(target) - var/target_x = targloc.x - var/target_y = targloc.y - var/target_z = targloc.z - targloc = null - spawn for(var/i=1 to min(projectiles, projectiles_per_shot)) - if(!chassis) break - var/turf/curloc = get_turf(chassis) - targloc = locate(target_x+GaussRandRound(deviation,1),target_y+GaussRandRound(deviation,1),target_z) - if (!targloc || !curloc) - continue - if (targloc == curloc) - continue - - playsound(chassis, fire_sound, 50, 1) - var/obj/item/projectile/A = new projectile(curloc) - src.projectiles-- - A.original = target - A.current = curloc - A.yo = targloc.y - curloc.y - A.xo = targloc.x - curloc.x - A.process() - sleep(2) - set_ready_state(0) - log_message("Fired from [src.name], targeting [target].") - var/turf/T = get_turf(src) - msg_admin_attack("[key_name_admin(chassis.occupant)] fired a [src] in ([T.x], [T.y], [T.z] - JMP)") - log_game("[key_name(chassis.occupant)] fired a [src] in [T.x], [T.y], [T.z]") - do_after_cooldown() - return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced name = "\improper S.H.H. \"Quietus\" Carbine" @@ -270,36 +258,8 @@ fire_sound = 'sound/weapons/Gunshot.ogg' projectiles = 40 projectile_energy_cost = 25 - var/projectiles_per_shot = 4 - var/deviation = 0.7 - - action(atom/target) - if(!action_checks(target)) return - var/turf/curloc = get_turf(chassis) - var/turf/targloc = get_turf(target) - if(!curloc || !targloc) return - var/target_x = targloc.x - var/target_y = targloc.y - var/target_z = targloc.z - targloc = null - for(var/i=1 to min(projectiles, projectiles_per_shot)) - targloc = locate(target_x+GaussRandRound(deviation,1),target_y+GaussRandRound(deviation,1),target_z) - if(!targloc || targloc == curloc) - break - playsound(chassis, fire_sound, 80, 1) - var/obj/item/projectile/A = new projectile(curloc) - src.projectiles-- - A.original = target - A.current = curloc - A.yo = targloc.y - curloc.y - A.xo = targloc.x - curloc.x - set_ready_state(0) - A.process() - log_message("Fired from [src.name], targeting [target].") - do_after_cooldown() - return - - + projectiles_per_shot = 4 + variance = 25 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg name = "Ultra AC 2" @@ -309,38 +269,9 @@ fire_sound = 'sound/weapons/Gunshot.ogg' projectiles = 300 projectile_energy_cost = 20 - var/projectiles_per_shot = 3 - var/deviation = 0.3 - - action(atom/target) - if(!action_checks(target)) return - var/turf/targloc = get_turf(target) - var/target_x = targloc.x - var/target_y = targloc.y - var/target_z = targloc.z - targloc = null - spawn for(var/i=1 to min(projectiles, projectiles_per_shot)) - if(!chassis) break - var/turf/curloc = get_turf(chassis) - targloc = locate(target_x+GaussRandRound(deviation,1),target_y+GaussRandRound(deviation,1),target_z) - if (!targloc || !curloc) - continue - if (targloc == curloc) - continue - - playsound(chassis, fire_sound, 50, 1) - var/obj/item/projectile/A = new projectile(curloc) - src.projectiles-- - A.original = target - A.current = curloc - A.yo = targloc.y - curloc.y - A.xo = targloc.x - curloc.x - A.process() - sleep(2) - set_ready_state(0) - log_message("Fired from [src.name], targeting [target].") - do_after_cooldown() - return + projectiles_per_shot = 3 + variance = 6 + projectile_delay = 2 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack name = "SRM-8 Missile Rack" @@ -353,20 +284,21 @@ var/missile_speed = 2 var/missile_range = 30 - action(target) - if(!action_checks(target)) return - set_ready_state(0) - var/obj/item/missile/M = new projectile(chassis.loc) - M.primed = 1 - playsound(chassis, fire_sound, 50, 1) - M.throw_at(target, missile_range, missile_speed, chassis) - projectiles-- - log_message("Fired from [src.name], targeting [target].") - var/turf/T = get_turf(src) - msg_admin_attack("[key_name_admin(chassis.occupant)] fired a [src] in ([T.x], [T.y], [T.z] - JMP)") - log_game("[key_name(chassis.occupant)] fired a [src] in [T.x], [T.y], [T.z]") - do_after_cooldown() +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/action(target, params) + if(!action_checks(target)) return + set_ready_state(0) + var/obj/item/missile/M = new projectile(chassis.loc) + M.primed = 1 + playsound(chassis, fire_sound, 50, 1) + M.throw_at(target, missile_range, missile_speed, chassis) + projectiles-- + log_message("Fired from [name], targeting [target].") + var/turf/T = get_turf(src) + msg_admin_attack("[key_name_admin(chassis.occupant)] fired a [src] in ([T.x], [T.y], [T.z] - JMP)") + log_game("[key_name(chassis.occupant)] fired a [src] in [T.x], [T.y], [T.z]") + do_after_cooldown() + return /obj/item/missile @@ -375,13 +307,13 @@ var/primed = null throwforce = 15 - throw_impact(atom/hit_atom) - if(primed) - explosion(hit_atom, 0, 0, 2, 4, 0) - qdel(src) - else - ..() - return +/obj/item/missile/throw_impact(atom/hit_atom) + if(primed) + explosion(hit_atom, 0, 0, 2, 4, 0) + qdel(src) + else + ..() + return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang name = "SGL-6 Grenade Launcher" @@ -394,18 +326,19 @@ equip_cooldown = 60 var/det_time = 20 size=1 - action(target) - if(!action_checks(target)) return - set_ready_state(0) - var/obj/item/weapon/grenade/flashbang/F = new projectile(chassis.loc) - playsound(chassis, fire_sound, 50, 1) - F.throw_at(target, missile_range, missile_speed, chassis) - projectiles-- - log_message("Fired from [src.name], targeting [target].") - spawn(det_time) - F.prime() - do_after_cooldown() +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/action(target, params) + if(!action_checks(target)) return + set_ready_state(0) + var/obj/item/weapon/grenade/flashbang/F = new projectile(chassis.loc) + playsound(chassis, fire_sound, 50, 1) + F.throw_at(target, missile_range, missile_speed, chassis) + projectiles-- + log_message("Fired from [name], targeting [target].") + spawn(det_time) + F.prime() + do_after_cooldown() + return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang//Because I am a heartless bastard -Sieve name = "SOB-3 Grenade Launcher" @@ -417,7 +350,7 @@ size=1 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited/get_equip_info()//Limited version of the clusterbang launcher that can't reload - return "* [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""]\[[src.projectiles]\]" + return "* [chassis.selected==src?"":""][name][chassis.selected==src?"":""]\[[projectiles]\]" /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited/rearm() return//Extra bit of security @@ -432,22 +365,23 @@ projectile_energy_cost = 100 equip_cooldown = 20 - can_attach(obj/mecha/combat/honker/M as obj) - if(..()) - if(istype(M)) - return 1 - return 0 +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/can_attach(obj/mecha/combat/honker/M as obj) + if(..()) + if(istype(M)) + return 1 + return 0 - action(target) - if(!action_checks(target)) return - set_ready_state(0) - var/obj/item/weapon/bananapeel/B = new projectile(chassis.loc) - playsound(chassis, fire_sound, 60, 1) - B.throw_at(target, missile_range, missile_speed, chassis) - projectiles-- - log_message("Bananed from [src.name], targeting [target]. HONK!") - do_after_cooldown() +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar/action(target, params) + if(!action_checks(target)) return + set_ready_state(0) + var/obj/item/weapon/bananapeel/B = new projectile(chassis.loc) + playsound(chassis, fire_sound, 60, 1) + B.throw_at(target, missile_range, missile_speed, chassis) + projectiles-- + log_message("Bananed from [name], targeting [target]. HONK!") + do_after_cooldown() + return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar @@ -460,23 +394,24 @@ projectile_energy_cost = 100 equip_cooldown = 10 - can_attach(obj/mecha/combat/honker/M as obj) - if(..()) - if(istype(M)) - return 1 - return 0 +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar/can_attach(obj/mecha/combat/honker/M as obj) + if(..()) + if(istype(M)) + return 1 + return 0 - action(target) - if(!action_checks(target)) return - set_ready_state(0) - var/obj/item/device/assembly/mousetrap/M = new projectile(chassis.loc) - M.secured = 1 - playsound(chassis, fire_sound, 60, 1) - M.throw_at(target, missile_range, missile_speed, chassis) - projectiles-- - log_message("Launched a mouse-trap from [src.name], targeting [target]. HONK!") - do_after_cooldown() +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar/action(target, params) + if(!action_checks(target)) return + set_ready_state(0) + var/obj/item/device/assembly/mousetrap/M = new projectile(chassis.loc) + M.secured = 1 + playsound(chassis, fire_sound, 60, 1) + M.throw_at(target, missile_range, missile_speed, chassis) + projectiles-- + log_message("Launched a mouse-trap from [name], targeting [target]. HONK!") + do_after_cooldown() + return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas name = "PCMK-6 Bolas Launcher" @@ -489,23 +424,24 @@ projectile_energy_cost = 50 equip_cooldown = 10 - can_attach(obj/mecha/combat/gygax/M as obj) - if(..()) - if(istype(M)) - return 1 - return 0 +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas/can_attach(obj/mecha/combat/gygax/M as obj) + if(..()) + if(istype(M)) + return 1 + return 0 - action(target) - if(!action_checks(target)) return - set_ready_state(0) - var/obj/item/weapon/legcuffs/bolas/M = new projectile(chassis.loc) - playsound(chassis, fire_sound, 50, 1) - M.thrown_from = src - M.throw_at(target, missile_range, missile_speed) - projectiles-- - log_message("Fired from [src.name], targeting [target].") - do_after_cooldown() +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/bolas/action(target, params) + if(!action_checks(target)) return + set_ready_state(0) + var/obj/item/weapon/legcuffs/bolas/M = new projectile(chassis.loc) + playsound(chassis, fire_sound, 50, 1) + M.thrown_from = src + M.throw_at(target, missile_range, missile_speed) + projectiles-- + log_message("Fired from [name], targeting [target].") + do_after_cooldown() + return /obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma equip_cooldown = 20 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index ceeca47f72e..fcfccd1f9b6 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -219,7 +219,7 @@ // return ..() */ -/obj/mecha/proc/click_action(atom/target,mob/user) +/obj/mecha/proc/click_action(atom/target, mob/user, params) if(!src.occupant || src.occupant != user ) return if(user.stat || !user.canmove) return @@ -239,9 +239,9 @@ return if(!target.Adjacent(src)) if(selected && selected.is_ranged()) - selected.action(target) + selected.action(target, params) else if(selected && selected.is_melee()) - selected.action(target) + selected.action(target, params) else if(internal_damage&MECHA_INT_CONTROL_LOST) target = safepick(oview(1,src)) @@ -1991,4 +1991,4 @@ /obj/mecha/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list()) - flick_overlay(image('icons/mob/talk.dmi', bubble_loc, bubble_state,MOB_LAYER+1), bubble_recipients, 30) \ No newline at end of file + flick_overlay(image('icons/mob/talk.dmi', bubble_loc, bubble_state,MOB_LAYER+1), bubble_recipients, 30) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 744edcd7711..d73edde1525 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -916,6 +916,8 @@ steam.start() -- spawns the effect /obj/effect/effect/foam/New(loc, var/ismetal=0) ..(loc) icon_state = "[ismetal ? "m":""]foam" + if(!ismetal && reagents) + color = mix_color_from_reagents(reagents.reagent_list) metal = ismetal playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3) spawn(3 + metal*3) @@ -944,10 +946,13 @@ steam.start() -- spawns the effect // on delete, transfer any reagents to the floor /obj/effect/effect/foam/Destroy() if(!metal && reagents) - for(var/atom/A in oview(0,src)) + reagents.handle_reactions() + for(var/atom/A in oview(1, src)) if(A == src) continue - reagents.reaction(A, 1, 1) + if(reagents.total_volume) + var/fraction = 5 / reagents.total_volume + reagents.reaction(A, TOUCH, fraction) return ..() /obj/effect/effect/foam/process() @@ -969,13 +974,14 @@ steam.start() -- spawns the effect if(F) continue - F = new(T, metal) + F = new /obj/effect/effect/foam(T, metal) F.amount = amount if(!metal) - F.create_reagents(10) - if (reagents) + F.create_reagents(15) + if(reagents) for(var/datum/reagent/R in reagents.reagent_list) - F.reagents.add_reagent(R.id,1) + F.reagents.add_reagent(R.id, min(R.volume, 3), R.data, reagents.chem_temp) + F.color = mix_color_from_reagents(reagents.reagent_list) // foam disolves when heated // except metal foams @@ -993,16 +999,26 @@ steam.start() -- spawns the effect if (istype(AM, /mob/living/carbon)) var/mob/living/carbon/M = AM - M.slip("foam", 5, 2) + if(M.slip("foam", 5, 2)) + if(reagents) + for(var/reagent_id in reagents.reagent_list) + var/amount = M.reagents.get_reagent_amount(reagent_id) + if(amount < 25) + M.reagents.add_reagent(reagent_id, min(round(amount / 2), 15)) + if(reagents.total_volume) + var/fraction = 5 / reagents.total_volume + reagents.reaction(M, TOUCH, fraction) /datum/effect/system/foam_spread var/amount = 5 // the size of the foam spread. var/list/carried_reagents // the IDs of reagents present when the foam was mixed var/metal = 0 // 0=foam, 1=metalfoam, 2=ironfoam + var/temperature = T0C + var/list/banned_reagents = list("smoke_powder", "fluorosurfactant", "stimulants") /datum/effect/system/foam_spread/set_up(amt=5, loca, var/datum/reagents/carry = null, var/metalfoam = 0) - amount = round(sqrt(amt / 3), 1) + amount = min(round(amt/5, 1), 7) if(istype(loca, /turf/)) location = loca else @@ -1010,35 +1026,40 @@ steam.start() -- spawns the effect carried_reagents = list() metal = metalfoam - + temperature = carry.chem_temp // bit of a hack here. Foam carries along any reagent also present in the glass it is mixed // with (defaults to water if none is present). Rather than actually transfer the reagents, // this makes a list of the reagent ids and spawns 1 unit of that reagent when the foam disolves. - if(carry && !metal) for(var/datum/reagent/R in carry.reagent_list) - carried_reagents += R.id + carried_reagents[R.id] = R.volume /datum/effect/system/foam_spread/start() spawn(0) var/obj/effect/effect/foam/F = locate() in location if(F) F.amount += amount + F.amount = min(F.amount, 27) return - F = new(src.location, metal) + F = new /obj/effect/effect/foam(location, metal) F.amount = amount if(!metal) // don't carry other chemicals if a metal foam - F.create_reagents(10) + F.create_reagents(15) if(carried_reagents) for(var/id in carried_reagents) - F.reagents.add_reagent(id,1) + if(banned_reagents.Find("[id]")) + continue + var/datum/reagent/reagent_volume = carried_reagents[id] + F.reagents.add_reagent(id, min(reagent_volume, 3), null, temperature) + F.color = mix_color_from_reagents(F.reagents.reagent_list) else - F.reagents.add_reagent("water", 1) + F.reagents.add_reagent("cleaner", 1) + F.color = mix_color_from_reagents(F.reagents.reagent_list) // wall formed by metal foams // dense and opaque, but easy to break diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index a916172118a..d88d5a309d1 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -118,3 +118,41 @@ /obj/item/weapon/relic = 3, "" = 11 ) + +/obj/effect/spawner/lootdrop/trade_sol_rare + name = "trader rare item spawner" + lootdoubles = 0 + color = "#00FFFF" + + loot = list( + /obj/item/weapon/card/emag_broken = 2, + /obj/item/weapon/defibrillator/compact/loaded = 2, + /obj/item/weapon/gun/energy/laser/retro = 2, + /obj/item/weapon/rcd/combat = 1, + /obj/item/weapon/rcd = 2, + ) + +/obj/effect/spawner/lootdrop/trade_sol_common + name = "trader common item spawner" + lootdoubles = 0 + color = "#00FFFF" + + loot = list( + /obj/item/weapon/tank/anesthetic = 2, + /obj/item/weapon/weldingtool/hugetank = 2, + /obj/item/weapon/pickaxe/diamond = 1, + /obj/item/device/spacepod_equipment/weaponry/mining_laser = 1, + /obj/item/device/paicard = 2, + /obj/item/weapon/gun/projectile/automatic/pistol = 2, + /obj/item/device/megaphone = 2, + /obj/item/weapon/stock_parts/capacitor = 1, + /obj/item/weapon/stock_parts/cell/high = 1, + /obj/item/weapon/stock_parts/manipulator = 1, + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/scanning_module = 1, + /obj/item/weapon/spacecash/c200 = 1, + /obj/item/weapon/airlock_electronics = 1, + /obj/item/weapon/gun/energy/kinetic_accelerator/super = 1, + /obj/item/pizzabox = 3, + ) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 417ad82d46b..2a3fe4a2a03 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -31,7 +31,7 @@ //If this is set, The item will make an action button on the player's HUD when picked up. var/action_button_name //It is also the text which gets displayed on the action button. If not set it defaults to 'Use [name]'. If it's not set, there'll be no button. - var/action_button_is_hands_free = 0 //If 1, bypass the restrained, lying, and stunned checks action buttons normally test for + var/action_button_custom_type = null var/datum/action/item_action/action = null var/list/materials = list() diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 86f6fd5a74d..178f56912c1 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -31,6 +31,9 @@ /obj/item/weapon/door_remote/afterattack(obj/machinery/door/airlock/D, mob/user) if(!istype(D)) return + if(D.is_special) + to_chat(user, "[src] cannot access this kind of door!") + return if(!(D.arePowerSystemsOn())) to_chat(user, "[D] has no power!") return @@ -99,6 +102,12 @@ icon_state = "gangtool-white" region_access = REGION_GENERAL +/obj/item/weapon/door_remote/centcomm + name = "centcomm door remote" + desc = "High-ranking NT officials only." + icon_state = "gangtool-blue" + region_access = REGION_CENTCOMM + #undef WAND_OPEN #undef WAND_BOLT -#undef WAND_EMERGENCY \ No newline at end of file +#undef WAND_EMERGENCY diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm new file mode 100644 index 00000000000..7fa9759e330 --- /dev/null +++ b/code/game/objects/items/devices/floor_painter.dm @@ -0,0 +1,98 @@ +// Floor painter + +/obj/item/device/floor_painter + name = "floor painter" + icon_state = "floor_painter" + + var/floor_icon + var/floor_state = "floor" + var/floor_dir = SOUTH + + w_class = 1 + item_state = "electronic" + flags = CONDUCT + slot_flags = SLOT_BELT + + var/static/list/allowed_states = list("arrival", "arrivalcorner", "bar", "barber", "blackcorner", "blue", "bluecorner", + "bluefull", "bluered", "blueyellow", "blueyellowfull", "bot", "brown", "browncorner", "browncornerold", "brownold", + "cafeteria", "caution", "cautioncorner", "chapel", "cmo", "dark", "delivery", "escape", "escapecorner", "floor", + "freezerfloor", "green", "greenblue", "greenbluefull", "greencorner", "greenfull", "greenyellow", + "greenyellowfull", "grimy", "loadingarea", "neutral", "neutralcorner", "neutralfull", "orange", "orangecorner", + "orangefull", "purple", "purplecorner", "purplefull", "rampbottom", "ramptop", "red", "redblue", "redbluefull", + "redcorner", "redfull", "redgreen", "redgreenfull", "redyellow", "redyellowfull", "warning", "warningcorner", "warnwhite", + "warnwhitecorner", "white", "whiteblue", "whitebluecorner", "whitebluefull", "whitebot", "whitecorner", "whitedelivery", + "whitegreen", "whitegreencorner", "whitegreenfull", "whitehall", "whitepurple", "whitepurplecorner", "whitepurplefull", + "whitered", "whiteredcorner", "whiteredfull", "whiteyellow", "whiteyellowcorner", "whiteyellowfull", "yellow", + "yellowcorner", "yellowcornersiding", "yellowsiding") + +/obj/item/device/floor_painter/afterattack(var/atom/A, var/mob/user, proximity, params) + if(!proximity) + return + + var/turf/simulated/floor/plasteel/F = A + if(!istype(F)) + to_chat(user, "\The [src] can only be used on station flooring.") + return + + F.icon_state = floor_state + F.icon_regular_floor = floor_state + F.dir = floor_dir + +/obj/item/device/floor_painter/attack_self(var/mob/user) + if(!user) + return 0 + user.set_machine(src) + interact(user) + return 1 + +/obj/item/device/floor_painter/interact(mob/user as mob) + if(!floor_icon) + floor_icon = icon('icons/turf/floors.dmi', floor_state, floor_dir) + user << browse_rsc(floor_icon, "floor.png") + var/dat = {" + 
+ ->
+ Style: [floor_state]
+ Choose Direction
+ Direction: [dir2text(floor_dir)]
+ "}
+
+ var/datum/browser/popup = new(user, "floor_painter", name, 225, 300)
+ popup.set_content(dat)
+ popup.open()
+
+/obj/item/device/floor_painter/Topic(href, href_list)
+ if(..())
+ return
+
+ if(href_list["choose_state"])
+ var/state = input("Please select a style", "[src]") as null|anything in allowed_states
+ if(state)
+ floor_state = state
+ floor_dir = SOUTH // Reset dir, because some icon_states might not have that dir.
+ if(href_list["choose_dir"])
+ var/seldir = input("Please select a direction", "[src]") as null|anything in list("north", "south", "east", "west", "northeast", "northwest", "southeast", "southwest")
+ if(seldir)
+ floor_dir = text2dir(seldir)
+ if(href_list["cycleleft"])
+ var/index = allowed_states.Find(floor_state)
+ index--
+ if(index < 1)
+ index = allowed_states.len
+ floor_state = allowed_states[index]
+ floor_dir = SOUTH
+ if(href_list["cycleright"])
+ var/index = allowed_states.Find(floor_state)
+ index++
+ if(index > allowed_states.len)
+ index = 1
+ floor_state = allowed_states[index]
+ floor_dir = SOUTH
+
+ floor_icon = icon('icons/turf/floors.dmi', floor_state, floor_dir)
+ if(usr)
+ attack_self(usr)
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 741ecfa7fa2..1f86a35c497 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -422,11 +422,13 @@ var/global/list/default_medbay_channels = list(
//#### Sending the signal to all subspace receivers ####//
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
- R.receive_signal(signal)
+ spawn(0)
+ R.receive_signal(signal)
// Allinone can act as receivers.
for(var/obj/machinery/telecomms/allinone/R in telecomms_list)
- R.receive_signal(signal)
+ spawn(0)
+ R.receive_signal(signal)
// Receiving code can be located in Telecommunications.dm
return signal.data["done"] && position.z in signal.data["level"]
@@ -475,7 +477,8 @@ var/global/list/default_medbay_channels = list(
signal.frequency = connection.frequency // Quick frequency set
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
- R.receive_signal(signal)
+ spawn(0)
+ R.receive_signal(signal)
sleep(rand(10,25)) // wait a little...
@@ -520,7 +523,7 @@ var/global/list/default_medbay_channels = list(
// what the range is in which mobs will hear the radio
// returns: -1 if can't receive, range otherwise
- if (wires.IsIndexCut(WIRE_RECEIVE))
+ if (!wires || wires.IsIndexCut(WIRE_RECEIVE))
return -1
if(!listening)
return -1
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index ef79d5c2a35..9ea2f17378a 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -233,7 +233,6 @@
sleep(300)
canprint = 1
-
//empty tape recorders
/obj/item/device/taperecorder/empty/New()
return
@@ -260,12 +259,29 @@
to_chat(user, "You pull out all the tape!")
ruin()
+/obj/item/device/tape/verb/wipe()
+ set name = "Wipe Tape"
+ set category = "Object"
+
+ if(usr.stat)
+ return
+ if(ruined)
+ return
+
+ to_chat(usr, "You erase the data from the [src]")
+ clear()
+
+/obj/item/device/tape/proc/clear()
+ used_capacity = 0
+ storedinfo.Cut()
+ timestamp.Cut()
/obj/item/device/tape/proc/ruin()
overlays += "ribbonoverlay"
ruined = 1
+
/obj/item/device/tape/proc/fix()
overlays -= "ribbonoverlay"
ruined = 0
@@ -277,6 +293,12 @@
if(do_after(user, 120, target = src))
to_chat(user, "You wound the tape back in!")
fix()
+ else if(istype(I, /obj/item/weapon/pen))
+ var/title = stripped_input(usr,"What do you want to name the tape?", "Tape Renaming", name, MAX_NAME_LEN)
+ if(!title || !length(title))
+ name = initial(name)
+ return
+ name = "tape - [title]"
//Random colour tapes
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 2a1bc41970b..f05b179e62a 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -27,35 +27,34 @@ effective or pretty fucking useless.
origin_tech = "magnets=3;combat=3;syndicate=3"
var/times_used = 0 //Number of times it's been used.
- var/max_uses = 2
+ var/max_uses = 5
-
-/obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
- if(!user) return
+/obj/item/device/batterer/examine(mob/user)
+ ..(user)
if(times_used >= max_uses)
- to_chat(user, "\red The mind batterer has been burnt out!")
+ to_chat(user, "[src] is out of charge.")
+ if(times_used < max_uses)
+ to_chat(user, "[src] has [max_uses-times_used] charges left.")
+
+/obj/item/device/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
+ if(!user)
+ return
+ if(times_used >= max_uses)
+ to_chat(user, "The mind batterer has been burnt out!")
return
- user.attack_log += text("\[[time_stamp()]\] Used [src] to knock down people in the area.")
- for(var/mob/living/carbon/human/M in orange(10, user))
- spawn()
- if(prob(50))
+ for(var/mob/living/carbon/human/M in oview(7, user))
+ if(prob(50))
+ M.Weaken(rand(4,7))
+ add_logs(M, user, "stunned", src)
+ to_chat(M, "You feel a tremendous, paralyzing wave flood your mind.")
+ else
+ to_chat(M, "You feel a sudden, electric jolt travel through your head.")
- M.Weaken(rand(10,20))
- if(prob(25))
- M.Stun(rand(5,10))
- to_chat(M, "\red You feel a tremendous, paralyzing wave flood your mind.")
- if(!iscarbon(user))
- M.LAssailant = null
- else
- M.LAssailant = user
- else
- to_chat(M, "\red You feel a sudden, electric jolt travel through your head.")
-
- playsound(src.loc, 'sound/misc/interference.ogg', 50, 1)
- to_chat(user, "\blue You trigger [src].")
- times_used += 1
+ playsound(loc, 'sound/misc/interference.ogg', 50, 1)
+ times_used++
+ to_chat(user, "You trigger [src]. It has [max_uses-times_used] charges left.")
if(times_used >= max_uses)
icon_state = "battererburnt"
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 9e4d83592b0..5b4afe8095c 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -9,6 +9,7 @@
var/mob/attacher = null
var/valve_open = 0
var/toggle = 1
+ origin_tech = "materials=1;engineering=1"
/obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D)
@@ -187,7 +188,7 @@
attacher_name = "[key_name_admin(attacher)]"
var/mob/mob = get_mob_by_key(src.fingerprintslast)
-
+
bombers += "Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]"
message_admins("Bomb valve opened at [A.name] (JMP) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name_admin(mob)]")
log_game("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]")
diff --git a/code/game/objects/items/policetape.dm b/code/game/objects/items/policetape.dm
index bd222c52dbb..ad46a511641 100644
--- a/code/game/objects/items/policetape.dm
+++ b/code/game/objects/items/policetape.dm
@@ -147,17 +147,14 @@ var/list/tape_roll_applications = list()
tape_roll_applications[F] |= direction
return
-/obj/item/tape/Bumped(M as mob)
- if(src.allowed(M))
- var/turf/T = get_turf(src)
- M:loc = T
-
/obj/item/tape/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(!density) return 1
if(air_group || (height==0)) return 1
if ((mover.pass_flags & PASSTABLE || istype(mover, /obj/effect/meteor) || mover.throwing == 1) )
return 1
+ else if(ismob(mover) && allowed(mover))
+ return 1
else
return 0
@@ -166,7 +163,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape/attack_hand(mob/user as mob)
if (user.a_intent == I_HELP && src.allowed(user))
- user.show_viewers("\blue [user] lifts [src], allowing passage.")
+ user.visible_message("[user] lifts [src], allowing passage.", "You lift [src], allowing passage.")
src.density = 0
spawn(200)
src.density = 1
@@ -180,7 +177,7 @@ var/list/tape_roll_applications = list()
if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user))))
to_chat(user, "You can't break the [src] with that!")
return
- user.show_viewers("\blue [user] breaks the [src]!")
+ user.visible_message("[user] breaks the [src]!", "You break the [src]!")
var/dir[2]
var/icon_dir = src.icon_state
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index bfb90de8cac..512baa30703 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -125,13 +125,13 @@
to_chat(usr, "This robot has had its disabler removed!")
return 0
- if(T.recharge_time <= 2)
+ if(T.charge_delay <= 2)
to_chat(R, "Maximum cooling achieved for this hardpoint!")
to_chat(usr, "There's no room for another cooling unit!")
return 0
else
- T.recharge_time = max(2 , T.recharge_time - 4)
+ T.charge_delay = max(2 , T.charge_delay - 4)
return 1
@@ -214,4 +214,4 @@
return 0
R.emagged = 1
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index c71f2e14182..fd3f5505f4f 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -114,7 +114,7 @@
bmark.pixel_x--
bmark.pixel_y--
- if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/practice))
+ if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/beam/practice))
bmark.icon_state = "scorch"
bmark.dir = pick(NORTH,SOUTH,EAST,WEST) // random scorch design
@@ -178,4 +178,4 @@
b2y1 = pixel_y + pick(1,1,1,1,2,2,3,3,4)
b2y2 = pixel_y - pick(1,1,1,1,2,2,3,3,4)
- Target.bulletholes.Add(src)
\ No newline at end of file
+ Target.bulletholes.Add(src)
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index e41457f0c38..efba4f62a77 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -80,7 +80,7 @@
return
to_chat(usr, "\blue Assembling grille...")
- if (!do_after(usr, 10, target = src))
+ if (!do_after(usr, 10, target = user))
return
var /obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc )
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 3fe6dc7102f..50dc5c3b467 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -140,7 +140,6 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
- new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0), \
new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1), \
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 41c2946a0c1..bd799640122 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -130,7 +130,7 @@
return
if (R.time)
to_chat(usr, "\blue Building [R.title] ...")
- if (!do_after(usr, R.time, target = src))
+ if (!do_after(usr, R.time, target = usr))
return
if (src.amount < R.req_amount*multiplier)
return
@@ -194,20 +194,24 @@
/obj/item/stack/proc/get_max_amount()
return max_amount
+/obj/item/stack/proc/split(mob/user, amt)
+ var/obj/item/stack/F = new type(user, amt)
+ F.copy_evidences(src)
+ if(isliving(user))
+ add_fingerprint(user)
+ F.add_fingerprint(user)
+ use(amt)
+ return F
+
/obj/item/stack/attack_hand(mob/user as mob)
if (user.get_inactive_hand() == src)
- var/obj/item/stack/F = new src.type( user, 1)
- F.copy_evidences(src)
+ var/obj/item/stack/F = split(user, 1)
user.put_in_hands(F)
- src.add_fingerprint(user)
- F.add_fingerprint(user)
- use(1)
- if (src && usr.machine==src)
- spawn(0) src.interact(usr)
+ if(src && usr.machine == src)
+ spawn(0)
+ interact(usr)
else
..()
- update_icon()
- return
/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params)
..()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 25ade73eb38..f2f07174ec5 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1318,7 +1318,7 @@ obj/item/toy/cards/deck/syndicate/black
/obj/item/toy/russian_revolver
name = "russian revolver"
desc = "for fun and games!"
- icon = 'icons/obj/gun.dmi'
+ icon = 'icons/obj/guns/projectile.dmi'
icon_state = "detective_gold"
item_state = "gun"
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 7bd8f6e1207..5d85ea20e2b 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -74,6 +74,12 @@ RCD
src.spark_system.start()
return
if(3)
+ mode = 4
+ to_chat(user, "Changed mode to 'Windows'")
+ if(prob(20))
+ src.spark_system.start()
+ return
+ if(4)
mode = 1
to_chat(user, "Changed mode to 'Floor & Walls'")
if(prob(20))
@@ -88,7 +94,7 @@ RCD
if(!proximity) return
if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))
return 0
- if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock)))
+ if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock) || istype(A, /obj/structure/grille) || istype(A, /obj/structure/window)))
return 0
switch(mode)
@@ -97,7 +103,8 @@ RCD
if(useResource(1, user))
to_chat(user, "Building Floor...")
activate()
- A:ChangeTurf(/turf/simulated/floor/plating)
+ var/turf/AT = A
+ AT.ChangeTurf(/turf/simulated/floor/plating)
return 1
return 0
@@ -108,7 +115,8 @@ RCD
if(do_after(user, 20, target = A))
if(!useResource(3, user)) return 0
activate()
- A:ChangeTurf(/turf/simulated/wall)
+ var/turf/AT = A
+ AT.ChangeTurf(/turf/simulated/wall)
return 1
return 0
@@ -136,7 +144,8 @@ RCD
if(do_after(user, 40, target = A))
if(!useResource(5, user)) return 0
activate()
- A:ChangeTurf(/turf/simulated/floor/plating)
+ var/turf/AT = A
+ AT.ChangeTurf(/turf/simulated/floor/plating)
return 1
return 0
@@ -147,7 +156,8 @@ RCD
if(do_after(user, 50, target = A))
if(!useResource(5, user)) return 0
activate()
- A:ChangeTurf(/turf/space)
+ var/turf/AT = A
+ AT.ChangeTurf(/turf/space)
return 1
return 0
@@ -161,7 +171,78 @@ RCD
qdel(A)
return 1
return 0
+
+ if(istype(A, /obj/structure/window)) // You mean the grille of course, do you?
+ A = locate(/obj/structure/grille) in A.loc
+
+ if(istype(A, /obj/structure/grille))
+ if(!checkResource(2, user))
+ return 0
+ to_chat(user, "Deconstructing window...")
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+ if(!do_after(user, 20, target = A))
+ return 0
+ if(locate(/obj/structure/window/full/shuttle) in A.contents)
+ return 0 // Let's not give shuttle-griefers an easy time.
+ if(!useResource(2, user))
+ return 0
+ activate()
+ var/turf/T1 = get_turf(A)
+ qdel(A)
+ A = null
+ for(var/obj/structure/window/W in T1.contents)
+ W.disassembled = 1
+ W.density = 0
+ qdel(W)
+ for(var/cdir in cardinal)
+ var/turf/T2 = get_step(T1, cdir)
+ if(locate(/obj/structure/window/full/shuttle) in T2.contents)
+ continue // Shuttle windows? Nah. We don't need extra windows there.
+ if(!(locate(/obj/structure/grille) in T2.contents))
+ continue
+ for(var/obj/structure/window/W in T2.contents)
+ if(W.dir == turn(cdir, 180))
+ W.disassembled = 1
+ W.density = 0
+ qdel(W)
+ var/obj/structure/window/reinforced/W = new(T2)
+ W.dir = turn(cdir, 180)
+ return 1
return 0
+ if(4)
+ if(istype(A, /turf/simulated/floor))
+ if(locate(/obj/structure/grille) in contents)
+ return 0 // We already have window
+ if(!checkResource(2, user))
+ return 0
+ to_chat(user, "Constructing window...")
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+ if(!do_after(user, 20, target = A))
+ return 0
+ if(locate(/obj/structure/grille) in A.contents)
+ return 0 // We already have window
+ if(!useResource(2, user))
+ return 0
+ activate()
+ new /obj/structure/grille(A)
+ for(var/obj/structure/window/W in contents)
+ W.disassembled = 1 // Prevent that annoying glass breaking sound
+ W.density = 0
+ qdel(W)
+ for(var/cdir in cardinal)
+ var/turf/T = get_step(A, cdir)
+ if(locate(/obj/structure/grille) in T.contents)
+ for(var/obj/structure/window/W in T.contents)
+ if(W.dir == turn(cdir, 180))
+ W.disassembled = 1
+ W.density = 0
+ qdel(W)
+ else // Build a window!
+ var/obj/structure/window/reinforced/W = new(A)
+ W.dir = cdir
+ var/turf/AT = A
+ AT.ChangeTurf(/turf/simulated/floor/plating) // Platings go under windows.
+ return 1
else
to_chat(user, "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin.")
return 0
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index d30cc76b0a7..79c6466235b 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -107,6 +107,8 @@
var/icon/side
var/dat
var/stamped = 0
+
+ var/obj/item/weapon/card/id/guest/guest_pass = null // Guest pass attached to the ID
/obj/item/weapon/card/id/New()
..()
@@ -120,6 +122,16 @@
show(usr)
else
to_chat(user, "It is too far away.")
+ if(guest_pass)
+ to_chat(user, "There is a guest pass attached to this ID card")
+ if (world.time < guest_pass.expiration_time)
+ to_chat(user, "It expires at [worldtime2text(guest_pass.expiration_time)].")
+ else
+ to_chat(user, "It expired at [worldtime2text(guest_pass.expiration_time)].")
+ to_chat(user, "It grants access to following areas:")
+ for (var/A in guest_pass.temp_access)
+ to_chat(user, "[get_access_desc(A)].")
+ to_chat(user, "Issuing reason: [guest_pass.reason].")
/obj/item/weapon/card/id/proc/show(mob/user as mob)
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper)
@@ -170,7 +182,9 @@
 |
"
stamped = 1
- to_chat(usr, "You stamp the ID card!")
+ to_chat(user, "You stamp the ID card!")
else
- to_chat(usr, "This ID has already been stamped!")
+ to_chat(user, "This ID has already been stamped!")
+
+ else if(istype(W, /obj/item/weapon/card/id/guest))
+ if(istype(src, /obj/item/weapon/card/id/guest))
+ return
+ var/obj/item/weapon/card/id/guest/G = W
+ if(world.time > G.expiration_time)
+ to_chat(user, "There's no point, the guest pass has expired.")
+ return
+ if(guest_pass)
+ to_chat(user, "There's already a guest pass attached to this ID.")
+ return
+ if(G.registered_name != registered_name && G.registered_name != "NOT SPECIFIED")
+ to_chat(user, "The guest pass cannot be attached to this ID")
+ return
+ if(!user.unEquip(G))
+ return
+ G.loc = src
+ guest_pass = G
+
+/obj/item/weapon/card/id/verb/remove_guest_pass()
+ set name = "Remove Guest Pass"
+ set category = "Object"
+ set src in range(0)
+
+ if(usr.stat || !usr.canmove || usr.restrained())
+ return
+
+ if(guest_pass)
+ to_chat(usr, "You remove the guest pass from this ID.")
+ guest_pass.forceMove(get_turf(src))
+ guest_pass = null
+ else
+ to_chat(usr, "There is no guest pass attached to this ID")
/obj/item/weapon/card/id/silver
name = "identification card"
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index e0ac96c4feb..b0a1c45622d 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -41,12 +41,11 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
item_state = "chronogun"
- w_class = 3.0
- projectile_type = "/obj/item/projectile/energy/chrono_beam"
- fire_sound = 'sound/weapons/Laser.ogg'
- charge_cost = 0
- fire_delay = 50
+ w_class = 3
flags = NODROP
+ ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
+ can_charge = 0
+ fire_delay = 50
var/obj/item/weapon/chrono_eraser/TED = null
var/obj/effect/chrono_field/field = null
var/turf/startpos = null
@@ -60,12 +59,13 @@
qdel(src)
/obj/item/weapon/gun/energy/chrono_gun/dropped()
+ ..()
qdel(src)
/obj/item/weapon/gun/energy/chrono_gun/update_icon()
return
-/obj/item/weapon/gun/energy/chrono_gun/Fire()
+/obj/item/weapon/gun/energy/chrono_gun/process_fire()
if(field)
field_disconnect(field)
..()
@@ -125,18 +125,23 @@
nodamage = 1
var/obj/item/weapon/gun/energy/chrono_gun/gun = null
-/obj/item/projectile/energy/chrono_beam/process()
+/obj/item/projectile/energy/chrono_beam/fire()
gun = firer.get_active_hand()
if(istype(gun))
return ..()
else
return 0
-/obj/item/projectile/energy/chrono_beam/on_hit(var/atom/target)
+/obj/item/projectile/energy/chrono_beam/on_hit(atom/target)
if(target && gun && isliving(target))
var/obj/effect/chrono_field/F = new(target.loc, target, gun)
gun.field_connect(F)
+/obj/item/ammo_casing/energy/chrono_beam
+ name = "eradication beam"
+ projectile_type = /obj/item/projectile/energy/chrono_beam
+ icon_state = "chronobolt"
+ e_cost = 0
/obj/effect/chrono_field
name = "eradication field"
@@ -256,4 +261,4 @@
#undef CHRONO_BEAM_RANGE
-#undef CHRONO_FRAME_COUNT
\ No newline at end of file
+#undef CHRONO_FRAME_COUNT
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index 3e2448fa8fe..89a8b52b8da 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -91,16 +91,16 @@
/obj/item/weapon/razor/attack(mob/living/carbon/M as mob, mob/user as mob)
if(ishuman(M))
var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/head/C = H.organs_by_name["head"]
+ var/obj/item/organ/external/head/C = H.get_organ("head")
var/datum/robolimb/robohead = all_robolimbs[C.model]
if(user.zone_sel.selecting == "mouth")
if(!get_location_accessible(H, "mouth"))
to_chat(user, "The mask is in the way.")
return
- if((H.species && H.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
+ if((C.species && C.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
to_chat(user, "You find yourself disappointed at the appalling lack of facial hair.")
return
- if(H.f_style == "Shaved")
+ if(C.f_style == "Shaved")
to_chat(user, "Already clean-shaven.")
return
if(H == user) //shaving yourself
@@ -109,7 +109,7 @@
if(do_after(user, 50, target = H))
user.visible_message("[user] shaves his facial hair clean with the [src].", \
"You finish shaving with the [src]. Fast and clean!")
- H.f_style = "Shaved"
+ C.f_style = "Shaved"
H.update_fhair()
playsound(src.loc, 'sound/items/Welder2.ogg', 20, 1)
else
@@ -121,17 +121,17 @@
if(user_loc == user.loc && H_loc == H.loc)
user.visible_message("[user] shaves off [H]'s facial hair with \the [src].", \
"You shave [H]'s facial hair clean off.")
- H.f_style = "Shaved"
+ C.f_style = "Shaved"
H.update_fhair()
playsound(src.loc, 'sound/items/Welder2.ogg', 20, 1)
if(user.zone_sel.selecting == "head")
if(!get_location_accessible(H, "head"))
to_chat(user, "The headgear is in the way.")
return
- if((H.species && H.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
+ if((C.species && C.species.flags & ALL_RPARTS) && robohead.is_monitor) //If the target is of a species that can have prosthetic heads, but the head doesn't support human hair 'wigs'...
to_chat(user, "You find yourself disappointed at the appalling lack of hair.")
return
- if(H.h_style == "Bald" || H.h_style == "Balding Hair" || H.h_style == "Skinhead")
+ if(C.h_style == "Bald" || C.h_style == "Balding Hair" || C.h_style == "Skinhead")
to_chat(user, "There is not enough hair left to shave...")
return
if(H == user) //shaving yourself
@@ -140,7 +140,7 @@
if(do_after(user, 50, target = H))
user.visible_message("[user] shaves his head with the [src].", \
"You finish shaving with the [src].")
- H.h_style = "Skinhead"
+ C.h_style = "Skinhead"
H.update_hair()
playsound(src.loc, 'sound/items/Welder2.ogg', 40, 1)
else
@@ -152,7 +152,7 @@
if(user_loc == user.loc && H_loc == H.loc)
user.visible_message("[user] shaves [H]'s head bald with \the [src]!", \
"You shave [H]'s head bald.")
- H.h_style = "Skinhead"
+ C.h_style = "Skinhead"
H.update_hair()
playsound(src.loc, 'sound/items/Welder2.ogg', 40, 1)
else
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 73eda279b3d..2cc37b0ba85 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -368,8 +368,26 @@
update_icon()
return
if(H.heart_attack)
- H.heart_attack = 0
- if(H.stat == 2)
+ if(!H.get_int_organ(/obj/item/organ/internal/heart) && !H.get_int_organ(/obj/item/organ/internal/brain/slime)) //prevents defibing someone still alive suffering from a heart attack attack if they lack a heart
+ user.visible_message("[defib] buzzes: Resuscitation failed - Failed to pick up any heart electrical activity.")
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
+ busy = 0
+ update_icon()
+ return
+ else
+ H.heart_attack = 0
+ user.visible_message("[defib] pings: Cardiac arrhythmia corrected.")
+ M.visible_message("[M]'s body convulses a bit.")
+ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
+ playsound(get_turf(src), "bodyfall", 50, 1)
+ playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
+ defib.deductcharge(revivecost)
+ busy = 0
+ cooldown = 1
+ update_icon()
+ defib.cooldowncheck(user)
+ return
+ if(H.stat == DEAD)
var/health = H.health
M.visible_message("[M]'s body convulses a bit.")
playsound(get_turf(src), "bodyfall", 50, 1)
@@ -377,7 +395,7 @@
for(var/obj/item/organ/external/O in H.organs)
total_brute += O.brute_dam
total_burn += O.burn_dam
- if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
+ if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime)))
tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you
tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
H.adjustOxyLoss(tobehealed)
diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm
index 47bea6ca58d..2765b4a319d 100644
--- a/code/game/objects/items/weapons/dnascrambler.dm
+++ b/code/game/objects/items/weapons/dnascrambler.dm
@@ -1,16 +1,16 @@
/obj/item/weapon/dnascrambler
name = "dna scrambler"
desc = "An illegal genetic serum designed to randomize the user's identity."
- icon = 'icons/obj/syringe.dmi'
+ icon = 'icons/obj/hypo.dmi'
item_state = "syringe_0"
- icon_state = "b10"
+ icon_state = "lepopen1"
var/used = null
update_icon()
if(used)
- icon_state = "b0"
+ icon_state = "lepopen0"
else
- icon_state = "b10"
+ icon_state = "lepopen1"
attack(mob/M as mob, mob/user as mob)
if(!M || !user)
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 149cc03a866..a951f1ade8f 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -458,11 +458,11 @@
New()
..()
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
- var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
+ var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("fluorosurfactant", 40)
- B2.reagents.add_reagent("water", 40)
- B2.reagents.add_reagent("cleaner", 60)
+ B2.reagents.add_reagent("cleaner", 10)
+ B2.reagents.add_reagent("water", 40) //when you make pre-designed foam reactions that carry the reagents, always add water last
beakers += B1
beakers += B2
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
new file mode 100644
index 00000000000..b56e103233e
--- /dev/null
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -0,0 +1,456 @@
+/obj/item/weapon/nullrod
+ name = "null rod"
+ desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of Nar-Sie's followers."
+ icon_state = "nullrod"
+ item_state = "nullrod"
+ force = 18
+ throw_speed = 3
+ throw_range = 4
+ throwforce = 10
+ w_class = 1
+ var/reskinned = FALSE
+ var/list/fluff_transformations = list() //does it have any special transformations only accessible to it? Should only be subtypes of /obj/item/weapon/nullrod
+
+/obj/item/weapon/nullrod/suicide_act(mob/user)
+ user.visible_message("[user] is killing \himself with \the [src.name]! It looks like \he's trying to get closer to god!")
+ return (BRUTELOSS|FIRELOSS)
+
+/obj/item/weapon/nullrod/attack(mob/M, mob/living/carbon/user)
+ ..()
+ if(M.mind)
+ if(M.mind.vampire)
+ if(ishuman(M))
+ if(!M.mind.vampire.get_ability(/datum/vampire_passive/full))
+ to_chat(M, "The nullrod's power interferes with your own!")
+ M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+
+/obj/item/weapon/nullrod/attack_self(mob/user)
+ if(reskinned)
+ return
+ if(user.mind && (user.mind.assigned_role == "Chaplain"))
+ reskin_holy_weapon(user)
+
+/obj/item/weapon/nullrod/proc/reskin_holy_weapon(mob/M)
+ var/list/holy_weapons_list = typesof(/obj/item/weapon/nullrod) - typesof(/obj/item/weapon/nullrod/fluff)
+ if(fluff_transformations.len)
+ for(var/thing in fluff_transformations)
+ holy_weapons_list += thing
+ var/list/display_names = list()
+ for(var/V in holy_weapons_list)
+ var/atom/A = V
+ display_names += initial(A.name)
+
+ var/choice = input(M,"What theme would you like for your holy weapon?","Holy Weapon Theme") as null|anything in display_names
+ if(!src || !choice || !in_range(M, src) || M.incapacitated() || reskinned)
+ return
+
+ var/index = display_names.Find(choice)
+ var/A = holy_weapons_list[index]
+
+ var/obj/item/weapon/nullrod/holy_weapon = new A
+
+ feedback_set_details("chaplain_weapon","[choice]")
+
+ if(holy_weapon)
+ holy_weapon.reskinned = TRUE
+ M.unEquip(src)
+ M.put_in_active_hand(holy_weapon)
+ qdel(src)
+
+/obj/item/weapon/nullrod/godhand
+ icon_state = "disintegrate"
+ item_state = "disintegrate"
+ name = "god hand"
+ desc = "This hand of yours glows with an awesome power!"
+ flags = ABSTRACT | NODROP
+ w_class = 5
+ hitsound = 'sound/weapons/sear.ogg'
+ damtype = BURN
+ attack_verb = list("punched", "cross countered", "pummeled")
+
+/obj/item/weapon/nullrod/staff
+ icon_state = "godstaff-red"
+ item_state = "godstaff-red"
+ name = "red holy staff"
+ desc = "It has a mysterious, protective aura."
+ w_class = 5
+ force = 5
+ slot_flags = SLOT_BACK
+
+/obj/item/weapon/nullrod/staff/IsShield()
+ return 1
+
+/obj/item/weapon/nullrod/staff/blue
+ name = "blue holy staff"
+ icon_state = "godstaff-blue"
+ item_state = "godstaff-blue"
+
+/obj/item/weapon/nullrod/claymore
+ icon_state = "claymore"
+ item_state = "claymore"
+ name = "holy claymore"
+ desc = "A weapon fit for a crusade!"
+ w_class = 4
+ slot_flags = SLOT_BACK|SLOT_BELT
+ sharp = 1
+ edge = 1
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/weapon/nullrod/claymore/IsShield()
+ if(prob(30))
+ return 1
+ else
+ return 0
+
+/obj/item/weapon/nullrod/claymore/darkblade
+ icon_state = "cultblade"
+ item_state = "cultblade"
+ name = "dark blade"
+ desc = "Spread the glory of the dark gods!"
+ slot_flags = SLOT_BELT
+ hitsound = 'sound/hallucinations/growl1.ogg'
+
+/obj/item/weapon/nullrod/claymore/chainsaw_sword
+ icon_state = "chainswordon"
+ item_state = "chainswordon"
+ name = "sacred chainsaw sword"
+ desc = "Suffer not a heretic to live."
+ slot_flags = SLOT_BELT
+ attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
+ hitsound = 'sound/weapons/chainsaw.ogg'
+
+/obj/item/weapon/nullrod/claymore/glowing
+ icon_state = "swordon"
+ item_state = "swordon"
+ name = "force weapon"
+ desc = "The blade glows with the power of faith. Or possibly a battery."
+ slot_flags = SLOT_BELT
+
+/obj/item/weapon/nullrod/claymore/katana
+ name = "hanzo steel"
+ desc = "Capable of cutting clean through a holy claymore."
+ icon_state = "katana"
+ item_state = "katana"
+ slot_flags = SLOT_BELT | SLOT_BACK
+
+/obj/item/weapon/nullrod/claymore/multiverse
+ name = "extradimensional blade"
+ desc = "Once the harbringer of a interdimensional war, now a dormant souvenir. Still sharp though."
+ icon_state = "multiverse"
+ item_state = "multiverse"
+ slot_flags = SLOT_BELT
+
+/obj/item/weapon/nullrod/claymore/saber
+ name = "light energy sword"
+ hitsound = 'sound/weapons/blade1.ogg'
+ icon_state = "swordblue"
+ item_state = "swordblue"
+ desc = "If you strike me down, I shall become more robust than you can possibly imagine."
+ slot_flags = SLOT_BELT
+
+/obj/item/weapon/nullrod/claymore/saber/red
+ name = "dark energy sword"
+ icon_state = "swordred"
+ item_state = "swordred"
+ desc = "Woefully ineffective when used on steep terrain."
+
+/obj/item/weapon/nullrod/claymore/saber/pirate
+ name = "nautical energy sword"
+ icon_state = "cutlass1"
+ item_state = "cutlass1"
+ desc = "Convincing HR that your religion involved piracy was no mean feat."
+
+/obj/item/weapon/nullrod/sord
+ name = "\improper UNREAL SORD"
+ desc = "This thing is so unspeakably HOLY you are having a hard time even holding it."
+ icon_state = "sord"
+ item_state = "sord"
+ slot_flags = SLOT_BELT
+ force = 4.13
+ throwforce = 1
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/weapon/nullrod/scythe
+ icon_state = "scythe0"
+ item_state = "scythe0"
+ name = "reaper scythe"
+ desc = "Ask not for whom the bell tolls..."
+ w_class = 4
+ armour_penetration = 35
+ slot_flags = SLOT_BACK
+ sharp = 1
+ edge = 1
+ attack_verb = list("chopped", "sliced", "cut", "reaped")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+
+/obj/item/weapon/nullrod/scythe/vibro
+ icon_state = "hfrequency0"
+ item_state = "hfrequency1"
+ name = "high frequency blade"
+ desc = "Bad references are the DNA of the soul."
+ attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
+
+/obj/item/weapon/nullrod/scythe/talking
+ icon_state = "talking_sword"
+ item_state = "talking_sword"
+ name = "possessed blade"
+ desc = "When the station falls into chaos, it's nice to have a friend by your side."
+ attack_verb = list("chopped", "sliced", "cut")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ var/possessed = FALSE
+
+/obj/item/weapon/nullrod/scythe/talking/attack_self(mob/living/user)
+ if(possessed)
+ return
+
+ to_chat(user, "You attempt to wake the spirit of the blade...")
+
+ possessed = TRUE
+
+ var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, 0, 100)
+ var/mob/dead/observer/theghost = null
+
+ if(candidates.len)
+ theghost = pick(candidates)
+ var/mob/living/simple_animal/shade/S = new(src)
+ S.real_name = name
+ S.name = name
+ S.ckey = theghost.ckey
+ var/input = stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN)
+
+ if(src && input)
+ name = input
+ S.real_name = input
+ S.name = input
+ else
+ to_chat(user, "The blade is dormant. Maybe you can try again later.")
+ possessed = FALSE
+
+/obj/item/weapon/nullrod/scythe/talking/Destroy()
+ for(var/mob/living/simple_animal/shade/S in contents)
+ to_chat(S, "You were destroyed!")
+ S.ghostize()
+ qdel(S)
+ return ..()
+
+/obj/item/weapon/nullrod/hammmer
+ icon_state = "hammeron"
+ item_state = "hammeron"
+ name = "relic war hammer"
+ desc = "This war hammer cost the chaplain fourty thousand space dollars."
+ slot_flags = SLOT_BELT
+ w_class = 5
+ attack_verb = list("smashed", "bashed", "hammered", "crunched")
+
+/obj/item/weapon/nullrod/chainsaw
+ name = "chainsaw hand"
+ desc = "Good? Bad? You're the guy with the chainsaw hand."
+ icon_state = "chainsaw1"
+ item_state = "mounted_chainsaw"
+ w_class = 5
+ flags = NODROP | ABSTRACT
+ sharp = 1
+ edge = 1
+ attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
+ hitsound = 'sound/weapons/chainsaw.ogg'
+
+/obj/item/weapon/nullrod/clown
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "clownrender"
+ item_state = "gold_horn"
+ name = "clown dagger"
+ desc = "Used for absolutely hilarious sacrifices."
+ hitsound = 'sound/items/bikehorn.ogg'
+ sharp = 1
+ edge = 1
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut", "honked")
+
+/obj/item/weapon/nullrod/whip
+ name = "holy whip"
+ desc = "What a terrible night to be on Space Station 13."
+ icon_state = "chain"
+ item_state = "chain"
+ slot_flags = SLOT_BELT
+ attack_verb = list("whipped", "lashed")
+ hitsound = 'sound/weapons/slash.ogg'
+
+/obj/item/weapon/nullrod/whip/afterattack(atom/movable/AM, mob/user, proximity)
+ if(!proximity)
+ return
+ if(istype(AM, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = AM
+ if(is_shadow(H))
+ var/phrase = pick("Die monster! You don't belong in this world!!!", "You steal men's souls and make them your slaves!!!", "Your words are as empty as your soul!!!", "Mankind ill needs a savior such as you!!!")
+ user.say("[phrase]")
+ H.adjustBruteLoss(8) //Bonus damage
+
+/obj/item/weapon/nullrod/fedora
+ name = "athiest's fedora"
+ desc = "The brim of the hat is as sharp as your wit. Throwing it at someone would hurt almost as much as disproving the existence of God."
+ icon_state = "fedora"
+ item_state = "fedora"
+ slot_flags = SLOT_HEAD
+ icon = 'icons/obj/clothing/hats.dmi'
+ force = 0
+ throw_speed = 4
+ throw_range = 7
+ throwforce = 20
+
+/obj/item/weapon/nullrod/armblade
+ name = "dark blessing"
+ desc = "Particularly twisted deities grant gifts of dubious value."
+ icon_state = "arm_blade"
+ item_state = "arm_blade"
+ flags = ABSTRACT | NODROP
+ w_class = 5
+ sharp = 1
+ edge = 1
+
+/obj/item/weapon/nullrod/carp
+ name = "carp-sie plushie"
+ desc = "An adorable stuffed toy that resembles the god of all carp. The teeth look pretty sharp. Activate it to recieve the blessing of Carp-Sie."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "carpplushie"
+ item_state = "carp_plushie"
+ force = 15
+ attack_verb = list("bitten", "eaten", "fin slapped")
+ hitsound = 'sound/weapons/bite.ogg'
+ var/used_blessing = FALSE
+
+/obj/item/weapon/nullrod/carp/attack_self(mob/living/user)
+ if(used_blessing)
+ return
+ if(user.mind && (user.mind.assigned_role != "Chaplain"))
+ return
+ to_chat(user, "You are blessed by Carp-Sie. Wild space carp will no longer attack you.")
+ user.faction |= "carp"
+ used_blessing = TRUE
+
+/obj/item/weapon/nullrod/claymore/bostaff //May as well make it a "claymore" and inherit the blocking
+ name = "monk's staff"
+ desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown."
+ w_class = 4
+ force = 15
+ slot_flags = SLOT_BACK
+ sharp = 0
+ edge = 0
+ hitsound = "swing_hit"
+ attack_verb = list("smashed", "slammed", "whacked", "thwacked")
+ icon = 'icons/obj/weapons.dmi'
+ icon_state = "bostaff0"
+ item_state = "bostaff0"
+
+/obj/item/weapon/nullrod/claymore/bostaff/IsShield()
+ if(prob(40))
+ return 1
+ else
+ return 0
+
+/obj/item/weapon/nullrod/tribal_knife
+ icon_state = "crysknife"
+ item_state = "crysknife"
+ name = "arrhythmic knife"
+ w_class = 5
+ desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
+ sharp = 1
+ edge = 1
+ slot_flags = null
+ flags = HANDSLOW
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/weapon/nullrod/tribal_knife/New()
+ ..()
+ processing_objects.Add(src)
+
+/obj/item/weapon/nullrod/tribal_knife/Destroy()
+ processing_objects.Remove(src)
+ return ..()
+
+/obj/item/weapon/nullrod/tribal_knife/process()
+ slowdown = rand(-2, 2)
+
+/obj/item/weapon/nullrod/pitchfork
+ icon_state = "pitchfork0"
+ item_state = "pitchfork0"
+ name = "unholy pitchfork"
+ w_class = 3
+ desc = "Holding this makes you look absolutely devilish."
+ attack_verb = list("poked", "impaled", "pierced", "jabbed")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ sharp = 1
+ edge = 1
+
+/obj/item/weapon/nullrod/rosary
+ icon_state = "rosary"
+ item_state = null
+ name = "prayer beads"
+ desc = "A set of prayer beads used by many of the more traditional religions in space.Vampires and other unholy abominations have learned to fear these." + force = 0 + throwforce = 0 + var/praying = 0 + +/obj/item/weapon/nullrod/rosary/New() + ..() + processing_objects.Add(src) + + +/obj/item/weapon/nullrod/rosary/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + if(!istype(M)) + return ..() + + if(!user.mind || user.mind.assigned_role != "Chaplain") + to_chat(user, "You are not close enough with [ticker.Bible_deity_name] to use [src].") + return + + if(praying) + to_chat(user, "You are already using [src].") + + user.visible_message("[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name].", \ + "You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name].") + + praying = 1 + if(do_after(user, 150, target = M)) + if(istype(M, /mob/living/carbon/human)) // This probably should not work on vulps. They're unholy abominations. + var/mob/living/carbon/human/target = M + + if(target.mind) + if(iscultist(target)) + ticker.mode.remove_cultist(target.mind) // This proc will handle message generation. + praying = 0 + return + + if(target.mind.vampire && !target.mind.vampire.get_ability(/datum/vampire_passive/full)) // Getting a full prayer off on a vampire will interrupt their powers for a large duration. + target.mind.vampire.nullified = max(120, target.mind.vampire.nullified + 120) + to_chat(target, "[user]'s prayer to [ticker.Bible_deity_name] has interfered with your power!") + praying = 0 + return + + if(prob(25)) + to_chat(target, "[user]'s prayer to [ticker.Bible_deity_name] has eased your pain!") + target.adjustToxLoss(-5) + target.adjustOxyLoss(-5) + target.adjustBruteLoss(-5) + target.adjustFireLoss(-5) + + praying = 0 + + else + to_chat(user, "Your prayer to [ticker.Bible_deity_name] was interrupted.") + praying = 0 + +/obj/item/weapon/nullrod/rosary/process() + if(istype(loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/holder = loc + + if(src == holder.l_hand || src == holder.r_hand) // Holding this in your hand will + for(var/mob/living/carbon/human/M in range(5)) + if(M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full)) + M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) + if(prob(10)) + to_chat(M, "Being in the presence of [holder]'s [src] is interfering with your powers!") + + + diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index c466c5ba811..67b52da31ec 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -2,7 +2,7 @@ name = "implant" icon = 'icons/obj/implants.dmi' icon_state = "generic" //Shows up as the action button icon - action_button_is_hands_free = 1 + action_button_custom_type = /datum/action/item_action/hands_free origin_tech = "materials=2;biotech=3;programming=2" var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like loyalty implants diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/implants/implant_traitor.dm index 547206da29c..78e63ddfae4 100644 --- a/code/game/objects/items/weapons/implants/implant_traitor.dm +++ b/code/game/objects/items/weapons/implants/implant_traitor.dm @@ -56,11 +56,11 @@ ticker.mode.traitors += H.mind H.mind.special_role = "traitor" to_chat(H, "You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost.") - var/datum/objective/protect/p = new - p.owner = H.mind - p.target = user:mind - p.explanation_text = "Obey every order from and protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]." - H.mind.objectives += p + var/datum/objective/protect/mindslave/MS = new + MS.owner = H.mind + MS.target = user:mind + MS.explanation_text = "Obey every order from and protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]." + H.mind.objectives += MS for(var/datum/objective/objective in H.mind.objectives) to_chat(H, "Objective #1: [objective.explanation_text]") @@ -71,10 +71,16 @@ var/datum/mindslaves/slaved = user.mind.som H.mind.som = slaved slaved.serv += H - slaved.add_serv_hud(user.mind,"syndicate")//handles master servent icons - slaved.add_serv_hud(H.mind,"mindslave") + slaved.add_serv_hud(user.mind, "master") //handles master servent icons + slaved.add_serv_hud(H.mind, "mindslave") log_admin("[ckey(user.key)] has mind-slaved [ckey(H.key)].") activated = 1 return 1 - return 0 \ No newline at end of file + return 0 + +/obj/item/weapon/implant/traitor/removed(mob/target) + if(..()) + ticker.mode.remove_traitor_mind(target.mind) + return 1 + return 0 \ No newline at end of file diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index fa485cbf93b..034dfc2ddc2 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -19,11 +19,15 @@ desc = "A trap used to catch bears and other legged creatures." var/armed = 0 var/obj/item/weapon/grenade/iedcasing/IED = null + var/obj/item/device/assembly/signaler/sig = null /obj/item/weapon/restraints/legcuffs/beartrap/Destroy() if(IED) qdel(IED) IED = null + if(sig) + qdel(sig) + sig = null return ..() /obj/item/weapon/restraints/legcuffs/beartrap/suicide_act(mob/user) @@ -43,6 +47,9 @@ if(IED) to_chat(user, "This beartrap already has an IED hooked up to it!") return + if(sig) + to_chat(user, "This beartrap already has a signaler hooked up to it!") + return IED = I switch(IED.assembled) if(0,1) //if it's not fueled/hooked up @@ -50,7 +57,7 @@ IED = null return if(2,3) - user.drop_item(src) + user.drop_item() I.forceMove(src) message_admins("[key_name_admin(user)] has rigged a beartrap with an IED.") log_game("[key_name(user)] has rigged a beartrap with an IED.") @@ -60,12 +67,33 @@ to_chat(user, "You shouldn't be reading this message! Contact a coder or someone, something broke!") IED = null return + if(istype(I, /obj/item/device/assembly/signaler)) + if(IED) + to_chat(user, "This beartrap already has an IED hooked up to it!") + return + if(sig) + to_chat(user, "This beartrap already has a signaler hooked up to it!") + return + sig = I + if(sig.secured) + to_chat(user, "The signaler is secured.") + sig = null + return + user.drop_item() + I.forceMove(src) + to_chat(user, "You sneak the [sig] underneath the pressure plate and connect the trigger wire.") + desc = "A trap used to catch bears and other legged creatures. There is a remote signaler hooked up to it." if(istype(I, /obj/item/weapon/screwdriver)) if(IED) IED.forceMove(get_turf(src)) IED = null to_chat(user, "You remove the IED from the [src].") return + if(sig) + sig.forceMove(get_turf(src)) + sig = null + to_chat(user, "You remove the signaler from the [src].") + return ..() /obj/item/weapon/restraints/legcuffs/beartrap/Crossed(AM as mob|obj) @@ -88,6 +116,9 @@ spawn(IED.det_time) IED.prime() + if(sig && isturf(src.loc)) + sig.signal() + if(ishuman(AM)) var/mob/living/carbon/H = AM if(H.lying) @@ -192,4 +223,4 @@ /obj/item/weapon/legcuffs/bolas/Bump() ..() - throw_failed() //allows a mech bolas to be destroyed \ No newline at end of file + throw_failed() //allows a mech bolas to be destroyed diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 3a371b8191e..b580a024b91 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -1815,18 +1815,6 @@
-
Atmospherics Technician
-
-
-
- Atmospheric Technicians are permitted to completely repipe the Atmospherics Piping Setup, provided they do not pump harmful gases into anywhere except the Turbine; -
- Atmospheric Technicians are not permitted to create volatile mixes using Plasma and Oxygen, nor are they permitted to create any potentially harmful mixes with Carbon Dioxide and/or Nitrous Oxide. An exception is made when working with the Turbine; -
- Atmospheric Technicians are permitted to cool Plasma and store it for later use in Radiation Collectors. Likewise, they are permitted to cool Nitrogen or Carbon Dioxide and store it for use as coolant for the Supermatter Engine; -
- Atmospheric Technicians are not permitted to take the axe out of its case unless there is an immediate and urgent threat to their life or urgent access to crisis locations is necessary. The axe must be returned to the case afterwards, and the case locked; -
- Atmospheric Technicians are not permitted to tamper with the default values on Air Alarms. They are, however, permitted to create small, acclimatized rooms for species that require special atmospheric conditions (such as Plasmamen and Vox), provided they receive express permission from the Chief Engineer; -
- Atmospheric Technicians must periodically check on the Central Alarms Computer, in periods of, at most, thirty (30) minutes; -
- Atmospheric Technicians must respond promptly to piping and station breaches. Failure to report within fifteen (15) minutes will be considered a breach of Standard Operating Procedure, unless there are no spare Atmospheric Technicians to report, or an Engineer has arrived on scene first. All Hazard Zones must be cordoned off with Engineering Tape, for the sake of everyone else -
-
Shaft Miner
- Shaft Miners are not permitted to bring Gibtonite aboard the station; @@ -2412,7 +2400,104 @@
- Demotion of Chief Engineer and reparation of Engine if no threat manifests.
- + +