- Desirable output pressure: - [round(target_pressure,0.1)]kPa | Change - "} +/obj/machinery/atmospherics/binary/passive_gate/ui_interact(mob/user, ui_key = "main") + if(stat & (BROKEN|NOPOWER)) + return - user << browse("
- Desirable output pressure: - [round(target_pressure,0.1)]kPa | Change - "} +/obj/machinery/atmospherics/binary/pump/ui_interact(mob/user, ui_key = "main") + if(stat & (BROKEN|NOPOWER)) + return - user << browse("
- Desirable output flow: - [round(transfer_rate,1)]l/s | Change - "} +/obj/machinery/atmospherics/binary/volume_pump/ui_interact(mob/user, ui_key = "main") + if(stat & (BROKEN|NOPOWER)) + return - user << browse("
- Filtering: [current_filter_type]
-
Set Filter Type:
- Plasma- Oxygen
- Nitrogen
- Carbon Dioxide
- Nitrous Oxide
- Nothing
-
Desirable output pressure: - [src.target_pressure]kPa | Change - "} -/* - user << browse("
Clear Screen", src.temp, src) - //else - // src.on != src.on -*/ - user << browse("
- Desirable output pressure: - [target_pressure]kPa | Change -
- Node 1 Concentration: - - - - - [node1_concentration]([node1_concentration*100]%) - + - + -
- Node 2 Concentration: - - - - - [node2_concentration]([node2_concentration*100]%) - + - + - "} - user << browse("
" slip.info += "CHECK CONTENTS AND STAMP BELOW THE LINE TO CONFIRM RECEIPT OF GOODS
" // And now this is actually meaningful. slip.loc = Crate - + if(istype(Crate, /obj/structure/closet/crate)) + var/obj/structure/closet/crate/CR = Crate + CR.manifest = slip + CR.update_icon() + if(istype(Crate, /obj/structure/largecrate)) + var/obj/structure/largecrate/LC = Crate + LC.manifest = slip + LC.update_icon() + return Crate /datum/subsystem/shuttle/proc/generateSupplyOrder(packId, _orderedby, _orderedbyRank, _comment) diff --git a/code/controllers/subsystem/shuttles/emergency.dm b/code/controllers/subsystem/shuttles/emergency.dm index 4b9d061cd8a..157e199b2ad 100644 --- a/code/controllers/subsystem/shuttles/emergency.dm +++ b/code/controllers/subsystem/shuttles/emergency.dm @@ -43,7 +43,10 @@ else return - SSshuttle.emergencyLastCallLoc = signalOrigin + if(prob(70)) + SSshuttle.emergencyLastCallLoc = signalOrigin + else + SSshuttle.emergencyLastCallLoc = null priority_announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][SSshuttle.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ]", null, 'sound/AI/shuttlecalled.ogg', "Priority") @@ -56,6 +59,8 @@ if(prob(70)) SSshuttle.emergencyLastCallLoc = signalOrigin + else + SSshuttle.emergencyLastCallLoc = null priority_announce("The emergency shuttle has been recalled.[SSshuttle.emergencyLastCallLoc ? " Recall signal traced. Results can be viewed on any communications console." : "" ]", null, 'sound/AI/shuttlerecalled.ogg', "Priority") /* diff --git a/code/controllers/subsystem/shuttles/supply.dm b/code/controllers/subsystem/shuttles/supply.dm index 4322a504b2e..2cce906435f 100644 --- a/code/controllers/subsystem/shuttles/supply.dm +++ b/code/controllers/subsystem/shuttles/supply.dm @@ -44,7 +44,7 @@ return 2 var/list/emptyTurfs = list() - for(var/turf/simulated/shuttle/T in areaInstance) + for(var/turf/simulated/floor/T in areaInstance) if(T.density || T.contents.len) continue emptyTurfs += T diff --git a/code/controllers/subsystem/sun.dm b/code/controllers/subsystem/sun.dm index 8637aff5efd..d04b0369eed 100644 --- a/code/controllers/subsystem/sun.dm +++ b/code/controllers/subsystem/sun.dm @@ -19,6 +19,9 @@ var/datum/subsystem/sun/SSsun if(prob(50)) // same chance to rotate clockwise than counter-clockwise rate = -rate +/datum/subsystem/sun/stat_entry(msg) + ..("P:[solars.len]") + /datum/subsystem/sun/fire() angle = (360 + angle + rate * 6) % 360 // increase/decrease the angle to the sun, adjusted by the rate diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 040232d7baa..4d80d74daae 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -17,6 +17,7 @@ var/datum/subsystem/ticker/ticker var/event = 0 var/login_music //music played in pregame lobby + var/round_end_sound //music/jingle played when the world reboots var/list/datum/mind/minds = list() //The characters in the game. Used for objective tracking. @@ -46,11 +47,13 @@ var/datum/subsystem/ticker/ticker /datum/subsystem/ticker/New() NEW_SS_GLOBAL(ticker) - login_music = pickweight(list('sound/ambience/title2.ogg' = 49, 'sound/ambience/title1.ogg' = 49, 'sound/ambience/clown.ogg' = 2)) // choose title music! + login_music = pickweight(list('sound/ambience/title2.ogg' = 31, 'sound/ambience/title1.ogg' = 31, 'sound/ambience/title3.ogg' =31, 'sound/ambience/clown.ogg' = 7)) // choose title music! if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS]) login_music = 'sound/ambience/clown.ogg' -/datum/subsystem/ticker/Initialize() +/datum/subsystem/ticker/Initialize(timeofday, zlevel) + if (zlevel) + return ..() if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase() if(!syndicate_code_response) syndicate_code_response = generate_code_phrase() setupGenetics() @@ -75,9 +78,11 @@ var/datum/subsystem/ticker/ticker ++totalPlayersReady //countdown + if(timeLeft < 0) + return timeLeft -= wait - if(timeLeft <= 30 && !tipped) + if(timeLeft <= 300 && !tipped) send_random_tip() tipped = 1 @@ -98,25 +103,9 @@ var/datum/subsystem/ticker/ticker declare_completion() spawn(50) if(mode.station_was_nuked) - feedback_set_details("end_proper","nuke") - if(!delay_end) - world << "\blue Rebooting due to destruction of station in [restart_timeout/10] seconds" + world.Reboot("Station destroyed by Nuclear Device.", "end_proper", "nuke") else - feedback_set_details("end_proper","proper completion") - if(!delay_end) - world << "\blue Restarting in [restart_timeout/10] seconds" - - - if(blackbox) - blackbox.save_all_data_to_sql() - - if(delay_end) - world << "\blue An admin has delayed the round end" - else - sleep(restart_timeout) - kick_clients_in_lobby("\red The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked - world.Reboot() - + world.Reboot("Round ended.", "end_proper", "proper completion") /datum/subsystem/ticker/proc/setup() //Create and announce mode @@ -149,11 +138,8 @@ var/datum/subsystem/ticker/ticker //Configure mode and assign player to special mode stuff var/can_continue = 0 - if(mode.pre_setup_before_jobs) - can_continue = src.mode.pre_setup() + can_continue = src.mode.pre_setup() //Choose antagonists SSjob.DivideOccupations() //Distribute jobs - if(!mode.pre_setup_before_jobs) - can_continue = src.mode.pre_setup() if(!Debug2) if(!can_continue) @@ -327,7 +313,7 @@ var/datum/subsystem/ticker/ticker if(player && player.mind && player.mind.assigned_role) if(player.mind.assigned_role == "Captain") captainless=0 - if(player.mind.assigned_role != "MODE") + if(player.mind.assigned_role != player.mind.special_role) SSjob.EquipRank(player, player.mind.assigned_role, 0) if(captainless) for(var/mob/M in player_list) @@ -351,7 +337,7 @@ var/datum/subsystem/ticker/ticker if(Player.stat != DEAD && !isbrain(Player)) num_survivors++ if(station_evacuated) //If the shuttle has already left the station - if(!Player.onCentcom()) + if(!Player.onCentcom() && !Player.onSyndieBase()) Player << "You managed to survive, but were marooned on [station_name()]..." else num_escapees++ @@ -364,7 +350,7 @@ var/datum/subsystem/ticker/ticker //Round statistics report var/datum/station_state/end_state = new /datum/station_state() end_state.count() - var/station_integrity = round( 100.0 * start_state.score(end_state), 0.1) + var/station_integrity = min(round( 100.0 * start_state.score(end_state), 0.1), 100.0) world << "
[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]" world << "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]" diff --git a/code/controllers/subsystem/voting.dm b/code/controllers/subsystem/voting.dm index 9fb28c1f174..7988d4ab99e 100644 --- a/code/controllers/subsystem/voting.dm +++ b/code/controllers/subsystem/voting.dm @@ -115,14 +115,8 @@ var/datum/subsystem/vote/SSvote restart = 1 else master_mode = . - if(restart) - world << "World restarting due to vote..." - feedback_set_details("end_error","restart vote") - if(blackbox) blackbox.save_all_data_to_sql() - sleep(50) - log_game("Rebooting due to restart vote") - world.Reboot() + world.Reboot("Restart vote successful.", "end_error", "restart vote") return . diff --git a/code/controllers/subsystems.dm b/code/controllers/subsystems.dm index 47eaadb43e5..5e10dcbcfd6 100644 --- a/code/controllers/subsystems.dm +++ b/code/controllers/subsystems.dm @@ -2,17 +2,20 @@ /datum/subsystem //things you will want to define - var/name //name of the subsystem - var/priority = 0 //priority affects order of initialization. Higher priorities are initialized first, lower priorities later. Can be decimal and negative values. - var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer. + var/name //name of the subsystem + var/priority = 0 //priority affects order of initialization. Higher priorities are initialized first, lower priorities later. Can be decimal and negative values. + var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer. + var/dynamic_wait = 0 //changes the wait based on the amount of time it took to process + var/dwait_upper = 20 //longest wait can be under dynamic_wait + var/dwait_lower = 5 //shortest wait can be under dynamic_wait + var/dwait_delta = 3 //How much should processing time effect dwait. or basically: wait = cost*dwait_delta //things you will probably want to leave alone - var/can_fire = 0 //prevent fire() calls - var/last_fire = 0 //last world.time we called fire() - var/next_fire = 0 //scheduled world.time for next fire() - var/cpu = 0 //cpu-usage stats (somewhat vague) - var/cost = 0 //average time to execute - var/times_fired = 0 //number of times we have called fire() + var/can_fire = 0 //prevent fire() calls + var/last_fire = 0 //last world.time we called fire() + var/next_fire = 0 //scheduled world.time for next fire() + var/cost = 0 //average time to execute + var/times_fired = 0 //number of times we have called fire() //used to initialize the subsystem BEFORE the map has loaded /datum/subsystem/New() @@ -25,21 +28,28 @@ can_fire = 0 //used to initialize the subsystem AFTER the map has loaded -/datum/subsystem/proc/Initialize(start_timeofday) +/datum/subsystem/proc/Initialize(start_timeofday, zlevel) var/time = (world.timeofday - start_timeofday) / 10 var/msg = "Initialized [name] SubSystem within [time] seconds" + if (zlevel) + testing(msg) + return world << "[msg]" world.log << msg //hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc. -/datum/subsystem/proc/stat_entry() - stat(name, "[round(cost,0.001)]ds\t(CPU:[round(cpu,1)]%)") +/datum/subsystem/proc/stat_entry(msg) + var/dwait = "" + if (dynamic_wait) + dwait = "DWait:[wait]ds " -//could be used to postpone a costly subsystem for one cycle + stat(name, "[round(cost,0.001)]ds\t[dwait][msg]") + +//could be used to postpone a costly subsystem for (default one) var/cycles, cycles //for instance, during cpu intensive operations like explosions -/datum/subsystem/proc/postpone() +/datum/subsystem/proc/postpone(var/cycles = 1) if(next_fire - world.time < wait) - next_fire += wait + next_fire += (wait*cycles) //usually called via datum/subsystem/New() when replacing a subsystem (i.e. due to a recurring crash) //should attempt to salvage what it can from the old instance of subsystem diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 0285f2be06c..a43a3996271 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -70,6 +70,7 @@ return {" + [head_content] diff --git a/code/datums/computerfiles.dm b/code/datums/computerfiles.dm index 14cd7e38612..37ba1ec51e0 100644 --- a/code/datums/computerfiles.dm +++ b/code/datums/computerfiles.dm @@ -1,4 +1,4 @@ -datum +/datum computer var/name folder diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 4014d4eb0eb..78728738681 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -188,7 +188,7 @@ var/record_id_num = 1001 /datum/datacore/proc/manifest_inject(var/mob/living/carbon/human/H) - if(H.mind && (H.mind.assigned_role != "MODE")) + if(H.mind && (H.mind.assigned_role != H.mind.special_role)) var/assignment if(H.mind.assigned_role) assignment = H.mind.assigned_role @@ -259,6 +259,8 @@ var/record_id_num = 1001 L.fields["b_dna"] = H.dna.unique_enzymes L.fields["enzymes"] = H.dna.struc_enzymes L.fields["identity"] = H.dna.uni_identity + L.fields["species"] = H.dna.species.type + L.fields["mcolor"] = H.dna.mutant_color L.fields["image"] = image locked += L return @@ -370,7 +372,7 @@ var/record_id_num = 1001 if("Bartender") clothes_s = icon('icons/mob/uniform.dmi', "ba_suit_s") clothes_s.Blend(icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(icon('icons/mob/suit.dmi', "armoralt"), ICON_OVERLAY) + clothes_s.Blend(icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY) if("Quartermaster") clothes_s = icon('icons/mob/uniform.dmi', "qm_s") clothes_s.Blend(icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index d115d54b80d..c4e3856e295 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -790,7 +790,7 @@ body if(result) var/newtype = species_list[result] - H.dna.species = new newtype() + hardset_dna(H, null, null, null, null, newtype) H.regenerate_icons() else if(href_list["adjustDamage"] && href_list["mobToDamage"]) diff --git a/code/datums/debug.dm b/code/datums/debug.dm new file mode 100644 index 00000000000..28235903616 --- /dev/null +++ b/code/datums/debug.dm @@ -0,0 +1,2 @@ +/datum/debug + var/list/debuglist \ No newline at end of file diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 48abda03c83..952c22982ef 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -128,3 +128,9 @@ if(!CanContractDisease(D)) return 0 AddDisease(D) + + +/mob/living/carbon/human/CanContractDisease(var/datum/disease/D) + if(dna && VIRUSIMMUNE in dna.species.specflags) + return 0 + return ..() \ No newline at end of file diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index 05ea21602c3..0de6ac8cebf 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -122,7 +122,7 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease if(isturf(source.loc)) for(var/mob/living/carbon/C in oview(spread_range, source)) if(isturf(C.loc)) - if(AStar(source.loc, C.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, spread_range)) + if(AStar(source.loc, C.loc, null, /turf/proc/Distance, spread_range)) C.ContractDisease(src) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 28b08852240..541fef7bef7 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -13,7 +13,7 @@ var/list/archive_diseases = list() var/list/advance_cures = list( "nutriment", "sugar", "orangejuice", "spaceacillin", "salglu_solution", "ethanol", - "leporazine", "synaptizine", "lipozine", + "leporazine", "synaptizine", "lipolicide", "silver", "gold" ) diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index 1edf47c6366..c615d644b51 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -31,10 +31,10 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(3, 4) - M << "[pick("You hear a ringing in your ear.", "Your ears pop.")]" + M << "[pick("You hear a ringing in your ear.", "Your ears pop.")]" if(5) if(!(M.ear_deaf)) - M << "Your ears pop and begin ringing loudly!" + M << "Your ears pop and begin ringing loudly!" M.setEarDamage(-1,INFINITY) //Shall be enough spawn(200) if(M) diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index 3de7edf76cc..315a01aa5d3 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -16,7 +16,7 @@ switch(stage) if(2) //also changes say, see say.dm if(prob(5)) - affected_mob << "Your feel anxious." + affected_mob << "You feel anxious." if(3) if(prob(10)) affected_mob << "Your stomach flutters." diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 4eac92f16b9..c46ce95e0a6 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -93,8 +93,8 @@ /datum/disease/transformation/jungle_fever/do_disease_transformation(var/mob/living/carbon/affected_mob) if(!ismonkey(affected_mob)) - affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) ticker.mode.add_monkey(affected_mob.mind) + affected_mob.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE) /datum/disease/transformation/jungle_fever/stage_act() ..() @@ -202,7 +202,7 @@ if(ishuman(affected_mob)) var/mob/living/carbon/human/human = affected_mob if(human.dna && human.dna.species.id != "slime") - human.dna.species = new /datum/species/slime() + hardset_dna(human, null, null, null, null, /datum/species/slime) human.regenerate_icons() /datum/disease/transformation/corgi diff --git a/code/datums/gas_mixture.dm b/code/datums/gas_mixture.dm index 54302f051a3..5a66e77b413 100644 --- a/code/datums/gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -948,3 +948,36 @@ What are the archived variables for? else return 0 return 1 + + + + +//Takes the amount of the gas you want to PP as an argument +//So I don't have to do some hacky switches/defines/magic strings + +//eg: +//Tox_PP = get_partial_pressure(gas_mixture.toxins) +//O2_PP = get_partial_pressure(gas_mixture.oxygen) + +//Does handle trace gases! + +/datum/gas_mixture/proc/get_breath_partial_pressure(var/gas_pressure) + var/breath_pressure = (total_moles()*R_IDEAL_GAS_EQUATION*temperature)/BREATH_VOLUME + return (gas_pressure/total_moles())*breath_pressure + + +//Reverse of the above +/datum/gas_mixture/proc/get_true_breath_pressure(var/breath_pp) + var/breath_pressure = (total_moles()/R_IDEAL_GAS_EQUATION/temperature)*BREATH_VOLUME + return (breath_pp/breath_pressure*total_moles()) + +//Mathematical proofs: +/* + +get_breath_partial_pressure(gas_pp) --> gas_pp/total_moles()*breath_pp = pp +get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles() + +10/20*5 = 2.5 +10 = 2.5/5*20 + +*/ diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 91826c2d749..4a7c4765b00 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -23,7 +23,7 @@ var/global/datum/getrev/revdata = new() world.log << revision return -client/verb/showrevinfo() +/client/verb/showrevinfo() set category = "OOC" set name = "Show Server Revision" set desc = "Check the current server code revision" @@ -39,4 +39,6 @@ client/verb/showrevinfo() src << "Enforce Human Authority: [config.enforce_human_authority]" src << "Allow Latejoin Antagonists: [config.allow_latejoin_antagonists]" src << "Protect Assistant From Antagonist: [config.protect_assistant_from_antagonist]" + src << "Enforce Continuous Rounds: [config.continuous.len] of [config.modes.len] roundtypes" + src << "Allow Midround Antagonists: [config.midround_antag.len] of [config.modes.len] roundtypes" return diff --git a/code/datums/helper_datums/icon_snapshot.dm b/code/datums/helper_datums/icon_snapshot.dm new file mode 100644 index 00000000000..22b402be446 --- /dev/null +++ b/code/datums/helper_datums/icon_snapshot.dm @@ -0,0 +1,15 @@ +/datum/icon_snapshot + var/name + var/icon + var/icon_state + var/list/overlays + +/datum/icon_snapshot/proc/makeImg() + if(!icon || !icon_state) + return + var/obj/temp = new + temp.icon = icon + temp.icon_state = icon_state + temp.overlays = overlays.Copy() + var/icon/tempicon = getFlatIcon(temp) // TODO Actually write something less heavy-handed for this + return tempicon diff --git a/code/datums/hud.dm b/code/datums/hud.dm index f3315d1cfd6..e1fa433e26f 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -12,6 +12,7 @@ var/datum/atom_hud/huds = list( \ ANTAG_HUD_GANG_A = new/datum/atom_hud/antag(), \ ANTAG_HUD_GANG_B = new/datum/atom_hud/antag(), \ ANTAG_HUD_WIZ = new/datum/atom_hud/antag(), \ + ANTAG_HUD_SHADOW = new/datum/atom_hud/antag(), \ ) /datum/atom_hud diff --git a/code/datums/martial.dm b/code/datums/martial.dm index ba35c5d98cd..81e611df4f4 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -3,6 +3,8 @@ var/streak = "" var/max_streak_length = 6 var/current_target = null + var/temporary = 0 + var/datum/martial_art/base = null // The permanent style /datum/martial_art/proc/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) return 0 @@ -65,7 +67,21 @@ D.forcesay(hit_appends) return 1 +/datum/martial_art/proc/teach(var/mob/living/carbon/human/H,var/make_temporary=0) + if(make_temporary) + temporary = 1 + if(H.martial_art && H.martial_art.temporary) + if(temporary) + base = H.martial_art.base + else + H.martial_art.base = src //temporary styles have priority + return + H.martial_art = src +/datum/martial_art/proc/remove(var/mob/living/carbon/human/H) + if(H.martial_art != src) + return + H.martial_art = base /datum/martial_art/boxing name = "Boxing" @@ -135,6 +151,7 @@ /datum/martial_art/wrestling/proc/Suplex(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) + add_logs(A, D, "suplexed") D.visible_message("[A] suplexes [D]!", \ "[A] suplexes [D]!") D.forceMove(A.loc) @@ -249,43 +266,43 @@ //ITEMS - /obj/item/clothing/gloves/boxing - var/datum/martial_art/old = null + var/datum/martial_art/boxing/style = new /obj/item/clothing/gloves/boxing/equipped(mob/user, slot) if(!ishuman(user)) return if(slot == slot_gloves) var/mob/living/carbon/human/H = user - old = H.martial_art - H.martial_art = new/datum/martial_art/boxing(null) + style.teach(H,1) return /obj/item/clothing/gloves/boxing/dropped(mob/user) if(!ishuman(user)) return var/mob/living/carbon/human/H = user - H.martial_art = old + if(H.get_item_by_slot(slot_gloves) == src) + style.remove(H) return /obj/item/weapon/storage/belt/champion/wrestling - var/datum/martial_art/old = null + name = "Wrestling Belt" + var/datum/martial_art/wrestling/style = new /obj/item/weapon/storage/belt/champion/wrestling/equipped(mob/user, slot) if(!ishuman(user)) return if(slot == slot_belt) var/mob/living/carbon/human/H = user - old = H.martial_art - H.martial_art = new/datum/martial_art/wrestling(null) + style.teach(H,1) return /obj/item/weapon/storage/belt/champion/wrestling/dropped(mob/user) if(!ishuman(user)) return var/mob/living/carbon/human/H = user - H.martial_art = old + if(H.get_item_by_slot(slot_belt) == src) + style.remove(H) return /obj/item/weapon/plasma_fist_scroll @@ -296,9 +313,12 @@ var/used = 0 /obj/item/weapon/plasma_fist_scroll/attack_self(mob/user as mob) - if(!ishuman(user) || used) + if(!ishuman(user)) return - var/mob/living/carbon/human/H = user - H.martial_art = new/datum/martial_art/plasma_fist - used = 1 - desc += "It looks like it's magic was used up." + if(!used) + var/mob/living/carbon/human/H = user + var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null) + F.teach(H) + H << "You learn the PLASMA FIST style" + used = 1 + desc += "It looks like it's magic was used up." diff --git a/code/datums/mind.dm b/code/datums/mind.dm index e178c01e30a..b4dc9608a3d 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -39,6 +39,7 @@ var/assigned_role var/special_role + var/list/restricted_roles = list() var/datum/job/assigned_job @@ -289,39 +290,26 @@ text += "
Equipment: give" var/list/L = current.get_contents() - var/obj/item/device/flash/flash = locate() in L - if (flash) - if(!flash.broken) - text += "|take." - else - text += "|take|repair flash." + var/obj/item/device/gangtool/gangtool = locate() in L + if (gangtool) + text += "|take." else text += "." - if (objectives.len==0) - text += "
Objectives are empty! Set to kill all rival gang leaders." - - else if (src in ticker.mode.B_bosses) text += "loyal|none|(A) gangster boss|(B) gangster BOSS" text += "
Equipment: give" var/list/L = current.get_contents() - var/obj/item/device/flash/flash = locate() in L - if (flash) - if(!flash.broken) - text += "
take." - else - text += "
take|repair flash." + var/obj/item/device/gangtool/gangtool = locate() in L + if (gangtool) + text += "|take." else text += "." - if (objectives.len==0) - text += "
Objectives are empty! Set to kill all rival gang leaders." - - else if (src in ticker.mode.A_gangsters) + else if (src in ticker.mode.A_gang) text += "loyal|none|(A) GANGSTER boss|(B) gangster boss" - else if (src in ticker.mode.B_gangsters) + else if (src in ticker.mode.B_gang) text += "loyal|none|(A) gangster boss|(B) GANGSTER boss" else if(isloyal(current)) text += "LOYAL|none|(A) gangster boss|(B) gangster boss" @@ -468,6 +456,25 @@ sections["shadowling"] = text + /** Abductors **/ + + text = "Abductor" + if(ticker.mode.config_tag == "abductor") + text = uppertext(text) + text = "[text]: " + if(src in ticker.mode.abductors) + text += "Abductor|human" + text += "|undress|equip" + else + text += "Abductor|human" + + if(current && current.client && current.client.prefs.be_special & BE_ABDUCTOR) + text += "|Enabled in Prefs" + else + text += "|Disabled in Prefs" + + sections["abductor"] = text + /** MONKEY ***/ if (istype(current, /mob/living/carbon)) text = "monkey" @@ -824,7 +831,7 @@ log_admin("[key_name(usr)] has de-gang'ed [current].") if("agang") - if(src in ticker.mode.A_gangsters) + if(src in ticker.mode.A_gang) return ticker.mode.remove_gangster(src, 0, 2) ticker.mode.add_gangster(src,"A",0) @@ -841,9 +848,11 @@ current << "You are a [gang_name("A")] Gang Boss!" message_admins("[key_name_admin(usr)] has added [current] to the [gang_name("A")] Gang (A) leadership.") log_admin("[key_name(usr)] has added [current] to the [gang_name("A")] Gang (A) leadership.") + ticker.mode.forge_gang_objectives(src) + ticker.mode.greet_gang(src,0) if("bgang") - if(src in ticker.mode.B_gangsters) + if(src in ticker.mode.B_gang) return ticker.mode.remove_gangster(src, 0, 2) ticker.mode.add_gangster(src,"B",0) @@ -860,39 +869,26 @@ current << "You are a [gang_name("B")] Gang Boss!" message_admins("[key_name_admin(usr)] has added [current] to the [gang_name("B")] Gang (B) leadership.") log_admin("[key_name(usr)] has added [current] to the [gang_name("B")] Gang (B) leadership.") - - if("autoobjective") ticker.mode.forge_gang_objectives(src) ticker.mode.greet_gang(src,0) - usr << "Unable to equip flash!" if(1) - usr << "Unable to equip recaller!" - if(0) - usr << "Unable to equip both flash and recaller!" + usr << "Unable to equip territory spraycan!" + if(2) + usr << "Unable to equip recruitment pen and spraycan!" + if(3) + usr << "Unable to equip gangtool, pen, and spraycan!" if("takeequip") var/list/L = current.get_contents() - var/obj/item/device/flash/flash = locate() in L - if (!flash) - usr << "Deleting flash failed!" - qdel(flash) - var/obj/item/device/recaller/recaller = locate() in L - if (!recaller) - usr << "Deleting recaller failed!" - qdel(recaller) - - if("repairflash") - var/list/L = current.get_contents() - var/obj/item/device/flash/flash = locate() in L - if (!flash) - usr << "Repairing flash failed!" - else - flash.broken = 0 + for(var/obj/item/weapon/pen/gang/pen in L) + qdel(pen) + for(var/obj/item/device/gangtool/gangtool in L) + qdel(gangtool) + for(var/obj/item/toy/crayon/spraycan/gang/SC in L) + qdel(SC) else if (href_list["cult"]) switch(href_list["cult"]) @@ -923,6 +919,10 @@ usr << "Spawning tome failed!" else H << "A tome, a message from your new master, appears in your [where]." + if(where == "backpack") + var/obj/item/weapon/storage/B = H.back + B.orient2hud(H) + B.show_to(H) if("amulet") if (!ticker.mode.equip_cultist(current)) @@ -997,7 +997,7 @@ else current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" special_role = "Syndicate" - assigned_role = "MODE" + assigned_role = "Syndicate" current << "You are a [syndicate_name()] agent!" ticker.mode.forge_syndicate_objectives(src) ticker.mode.greet_syndicate(src) @@ -1058,6 +1058,7 @@ else if(href_list["shadowling"]) switch(href_list["shadowling"]) if("clear") + ticker.mode.update_shadow_icons_removed(src) src.spell_list = null if(src in ticker.mode.shadows) ticker.mode.shadows -= src @@ -1083,9 +1084,8 @@ current << "You notice a brightening around you. No, it isn't that. The shadows grow, darken, swirl. The darkness has a new welcome for you, and you realize with a \ start that you can't be human. No, you are a shadowling, a harbringer of the shadows! Your alien abilities have been unlocked from within, and you may both commune with your allies and use \ a chrysalis to reveal your true form. You are to ascend at all costs." - src.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind - src.spell_list += new /obj/effect/proc_holder/spell/targeted/enthrall - current.verbs += /mob/living/carbon/human/proc/shadowling_hatch + ticker.mode.finalize_shadowling(src) + ticker.mode.update_shadow_icons_added(src) if("thrall") if(!ishuman(current)) usr << "This only works on humans!" @@ -1097,7 +1097,26 @@ current << "You may use the Hivemind Commune ability to communicate with your fellow enlightened ones." message_admins("[key_name_admin(usr)] has thrall'ed [current].") log_admin("[key_name(usr)] has thrall'ed [current].") - src.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind + + else if(href_list["abductor"]) + switch(href_list["abductor"]) + if("clear") + usr << "Not implemented yet. Sorry!" + if("abductor") + if(!ishuman(current)) + usr << "This only works on humans!" + return + make_Abductor() + log_admin("[key_name(usr)] turned [current] into abductor.") + if("equip") + var/gear = alert("Agent or Scientist Gear","Gear","Agent","Scientist") + if(gear) + var/datum/game_mode/abduction/temp = new + temp.equip_common(current) + if(gear=="Agent") + temp.equip_agent(current) + else + temp.equip_scientist(current) else if (href_list["monkey"]) var/mob/living/L = current @@ -1287,7 +1306,7 @@ if(!(src in ticker.mode.wizards)) ticker.mode.wizards += src special_role = "Wizard" - assigned_role = "MODE" + assigned_role = "Wizard" //ticker.mode.learn_basic_spells(current) if(!wizardstart.len) current.loc = pick(latejoin) @@ -1368,12 +1387,67 @@ /datum/mind/proc/make_Gang(var/gang) - special_role = "[(gang=="A") ? "[gang_name("A")] Gang (A)" : "[gang_name("B")] Gang (B)"] Boss" + special_role = "[gang_name(gang)] Gang ([gang]) Boss" + if(gang=="A") + ticker.mode.A_bosses += src + else if(gang=="B") + ticker.mode.B_bosses += src ticker.mode.update_gang_icons_added(src, gang) ticker.mode.forge_gang_objectives(src, gang) ticker.mode.greet_gang(src) ticker.mode.equip_gang(current) +/datum/mind/proc/make_Abductor() + var/role = alert("Abductor Role ?","Role","Agent","Scientist") + var/team = input("Abductor Team ?","Team ?") in list(1,2,3,4) + var/teleport = alert("Teleport to ship ?","Teleport","Yes","No") + + if(!role || !team || !teleport) + return + + if(!ishuman(current)) + return + + ticker.mode.abductors |= src + + var/datum/objective/experiment/O = new + O.owner = src + objectives += O + + var/mob/living/carbon/human/H = current + + hardset_dna(H,null,null,null,null,/datum/species/abductor,null) + var/datum/species/abductor/S = H.dna.species + + switch(role) + if("Agent") + S.agent = 1 + if("Scientist") + S.scientist = 1 + S.team = team + + var/list/obj/effect/landmark/abductor/agent_landmarks = new + var/list/obj/effect/landmark/abductor/scientist_landmarks = new + agent_landmarks.len = 4 + scientist_landmarks.len = 4 + for(var/obj/effect/landmark/abductor/A in landmarks_list) + if(istype(A,/obj/effect/landmark/abductor/agent)) + agent_landmarks[text2num(A.team)] = A + else if(istype(A,/obj/effect/landmark/abductor/scientist)) + scientist_landmarks[text2num(A.team)] = A + + var/obj/effect/landmark/L + if(teleport=="Yes") + switch(role) + if("Agent") + S.agent = 1 + L = agent_landmarks[team] + H.loc = L.loc + if("Scientist") + S.scientist = 1 + L = agent_landmarks[team] + H.loc = L.loc + /datum/mind/proc/AddSpell(var/obj/effect/proc_holder/spell/spell) diff --git a/code/datums/mixed.dm b/code/datums/mixed.dm deleted file mode 100644 index d54c5327ec5..00000000000 --- a/code/datums/mixed.dm +++ /dev/null @@ -1,30 +0,0 @@ -/datum/powernet - var/list/cables = list() // all cables & junctions - var/list/nodes = list() // all connected machines - - var/load = 0 // the current load on the powernet, increased by each machine at processing - var/newavail = 0 // what available power was gathered last tick, then becomes... - var/avail = 0 //...the current available power in the powernet - var/viewload = 0 // the load as it appears on the power console (gradually updated) - var/number = 0 // Unused //TODEL - var/netexcess = 0 // excess power on the powernet (typically avail-load) - -/*Powernet procs : - -In modules/power/power.dm : - -/datum/powernet/New() -/datum/powernet/Destroy() -/datum/powernet/proc/is_empty() -/datum/powernet/proc/remove_cable(var/obj/structure/cable/C) -/datum/powernet/proc/add_cable(var/obj/structure/cable/C) -/datum/powernet/proc/remove_machine(var/obj/machinery/power/M) -/datum/powernet/proc/add_machine(var/obj/machinery/power/M) -/datum/powernet/proc/reset() -/datum/powernet/proc/get_electrocute_damage() - - -*/ - -/datum/debug - var/list/debuglist \ No newline at end of file diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm index 4b435d4b09c..9a17e523f9c 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations.dm @@ -94,7 +94,7 @@ name = "Hulk" quality = POSITIVE - get_chance = 5 + get_chance = 15 lowest_value = 256 * 14 text_gain_indication = "Your muscles hurt!" @@ -136,7 +136,7 @@ name = "Telekinesis" quality = POSITIVE - get_chance = 10 + get_chance = 20 lowest_value = 256 * 14 text_gain_indication = "You feel smarter!" @@ -151,7 +151,7 @@ name = "Cold Resistance" quality = POSITIVE - get_chance = 10 + get_chance = 25 lowest_value = 256 * 12 text_gain_indication = "Your body feels warm!" @@ -168,7 +168,7 @@ name = "X Ray Vision" quality = POSITIVE - get_chance = 10 + get_chance = 25 lowest_value = 256 * 15 text_gain_indication = "The walls suddenly disappear!" @@ -348,7 +348,7 @@ /datum/mutation/human/stealth name = "Cloak Of Darkness" quality = POSITIVE - get_chance = 10 + get_chance = 25 lowest_value = 256 * 14 text_gain_indication = "You begin to fade into the shadows." text_lose_indication = "You become fully visible." @@ -371,7 +371,7 @@ /datum/mutation/human/chameleon name = "Chameleon" quality = POSITIVE - get_chance = 10 + get_chance = 20 lowest_value = 256 * 14 text_gain_indication = "You feel one with your surroundings." text_lose_indication = "You feel oddly exposed." diff --git a/code/datums/spell.dm b/code/datums/spell.dm index b6978142e01..c01f7c427e6 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -10,6 +10,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin name = "Spell" desc = "A wizard spell" panel = "Spells" + var/sound = "sound/weapons/badZap.ogg" anchored = 1 // Crap like fireball projectiles are proc_holders, this is needed so fireballs don't get blown back into your face via atmos etc. pass_flags = PASSTABLE density = 0 @@ -136,6 +137,9 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin if("emote") user.visible_message(invocation, invocation_emote_self) //same style as in mob/living/emote.dm +/obj/effect/proc_holder/spell/proc/playMagSound() + playsound(get_turf(usr), sound,50,1) + /obj/effect/proc_holder/spell/New() ..() @@ -256,6 +260,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin var/random_target = 0 // chooses random viable target instead of asking the caster var/random_target_priority = TARGET_CLOSEST // if random_target is enabled how it will pick the target + /obj/effect/proc_holder/spell/aoe_turf //affects all turfs in view or range (depends) var/inner_radius = -1 //for all your ring spell needs diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm index 83aa183ae41..49f19c3a23f 100644 --- a/code/datums/spells/area_teleport.dm +++ b/code/datums/spells/area_teleport.dm @@ -5,6 +5,8 @@ var/randomise_selection = 0 //if it lets the usr choose the teleport loc or picks it from the list var/invocation_area = 1 //if the invocation appends the selected area + var/sound1 = "sound/weapons/ZapBang.ogg" + var/sound2 = "sound/weapons/ZapBang.ogg" /obj/effect/proc_holder/spell/targeted/area_teleport/perform(list/targets, recharge = 1) var/thearea = before_cast(targets) @@ -31,6 +33,7 @@ return thearea /obj/effect/proc_holder/spell/targeted/area_teleport/cast(list/targets,area/thearea) + playsound(get_turf(usr), sound1, 50,1) for(var/mob/living/target in targets) var/list/L = list() for(var/turf/T in get_area_turfs(thearea.type)) @@ -64,6 +67,7 @@ if(!success) target.loc = pick(L) + playsound(get_turf(usr), sound2, 50,1) return diff --git a/code/datums/spells/barnyard.dm b/code/datums/spells/barnyard.dm index 5b81f684b44..61238a7623a 100644 --- a/code/datums/spells/barnyard.dm +++ b/code/datums/spells/barnyard.dm @@ -31,7 +31,12 @@ user << "They are too far away!" return - var/choice = pick(/obj/item/clothing/mask/spig, /obj/item/clothing/mask/cowmask, /obj/item/clothing/mask/horsehead) + var/list/masks = list(/obj/item/clothing/mask/spig, /obj/item/clothing/mask/cowmask, /obj/item/clothing/mask/horsehead) + var/list/mSounds = list("sound/magic/PigHead_curse.ogg", "sound/magic/CowHead_Curse.ogg", "sound/magic/HorseHead_curse.ogg") + var/randM = rand(1,3) + + + var/choice = masks[randM] var/obj/item/clothing/mask/magichead = new choice magichead.flags |=NODROP magichead.flags_inv = null @@ -40,5 +45,6 @@ if(!target.unEquip(target.wear_mask)) qdel(target.wear_mask) target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) + playsound(get_turf(target), mSounds[randM], 50, 1) flick("e_flash", target.flash) diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index a288e7d0421..e2fbf651a33 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -85,4 +85,5 @@ else if(burnt_out) user << "[charged_item] doesn't seem to be reacting to the spell..." else + playsound(get_turf(usr), "sound/magic/Charge.ogg", 50, 1) user << "[charged_item] suddenly feels very warm!" diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index b17b5746801..c21e37113b7 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -16,14 +16,11 @@ var/cast_sound = 'sound/items/welder.ogg' /obj/effect/proc_holder/spell/aoe_turf/conjure/cast(list/targets) - + playsound(get_turf(usr), cast_sound, 50,1) for(var/turf/T in targets) if(T.density && !summon_ignore_density) targets -= T - if(cast_sound) - playsound(src.loc, cast_sound, 50, 1) - for(var/i=0,i
Health:
[viable_occupant.health]%
Radiation Level:
[viable_occupant.radiation]%
Health:
[viable_occupant.health] %
Radiation Level:
[viable_occupant.radiation] %
Rejuvenators:
[rejuvenators] units
Unique Enzymes :
[viable_occupant.dna.unique_enzymes]
Radiation Emitter Status
" + status += "Radiation Emitter Status
Output Level:
[radstrength]
\> Mutation:
(-[stddev] to +[stddev] = 68%) (-[2*stddev] to +[2*stddev] = 95%)
\> Mutation:
(-[stddev] to +[stddev] = 68 %) (-[2*stddev] to +[2*stddev] = 95 %)
Pulse Duration:
[radduration]
\> Accuracy:
[chance_to_hit]
" // Close statusDisplay div var/buttons = "Scan " if(connected) buttons += " [connected.state_open ? "Close" : "Open"] Scanner " @@ -681,10 +684,10 @@ temp_html += "
\tUI: No Data" if(se) temp_html += "
\tSE: [se] " - if(viable_occupant) temp_html += "Occupant " - else temp_html += "Occupant " - if(injectorready) temp_html += "Injector" - else temp_html += "Injector" + if(viable_occupant && viable_occupant.stat != DEAD) temp_html += "Occupant " + else temp_html += "Occupant " + if(injectorready) temp_html += "Injector" + else temp_html += "Injector" else temp_html += "
\tSE: No Data" if(viable_occupant) temp_html += "
Save to Buffer " @@ -719,7 +722,7 @@ temp_html += "----" temp_html += "
" - temp_html += "
Structural Enzymes:
"
+ temp_html += "
Structural Enzymes:
"
if(viable_occupant)
temp_html += "
The Abductors were:" + for(var/team_number=1,team_number<=teams,team_number++) + var/obj/machinery/abductor/console/console = get_team_console(team_number) + var/datum/objective/objective = team_objectives[team_number] + var/team_name = team_names[team_number] + var/datum/mind/amind = agents[team_number] + var/datum/mind/smind = scientists[team_number] + var/mob/living/carbon/human/agent = amind.current + var/mob/living/carbon/human/scientist = smind.current + if (console.experiment.points > objective.target_amount) + world << "[team_name] team fullfilled its mission! " + world << "Team Members : [agent.name]([agent.ckey]),[scientist.name]([scientist.ckey])" + else + world << "[team_name] team failed its mission! " + world << "Team Members: [agent.name]([agent.ckey])
[scientist.name]([scientist.ckey])" + + world << "
The Abductees were:" + display_abductees(console) + + ..() + return 1 + +/datum/game_mode/abduction/proc/display_abductees(var/obj/machinery/abductor/console/console) + var/list/mob/living/abductees = console.experiment.history + for(var/mob/living/abductee in abductees) + if(!abductee.mind) + continue + world << printplayer(abductee.mind) + world << printobjectives(abductee.mind) + +/datum/game_mode/proc/auto_declare_completion_abduction() + if(abductors.len && ticker.mode.config_tag != "abduction") // no repeating for the gamemode + world << "
The Abductors were:" + for(var/datum/mind/M in abductors) + world << "Abductor [M.current ? M.current.name : "Abductor"]([M.key])" + world << printobjectives(M) + world << "
The Abductees were:" + var/list/full_history = list() + for(var/obj/machinery/abductor/console/C in machines) + full_history |= C.experiment.history + for(var/mob/living/abductee in full_history) + if(!abductee.mind) + continue + world << printplayer(abductee.mind) + world << printobjectives(abductee.mind) + return + +//Landmarks +// TODO: Split into seperate landmarks for prettier ships +/obj/effect/landmark/abductor + var/team = 1 + +/obj/effect/landmark/abductor/console/New() + var/obj/machinery/abductor/console/c = new /obj/machinery/abductor/console(src.loc) + c.team = team + + spawn(5) // I'd do this properly when i got some time, temporary hack for mappers + c.Initialize() + qdel(src) + + +/obj/effect/landmark/abductor/agent +/obj/effect/landmark/abductor/scientist + + +// OBJECTIVES +/datum/objective/experiment + dangerrating = 10 + target_amount = 6 + var/team + +/datum/objective/experiment/New() + explanation_text = "Experiment on [target_amount] humans" + +/datum/objective/experiment/check_completion() + if(!owner.current || !ishuman(owner.current)) + return 0 + var/mob/living/carbon/human/H = owner.current + if(!H.dna || !H.dna.species || !(H.dna.species.id == "abductor")) + return 0 + var/datum/species/abductor/S = H.dna.species + var/ab_team = S.team + for(var/obj/machinery/abductor/experiment/E in machines) + if(E.team == ab_team) + if(E.points >= target_amount) + return 1 + else + return 0 + return 0 + +/datum/objective/abductee + dangerrating = 5 + completed = 1 + +/datum/objective/abductee/steal + explanation_text = "Steal all" + +/datum/objective/abductee/steal/New() + var/target = pick(list("Pets","Lights","Monkeys","Fruits","Shoes","Soap Bars")) + explanation_text+=" [target]" + +/datum/objective/abductee/capture + explanation_text = "Capture" + +/datum/objective/abductee/capture/New() + var/list/jobs = SSjob.occupations + for(var/datum/job/J in jobs) + if(J.current_positions < 1) + jobs -= J + if(jobs.len > 0) + var/datum/job/target = pick(jobs) + explanation_text += " \a [target.title]." + else + explanation_text += " someone." + +/datum/objective/abductee/shuttle + explanation_text = "You must escape the station! Get the shuttle called!" + +/datum/objective/abductee/noclone + explanation_text = "Don't allow anyone to be cloned." \ No newline at end of file diff --git a/code/game/gamemodes/abduction/abduction_gear.dm b/code/game/gamemodes/abduction/abduction_gear.dm new file mode 100644 index 00000000000..a13b347907c --- /dev/null +++ b/code/game/gamemodes/abduction/abduction_gear.dm @@ -0,0 +1,560 @@ +#define VEST_STEALTH 1 +#define VEST_COMBAT 2 +#define GIZMO_SCAN 1 +#define GIZMO_MARK 2 + +//AGENT VEST +/obj/item/clothing/suit/armor/abductor/vest + name = "Agent Vest" + desc = "Vest outfitted with alien stealth technology." + icon = 'icons/obj/abductor.dmi' + icon_state = "vest_stealth" + item_state = "armor" + blood_overlay_type = "armor" + origin_tech = "materials=5;biotech=4;powerstorage=5" + armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15) + action_button_name = "Activate" + action_button_is_hands_free = 1 + var/mode = VEST_STEALTH + var/stealth_active = 0 + var/combat_cooldown = 10 + var/datum/icon_snapshot/disguise + var/stealth_armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15) + var/combat_armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 50, rad = 50) + + var/obj/machinery/camera/portable/vest_cam = null + + +/obj/item/clothing/suit/armor/abductor/vest/New() + ..() + vest_cam = new /obj/machinery/camera/portable(src) + vest_cam.c_tag = "Agent Vest Cam" + vest_cam.network = list("Abductor") + +/obj/item/clothing/suit/armor/abductor/vest/proc/flip_mode() + switch(mode) + if(VEST_STEALTH) + mode = VEST_COMBAT + DeactivateStealth() + armor = combat_armor + icon_state = "vest_combat" + if(istype(loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = loc + H.update_inv_wear_suit() + return + if(VEST_COMBAT)// TO STEALTH + mode = VEST_STEALTH + armor = stealth_armor + icon_state = "vest_stealth" + if(istype(loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = loc + H.update_inv_wear_suit() + return + + + +/obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(var/datum/icon_snapshot/entry) + disguise = entry + +/obj/item/clothing/suit/armor/abductor/vest/proc/ActivateStealth() + if(disguise == null) + return + stealth_active = 1 + if(istype(src.loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/M = src.loc + spawn(0) + anim(M.loc,M,'icons/mob/mob.dmi',,"cloak",,M.dir) + + M.name_override = disguise.name + M.icon = disguise.icon + M.icon_state = disguise.icon_state + M.overlays = disguise.overlays + M.update_inv_r_hand() + M.update_inv_l_hand() + return + +/obj/item/clothing/suit/armor/abductor/vest/proc/DeactivateStealth() + if(!stealth_active) + return + stealth_active = 0 + if(istype(src.loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/M = src.loc + spawn(0) + anim(M.loc,M,'icons/mob/mob.dmi',,"uncloak",,M.dir) + M.name_override = null + M.overlays.Cut() + M.regenerate_icons() + return + +/obj/item/clothing/suit/armor/abductor/vest/IsShield() + DeactivateStealth() + return 0 +/obj/item/clothing/suit/armor/abductor/vest/IsReflect() + DeactivateStealth() + return 0 + +/obj/item/clothing/suit/armor/abductor/vest/ui_action_click() + switch(mode) + if(VEST_COMBAT) + Adrenaline() + if(VEST_STEALTH) + if(stealth_active) + DeactivateStealth() + else + ActivateStealth() + +/obj/item/clothing/suit/armor/abductor/vest/proc/Adrenaline() + if(istype(src.loc, /mob/living/carbon/human)) + if(combat_cooldown != initial(combat_cooldown)) + src.loc << "Combat injection is still recharging." + var/mob/living/carbon/human/M = src.loc + M.stat = 0 + M.SetParalysis(0) + M.SetStunned(0) + M.SetWeakened(0) + M.lying = 0 + M.update_canmove() + M.adjustStaminaLoss(-75) + combat_cooldown = 0 + SSobj.processing |= src + +/obj/item/clothing/suit/armor/abductor/vest/process() + combat_cooldown++ + if(combat_cooldown==initial(combat_cooldown)) + SSobj.processing.Remove(src) + +/obj/item/device/abductor/proc/IsAbductor(var/user) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.dna.species.id != "abductor") + return 0 + return 1 + return 0 + +/obj/item/device/abductor/proc/AbductorCheck(var/user) + if(IsAbductor(user)) + return 1 + user << "You can't figure how this works!" + return 0 + +/obj/item/device/abductor/proc/ScientistCheck(var/user) + var/mob/living/carbon/human/H = user + var/datum/species/abductor/S = H.dna.species + return S.scientist + +/obj/item/device/abductor/gizmo + name = "Science Tool" + desc = "Alien science is 90% dissections 10% probings." + icon = 'icons/obj/abductor.dmi' + icon_state = "gizmo_scan" + item_state = "silencer" + origin_tech = "materials=5;magnets=5;bluespace=6" + var/mode = GIZMO_SCAN + var/mob/living/marked = null + var/obj/machinery/abductor/console/console + +/obj/item/device/abductor/gizmo/attack_self(mob/user) + if(!AbductorCheck(user)) + return + if(!ScientistCheck(user)) + user << "You're not trained to use this!" + return + if(mode == GIZMO_SCAN) + mode = GIZMO_MARK + icon_state = "gizmo_mark" + else + mode = GIZMO_SCAN + icon_state = "gizmo_scan" + user << "You switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE" + +/obj/item/device/abductor/gizmo/attack(mob/living/M, mob/user) + if(!AbductorCheck(user)) + return + if(!ScientistCheck(user)) + user << "You're not trained to use this" + return + switch(mode) + if(GIZMO_SCAN) + scan(M, user) + if(GIZMO_MARK) + mark(M, user) + + +/obj/item/device/abductor/gizmo/afterattack(var/atom/target, var/mob/living/user, flag, params) + if(flag) + return + if(!AbductorCheck(user)) + return + if(!ScientistCheck(user)) + user << "You're not trained to use this" + return + switch(mode) + if(GIZMO_SCAN) + scan(target, user) + if(GIZMO_MARK) + mark(target, user) + +/obj/item/device/abductor/gizmo/proc/scan(var/atom/target, var/mob/living/user) + if(istype(target,/mob/living/carbon/human)) + if(console!=null) + console.AddSnapshot(target) + user << "You scan and add the being to the database" + +/obj/item/device/abductor/gizmo/proc/mark(var/atom/target, var/mob/living/user) + if(marked == target) + user << "This specimen is already marked!" + return + if(istype(target,/mob/living/carbon/human)) + if(IsAbductor(target)) + marked = target + user << "You mark the target for future retrieval." + else + prepare(target,user) + else + prepare(target,user) + +/obj/item/device/abductor/gizmo/proc/prepare(var/atom/target, var/mob/living/user) + if(get_dist(target,user)>1) + user << "You need to be next to the specimen to prepare it for transport!" + return + user << "You start preparing the specimen for transport..." + if(do_after(user, 100)) + marked = target + user << "You finish preparing the specimen for transport." + + +/obj/item/device/abductor/silencer + name = "Abductor Silencer" + desc = "Device used to break communication equipment" + icon = 'icons/obj/abductor.dmi' + icon_state = "silencer" + item_state = "gizmo" + origin_tech = "materials=5;magnets=5" + +/obj/item/device/abductor/silencer/attack(mob/living/M, mob/user) + if(!AbductorCheck(user)) + return + radio_off(M, user) + +/obj/item/device/abductor/silencer/afterattack(var/atom/target, var/mob/living/user, flag, params) + if(flag) + return + if(!AbductorCheck(user)) + return + radio_off(target, user) + +/obj/item/device/abductor/silencer/proc/radio_off(var/atom/target, var/mob/living/user) + if( !(user in (viewers(7,target))) ) + return + + var/turf/targloc = get_turf(target) + + var/mob/living/carbon/human/M + for(M in view(2,targloc)) + if(M == user) + continue + user << "You silence [M.name] radio devices." + radio_off_mob(M) + +/obj/item/device/abductor/silencer/proc/radio_off_mob(var/mob/living/carbon/human/M) + var/list/all_items = M.GetAllContents() + + for(var/obj/I in all_items) + if(istype(I,/obj/item/device/radio/)) + var/obj/item/device/radio/r = I + r.listening = 0 + if(!istype(I,/obj/item/device/radio/headset)) + r.broadcasting = 0 //goddamned headset hacks + + +/obj/item/weapon/implant/abductor + name = "Emergency Beam" + desc = "Gets you back on the ship." + icon = 'icons/obj/abductor.dmi' + icon_state = "implant" + activated = 1 + var/obj/machinery/abductor/pad/home + var/cooldown = 30 + +/obj/item/weapon/implant/abductor/activate() + if(cooldown == initial(cooldown)) + home.Retrieve(imp_in,1) + cooldown = 0 + SSobj.processing |= src + else + imp_in << "The emergency beam is still recharging!" + return + +/obj/item/weapon/implant/abductor/process() + if(cooldown < initial(cooldown)) + cooldown++ + if(cooldown == initial(cooldown)) + SSobj.processing.Remove(src) + + +/obj/item/device/firing_pin/alien + name = "alien-looking pin" + desc = "Only non-humans can use this pin" + fail_message = "Human DNA detected! Authorization revoked!" + +/obj/item/device/firing_pin/alien/pin_auth(mob/living/user) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.dna.species.id == "human") //stealth lizard buff go + return 0 + return 1 + +/obj/item/weapon/gun/energy/decloner/alien + ammo_type = list(/obj/item/ammo_casing/energy/declone) + pin = /obj/item/device/firing_pin/alien + icon_state = "alienpistol" + item_state = "alienpistol" + +/obj/item/weapon/gun/energy/decloner/alien/update_icon() // No charge levels + return + +/obj/item/weapon/paper/abductor + name = "Dissection Guide" + info = {"Dissection for Dummies
+
+ 1.Acquire fresh specimen.
+ 2.Put the specimen on operating table
+ 3.Apply surgical drapes preparing for dissection
+ 4.Apply scalpel to specimen torso
+ 5.Stop the bleeders and retract skin
+ 6.Cut out organs you find with a scalpel
+ 7.Use your hands to remove the remaining organs
+ 8.Insert replacement gland (Retrieve one from gland storage)
+ 9.Consider dressing the specimen back to not disturb the habitat
+ 10.Put the specimen in the experiment machinery
+ 11.Choose one of the machine options and follow displayed instructions
+
+Congratulations! You are now trained for xenobiology research!"} + +#define BATON_STUN 0 +#define BATON_SLEEP 1 +#define BATON_CUFF 2 +#define BATON_PROBE 3 +#define BATON_MODES 4 + +/obj/item/weapon/abductor_baton + name = "Advanced Baton" + var/mode = BATON_STUN + icon = 'icons/obj/abductor.dmi' + icon_state = "wonderprod" + item_state = "wonderprod" + slot_flags = SLOT_BELT + origin_tech = "materials=6;combat=5;biotech=7" + force = 7 + w_class = 3 + action_button_name = "Toggle Mode" + +/obj/item/weapon/abductor_baton/proc/toggle(mob/living/user=usr) + mode = (mode+1)%BATON_MODES + var/txt + switch(mode) + if(BATON_STUN) + txt = "stun" + if(BATON_SLEEP) + txt = "sleep inducment" + if(BATON_CUFF) + txt = "restraining" + if(BATON_PROBE) + txt = "probing" + + usr << "You switch the baton to [txt] mode" + update_icon() + +/obj/item/weapon/abductor_baton/update_icon() + switch(mode) + if(BATON_STUN) + icon_state = "wonderprod" + if(BATON_SLEEP) + icon_state = "wonderprod" + if(BATON_CUFF) + icon_state = "wonderprod" + if(BATON_PROBE) + icon_state = "wonderprod" + +/obj/item/weapon/abductor_baton/proc/IsAbductor(var/mob/living/user) + if(!ishuman(user)) + return 0 + var/mob/living/carbon/human/H = user + if(!H.dna) + return 0 + if(H.dna.species.id != "abductor") + return 0 + return 1 + +/obj/item/weapon/abductor_baton/attack(mob/target as mob, mob/living/user as mob) + if(!IsAbductor(user)) + return + + if(isrobot(target)) + ..() + return + + if(!isliving(target)) + return + + var/mob/living/L = target + + user.do_attack_animation(L) + switch(mode) + if(BATON_STUN) + StunAttack(L,user) + if(BATON_SLEEP) + SleepAttack(L,user) + if(BATON_CUFF) + CuffAttack(L,user) + if(BATON_PROBE) + ProbeAttack(L,user) + +/obj/item/weapon/abductor_baton/attack_self(mob/living/user) + toggle(user) + +/obj/item/weapon/abductor_baton/proc/StunAttack(mob/living/L,mob/living/user) + user.lastattacked = L + L.lastattacker = user + + L.Stun(7) + L.Weaken(7) + L.apply_effect(STUTTER, 7) + + L.visible_message("[user] has stunned [L] with [src]!", \ + "[user] has stunned you with [src]!") + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + + if(ishuman(L)) + var/mob/living/carbon/human/H = L + H.forcesay(hit_appends) + + add_logs(user, L, "stunned") + return + +/obj/item/weapon/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) + if(L.stunned) + L.SetSleeping(60) + L.visible_message("[user] has induced sleep in [L] with [src]!", \ + "You suddenly feel very drowsy!") + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + + add_logs(user, L, "put to sleep") + return + +/obj/item/weapon/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user) + if(!iscarbon(L)) + return + var/mob/living/carbon/C = L + if(!C.handcuffed) + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + C.visible_message("[user] is trying to put energy cuffs on [C]!", \ + "[user] is trying to put energy cuffs on [C]!") + if(do_mob(user, C, 30)) + if(!C.handcuffed) + C.handcuffed = new /obj/item/weapon/restraints/handcuffs/energy/used(C) + C.update_inv_handcuffed(0) + user << "You handcuff [C]." + add_logs(user, C, "handcuffed") + else + user << "You fail to handcuff [C]." + return + +/obj/item/weapon/abductor_baton/proc/ProbeAttack(mob/living/L,mob/living/user) + L.visible_message("[user] probes [L] with [src]!", \ + "[user] probed [L]!") + + var/species = "Unknown Species" + if(ishuman(L)) + var/mob/living/carbon/human/H = L + if(H.dna && H.dna.species) + species = "[H.dna.species.name]" + if(L.mind && L.mind.changeling) + species = "Changeling Lifeform" + user << "Probing Result:[species]" + +/obj/item/weapon/restraints/handcuffs/energy + name = "energy cuffs" + desc = "Energy field restraining the hands." + icon_state = "cuff_white" // Needs sprite + breakouttime = 450 + trashtype = /obj/item/weapon/restraints/handcuffs/energy/used + +/obj/item/weapon/restraints/handcuffs/energy/used + desc = "Energy Discharge" + +/obj/item/weapon/restraints/handcuffs/energy/used/dropped(mob/user) + user.visible_message("[user] cuffs break in a discharge of energy!", \ + "[user] cuffs break in a discharge of energy!") + var/datum/effect/effect/system/spark_spread/S = new + S.set_up(4,0,user.loc) + S.start() + qdel(src) + +/obj/item/weapon/abductor_baton/examine(mob/user) + ..() + switch(mode) + if(BATON_STUN) + user <<"The baton is in stun mode." + if(BATON_SLEEP) + user <<"The baton is in sleep induction mode." + if(BATON_CUFF) + user <<"The baton is in restrain mode." + + +/obj/item/weapon/scalpel/alien + name = "alien scalpel" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/hemostat/alien + name = "alien hemostat" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/retractor/alien + name = "alien retractor" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/circular_saw/alien + name = "alien saw" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/surgicaldrill/alien + name = "alien drill" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/cautery/alien + name = "alien cautery" + icon = 'icons/obj/abductor.dmi' + +/obj/item/clothing/head/helmet/abductor + name = "Agent Headgear" + desc = "Abducting with style. Spiky style. Prevents digital tracking." + icon_state = "alienhelmet" + item_state = "alienhelmet" + blockTracking = 1 + origin_tech = "materials=6;magnets=5" + +// Operating Table / Beds / Lockers + +/obj/structure/optable/abductor + icon = 'icons/obj/abductor.dmi' + icon_state = "bed" + can_buckle = 1 + buckle_lying = 1 + +/obj/structure/stool/bed/abductor + name = "resting contraption" + desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?" + icon = 'icons/obj/abductor.dmi' + icon_state = "bed" + +/obj/structure/table/abductor + name = "alien table" + desc = "Advanced flat surface technology at work!" + icon_state = "alientable" + +/obj/structure/closet/abductor + name = "alien locker" + desc = "Contains secrets of the universe" + icon_state = "abductor" + icon_door = "abductor" \ No newline at end of file diff --git a/code/game/gamemodes/abduction/abduction_surgery.dm b/code/game/gamemodes/abduction/abduction_surgery.dm new file mode 100644 index 00000000000..a618e1d2544 --- /dev/null +++ b/code/game/gamemodes/abduction/abduction_surgery.dm @@ -0,0 +1,47 @@ +/datum/surgery/organ_extraction + name = "experimental dissection" + steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin,/datum/surgery_step/incise, /datum/surgery_step/extract_organ ,/datum/surgery_step/gland_insert) + species = list(/mob/living/carbon/human) + location = "chest" + user_species_restricted = 1 + user_species_ids = list("abductor") + ignore_clothes = 1 + +/datum/surgery_step/extract_organ + accept_hand = 1 + time = 32 + var/obj/item/IC = null + var/list/organ_types = list(/obj/item/organ/heart) + +/datum/surgery_step/extract_organ/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + for(var/obj/item/I in target.internal_organs) + if(I.type in organ_types) + IC = I + break + user.visible_message("[user] starts to remove [target]'s organs.", "You start to remove [target]'s organs...") + +/datum/surgery_step/extract_organ/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(IC) + user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "You pull [IC] out of [target]'s [target_zone].") + user.put_in_hands(IC) + target.internal_organs -= IC + return 1 + else + user << "You don't find anything in [target]'s [target_zone]!" + return 0 + +/datum/surgery_step/gland_insert + implements = list(/obj/item/gland = 100) + time = 32 + +/datum/surgery_step/gland_insert/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + user.visible_message("[user] starts to insert [tool] into [target].", "You start to insert [tool] into [target]...") + +/datum/surgery_step/gland_insert/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + user.visible_message("[user] inserts [tool] into [target].", "You insert [tool] into [target].") + user.drop_item() + var/obj/item/gland/gland = tool + gland.Inject(target) + return 1 + + diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm new file mode 100644 index 00000000000..ccb60820159 --- /dev/null +++ b/code/game/gamemodes/abduction/gland.dm @@ -0,0 +1,255 @@ +/obj/item/gland/ + name = "Fleshy mass" + desc = "Eww" + icon = 'icons/obj/abductor.dmi' + icon_state = "gland" + var/cooldown_low = 300 + var/cooldown_high = 300 + var/next_activation = 0 + var/uses // -1 For inifinite + var/active = 0 + var/mob/living/carbon/human/host + +/obj/item/gland/proc/HostCheck() + if(ishuman(host) && host == src.loc) + if(host.stat != DEAD) + return 1 + return 0 + +/obj/item/gland/proc/Start() + active = 1 + next_activation = world.time + rand(cooldown_low,cooldown_high) + SSobj.processing |= src + +/obj/item/gland/proc/Inject(var/mob/living/carbon/human/target) + host = target + target.internal_organs += src + src.loc = target + +/obj/item/gland/process() + if(!active) + SSobj.processing.Remove(src) + return + if(next_activation <= world.time) + //This gives a chance to transplant the gland active into someone else if you're fast + if(!HostCheck()) + active = 0 + return + activate() + uses-- + next_activation = world.time + rand(cooldown_low,cooldown_high) + if(uses == 0) + active = 0 + +/obj/item/gland/proc/activate() + return + +/obj/item/gland/heals + cooldown_low = 200 + cooldown_high = 400 + uses = -1 + icon_state = "health" + +/obj/item/gland/heals/activate() + host << "You feel weird." + host.adjustBruteLoss(-20) + host.adjustOxyLoss(-20) + host.adjustFireLoss(-20) + +/obj/item/gland/slime + cooldown_low = 600 + cooldown_high = 1200 + uses = -1 + icon_state = "slime" + +/obj/item/gland/slime/activate() + host << "You feel weird." + + host.visible_message("[host] vomits on the floor!", \ + "You throw up on the floor!") + + host.nutrition -= 20 + host.adjustToxLoss(-3) + + var/turf/pos = get_turf(host) + pos.add_vomit_floor(host) + playsound(pos, 'sound/effects/splat.ogg', 50, 1) + + var/mob/living/simple_animal/slime/Slime = new/mob/living/simple_animal/slime(pos) + Slime.Friends = list(host) + Slime.Leader = host + +/obj/item/gland/mindshock + cooldown_low = 300 + cooldown_high = 300 + uses = -1 + icon_state = "mindshock" + +/obj/item/gland/mindshock/activate() + host << "You feel weird." + + var/turf/T = get_turf(host) + for(var/mob/living/carbon/human/H in orange(4,T)) + if(H == host) + continue + H << " You hear a buzz in your head " + H.confused += 20 + +/obj/item/gland/pop + cooldown_low = 900 + cooldown_high = 1800 + uses = 6 + icon_state = "species" + +/obj/item/gland/pop/activate() + host << "You feel weird." + var/species = pick(list(/datum/species/lizard,/datum/species/slime,/datum/species/plant/pod,/datum/species/fly)) + hardset_dna(host, null, null, null, null, species) + host.regenerate_icons() + return + +/obj/item/gland/ventcrawling + cooldown_low = 1800 + cooldown_high = 2400 + uses = 1 + icon_state = "vent" + +/obj/item/gland/ventcrawling/activate() + host << "You feel weird." + host << "You feel very stretchy." + host.ventcrawler = 2 + return + + +/obj/item/gland/viral + cooldown_low = 1800 + cooldown_high = 2400 + uses = 1 + icon_state = "viral" + +/obj/item/gland/viral/activate() + var/virus_type = pick(/datum/disease/beesease, /datum/disease/brainrot, /datum/disease/magnitis) + var/datum/disease/D = new virus_type() + D.carrier = 1 + host.viruses += D + D.affected_mob = host + D.holder = host + host.med_hud_set_status() + + +/obj/item/gland/emp //TODO : Replace with something more interesting + cooldown_low = 900 + cooldown_high = 1600 + uses = 10 + icon_state = "emp" + +/obj/item/gland/emp/activate() + empulse(get_turf(host), 2, 5, 1) + +/obj/item/gland/spiderman + cooldown_low = 450 + cooldown_high = 900 + uses = 10 + icon_state = "spider" + +/obj/item/gland/spiderman/activate() + if(uses == initial(uses)) + host.faction += "spiders" + new /obj/effect/spider/spiderling(host.loc) + +/obj/item/gland/egg + cooldown_low = 300 + cooldown_high = 600 + uses = -1 + icon_state = "egg" + +/obj/item/gland/egg/activate() + var/obj/item/weapon/reagent_containers/food/snacks/egg/egg = new(host.loc) + egg.reagents.add_reagent("sacid",20) + egg.desc += " It smells bad." + +/obj/item/gland/bloody + cooldown_low = 200 + cooldown_high = 400 + uses = -1 + +/obj/item/gland/bloody/activate() + host.adjustBruteLoss(15) + + host.visible_message("[host] skin erupts with blood!",\ + "Your skin erupts with blood! It hurts!") + + for(var/turf/T in oview(3,host)) //Make this respect walls and such + T.add_blood_floor(host) + for(var/mob/living/carbon/human/H in oview(3,host)) //Blood decals for simple animals would be neat. aka Carp with blood on it. + if(H.wear_suit) + H.wear_suit.add_blood(host) + H.update_inv_wear_suit(0) + else if(H.w_uniform) + H.w_uniform.add_blood(host) + H.update_inv_w_uniform(0) + +/obj/item/gland/bodysnatch + cooldown_low = 600 + cooldown_high = 600 + uses = 1 + +/obj/item/gland/bodysnatch/activate() + //spawn cocoon with clone greytide snpc inside + var/obj/effect/cocoon/abductor/C = new (get_turf(host)) + C.Copy(host) + C.Start() + host.gib() + return + +/obj/effect/cocoon/abductor + name = "Slimy cocoon" + desc = "You can see something moving inside" + icon = 'icons/effects/effects.dmi' + icon_state = "cocoon_large3" + color = rgb(10,120,10) + density = 1 + var/hatch_time = 0 + +/obj/effect/cocoon/abductor/proc/Copy(var/mob/living/carbon/human/H) + var/mob/living/carbon/human/interactive/greytide/clone = new(src) + hardset_dna(clone,H.dna.uni_identity,H.dna.struc_enzymes,H.real_name, H.dna.blood_type, H.dna.species.type, H.dna.mutant_color) + + //There's no define for this / get all items ? + var/list/slots = list(slot_back,slot_w_uniform,slot_wear_suit,\ + slot_wear_mask,slot_head,slot_shoes,slot_gloves,slot_ears,\ + slot_glasses,slot_belt,slot_s_store,slot_l_store,slot_r_store,slot_wear_id) + + for(var/slot in slots) + var/obj/item/I = H.get_item_by_slot(slot) + if(I) + clone.equip_to_slot_if_possible(I,slot) + +/obj/effect/cocoon/abductor/proc/Start() + hatch_time = world.time + 600 + SSobj.processing |= src + +/obj/effect/cocoon/abductor/process() + if(world.time > hatch_time) + SSobj.processing.Remove(src) + for(var/mob/M in contents) + src.visible_message("[src] hatches!") + M.loc = src.loc + qdel(src) + +/obj/item/gland/plasma + cooldown_low = 1200 + cooldown_high = 2400 + uses = 1 + +/obj/item/gland/plasma/activate() + host << "You feel bloated." + sleep(150) + host << "Your stomach feels about to explode!" + sleep(50) + host.visible_message("[host] explodes in a cloud of plasma!") + var/turf/simulated/T = get_turf(host) + if(istype(T)) + T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C,300) + host.gib() + return diff --git a/code/game/gamemodes/abduction/machinery/camera.dm b/code/game/gamemodes/abduction/machinery/camera.dm new file mode 100644 index 00000000000..52773d60e1a --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/camera.dm @@ -0,0 +1,142 @@ +/obj/machinery/computer/camera_advanced/abductor + name = "Human Observation Console" + var/team = 0 + networks = list("SS13","Abductor") + off_action = new/datum/action/camera_off/abductor //specific datum + var/datum/action/teleport_in/tele_in_action = new + var/datum/action/teleport_out/tele_out_action = new + var/datum/action/teleport_self/tele_self_action = new + var/datum/action/vest_mode_swap/vest_mode_action = new + var/datum/action/vest_disguise_swap/vest_disguise_action = new + var/obj/machinery/abductor/console/console + + icon = 'icons/obj/abductor.dmi' + icon_state = "camera" + +/obj/machinery/computer/camera_advanced/abductor/CreateEye() + ..() + eyeobj.visible_icon = 1 + eyeobj.icon = 'icons/obj/abductor.dmi' + eyeobj.icon_state = "camera_target" + +/obj/machinery/computer/camera_advanced/abductor/GrantActions(var/mob/living/carbon/user) + off_action.target = user + off_action.Grant(user) + + jump_action.target = user + jump_action.Grant(user) + //TODO : add null checks + tele_in_action.target = console.pad + tele_in_action.Grant(user) + + tele_out_action.target = console + tele_out_action.Grant(user) + + tele_self_action.target = console.pad + tele_self_action.Grant(user) + + vest_mode_action.target = console + vest_mode_action.Grant(user) + + vest_disguise_action.target = console + vest_disguise_action.Grant(user) + +/obj/machinery/computer/camera_advanced/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) + return H.dna.species.id == "abductor" + +/obj/machinery/computer/camera_advanced/abductor/proc/IsScientist(var/mob/living/carbon/human/H) + var/datum/species/abductor/S = H.dna.species + return S.scientist + +/obj/machinery/computer/camera_advanced/abductor/attack_hand(var/mob/user as mob) + if(!iscarbon(user) || !IsAbductor(user)) + return + return ..() + +/datum/action/camera_off/abductor/Activate() + if(!target || !iscarbon(target)) + return + var/mob/living/carbon/C = target + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/computer/camera_advanced/abductor/origin = remote_eye.origin + C.remote_view = 0 + origin.current_user = null + origin.jump_action.Remove(C) + origin.tele_in_action.Remove(C) + origin.tele_out_action.Remove(C) + origin.tele_self_action.Remove(C) + origin.vest_mode_action.Remove(C) + origin.vest_disguise_action.Remove(C) + if(C.client) + C.client.perspective = MOB_PERSPECTIVE + C.client.eye = src + C.client.images -= remote_eye.user_image + C.remote_control = null + C.unset_machine() + src.Remove(C) + + +/datum/action/teleport_in + name = "Send To" + action_type = AB_INNATE + button_icon_state = "beam_down" + +/datum/action/teleport_in/Activate() + if(!target || !iscarbon(owner)) + return + var/mob/living/carbon/human/C = owner + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/abductor/pad/P = target + + if(cameranet.checkTurfVis(remote_eye.loc)) + P.PadToLoc(remote_eye.loc) + +/datum/action/teleport_out + name = "Retrieve" + action_type = AB_INNATE + button_icon_state = "beam_up" + +/datum/action/teleport_out/Activate() + if(!target || !iscarbon(owner)) + return + var/obj/machinery/abductor/console/console = target + + console.TeleporterRetrieve() + +/datum/action/teleport_self + name = "Send Self" + action_type = AB_INNATE + button_icon_state = "beam_down" + +/datum/action/teleport_self/Activate() + if(!target || !iscarbon(owner)) + return + var/mob/living/carbon/human/C = owner + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/abductor/pad/P = target + + if(cameranet.checkTurfVis(remote_eye.loc)) + P.MobToLoc(remote_eye.loc,C) + +/datum/action/vest_mode_swap + name = "Switch Vest Mode" + action_type = AB_INNATE + button_icon_state = "vest_mode" + +/datum/action/vest_mode_swap/Activate() + if(!target || !iscarbon(owner)) + return + var/obj/machinery/abductor/console/console = target + console.FlipVest() + + +/datum/action/vest_disguise_swap + name = "Switch Vest Disguise" + action_type = AB_INNATE + button_icon_state = "vest_disguise" + +/datum/action/vest_disguise_swap/Activate() + if(!target || !iscarbon(owner)) + return + var/obj/machinery/abductor/console/console = target + console.SelectDisguise(remote=1) diff --git a/code/game/gamemodes/abduction/machinery/console.dm b/code/game/gamemodes/abduction/machinery/console.dm new file mode 100644 index 00000000000..89f37c05ccf --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/console.dm @@ -0,0 +1,212 @@ +//Common + +/obj/machinery/abductor + var/team = 0 + +/obj/machinery/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) + if(!H.dna) + return 0 + return H.dna.species.id == "abductor" + +/obj/machinery/abductor/proc/IsAgent(var/mob/living/carbon/human/H) + if(H.dna.species.id == "abductor") + var/datum/species/abductor/S = H.dna.species + return S.agent + return 0 + +/obj/machinery/abductor/proc/IsScientist(var/mob/living/carbon/human/H) + if(H.dna.species.id == "abductor") + var/datum/species/abductor/S = H.dna.species + return S.scientist + return 0 + +//Console + +/obj/machinery/abductor/console + name = "Abductor console" + desc = "Ship command center." + icon = 'icons/obj/abductor.dmi' + icon_state = "console" + density = 1 + anchored = 1.0 + var/obj/item/device/abductor/gizmo/gizmo + var/obj/item/clothing/suit/armor/abductor/vest/vest + var/obj/machinery/abductor/experiment/experiment + var/obj/machinery/abductor/pad/pad + var/obj/machinery/computer/camera_advanced/abductor/camera + var/list/datum/icon_snapshot/disguises = list() + +/obj/machinery/abductor/console/attack_hand(var/mob/user as mob) + if(..()) + return + if(!IsAbductor(user)) + user << "You start mashing alien buttons at random!" + if(do_after(user,100)) + TeleporterSend() + return + user.set_machine(src) + var/dat = "" + dat += "
" + dat += "Transfer data in exchange for supplies:
" + dat += "Advanced Baton
" + dat += "Agent Helmet
" + dat += "Radio Silencer
" + dat += "Science Tool
" + else + dat += "NO EXPERIMENT MACHINE DETECTED
" + + if(pad!=null) + dat += "Emergency Teleporter System." + dat += "Consider using primary observation console first." + dat += "Activate Teleporter
" + dat += "Set Teleporter
" + if(gizmo!=null && gizmo.marked!=null) + dat += "Retrieve Mark
" + else + dat += "Retrieve Mark
" + else + dat += "NO TELEPAD DETECTED" + + if(vest!=null) + dat += "
" + var/mode = vest.mode + if(mode == VEST_STEALTH) + dat += "Combat" + dat += "Stealth" + else + dat += "Combat" + dat += "Stealth" + + dat+="
" + dat += "Select Agent Vest Disguise
" + else + dat += "NO AGENT VEST DETECTED" + var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/abductor/console/Topic(href, href_list) + if(..()) + return + + usr.set_machine(src) + if(href_list["teleporter_set"]) + TeleporterSet() + else if(href_list["teleporter_send"]) + TeleporterSend() + else if(href_list["teleporter_retrieve"]) + TeleporterRetrieve() + else if(href_list["flip_vest"]) + FlipVest() + else if(href_list["select_disguise"]) + SelectDisguise() + else if(href_list["dispense"]) + switch(href_list["dispense"]) + if("baton") + Dispense(/obj/item/weapon/abductor_baton,cost=2) + if("helmet") + Dispense(/obj/item/clothing/head/helmet/abductor) + if("silencer") + Dispense(/obj/item/device/abductor/silencer) + if("tool") + Dispense(/obj/item/device/abductor/gizmo) + src.updateUsrDialog() + +/obj/machinery/abductor/console/proc/TeleporterSet() + var/A = null + A = input("Select area to teleport to", "Teleport", A) in teleportlocs + if(pad!=null && in_range(usr,src)) + pad.teleport_target = teleportlocs[A] + return + +/obj/machinery/abductor/console/proc/TeleporterRetrieve() + if(gizmo!=null && pad!=null && gizmo.marked) + pad.Retrieve(gizmo.marked) + return + +/obj/machinery/abductor/console/proc/TeleporterSend() + if(pad!=null) + pad.Send() + return + +/obj/machinery/abductor/console/proc/FlipVest() + if(vest!=null) + vest.flip_mode() + return + +/obj/machinery/abductor/console/proc/SelectDisguise(var/remote=0) + var/list/entries = list() + var/tempname + var/datum/icon_snapshot/temp + for(var/i = 1; i <= disguises.len; i++) + temp = disguises[i] + tempname = temp.name + entries["[tempname]"] = disguises[i] + var/entry_name = input( "Choose Disguise", "Disguise") in entries + var/datum/icon_snapshot/chosen = entries[entry_name] + if(chosen && (remote || in_range(usr,src))) + vest.SetDisguise(chosen) + return + +/obj/machinery/abductor/console/proc/Initialize() + + for(var/obj/machinery/abductor/pad/p in machines) + if(p.team == team) + pad = p + break + + for(var/obj/machinery/abductor/experiment/e in machines) + if(e.team == team) + experiment = e + e.console = src + + for(var/obj/machinery/computer/camera_advanced/abductor/c in machines) + if(c.team == team) + camera = c + c.console = src + +/obj/machinery/abductor/console/proc/AddSnapshot(var/mob/living/carbon/human/target) + var/datum/icon_snapshot/entry = new + entry.name = target.name + entry.icon = target.icon + entry.icon_state = target.icon_state + entry.overlays = target.get_overlays_copy(list(L_HAND_LAYER,R_HAND_LAYER)) + for(var/i=1,i<=disguises.len,i++) + var/datum/icon_snapshot/temp = disguises[i] + if(temp.name == entry.name) + disguises[i] = entry + return + disguises.Add(entry) + return + +/obj/machinery/abductor/console/attackby(O as obj, user as mob, params) + if(istype(O, /obj/item/device/abductor/gizmo)) + var/obj/item/device/abductor/gizmo/G = O + user << "You link the tool to the console." + gizmo = G + G.console = src + else if(istype(O, /obj/item/clothing/suit/armor/abductor/vest)) + var/obj/item/clothing/suit/armor/abductor/vest/V = O + user << "You link the vest to the console." + vest = V + else + ..() + +/obj/machinery/abductor/console/proc/Dispense(var/item,var/cost=1) + if(experiment && experiment.points >= cost) + experiment.points-=cost + say("Incoming supply!") + if(pad) + flick("alien-pad", pad) + new item(pad.loc) + else + new item(src.loc) + else + say("Insufficent data!") + return \ No newline at end of file diff --git a/code/game/gamemodes/abduction/machinery/dispenser.dm b/code/game/gamemodes/abduction/machinery/dispenser.dm new file mode 100644 index 00000000000..d346e0366a5 --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/dispenser.dm @@ -0,0 +1,82 @@ +/obj/machinery/abductor/gland_dispenser + name = "Replacement Organ Storage" + desc = "A tank filled with replacement organs" + icon = 'icons/obj/abductor.dmi' + icon_state = "dispenser" + density = 1 + anchored = 1 + var/list/gland_types + var/list/gland_colors + var/list/amounts + +/obj/machinery/abductor/gland_dispenser/proc/random_color() + //TODO : replace with presets or spectrum + return rgb(rand(0,255),rand(0,255),rand(0,255)) + +/obj/machinery/abductor/gland_dispenser/New() + gland_types = typesof(/obj/item/gland) - /obj/item/gland + gland_types = shuffle(gland_types) + gland_colors = new/list(gland_types.len) + amounts = new/list(gland_types.len) + for(var/i=1,i<=gland_types.len,i++) + gland_colors[i] = random_color() + amounts[i] = rand(1,5) + +/obj/machinery/abductor/gland_dispenser/attack_hand(var/mob/user as mob) + if(..()) + return + if(!IsAbductor(user)) + return + user.set_machine(src) + var/box_css = {" + "} + var/dat = "" + var/item_count = 0 + for(var/i=1,i<=gland_colors.len,i++) + item_count++ + var/g_color = gland_colors[i] + var/amount = amounts[i] + dat += "[amount]" + if(item_count == 3) // Three boxes per line + dat +="" + item_count = 0 + var/datum/browser/popup = new(user, "glands", "Gland Dispenser", 200, 200) + popup.add_head_content(box_css) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/abductor/gland_dispenser/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W, /obj/item/gland)) + user.drop_item() + W.loc = src + for(var/i=1,i<=gland_colors.len,i++) + if(gland_types[i] == W.type) + amounts[i]++ + +/obj/machinery/abductor/gland_dispenser/Topic(href, href_list) + if(..()) + return + usr.set_machine(src) + + if(href_list["dispense"]) + Dispense(text2num(href_list["dispense"])) + src.updateUsrDialog() + +/obj/machinery/abductor/gland_dispenser/proc/Dispense(var/count) + if(amounts[count]>0) + amounts[count]-- + var/T = gland_types[count] + new T(get_turf(src)) \ No newline at end of file diff --git a/code/game/gamemodes/abduction/machinery/experiment.dm b/code/game/gamemodes/abduction/machinery/experiment.dm new file mode 100644 index 00000000000..3d79a64b56b --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/experiment.dm @@ -0,0 +1,202 @@ +/obj/machinery/abductor/experiment + name = "Experimental machinery" + desc = "A human-sized coffin sporting wide array of automatic surgery tools" + icon = 'icons/obj/abductor.dmi' + icon_state = "experiment-open" + density = 0 + anchored = 1 + state_open = 1 + var/points = 0 + var/list/history = list() + var/list/abductee_minds = list() + var/flash = " - || - " + var/obj/machinery/abductor/console/console + +/obj/machinery/abductor/experiment/MouseDrop_T(mob/target, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target)) + return + if(IsAbductor(target)) + return + close_machine(target) + +/obj/machinery/abductor/experiment/attack_hand(mob/user) + if(..()) + return + + experimentUI(user) + +/obj/machinery/abductor/experiment/open_machine() + if(!state_open && !panel_open) + ..() + +/obj/machinery/abductor/experiment/close_machine(mob/target) + for(var/mob/living/carbon/C in loc) + if(IsAbductor(C)) + return + if(state_open && !panel_open) + ..(target) + +/obj/machinery/abductor/experiment/proc/dissection_icon(var/mob/living/carbon/human/H) + var/icon/photo = null + var/g = (H.gender == FEMALE) ? "f" : "m" + if(!config.mutant_races || H.dna.species.use_skintones) + photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]_s") + else + photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.dna.species.id]_[g]_s") + photo.Blend("#[H.dna.mutant_color]", ICON_MULTIPLY) + + var/icon/eyes_s + if(EYECOLOR in H.dna.species.specflags) + eyes_s = icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "[H.dna.species.eyes]_s") + eyes_s.Blend("#[H.eye_color]", ICON_MULTIPLY) + + var/datum/sprite_accessory/S + S = hair_styles_list[H.hair_style] + if(S && (HAIR in H.dna.species.specflags)) + var/icon/hair_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") + hair_s.Blend("#[H.hair_color]", ICON_MULTIPLY) + eyes_s.Blend(hair_s, ICON_OVERLAY) + + S = facial_hair_styles_list[H.facial_hair_style] + if(S && (FACEHAIR in H.dna.species.specflags)) + var/icon/facial_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") + facial_s.Blend("#[H.facial_hair_color]", ICON_MULTIPLY) + eyes_s.Blend(facial_s, ICON_OVERLAY) + + if(eyes_s) + photo.Blend(eyes_s, ICON_OVERLAY) + + var/icon/splat = icon("icon" = 'icons/mob/dam_human.dmi',"icon_state" = "chest30") + photo.Blend(splat,ICON_OVERLAY) + + return photo + +/obj/machinery/abductor/experiment/proc/experimentUI(mob/user) + var/dat + dat += "
"
+ else
+ dat += " Experiment "
+
+ if(!occupant)
+ dat += "
" + dat += "[flash]" + dat += "
" + dat += "Scan" + dat += "Close" : "open=1'>Open"]" + var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300) + popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) + popup.set_content(dat) + popup.open() + +/obj/machinery/abductor/experiment/Topic(href, href_list) + if(..() || usr == occupant) + return + usr.set_machine(src) + if(href_list["refresh"]) + updateUsrDialog() + return + if(href_list["open"]) + open_machine() + return + if(href_list["close"]) + close_machine() + return + if(occupant && occupant.stat != DEAD) + if(href_list["experiment"]) + flash = Experiment(occupant,href_list["experiment"]) + updateUsrDialog() + add_fingerprint(usr) + +/obj/machinery/abductor/experiment/proc/Experiment(var/mob/occupant,var/type) + var/mob/living/carbon/human/H = occupant + var/point_reward = 0 + if(H in history) + return "Specimen already in the database" + if(H.stat == DEAD) + say("Specimen deceased - please provide fresh sample.") + return "Specimen Deceased" + var/obj/item/gland/GlandTest = locate() in H + if(!GlandTest) + say("Experimental dissection not detected!") + return "No glands detected!" + if(H.mind != null && H.ckey != null) + history += H + abductee_minds += H.mind + say("Processing Specimen...") + sleep(5) + switch(text2num(type)) + if(1) + H << "You feel violated." + if(2) + H << "You feel being sliced and put back together." + if(3) + H << "You feel under intense scrutiny." + sleep(5) + H << "Your mind snaps!" + var/objtype = pick(typesof(/datum/objective/abductee/) - /datum/objective/abductee/) + var/datum/objective/abductee/O = new objtype() + H.mind.objectives += O + var/obj_count = 1 + H << "Your current objectives:" + for(var/datum/objective/objective in H.mind.objectives) + H << "Objective #[obj_count]: [objective.explanation_text]" + obj_count++ + + for(var/obj/item/gland/G in H) + G.Start() + point_reward++ + if(point_reward > 0) + open_machine() + SendBack(H) + playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + points += point_reward + return "Experiment Successfull! [point_reward] new data-points collected." + else + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) + return "Experiment Failed! No replacement organ detected." + else + say("Brain Activity Nonexistant - Disposing Sample...") + open_machine() + SendBack(H) + return "Specimen Braindead - Disposed" + return "ERROR" + + +/obj/machinery/abductor/experiment/proc/SendBack(var/mob/living/carbon/human/H) + H.Sleeping(8) + var/area/A + if(console && console.pad && console.pad.teleport_target) + A = console.pad.teleport_target + if(A.safe) // right now crew areas are safe - being locked behind closed doors is not fun + TeleportToArea(H,A) + //Area not chosen / It's not safe area - teleport to arrivals + H.forceMove(pick(latejoin)) + + +/obj/machinery/abductor/experiment/update_icon() + if(state_open) + icon_state = "experiment-open" + else + icon_state = "experiment" diff --git a/code/game/gamemodes/abduction/machinery/pad.dm b/code/game/gamemodes/abduction/machinery/pad.dm new file mode 100644 index 00000000000..b586874397d --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/pad.dm @@ -0,0 +1,86 @@ +/obj/machinery/abductor/pad + name = "Alien Telepad" + desc = "Use this to transport to and from human habitat" + icon = 'icons/obj/abductor.dmi' + icon_state = "alien-pad-idle" + anchored = 1 + var/area/teleport_target + +/obj/machinery/abductor/proc/TeleportToArea(var/mob/living/target,var/area/thearea) + var/list/L = list() + for(var/turf/T in get_area_turfs(thearea.type)) + if(!T.density) + var/clear = 1 + for(var/obj/O in T) + if(O.density) + clear = 0 + break + if(clear) + L+=T + if(!L.len) + return + + if(target && target.buckled) + target.buckled.unbuckle_mob() + + var/list/tempL = L + var/attempt = null + var/success = 0 + while(tempL.len) + attempt = pick(tempL) + target.Move(attempt) + if(get_turf(target) == attempt) + success = 1 + break + else + tempL.Remove(attempt) + if(!success) + target.loc = pick(L) + +/obj/machinery/abductor/pad/proc/Warp(var/mob/living/target) + target.Move(src.loc) + +/obj/machinery/abductor/pad/proc/Send() + if(teleport_target == null) + teleport_target = teleportlocs[pick(teleportlocs)] + flick("alien-pad", src) + for(var/mob/living/target in src.loc) + TeleportToArea(target,teleport_target) + spawn(0) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + +/obj/machinery/abductor/pad/proc/Retrieve(var/mob/living/target) + flick("alien-pad", src) + spawn(0) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + Warp(target) + +/obj/machinery/abductor/pad/proc/MobToLoc(var/place,var/mob/living/target) + var/obj/effect/teleport_abductor/F = new(place) + var/datum/effect/effect/system/spark_spread/S = new + S.set_up(10,0,place) + S.start() + sleep(80) + qdel(F) + flick("alien-pad", src) + target.forceMove(place) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + +/obj/machinery/abductor/pad/proc/PadToLoc(var/place) + var/obj/effect/teleport_abductor/F = new(place) + var/datum/effect/effect/system/spark_spread/S = new + S.set_up(10,0,place) + S.start() + sleep(80) + qdel(F) + flick("alien-pad", src) + for(var/mob/living/target in src.loc) + target.forceMove(place) + spawn(0) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + + +/obj/effect/teleport_abductor + name = "Huh" + icon = 'icons/obj/abductor.dmi' + icon_state = "teleport" diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 207805d235b..c629c157f98 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -15,6 +15,7 @@ var/list/blob_nodes = list() required_enemies = 1 recommended_enemies = 1 + round_ends_with_antag_death = 1 restricted_jobs = list("Cyborg", "AI") var/declared = 0 @@ -33,17 +34,13 @@ var/list/blob_nodes = list() blobwincount = initial(blobwincount) * cores_to_spawn - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs)//Removing robots from the list - if(player.assigned_role == job) - antag_candidates -= player - for(var/j = 0, j < cores_to_spawn, j++) if (!antag_candidates.len) break var/datum/mind/blob = pick(antag_candidates) infected_crew += blob blob.special_role = "Blob" + blob.restricted_roles = restricted_jobs log_game("[blob.key] (ckey) has been selected as a Blob") antag_candidates -= blob @@ -140,6 +137,7 @@ var/list/blob_nodes = list() core.overmind.mind.name = blob.name infected_crew -= blob infected_crew += core.overmind.mind + core.overmind.mind.special_role = "Blob Overmind" /datum/game_mode/blob/post_setup() diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index cc0ddf0eb9a..743196fbb2a 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -1,28 +1,19 @@ /datum/game_mode/blob/check_finished() - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - if(round_converted) - return ..() if(infected_crew.len > burst)//Some blobs have yet to burst return 0 if(blobwincount <= blobs.len)//Blob took over return 1 if(!blob_cores.len) // blob is dead if(config.continuous["blob"]) + continuous_sanity_checked = 1 //Nonstandard definition of "alive" gets past the check otherwise + SSshuttle.emergencyNoEscape = 0 if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) SSshuttle.emergency.mode = SHUTTLE_DOCKED SSshuttle.emergency.timer = world.time priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") - - if(config.midround_antag["blob"]) - round_converted = convert_roundtype() - if(!round_converted) - return 1 return ..() return 1 - if(station_was_nuked)//Nuke went off - return 1 - return 0 + return ..() /datum/game_mode/blob/declare_completion() @@ -49,7 +40,7 @@ ..() return 1 -datum/game_mode/proc/auto_declare_completion_blob() +/datum/game_mode/proc/auto_declare_completion_blob() if(istype(ticker.mode,/datum/game_mode/blob) ) var/datum/game_mode/blob/blob_mode = src if(blob_mode.infected_crew.len) diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 9d6de20b142..d08526eda5d 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -54,9 +54,10 @@ var/door = 0 var/grille = 0 var/mach = 0 + var/num_territories = 1//Number of total valid territories for gang mode -/datum/station_state/proc/count() +/datum/station_state/proc/count(var/count_territories) for(var/turf/T in block(locate(1,1,1), locate(world.maxx,world.maxy,1))) if(istype(T,/turf/simulated/floor)) @@ -88,6 +89,16 @@ else if(istype(O, /obj/machinery)) src.mach += 1 + if(count_territories) + var/list/valid_territories = list() + for(var/area/A in world) //First, collect all area types on the station zlevel + if(A.z == ZLEVEL_STATION) + if(!(A.type in valid_territories) && A.valid_territory) + valid_territories |= A.type + if(valid_territories.len) + num_territories = valid_territories.len //Add them all up to make the total number of area types + else + world << "ERROR: NO VALID TERRITORIES" /datum/station_state/proc/score(var/datum/station_state/result) if(!result) return 0 diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 04508a5e2d0..7dcd49f1821 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -113,6 +113,7 @@ /mob/living/simple_animal/hostile/blob/blobspore/Destroy() if(factory) factory.spores -= src + factory = null if(contents) for(var/mob/M in contents) M.loc = src.loc diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index b57568953fa..bf8822c40f5 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -38,6 +38,7 @@ blob_cores -= src if(overmind) overmind.blob_core = null + overmind = null SSobj.processing.Remove(src) ..() @@ -105,6 +106,8 @@ B.blob_core = src src.overmind = B color = overmind.blob_reagent_datum.color + if(B.mind && !B.mind.special_role) + B.mind.special_role = "Blob Overmind" spawn(0) if(is_offspring) B.verbs -= /mob/camera/blob/verb/split_consciousness diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index 872dafad212..3ab5874c176 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -17,6 +17,7 @@ for(var/mob/living/simple_animal/hostile/blob/blobspore/spore in spores) if(spore.factory == src) spore.factory = null + spores = null ..() /obj/effect/blob/factory/PulseAnimation(var/activate = 0) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 2ca962f00df..840e16b90f5 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -65,12 +65,12 @@ /mob/camera/blob/proc/update_health() if(blob_core) - hud_used.blobhealthdisplay.maptext = "
Objective #[count]: [objective.explanation_text] Success!" + else + text += "
Objective #[count]: [objective.explanation_text] Fail." + count++ + return text + //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 /datum/game_mode/proc/age_check(client/C) if(get_remaining_days(C) == 0) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 45d23881221..6967dc894c7 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -2,10 +2,19 @@ //Gang War Game Mode /datum/game_mode - var/list/datum/mind/A_bosses = list() //gang A bosses - var/list/datum/mind/A_gangsters = list() //gang A Members - var/list/datum/mind/B_bosses = list() //gang B bosses - var/list/datum/mind/B_gangsters = list() //gang B Members + var/list/datum/mind/A_gang = list() //gang A Members + var/list/datum/mind/B_gang = list() //gang B Members + var/list/datum/mind/A_bosses = list() //gang A Bosses + var/list/datum/mind/B_bosses = list() //gang B Bosses + var/obj/item/device/gangtool/A_tools = list() + var/obj/item/device/gangtool/B_tools = list() + var/datum/gang_points/gang_points + var/list/A_territory = list() + var/list/B_territory = list() + var/list/A_territory_new = list() + var/list/A_territory_lost = list() + var/list/B_territory_new = list() + var/list/B_territory_lost = list() /datum/game_mode/gang name = "gang war" @@ -16,15 +25,15 @@ required_enemies = 2 recommended_enemies = 2 enemy_minimum_age = 14 - var/finished = 0 - var/checkwin_counter = 0 + var/goal_scalar = 0.5 //Goal = Total territories x goal_scalar + /////////////////////////// //Announces the game type// /////////////////////////// /datum/game_mode/gang/announce() world << "The current game mode is - Gang War!" - world << "A violent turf war has erupted on the station!
Gangsters - Take over the station by recruiting gangsters and killing the rival gang's boss!
Crew - Identify and stop the mob bosses without killing either of them!" + world << "A violent turf war has erupted on the station!
Gangsters - Take over the station by claiming more than [round(100*goal_scalar,1)]% of the station!
Crew - The gangs will try to keep you on the station. Successfully evacuate the station to win!" /////////////////////////////////////////////////////////////////////////////// @@ -37,11 +46,6 @@ if(config.protect_assistant_from_antagonist) restricted_jobs += "Assistant" - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs)//Removing heads and such from the list - if(player.assigned_role == job) - antag_candidates -= player - if(antag_candidates.len >= 2) assign_bosses() @@ -69,39 +73,32 @@ modePlayer += B_bosses ..() - -/datum/game_mode/gang/process() - checkwin_counter++ - if(checkwin_counter >= 5) - if(!finished) - ticker.mode.check_win() - checkwin_counter = 0 - return 0 - /datum/game_mode/gang/proc/assign_bosses() var/datum/mind/boss = pick(antag_candidates) A_bosses += boss antag_candidates -= boss boss.special_role = "[gang_name("A")] Gang (A) Boss" - log_game("[boss.key] has been selected as a boss for the [gang_name("A")] Gang (A)") + boss.restricted_roles = restricted_jobs + log_game("[boss.key] has been selected as the boss for the [gang_name("A")] Gang (A)") boss = pick(antag_candidates) B_bosses += boss antag_candidates -= boss boss.special_role = "[gang_name("B")] Gang (B) Boss" - log_game("[boss.key] has been selected as a boss for the [gang_name("B")] Gang (B)") + boss.restricted_roles = restricted_jobs + log_game("[boss.key] has been selected as the boss for the [gang_name("B")] Gang (B)") /datum/game_mode/proc/forge_gang_objectives(var/datum/mind/boss_mind) var/datum/objective/rival_obj = new rival_obj.owner = boss_mind - rival_obj.explanation_text = "Assassinate or exile the [(boss_mind in A_bosses) ? gang_name("B") : gang_name("A")] Gang's bosses." + rival_obj.explanation_text = "Claim more than 50% the station before the [(boss_mind in A_bosses) ? gang_name("B") : gang_name("A")] Gang does." boss_mind.objectives += rival_obj /datum/game_mode/proc/greet_gang(var/datum/mind/boss_mind, var/you_are=1) var/obj_count = 1 if (you_are) - boss_mind.current << "You are a [(boss_mind in A_bosses) ? gang_name("A") : gang_name("B")] Gang Boss!" + boss_mind.current << "You are the founding member of the [(boss_mind in A_bosses) ? gang_name("A") : gang_name("B")] Gang!" for(var/datum/objective/objective in boss_mind.objectives) boss_mind.current << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ @@ -118,51 +115,9 @@ mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." mob.dna.remove_mutation(CLOWNMUT) - // find a radio! toolbox(es), backpack, belt, headset - var/loc = "" - var/obj/item/R = locate(/obj/item/device/pda) in mob.contents //Hide the uplink in a PDA if available, otherwise radio - if(!R) - R = locate(/obj/item/device/radio) in mob.contents - - if (!R) - mob << "Unfortunately, Your Syndicate benefactors wasn't able to get you an uplink." - . = 0 - else - if (istype(R, /obj/item/device/radio)) - // generate list of radio freqs - var/obj/item/device/radio/target_radio = R - var/freq = 1441 - var/list/freqlist = list() - while (freq <= 1489) - if (freq < 1451 || freq > 1459) - freqlist += freq - freq += 2 - if ((freq % 2) == 0) - freq += 1 - freq = freqlist[rand(1, freqlist.len)] - - var/obj/item/device/uplink/hidden/T = new(R) - target_radio.hidden_uplink = T - T.uplink_owner = "[mob.key]" - target_radio.traitor_frequency = freq - mob << "Your Syndicate benefactors have cunningly disguised a Syndicate Uplink as your [R.name] [loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features." - mob.mind.store_memory("Radio Freq: [format_frequency(freq)] ([R.name] [loc]).") - else if (istype(R, /obj/item/device/pda)) - // generate a passcode if the uplink is hidden in a PDA - var/pda_pass = "[rand(100,999)] [pick("Alpha","Bravo","Delta","Omega")]" - - var/obj/item/device/uplink/hidden/T = new(R) - R.hidden_uplink = T - T.uplink_owner = "[mob.key]" - var/obj/item/device/pda/P = R - P.lock_code = pda_pass - - mob << "Your Syndicate benefactors have cunningly disguised a Syndicate Uplink as your [R.name] [loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features." - mob.mind.store_memory("Uplink Passcode: [pda_pass] ([R.name] [loc]).") - - var/obj/item/device/flash/T = new(mob) - var/obj/item/device/recaller/recaller = new(mob) - var/obj/item/toy/crayon/spraycan/SC = new(mob) + var/obj/item/weapon/pen/gang/T = new(mob) + var/obj/item/device/gangtool/gangtool = new(mob) + var/obj/item/toy/crayon/spraycan/gang/SC = new(mob) var/list/slots = list ( "backpack" = slot_in_backpack, @@ -174,21 +129,28 @@ . = 0 - var/where2 = mob.equip_in_one_of_slots(recaller, slots) - if (!where2) - mob << "Your Syndicate benefactors were unfortunately unable to get you a Recaller." - else - mob << "The Recaller in your [where2] will allow you to prevent the station from prematurely evacuating. Use it to recall the emergency shuttle from anywhere on the station." - . += 2 - - var/where = mob.equip_in_one_of_slots(T, slots) + var/where = mob.equip_in_one_of_slots(gangtool, slots) if (!where) - mob << "Your Syndicate benefactors were unfortunately unable to get you a flash." + mob << "Your Syndicate benefactors were unfortunately unable to get you a Gangtool." else - mob << "The flash in your [where] will help you to persuade the crew to work for you." + gangtool.register_device(mob) + mob << "The Gangtool in your [where] will allow you to use your influence to purchase items and prevent the station from evacuating before you can take over. Use it to recall the emergency shuttle from anywhere on the station." + mob << "You can also promote your gang members to lieutenant by giving them an unregistered gangtool. Lieutenants cannot be deconverted and are able to use recruitment pens and gangtools." . += 1 - mob.equip_in_one_of_slots(SC,slots) + var/where2 = mob.equip_in_one_of_slots(T, slots) + if (!where2) + mob << "Your Syndicate benefactors were unfortunately unable to get you a recruitment pen to start." + else + mob << "The recruitment pen in your [where2] will help you get your gang started. Use it on unsuspecting crew members to recruit them." + . += 1 + + var/where3 = mob.equip_in_one_of_slots(SC, slots) + if (!where3) + mob << "Your Syndicate benefactors were unfortunately unable to get you a territory spraycan to start." + else + mob << "The territory spraycan in your [where3] can be used to claim areas of the station for your gang. The more territory your gang controls, the more influence you get. Distribute these to your gangsters to grow your influence faster." + . += 1 mob.update_icons() return . @@ -197,23 +159,16 @@ //Checks if the either gang have won or not// ///////////////////////////////////////////// /datum/game_mode/gang/check_win() - var/A_victory = check_gang_victory(B_bosses) //Check if B bosses are dead or exiled - var/B_victory = check_gang_victory(A_bosses) //Check if A bosses are dead or exiled - - if(A_victory && B_victory) - finished = "Draw" //Both teams fail. Allow for draws in case they're all incapacitated at the same time. - - else if(A_victory) + if(A_territory.len > (start_state.num_territories * goal_scalar)) finished = "A" //Gang A wins - - else if(B_victory) + else if(B_territory.len > (start_state.num_territories * goal_scalar)) finished = "B" //Gang B wins /////////////////////////////// //Checks if the round is over// /////////////////////////////// /datum/game_mode/gang/check_finished() - if(finished && !config.continuous["gang"]) //Check for Gang Boss death + if(finished) return 1 return ..() //Check for evacuation/nuke @@ -223,12 +178,12 @@ /datum/game_mode/proc/add_gangster(datum/mind/gangster_mind, var/gang, var/check = 1) if(check && isloyal(gangster_mind.current)) //Check to see if the potential gangster is implanted return 0 - if((gangster_mind in A_bosses) || (gangster_mind in A_gangsters) || (gangster_mind in B_bosses) || (gangster_mind in B_gangsters)) + if(gangster_mind in (A_bosses | A_gang | B_bosses | B_gang)) return 0 if(gang == "A") - A_gangsters += gangster_mind + A_gang += gangster_mind else - B_gangsters += gangster_mind + B_gang += gangster_mind if(check) if(iscarbon(gangster_mind.current)) var/mob/living/carbon/carbon_mob = gangster_mind.current @@ -236,14 +191,15 @@ carbon_mob.flash_eyes(1, 1) gangster_mind.current.Stun(5) gangster_mind.current << "You are now a member of the [gang=="A" ? gang_name("A") : gang_name("B")] Gang!" - gangster_mind.current << "Help your Boss take over the station by defeating the rival gang. You can identify your Boss by their brown \"B\" icon." + gangster_mind.current << "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station." + gangster_mind.current << "You can identify your bosses by their red \[G\] icon." gangster_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the [gang=="A" ? "[gang_name("A")] Gang (A)" : "[gang_name("B")] Gang (B)"]!" gangster_mind.special_role = "[gang=="A" ? "[gang_name("A")] Gang (A)" : "[gang_name("B")] Gang (B)"]" update_gang_icons_added(gangster_mind,gang) return 1 -////////////////////////////////////////////////////////////// -//Deals with players going straight (Not a gangster anymore)// -////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////// +//Deals with players reverting to neutral (Not a gangster anymore)// +//////////////////////////////////////////////////////////////////// /datum/game_mode/proc/remove_gangster(datum/mind/gangster_mind, var/beingborged, var/silent, var/exclude_bosses=0) var/gang @@ -256,12 +212,12 @@ B_bosses -= gangster_mind gang = "B" - if(gangster_mind in A_gangsters) - A_gangsters -= gangster_mind + if(gangster_mind in A_gang) + A_gang -= gangster_mind gang = "A" - if(gangster_mind in B_gangsters) - B_gangsters -= gangster_mind + if(gangster_mind in B_gang) + B_gang -= gangster_mind gang = "B" if(!gang) //not a valid gangster @@ -279,8 +235,8 @@ else if(!silent) gangster_mind.current.Paralyse(5) - gangster_mind.current.visible_message("[gangster_mind.current] looks like they've given up the life of crime!") - gangster_mind.current << "You have been reformed! You are no longer a gangster!" + gangster_mind.current.visible_message("[gangster_mind.current] looks like they've given up the life of crime!") + gangster_mind.current << "You have been reformed! You are no longer a gangster!
You try as hard as you can, but you can't seem to recall any of the identities of your former gangsters..." update_gang_icons_removed(gangster_mind, gang) @@ -318,21 +274,6 @@ ganghud.leave_hud(defector_mind.current) set_antag_hud(defector_mind.current, null) -/////////////////////////// -//Checks for gang victory// -/////////////////////////// -/datum/game_mode/gang/proc/check_gang_victory(var/list/boss_list) - if(!boss_list.len) - return 0 - for(var/datum/mind/boss_mind in boss_list) - if(boss_mind.current) - if(boss_mind.current.stat == DEAD || !ishuman(boss_mind.current) || !boss_mind.current.ckey) - return 1 - var/turf/T = get_turf(boss_mind.current) - if(T && (T.z != ZLEVEL_STATION)) //If they leave the station they count as dead for this - return 1 - return 0 - return 1 ////////////////////////////////////////////////////////////////////// //Announces the end of the game with all relavent information stated// @@ -340,10 +281,8 @@ /datum/game_mode/gang/declare_completion() if(!finished) world << "The station was [station_was_nuked ? "destroyed!" : "evacuated before either gang could claim it!"]" - else if(finished == "Draw") - world << "All gang bosses have been killed or exiled!" else - world << "The [finished=="A" ? gang_name("A") : gang_name("B")] Gang defeated their rivals!" + world << "The [finished=="A" ? gang_name("A") : gang_name("B")] Gang has claimed over [round(100*goal_scalar,1)]% of the station and has assumed control!" ..() return 1 @@ -356,36 +295,22 @@ else winner = "Draw" - var/num_ganga = 0 - var/list/agang = A_gangsters + A_bosses - for(var/datum/mind/agangster in agang) - if(agangster.current) - if(agangster.current in living_mob_list) - num_ganga++ - - var/num_gangb = 0 - var/list/bgang = B_gangsters + B_bosses - for(var/datum/mind/bgangster in bgang) - if(bgangster.current) - if(bgangster.current in living_mob_list) - num_gangb++ - - if(A_bosses.len || A_gangsters.len) + if(A_bosses.len || A_gang.len) if(winner) - world << "
The [gang_name("A")] Gang was [winner=="A" ? "victorious" : "defeated"] with [num_ganga] members!" - world << "
The [gang_name("A")] Gang Boss was:" + world << "
The [gang_name("A")] Gang was [winner=="A" ? "victorious" : "defeated"] with [round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1)]% control of the station!" + world << "
The [gang_name("A")] Gang Bosses were:" gang_membership_report(A_bosses) world << "
The [gang_name("A")] Gangsters were:" - gang_membership_report(A_gangsters) + gang_membership_report(A_gang) world << "
" - if(B_bosses.len || B_gangsters.len) + if(B_bosses.len || B_gang.len) if(winner) - world << "
The [gang_name("B")] Gang was [winner=="B" ? "victorious" : "defeated"] with [num_gangb] members!" - world << "
The [gang_name("B")] Gang Boss was:" + world << "
The [gang_name("B")] Gang was [winner=="B" ? "victorious" : "defeated"] with [round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1)]% control of the station!" + world << "
The [gang_name("B")] Gang Bosses were:" gang_membership_report(B_bosses) world << "
The [gang_name("B")] Gangsters were:" - gang_membership_report(B_gangsters) + gang_membership_report(B_gang) world << "
" /datum/game_mode/proc/gang_membership_report(var/list/membership) @@ -395,7 +320,7 @@ if(gang_mind.current) if(gang_mind.current.stat == DEAD || isbrain(gang_mind.current)) text += "died" - else if(gang_mind.current.z != ZLEVEL_STATION) + else if(gang_mind.current.z > ZLEVEL_STATION) text += "fled the station" else text += "survived" @@ -406,3 +331,126 @@ text += ")" world << text + + +////////////////////////////////////////////////////////// +//Handles influence, territories, and the victory checks// +////////////////////////////////////////////////////////// + +/datum/gang_points + var/A = 30 + var/B = 30 + var/next_point_interval = 1800 + var/next_point_time + +/datum/gang_points/proc/start() + next_point_time = world.time + next_point_interval + spawn(next_point_interval) + income() + +/datum/gang_points/proc/income() + var/A_added_names = "" + var/B_added_names = "" + var/A_lost_names = "" + var/B_lost_names = "" + + //Process lost territories + for(var/area in ticker.mode.A_territory_lost) + if(A_lost_names == "") + A_lost_names += ":
" + else + A_lost_names += ", " + A_lost_names += "[ticker.mode.A_territory_lost[area]], " + ticker.mode.A_territory -= area + + for(var/area in ticker.mode.B_territory_lost) + if(B_lost_names == "") + B_lost_names += ":
" + else + B_lost_names += ", " + B_lost_names += "[ticker.mode.B_territory_lost[area]], " + ticker.mode.B_territory -= area + + //Calculate and report influence growth + ticker.mode.message_gangtools(ticker.mode.A_tools,"[gang_name("A")] Gang Status Report:") + var/A_new = min(999,A + 15 + ticker.mode.A_territory.len) + var/A_message = "" + if(A_new != A) + A_message += "Your gang has gained [A_new - A] Influence for holding on to [ticker.mode.A_territory.len] territories." + if(A_new == 999) + A_message += " You cannot gain any more influence without spending some with this device." + A = A_new + ticker.mode.message_gangtools(ticker.mode.A_tools,A_message,0) + + ticker.mode.message_gangtools(ticker.mode.B_tools,"[gang_name("B")] Gang Status Report:") + var/B_new = min(999,B + 15 + ticker.mode.B_territory.len) + var/B_message = "" + if(B_new != B) + B_message += "Your gang has gained [B_new - B] Influence for holding on to [ticker.mode.B_territory.len] territories." + if(B_new == 999) + B_message += " You cannot gain any more influence without spending some with this device." + B = B_new + ticker.mode.message_gangtools(ticker.mode.B_tools,B_message,0) + + + //Remove territories they already own from the buffer, so if they got tagged over, they can still earn income if they tag it back before the next status report + ticker.mode.A_territory_new -= ticker.mode.A_territory + ticker.mode.B_territory_new -= ticker.mode.B_territory + + //Process new territories + for(var/area in ticker.mode.A_territory_new) + if(A_added_names == "") + A_added_names += ":
" + else + A_added_names += ", " + A_added_names += "[ticker.mode.A_territory_new[area]]" + ticker.mode.A_territory += area + + for(var/area in ticker.mode.B_territory_new) + if(B_added_names == "") + B_added_names += ":
" + else + B_added_names += ", " + B_added_names += "[ticker.mode.B_territory_new[area]]" + ticker.mode.B_territory += area + + //Report territory changes + ticker.mode.message_gangtools(ticker.mode.A_tools,"[ticker.mode.A_territory_new.len] new territories[A_added_names]",0) + ticker.mode.message_gangtools(ticker.mode.B_tools,"[ticker.mode.B_territory_new.len] new territories[B_added_names]",0,) + ticker.mode.message_gangtools(ticker.mode.A_tools,"[ticker.mode.A_territory_lost.len] territories lost[A_lost_names]",0,1) + ticker.mode.message_gangtools(ticker.mode.B_tools,"[ticker.mode.B_territory_lost.len] territories lost[B_lost_names]",0,1) + + //Clear the lists + ticker.mode.A_territory_new = list() + ticker.mode.B_territory_new = list() + ticker.mode.A_territory_lost = list() + ticker.mode.B_territory_lost = list() + + var/A_control = round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1) + var/B_control = round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1) + ticker.mode.message_gangtools((ticker.mode.A_tools),"Your gang now has [A_control]% control of the station.",0) + ticker.mode.message_gangtools((ticker.mode.A_tools),"The [gang_name("B")] Gang has [B_control]% control of the station.",0,1) + ticker.mode.message_gangtools((ticker.mode.B_tools),"Your gang now has [B_control]% control of the station.",0) + ticker.mode.message_gangtools((ticker.mode.B_tools),"The [gang_name("A")] Gang has [A_control]% control of the station.",0,1) + + //Victory check + ticker.mode.check_win() + + //Restart the counter + start() + + +//////////////////////////////////////////////// +//Sends a message to the boss via his gangtool// +//////////////////////////////////////////////// + +/datum/game_mode/proc/message_gangtools(var/list/gangtools,var/message,var/beep=1,var/warning) + if(!gangtools.len || !message) + return + for(var/obj/item/device/gangtool/tool in gangtools) + var/mob/living/mob = get(tool.loc,/mob/living) + if(mob && mob.mind) + if(((tool.gang == "A") && ((mob.mind in A_gang) || (mob.mind in A_bosses))) || ((tool.gang == "B") && ((mob.mind in B_gang) || (mob.mind in B_bosses)))) + mob << "\icon[tool] [message]" + if(beep) + playsound(mob.loc, 'sound/machines/twobeep.ogg', 50, 1) \ No newline at end of file diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index 81ed244f086..e392f101ae7 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -228,9 +228,9 @@ */ /datum/intercept_text/proc/build_gang(datum/mind/correct_person) - src.text += "
Syndicate forces may be supplying opposing criminal organizations within your sector in an attempt at destabilizing our operations." - src.text += "Ensure law and order is maintained on the station and be on the lookout for violent confrontations between station factions." - src.text += "Central Command retains an interest in any criminal leaders captured by station security. The execution or exile of these persons are ill-advised." + src.text += "
We have recieved reports of a sudden increase of criminal activity in close proximity to our operations within your sector." + src.text += "Ensure law and order is maintained on the station and be on the lookout for unusually territorial behavior from the crew." + src.text += "In the event of a full-scale takeover attempt, sensitive research items are to be secured and the station evacuated ASAP." src.text += "
" /datum/intercept_text/proc/build_wizard(datum/mind/correct_person) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 5e5aa1bf462..5ef07cdcbf5 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -227,7 +227,7 @@ for(var/datum/AI_Module/small/overload_machine/overload in current_modules) if(overload.uses > 0) overload.uses -- - audible_message("You hear a loud electrical buzzing sound!") + audible_message("You hear a loud electrical buzzing sound!") src << "Overloading machine circuitry..." spawn(50) if(M) @@ -257,7 +257,7 @@ for(var/datum/AI_Module/small/override_machine/override in current_modules) if(override.uses > 0) override.uses -- - audible_message("You hear a loud electrical buzzing sound!") + audible_message("You hear a loud electrical buzzing sound!") src << "Reprogramming machine behaviour..." spawn(50) if(M && !M.gc_destroyed) @@ -270,65 +270,71 @@ mod_pick_name = "cyborgtransformer" description = "Build a machine anywhere, using expensive nanomachines, that can convert a living human into a loyal cyborg slave when placed inside." cost = 100 - power_type = /mob/living/silicon/ai/proc/place_transformer + var/list/turfOverlays = list() + +/datum/AI_Module/large/place_cyborg_transformer/New() + for(var/i=0;i<3;i++) + var/image/I = image("icon"='icons/turf/overlays.dmi') + turfOverlays += I + ..() /mob/living/silicon/ai/proc/place_transformer() set name = "Place Robotic Factory" set category = "Malfunction" - - if(!eyeobj) + if(!canPlaceTransformer()) return - - if(!isturf(src.loc)) // AI must be in it's core. - return - - var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in src.current_modules - if(!PCT) - return - - if(PCT.uses < 1) - src << "Out of uses." - return - - if(!canUseTopic()) - return - - var/sure = alert(src, "Make sure the room it is in is big enough, there is camera vision and that there is a 1x3 area for the machine. Are you sure you want to place the machine here?", "Are you sure?", "Yes", "No") - if(sure != "Yes") - return - - // Make sure there is enough room. - var/turf/middle = get_turf(eyeobj.loc) - var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z)) - - var/alert_msg = "There isn't enough room. Make sure you are placing the machine in a clear area and on a floor." - - var/datum/camerachunk/C = cameranet.getCameraChunk(middle.x, middle.y, middle.z) - if(!C.visibleTurfs[middle]) - alert(src, "We cannot get camera vision of this location.") - return - - for(var/T in turfs) - - // Make sure the turfs are clear and the correct type. - if(!istype(T, /turf/simulated/floor)) - alert(src, alert_msg) + var/sure = alert(src, "Are you sure you want to place the machine here?", "Are you sure?", "Yes", "No") + if(sure == "Yes") + if(!canPlaceTransformer()) return + var/turf/T = get_turf(eyeobj) + new /obj/machinery/transformer/conveyor(T) + playsound(T, 'sound/effects/phasein.ogg', 100, 1) + var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in current_modules + PCT.uses -- + can_shunt = 0 + src << "You cannot shunt anymore." - var/turf/simulated/floor/F = T - for(var/atom/movable/AM in F.contents) - if(AM.density) - alert(src, alert_msg) - return - - // All clear, place the transformer - new /obj/machinery/transformer/conveyor(middle) - playsound(middle, 'sound/effects/phasein.ogg', 100, 1) - src.can_shunt = 0 - PCT.uses -= 1 - src << "You cannot shunt anymore." - +/mob/living/silicon/ai/proc/canPlaceTransformer() + if(!eyeobj || !isturf(src.loc) || !canUseTopic()) + return + var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in current_modules + if(!PCT || PCT.uses < 1) + alert(src, "Out of uses.") + return + var/turf/middle = get_turf(eyeobj) + var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z)) + var/alert_msg = "There isn't enough room. Make sure you are placing the machine in a clear area and on a floor." + var/success = 1 + if(turfs.len == 3) + for(var/n=1;n<4,n++) + var/fail + var/turf/T = turfs[n] + if(!istype(T, /turf/simulated/floor)) + fail = 1 + var/datum/camerachunk/C = cameranet.getCameraChunk(T.x, T.y, T.z) + if(!C.visibleTurfs[T]) + alert_msg = "We cannot get camera vision of this location." + fail = 1 + for(var/atom/movable/AM in T.contents) + if(AM.density) + fail = 1 + var/image/I = PCT.turfOverlays[n] + I.loc = T + client.images += I + if(fail) + success = 0 + I.icon_state = "redOverlay" + else + I.icon_state = "greenOverlay" + spawn(30) + if(client && (I.loc == T)) + client.images -= I + if(success) + return 1 + alert(src, alert_msg) + return /datum/AI_Module/small/blackout module_name = "Blackout" @@ -426,11 +432,11 @@ if(upgraded) UC.uses -- C.visible_message("\icon[C] *beep*") - src << "Camera successully upgraded!" + src << "You successully upgrade the camera." else - src << "This camera is already upgraded!" + src << "This camera is already upgraded!" else - src << "Out of uses." + src << "Out of uses!" /datum/module_picker var/temp = null diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 7271875daee..f08f4e58d4e 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -8,9 +8,8 @@ required_players = 25 required_enemies = 1 recommended_enemies = 1 - pre_setup_before_jobs = 1 enemy_minimum_age = 30 //Same as AI minimum age - + round_ends_with_antag_death = 1 var/AI_win_timeleft = 5400 //started at 5400, in case I change this for testing round end. var/malf_mode_declared = 0 @@ -49,7 +48,7 @@ if (malf_ai.len < required_enemies) return 0 for(var/datum/mind/ai_mind in malf_ai) - ai_mind.assigned_role = "MODE" + ai_mind.assigned_role = "malfunctioning AI" ai_mind.special_role = "malfunctioning AI"//So they actually have a special role/N log_game("[ai_mind.key] (ckey) has been selected as a malf AI") return 1 @@ -58,33 +57,16 @@ /datum/game_mode/malfunction/post_setup() for(var/datum/mind/AI_mind in malf_ai) if(malf_ai.len < 1) - world << "Uh oh, its malfunction and there is no AI! Please report this." - world << "Rebooting world in 5 seconds." - - feedback_set_details("end_error","malf - no AI") - - if(blackbox) - blackbox.save_all_data_to_sql() - sleep(50) - world.Reboot() + world.Reboot("No AI during Malfunction.", "end_error", "malf - no AI", 50) return AI_mind.current.verbs += /mob/living/silicon/ai/proc/choose_modules AI_mind.current:laws = new /datum/ai_laws/malfunction AI_mind.current:malf_picker = new /datum/module_picker AI_mind.current:show_laws() - greet_malf(AI_mind) - AI_mind.special_role = "malfunction" - AI_mind.current.verbs += /datum/game_mode/malfunction/proc/takeover AI_mind.current.verbs += /mob/living/silicon/ai/proc/ai_cancel_call - -/* AI_mind.current.icon_state = "ai-malf" - spawn(10) - if(alert(AI_mind.current,"Do you want to use an alternative sprite for your real core?",,"Yes","No")=="Yes") - AI_mind.current.icon_state = "ai-malf2" -*/ SSshuttle.emergencyNoEscape = 1 ..() @@ -170,10 +152,6 @@ /datum/game_mode/malfunction/check_finished() - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - if(round_converted == 1) //No reason to waste resources - return ..() //Check for evacuation/nuke if (station_captured && !to_nuke_or_not_to_nuke) return 1 if (is_malf_ai_dead() || !check_ai_loc()) @@ -184,12 +162,9 @@ priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") SSshuttle.emergencyNoEscape = 0 malf_mode_declared = 0 + continuous_sanity_checked = 1 if(get_security_level() == "delta") set_security_level("red") - if(config.midround_antag["malfunction"]) - round_converted = convert_roundtype() - if(!round_converted) - return 1 return ..() else return 1 diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 2d3e4e1c380..cceb0c6a622 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -34,6 +34,8 @@ if(player.onCentcom()) text += "
[player.real_name] escaped to the safety of Centcom." + else if(player.onSyndieBase()) + text += "
[player.real_name] escaped to the (relative) safety of Syndicate Space." else text += "
[player.real_name] survived but is stranded without any hope of rescue." diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 43992706cd4..a8a74bbffb1 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -238,7 +238,7 @@ explosion(src.loc, 0, 0, 4, 3, 0) new /obj/effect/decal/cleanable/greenglow(get_turf(src)) for(var/mob/living/L in view(5, src)) - L.apply_effect(40, IRRADIATE) + L.irradiate(40) //Meaty Ore /obj/effect/meteor/meaty diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm index 66cc61bd322..18a62827b4f 100644 --- a/code/game/gamemodes/monkey/monkey.dm +++ b/code/game/gamemodes/monkey/monkey.dm @@ -24,17 +24,13 @@ /datum/game_mode/monkey/pre_setup() carriers_to_make = max(round(num_players()/players_per_carrier, 1), 1) - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs)//Removing robots from the list - if(player.assigned_role == job) - antag_candidates -= player - for(var/j = 0, j < carriers_to_make, j++) if (!antag_candidates.len) break var/datum/mind/carrier = pick(antag_candidates) carriers += carrier carrier.special_role = "monkey" + carrier.restricted_roles = restricted_jobs log_game("[carrier.key] (ckey) has been selected as a Jungle Fever carrier") antag_candidates -= carrier @@ -69,15 +65,36 @@ carriermind.current.viruses += D ..() +/datum/game_mode/monkey/check_finished() + if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || station_was_nuked) + return 1 + + if(!round_converted) + for(var/datum/mind/monkey_mind in ape_infectees) + continuous_sanity_checked = 1 + if(monkey_mind.current && monkey_mind.current.stat != DEAD) + return 0 + + var/datum/disease/D = new /datum/disease/transformation/jungle_fever() //ugly but unfortunately needed + for(var/mob/living/carbon/human/H in living_mob_list) + if(H.mind && H.stat != DEAD) + if(H.HasDisease(D)) + return 0 + + ..() + /datum/game_mode/monkey/proc/check_monkey_victory() + if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) + return 0 + var/datum/disease/D = new /datum/disease/transformation/jungle_fever() for(var/mob/living/carbon/monkey/M in living_mob_list) - if (M.HasDisease(/datum/disease/transformation/jungle_fever)) - if(M.onCentcom()) + if (M.HasDisease(D)) + if(M.onCentcom() || M.onSyndieBase()) escaped_monkeys++ if(escaped_monkeys >= monkeys_to_win) - return 0 - else return 1 + else + return 0 /datum/game_mode/proc/add_monkey(datum/mind/monkey_mind) ape_infectees |= monkey_mind @@ -89,7 +106,7 @@ /datum/game_mode/monkey/declare_completion() - if(!check_monkey_victory()) + if(check_monkey_victory()) feedback_set_details("round_end_result","win - monkey win") feedback_set("round_end_result",escaped_monkeys) world << "The monkeys have overthrown their captors! Eeek eeeek!!" diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index afd98a9ab5d..7d8a51b32eb 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -8,7 +8,6 @@ required_players = 20 // 20 players - 5 players to be the nuke ops = 15 players remaining required_enemies = 5 recommended_enemies = 5 - pre_setup_before_jobs = 1 antag_flag = BE_OPERATIVE enemy_minimum_age = 14 @@ -41,7 +40,7 @@ agent_number-- for(var/datum/mind/synd_mind in syndicates) - synd_mind.assigned_role = "MODE" + synd_mind.assigned_role = "Syndicate" synd_mind.special_role = "Syndicate"//So they actually have a special role/N log_game("[synd_mind.key] (ckey) has been selected as a nuclear operative") return 1 @@ -164,6 +163,7 @@ var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(synd_mob) R.set_frequency(radio_freq) + R.freqlock = 1 synd_mob.equip_to_slot_or_del(R, slot_ears) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) @@ -201,6 +201,15 @@ return 0 return 1 +/datum/game_mode/nuclear/check_finished() //to be called by ticker + if(replacementmode && round_converted == 2) + return replacementmode.check_finished() + if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || station_was_nuked) + return 1 + if(are_operatives_dead()) + if(bomb_set) //snaaaaaaaaaake! It's not over yet! + return 0 + ..() /datum/game_mode/nuclear/declare_completion() var/disk_rescued = 1 @@ -237,7 +246,7 @@ world << "[syndicate_name()] operatives have earned Darwin Award!" world << "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't lose the disk!" - else if ( disk_rescued && are_operatives_dead()) + else if ((disk_rescued || SSshuttle.emergency.mode < SHUTTLE_ENDGAME) && are_operatives_dead()) feedback_set_details("round_end_result","loss - evacuation - disk secured - syndi team dead") world << "Crew Major Victory!" world << "The Research Staff has saved the disc and killed the [syndicate_name()] Operatives" diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 3364fe864a7..2629d2bfce2 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -208,21 +208,10 @@ var/bomb_set ticker.mode:nukes_left -- else world << "The station was destoyed by the nuclear blast!" - ticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated. //kinda shit but I couldn't get permission to do what I wanted to do. - if(!ticker.mode.check_finished())//If the mode does not deal with the nuke going off so just reboot because everyone is stuck as is - world << "Resetting in 30 seconds!" - - feedback_set_details("end_error","nuke - unhandled ending") - - if(blackbox) - blackbox.save_all_data_to_sql() - sleep(300) - log_game("Rebooting due to nuclear detonation") - kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked - world.Reboot() + world.Reboot("Station destroyed by Nuclear Device.", "end_error", "nuke - unhandled ending") return return @@ -246,6 +235,7 @@ This is here to make the tiles around the station mininuke change when it's arme /obj/item/weapon/disk/nuclear name = "nuclear authentication disk" desc = "Better keep this safe." + icon = 'icons/obj/items.dmi' icon_state = "nucleardisk" item_state = "card-id" w_class = 1.0 @@ -258,7 +248,7 @@ This is here to make the tiles around the station mininuke change when it's arme var/turf/disk_loc = get_turf(src) if(disk_loc.z > ZLEVEL_CENTCOM) get(src, /mob) << "You can't help but feel that you just lost something back there..." - Destroy() + qdel(src) /obj/item/weapon/disk/nuclear/Destroy() if(blobstart.len > 0) @@ -267,7 +257,7 @@ This is here to make the tiles around the station mininuke change when it's arme var/turf/diskturf = get_turf(src) message_admins("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z] - JMP). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - JMP).") log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).") - del(src) //Needed to clear all references to it + return QDEL_HINT_HARDDEL_NOW else ERROR("[src] was supposed to be destroyed, but we were unable to locate a blobstart landmark to spawn a new one.") - return 1 // Cancel destruction. + return QDEL_HINT_LETMELIVE // Cancel destruction. diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index bfccd051890..74e88d79bad 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -122,7 +122,7 @@ location = locate(locationx,locationy,Z.z) - usr << "You set the pinpointer to locate [locationx],[locationy]" + usr << "You set the pinpointer to locate [locationx],[locationy]" return attack_self() @@ -140,9 +140,9 @@ return target=locate(possible_items[targetitem]) if(!target) - usr << "Failed to locate [targetitem]!" + usr << "Failed to locate [targetitem]!" return - usr << "You set the pinpointer to locate [targetitem]" + usr << "You set the pinpointer to locate [targetitem]." if("DNA") var/DNAstring = input("Input DNA string to search for." , "Please Enter String." , "") if(!DNAstring) @@ -170,12 +170,13 @@ /obj/item/weapon/pinpointer/nukeop/attack_self(mob/user as mob) if(!active) active = 1 + var/mode_text = "Authentication Disk Locator mode" if(!mode) workdisk() - user << "Authentication Disk Locator active." else + mode_text = "Shuttle Locator mode" worklocation() - user << "Shuttle Locator active." + user << "You activate the pinpointer([mode_text])." else active = 0 icon_state = "pinoff" @@ -191,7 +192,7 @@ mode = 1 //Ensures worklocation() continues to work worklocation() playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep - visible_message("Shuttle Locator active.") //Lets the mob holding it know that the mode has changed + visible_message("Shuttle Locator mode actived.") //Lets the mob holding it know that the mode has changed return //Get outta here scandisk() if(!the_disk) @@ -221,7 +222,7 @@ mode = 0 workdisk() playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) - visible_message("Authentication Disk Locator active.") + visible_message("Authentication Disk Locator mode actived.") return if(!home) home = SSshuttle.getShuttle("syndicate") diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 9f0eee8e881..34097634102 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1,4 +1,4 @@ -datum/objective +/datum/objective var/datum/mind/owner = null //Who owns the objective. var/explanation_text = "Nothing" //What that person is supposed to do. var/datum/mind/target = null //If they are focused on a particular person. @@ -7,23 +7,23 @@ datum/objective var/dangerrating = 0 //How hard the objective is, essentially. Used for dishing out objectives and checking overall victory. var/martyr_compatible = 0 //If the objective is compatible with martyr objective, i.e. if you can still do it while dead. -datum/objective/New(var/text) +/datum/objective/New(var/text) if(text) explanation_text = text -datum/objective/proc/check_completion() +/datum/objective/proc/check_completion() return completed -datum/objective/proc/is_unique_objective(possible_target) +/datum/objective/proc/is_unique_objective(possible_target) for(var/datum/objective/O in owner.objectives) if(istype(O, type) && O.get_target() == possible_target) return 0 return 1 -datum/objective/proc/get_target() +/datum/objective/proc/get_target() return target -datum/objective/proc/find_target() +/datum/objective/proc/find_target() var/list/possible_targets = list() for(var/datum/mind/possible_target in ticker.minds) if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != 2) && is_unique_objective(possible_target)) @@ -33,36 +33,36 @@ datum/objective/proc/find_target() update_explanation_text() return target -datum/objective/proc/find_target_by_role(role, role_type=0)//Option sets either to check assigned role or special role. Default to assigned. +/datum/objective/proc/find_target_by_role(role, role_type=0)//Option sets either to check assigned role or special role. Default to assigned. for(var/datum/mind/possible_target in ticker.minds) if((possible_target != owner) && ishuman(possible_target.current) && ((role_type ? possible_target.special_role : possible_target.assigned_role) == role) ) target = possible_target break update_explanation_text() -datum/objective/proc/update_explanation_text() +/datum/objective/proc/update_explanation_text() //Default does nothing, override where needed -datum/objective/assassinate +/datum/objective/assassinate var/target_role_type=0 dangerrating = 10 martyr_compatible = 1 -datum/objective/assassinate/find_target_by_role(role, role_type=0) +/datum/objective/assassinate/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/assassinate/check_completion() +/datum/objective/assassinate/check_completion() if(target && target.current) if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite return 1 return 0 return 1 -datum/objective/assassinate/update_explanation_text() +/datum/objective/assassinate/update_explanation_text() ..() if(target && target.current) explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." @@ -71,26 +71,26 @@ datum/objective/assassinate/update_explanation_text() -datum/objective/mutiny +/datum/objective/mutiny var/target_role_type=0 martyr_compatible = 1 -datum/objective/mutiny/find_target_by_role(role, role_type=0) +/datum/objective/mutiny/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/mutiny/check_completion() +/datum/objective/mutiny/check_completion() if(target && target.current) if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey || !target.current.client) return 1 var/turf/T = get_turf(target.current) - if(T && (T.z != ZLEVEL_STATION)) //If they leave the station they count as dead for this + if(T && (T.z > ZLEVEL_STATION) || target.current.client.is_afk()) //If they leave the station or go afk they count as dead for this return 2 return 0 return 1 -datum/objective/mutiny/update_explanation_text() +/datum/objective/mutiny/update_explanation_text() ..() if(target && target.current) explanation_text = "Assassinate or exile [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." @@ -99,25 +99,25 @@ datum/objective/mutiny/update_explanation_text() -datum/objective/maroon +/datum/objective/maroon var/target_role_type=0 dangerrating = 5 martyr_compatible = 1 -datum/objective/maroon/find_target_by_role(role, role_type=0) +/datum/objective/maroon/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/maroon/check_completion() +/datum/objective/maroon/check_completion() if(target && target.current) if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite return 1 - if(target.current.onCentcom()) + if(target.current.onCentcom() || target.current.onSyndieBase()) return 0 return 1 -datum/objective/maroon/update_explanation_text() +/datum/objective/maroon/update_explanation_text() if(target && target.current) explanation_text = "Prevent [target.name], the [!target_role_type ? target.assigned_role : target.special_role], from escaping alive." else @@ -125,16 +125,16 @@ datum/objective/maroon/update_explanation_text() -datum/objective/debrain//I want braaaainssss +/datum/objective/debrain//I want braaaainssss var/target_role_type=0 dangerrating = 20 -datum/objective/debrain/find_target_by_role(role, role_type=0) +/datum/objective/debrain/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/debrain/check_completion() +/datum/objective/debrain/check_completion() if(!target)//If it's a free objective. return 1 if( !owner.current || owner.current.stat==DEAD )//If you're otherwise dead. @@ -148,7 +148,7 @@ datum/objective/debrain/check_completion() return 1 return 0 -datum/objective/debrain/update_explanation_text() +/datum/objective/debrain/update_explanation_text() ..() if(target && target.current) explanation_text = "Steal the brain of [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." @@ -157,17 +157,17 @@ datum/objective/debrain/update_explanation_text() -datum/objective/protect//The opposite of killing a dude. +/datum/objective/protect//The opposite of killing a dude. var/target_role_type=0 dangerrating = 10 martyr_compatible = 1 -datum/objective/protect/find_target_by_role(role, role_type=0) +/datum/objective/protect/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/protect/check_completion() +/datum/objective/protect/check_completion() if(!target) //If it's a free objective. return 1 if(target.current) @@ -176,7 +176,7 @@ datum/objective/protect/check_completion() return 1 return 0 -datum/objective/protect/update_explanation_text() +/datum/objective/protect/update_explanation_text() ..() if(target && target.current) explanation_text = "Protect [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." @@ -185,12 +185,12 @@ datum/objective/protect/update_explanation_text() -datum/objective/hijack +/datum/objective/hijack explanation_text = "Hijack the emergency shuttle by escaping alone." dangerrating = 25 martyr_compatible = 0 //Technically you won't get both anyway. -datum/objective/hijack/check_completion() +/datum/objective/hijack/check_completion() if(!owner.current || owner.current.stat) return 0 if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) @@ -209,16 +209,17 @@ datum/objective/hijack/check_completion() if(/mob/living/silicon/ai, /mob/living/silicon/pai) continue if(get_area(player) == A) - return 0 + if(!player.mind.special_role && !istype(get_turf(player.mind.current), /turf/simulated/floor/plasteel/shuttle/red)) + return 0 return 1 -datum/objective/block +/datum/objective/block explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive." dangerrating = 25 martyr_compatible = 1 -datum/objective/block/check_completion() +/datum/objective/block/check_completion() if(!istype(owner.current, /mob/living/silicon)) return 0 if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) @@ -237,11 +238,11 @@ datum/objective/block/check_completion() return 1 -datum/objective/escape +/datum/objective/escape explanation_text = "Escape on the shuttle or an escape pod alive and without being in custody." dangerrating = 5 -datum/objective/escape/check_completion() +/datum/objective/escape/check_completion() if(issilicon(owner.current)) return 0 if(isbrain(owner.current)) @@ -254,24 +255,24 @@ datum/objective/escape/check_completion() if(!location) return 0 - if(istype(location, /turf/simulated/shuttle/floor4)) // Fails traitors if they are in the shuttle brig -- Polymorph + if(istype(location, /turf/simulated/floor/plasteel/shuttle/red)) // Fails traitors if they are in the shuttle brig -- Polymorph return 0 - if(location.onCentcom()) + if(location.onCentcom() || location.onSyndieBase()) return 1 return 0 -datum/objective/escape/escape_with_identity +/datum/objective/escape/escape_with_identity dangerrating = 10 var/target_real_name // Has to be stored because the target's real_name can change over the course of the round var/target_missing_id -datum/objective/escape/escape_with_identity/find_target() +/datum/objective/escape/escape_with_identity/find_target() target = ..() update_explanation_text() -datum/objective/escape/escape_with_identity/update_explanation_text() +/datum/objective/escape/escape_with_identity/update_explanation_text() if(target && target.current) target_real_name = target.current.real_name explanation_text = "Escape on the shuttle or an escape pod with the identity of [target_real_name], the [target.assigned_role]" @@ -287,7 +288,7 @@ datum/objective/escape/escape_with_identity/update_explanation_text() else explanation_text = "Free Objective." -datum/objective/escape/escape_with_identity/check_completion() +/datum/objective/escape/escape_with_identity/check_completion() if(!target_real_name) return 1 if(!ishuman(owner.current)) @@ -300,11 +301,11 @@ datum/objective/escape/escape_with_identity/check_completion() return 0 -datum/objective/survive +/datum/objective/survive explanation_text = "Stay alive until the end." dangerrating = 3 -datum/objective/survive/check_completion() +/datum/objective/survive/check_completion() if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current)) return 0 //Brains no longer win survive objectives. --NEO if(!is_special_character(owner.current)) //This fails borg'd traitors @@ -312,11 +313,11 @@ datum/objective/survive/check_completion() return 1 -datum/objective/martyr +/datum/objective/martyr explanation_text = "Die a glorious death." dangerrating = 1 -datum/objective/martyr/check_completion() +/datum/objective/martyr/check_completion() if(!owner.current) //Gibbed, etc. return 1 if(owner.current && owner.current.stat == DEAD) //You're dead! Yay! @@ -324,34 +325,34 @@ datum/objective/martyr/check_completion() return 0 -datum/objective/nuclear +/datum/objective/nuclear explanation_text = "Destroy the station with a nuclear device." martyr_compatible = 1 var/global/list/possible_items = list() -datum/objective/steal +/datum/objective/steal var/datum/objective_item/targetinfo = null //Save the chosen item datum so we can access it later. var/obj/item/steal_target = null //Needed for custom objectives (they're just items, not datums). dangerrating = 5 //Overridden by the individual item's difficulty, but defaults to 5 for custom objectives. martyr_compatible = 0 -datum/objective/steal/get_target() +/datum/objective/steal/get_target() return steal_target -datum/objective/steal/New() +/datum/objective/steal/New() ..() if(!possible_items.len)//Only need to fill the list when it's needed. init_subtypes(/datum/objective_item/steal,possible_items) -datum/objective/steal/find_target() +/datum/objective/steal/find_target() var/approved_targets = list() for(var/datum/objective_item/possible_item in possible_items) if(is_unique_objective(possible_item.targetitem)) approved_targets += possible_item return set_target(safepick(possible_items)) -datum/objective/steal/proc/set_target(var/datum/objective_item/item) +/datum/objective/steal/proc/set_target(var/datum/objective_item/item) if(item) targetinfo = item @@ -363,7 +364,7 @@ datum/objective/steal/proc/set_target(var/datum/objective_item/item) explanation_text = "Free objective" return -datum/objective/steal/proc/select_target() //For admins setting objectives manually. +/datum/objective/steal/proc/select_target() //For admins setting objectives manually. var/list/possible_items_all = possible_items+"custom" var/new_target = input("Select target:", "Objective target", steal_target) as null|anything in possible_items_all if (!new_target) return @@ -383,7 +384,7 @@ datum/objective/steal/proc/select_target() //For admins setting objectives manua set_target(new_target) return steal_target -datum/objective/steal/check_completion() +/datum/objective/steal/check_completion() if(!steal_target) return 1 if(!isliving(owner.current)) return 0 var/list/all_items = owner.current.GetAllContents() //this should get things in cheesewheels, books, etc. @@ -401,23 +402,23 @@ datum/objective/steal/check_completion() return 0 var/global/list/possible_items_special = list() -datum/objective/steal/special //ninjas are so special they get their own subtype good for them +/datum/objective/steal/special //ninjas are so special they get their own subtype good for them -datum/objective/steal/special/New() +/datum/objective/steal/special/New() ..() if(!possible_items_special.len) init_subtypes(/datum/objective_item/special,possible_items) init_subtypes(/datum/objective_item/stack,possible_items) -datum/objective/steal/special/find_target() +/datum/objective/steal/special/find_target() return set_target(pick(possible_items_special)) -datum/objective/steal/exchange +/datum/objective/steal/exchange dangerrating = 10 -datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) +/datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) target = otheragent if(faction == "red") targetinfo = new/datum/objective_item/unique/docs_blue @@ -427,7 +428,7 @@ datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) steal_target = targetinfo.targetitem -datum/objective/steal/exchange/update_explanation_text() +/datum/objective/steal/exchange/update_explanation_text() ..() if(target && target.current) explanation_text = "Acquire [targetinfo.name] held by [target.name], the [target.assigned_role] and syndicate agent" @@ -435,10 +436,10 @@ datum/objective/steal/exchange/update_explanation_text() explanation_text = "Free Objective" -datum/objective/steal/exchange/backstab +/datum/objective/steal/exchange/backstab dangerrating = 3 -datum/objective/steal/exchange/backstab/set_faction(var/faction) +/datum/objective/steal/exchange/backstab/set_faction(var/faction) if(faction == "red") targetinfo = new/datum/objective_item/unique/docs_red else if(faction == "blue") @@ -447,15 +448,15 @@ datum/objective/steal/exchange/backstab/set_faction(var/faction) steal_target = targetinfo.targetitem -datum/objective/download +/datum/objective/download dangerrating = 10 -datum/objective/download/proc/gen_amount_goal() +/datum/objective/download/proc/gen_amount_goal() target_amount = rand(10,20) explanation_text = "Download [target_amount] research level\s." return target_amount -datum/objective/download/check_completion()//NINJACODE +/datum/objective/download/check_completion()//NINJACODE if(!ishuman(owner.current)) return 0 @@ -483,15 +484,15 @@ datum/objective/download/check_completion()//NINJACODE -datum/objective/capture +/datum/objective/capture dangerrating = 10 -datum/objective/capture/proc/gen_amount_goal() +/datum/objective/capture/proc/gen_amount_goal() target_amount = rand(5,10) explanation_text = "Accumulate [target_amount] capture point\s. It is better if they remain relatively unharmed." return target_amount -datum/objective/capture/check_completion()//Basically runs through all the mobs in the area to determine how much they are worth. +/datum/objective/capture/check_completion()//Basically runs through all the mobs in the area to determine how much they are worth. var/captured_amount = 0 var/area/centcom/holding/A = locate() for(var/mob/living/carbon/human/M in A)//Humans. @@ -523,10 +524,10 @@ datum/objective/capture/check_completion()//Basically runs through all the mobs -datum/objective/absorb +/datum/objective/absorb dangerrating = 10 -datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6) +/datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6) target_amount = rand (lowbound,highbound) if (ticker) var/n_p = 1 //autowin @@ -543,7 +544,7 @@ datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6) explanation_text = "Extract [target_amount] compatible genome\s." return target_amount -datum/objective/absorb/check_completion() +/datum/objective/absorb/check_completion() if(owner && owner.changeling && owner.changeling.absorbed_dna && (owner.changeling.absorbedcount >= target_amount)) return 1 else @@ -551,25 +552,25 @@ datum/objective/absorb/check_completion() -datum/objective/destroy +/datum/objective/destroy dangerrating = 10 martyr_compatible = 1 -datum/objective/destroy/find_target() +/datum/objective/destroy/find_target() var/list/possible_targets = active_ais(1) var/mob/living/silicon/ai/target_ai = pick(possible_targets) target = target_ai.mind update_explanation_text() return target -datum/objective/destroy/check_completion() +/datum/objective/destroy/check_completion() if(target && target.current) if(target.current.stat == DEAD || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite return 1 return 0 return 1 -datum/objective/destroy/update_explanation_text() +/datum/objective/destroy/update_explanation_text() ..() if(target && target.current) explanation_text = "Destroy [target.name], the experimental AI." diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index ca69a926263..44da2ef735d 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -1,126 +1,126 @@ //Contains the target item datums for Steal objectives. -datum/objective_item +/datum/objective_item var/name = "A silly bike horn! Honk!" var/targetitem = /obj/item/weapon/bikehorn //typepath of the objective item var/difficulty = 9001 //vaguely how hard it is to do this objective var/list/excludefromjob = list() //If you don't want a job to get a certain objective (no captain stealing his own medal, etcetc) var/list/altitems = list() //Items which can serve as an alternative to the objective (darn you blueprints) -datum/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc) +/datum/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc) return 1 -datum/objective_item/steal/caplaser +/datum/objective_item/steal/caplaser name = "the captain's antique laser gun" targetitem = /obj/item/weapon/gun/energy/laser/captain difficulty = 5 excludefromjob = list("Captain") -datum/objective_item/steal/hoslaser +/datum/objective_item/steal/hoslaser name = "the head of security's personal laser gun" targetitem = /obj/item/weapon/gun/energy/gun/hos difficulty = 10 excludefromjob = list("Head Of Security") -datum/objective_item/steal/handtele +/datum/objective_item/steal/handtele name = "a hand teleporter" targetitem = /obj/item/weapon/hand_tele difficulty = 5 excludefromjob = list("Captain") -datum/objective_item/steal/rcd +/datum/objective_item/steal/rcd name = "a rapid-construction-device" targetitem = /obj/item/weapon/rcd difficulty = 3 excludefromjob = list("Chief Engineer", "Quartermaster", "Cargo Technician") -datum/objective_item/steal/jetpack +/datum/objective_item/steal/jetpack name = "a jetpack" targetitem = /obj/item/weapon/tank/jetpack difficulty = 3 excludefromjob = list("Chief Engineer") -datum/objective_item/steal/magboots +/datum/objective_item/steal/magboots name = "the chief engineer's advanced magnetic boots" targetitem = /obj/item/clothing/shoes/magboots/advance difficulty = 5 excludefromjob = list("Chief Engineer") -datum/objective_item/steal/corgimeat +/datum/objective_item/steal/corgimeat name = "a piece of corgi meat" targetitem = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi difficulty = 5 excludefromjob = list("Head of Personnel", "Quartermaster", "Cargo Technician") //>hurting your little buddy ever -datum/objective_item/steal/capmedal +/datum/objective_item/steal/capmedal name = "the medal of captaincy" targetitem = /obj/item/clothing/tie/medal/gold/captain difficulty = 5 excludefromjob = list("Captain") -datum/objective_item/steal/hypo +/datum/objective_item/steal/hypo name = "the hypospray" targetitem = /obj/item/weapon/reagent_containers/hypospray/CMO difficulty = 5 excludefromjob = list("Chief Medical Officer") -datum/objective_item/steal/nukedisc +/datum/objective_item/steal/nukedisc name = "the nuclear authentication disk" targetitem = /obj/item/weapon/disk/nuclear difficulty = 5 excludefromjob = list("Captain") -datum/objective_item/steal/ablative +/datum/objective_item/steal/ablative name = "an ablative armor vest" targetitem = /obj/item/clothing/suit/armor/laserproof difficulty = 3 excludefromjob = list("Head of Security", "Warden") -datum/objective_item/steal/reactive +/datum/objective_item/steal/reactive name = "the reactive teleport armor" targetitem = /obj/item/clothing/suit/armor/reactive difficulty = 5 excludefromjob = list("Research Director") -datum/objective_item/steal/documents +/datum/objective_item/steal/documents name = "any set of secret documents of any organization" targetitem = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's difficulty = 5 //Items with special checks! -datum/objective_item/steal/plasma +/datum/objective_item/steal/plasma name = "28 moles of plasma (full tank)" targetitem = /obj/item/weapon/tank difficulty = 3 excludefromjob = list("Chief Engineer","Research Director","Station Engineer","Scientist","Atmospheric Technician") -datum/objective_item/plasma/check_special_completion(var/obj/item/weapon/tank/T) +/datum/objective_item/plasma/check_special_completion(var/obj/item/weapon/tank/T) var/target_amount = text2num(name) var/found_amount = 0 found_amount += T.air_contents.toxins return found_amount>=target_amount -datum/objective_item/steal/functionalai +/datum/objective_item/steal/functionalai name = "a functional AI" targetitem = /obj/item/device/aicard difficulty = 20 //beyond the impossible -datum/objective_item/functionalai/check_special_completion(var/obj/item/device/aicard/C) +/datum/objective_item/functionalai/check_special_completion(var/obj/item/device/aicard/C) for(var/mob/living/silicon/ai/A in C) if(istype(A, /mob/living/silicon/ai) && A.stat != 2) //See if any AI's are alive inside that card. return 1 return 0 -datum/objective_item/steal/blueprints +/datum/objective_item/steal/blueprints name = "the station blueprints" targetitem = /obj/item/areaeditor/blueprints difficulty = 10 excludefromjob = list("Chief Engineer") altitems = list(/obj/item/weapon/photo) -datum/objective_item/blueprints/check_special_completion(var/obj/item/I) +/datum/objective_item/blueprints/check_special_completion(var/obj/item/I) if(istype(I, /obj/item/areaeditor/blueprints)) return 1 if(istype(I, /obj/item/weapon/photo)) @@ -129,66 +129,66 @@ datum/objective_item/blueprints/check_special_completion(var/obj/item/I) return 1 return 0 -datum/objective_item/steal/slime +/datum/objective_item/steal/slime name = "an unused sample of slime extract" targetitem = /obj/item/slime_extract difficulty = 3 excludefromjob = list("Research Director","Scientist") -datum/objective_item/slime/check_special_completion(var/obj/item/slime_extract/E) +/datum/objective_item/slime/check_special_completion(var/obj/item/slime_extract/E) if(E.Uses > 0) return 1 return 0 //Unique Objectives -datum/objective_item/unique/docs_red +/datum/objective_item/unique/docs_red name = "the \"Red\" secret documents" targetitem = /obj/item/documents/syndicate/red difficulty = 10 -datum/objective_item/unique/docs_blue +/datum/objective_item/unique/docs_blue name = "the \"Blue\" secret documents" targetitem = /obj/item/documents/syndicate/blue difficulty = 10 //Old ninja objectives. -datum/objective_item/special/pinpointer +/datum/objective_item/special/pinpointer name = "the captain's pinpointer" targetitem = /obj/item/weapon/pinpointer difficulty = 10 -datum/objective_item/special/aegun +/datum/objective_item/special/aegun name = "an advanced energy gun" targetitem = /obj/item/weapon/gun/energy/gun/nuclear difficulty = 10 -datum/objective_item/special/ddrill +/datum/objective_item/special/ddrill name = "a diamond drill" targetitem = /obj/item/weapon/pickaxe/drill/diamonddrill difficulty = 10 -datum/objective_item/special/boh +/datum/objective_item/special/boh name = "a bag of holding" targetitem = /obj/item/weapon/storage/backpack/holding difficulty = 10 -datum/objective_item/special/hypercell +/datum/objective_item/special/hypercell name = "a hyper-capacity cell" targetitem = /obj/item/weapon/stock_parts/cell/hyper difficulty = 5 -datum/objective_item/special/laserpointer +/datum/objective_item/special/laserpointer name = "a laser pointer" targetitem = /obj/item/device/laser_pointer difficulty = 5 //Stack objectives get their own subtype -datum/objective_item/stack +/datum/objective_item/stack name = "5 cardboards" targetitem = /obj/item/stack/sheet/cardboard difficulty = 9001 -datum/objective_item/stack/check_special_completion(var/obj/item/stack/S) +/datum/objective_item/stack/check_special_completion(var/obj/item/stack/S) var/target_amount = text2num(name) var/found_amount = 0 @@ -196,17 +196,17 @@ datum/objective_item/stack/check_special_completion(var/obj/item/stack/S) found_amount = S.amount return found_amount>=target_amount -datum/objective_item/stack/diamond +/datum/objective_item/stack/diamond name = "10 diamonds" targetitem = /obj/item/stack/sheet/mineral/diamond difficulty = 10 -datum/objective_item/stack/gold +/datum/objective_item/stack/gold name = "50 gold bars" targetitem = /obj/item/stack/sheet/mineral/gold difficulty = 15 -datum/objective_item/stack/uranium +/datum/objective_item/stack/uranium name = "25 refined uranium bars" targetitem = /obj/item/stack/sheet/mineral/uranium difficulty = 10 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 2002cb82d6e..b1cabe16cec 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -44,25 +44,15 @@ if(config.protect_assistant_from_antagonist) restricted_jobs += "Assistant" - var/head_check = 0 - for(var/mob/new_player/player in player_list) - if(player.mind.assigned_role in command_positions) - head_check = 1 - break - - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs)//Removing heads and such from the list - if(player.assigned_role == job) - antag_candidates -= player - for (var/i=1 to max_headrevs) if (antag_candidates.len==0) break var/datum/mind/lenin = pick(antag_candidates) antag_candidates -= lenin head_revolutionaries += lenin + lenin.restricted_roles = restricted_jobs - if((head_revolutionaries.len < required_enemies)||(!head_check)) + if(head_revolutionaries.len < required_enemies) return 0 return 1 @@ -179,7 +169,7 @@ for(var/datum/mind/rev_mind in head_revolutionaries) mark_for_death(rev_mind, head_mind) - if(max_headrevs < initial(max_headrevs) && max_headrevs < heads.len) + if(head_revolutionaries.len < max_headrevs && head_revolutionaries.len < heads.len) latejoin_headrev() /////////////////////////////// @@ -187,14 +177,19 @@ /////////////////////////////// /datum/game_mode/revolution/proc/latejoin_headrev() if(revolutionaries) //Head Revs are not in this list - var/datum/mind/stalin = pick(revolutionaries) - revolutionaries -= stalin - head_revolutionaries += stalin - log_game("[stalin.key] (ckey) has been promoted to a head rev") - equip_revolutionary(stalin.current) - forge_revolutionary_objectives(stalin) - greet_revolutionary(stalin) - ++max_headrevs + var/list/promotable_revs = list() + for(var/datum/mind/khrushchev in revolutionaries) + if(khrushchev.current && khrushchev.current.client && khrushchev.current.stat != DEAD) + if(khrushchev.current.client.prefs.be_special & BE_REV) + promotable_revs += khrushchev + if(promotable_revs) + var/datum/mind/stalin = pick(promotable_revs) + revolutionaries -= stalin + head_revolutionaries += stalin + log_game("[stalin.key] (ckey) has been promoted to a head rev") + equip_revolutionary(stalin.current) + forge_revolutionary_objectives(stalin) + greet_revolutionary(stalin) ////////////////////////////////////// //Checks if the revs have won or not// @@ -213,11 +208,15 @@ if(config.continuous["revolution"]) if(finished != 0) SSshuttle.emergencyNoEscape = 0 + if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) + SSshuttle.emergency.mode = SHUTTLE_DOCKED + SSshuttle.emergency.timer = world.time + priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") return ..() if(finished != 0) return 1 else - return 0 + return ..() /////////////////////////////////////////////////// //Deals with converting players to the revolution// @@ -340,7 +339,7 @@ if(headrev.current) if(headrev.current.stat == DEAD) text += "died" - else if(headrev.current.z != ZLEVEL_STATION) + else if(headrev.current.z > ZLEVEL_STATION) text += "fled the station" else text += "survived the revolution" @@ -364,7 +363,7 @@ if(rev.current) if(rev.current.stat == DEAD || isbrain(rev.current)) text += "died" - else if(rev.current.z != ZLEVEL_STATION) + else if(rev.current.z > ZLEVEL_STATION) text += "fled the station" else text += "survived the revolution" @@ -390,7 +389,7 @@ if(head.current) if(head.current.stat == DEAD || isbrain(head.current)) text += "died" - else if(head.current.z != ZLEVEL_STATION) + else if(head.current.z > ZLEVEL_STATION) text += "fled the station" else text += "survived the revolution" diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm index 7a8f7beb7c7..597064a68f0 100644 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ b/code/game/gamemodes/sandbox/airlock_maker.dm @@ -4,15 +4,15 @@ -Sayu */ -obj/structure/door_assembly +/obj/structure/door_assembly var/datum/airlock_maker/maker = null -obj/structure/door_assembly/attack_hand() +/obj/structure/door_assembly/attack_hand() ..() if(maker) maker.interact() -datum/airlock_maker +/datum/airlock_maker var/obj/structure/door_assembly/linked = null var/list/access_used = null @@ -23,7 +23,7 @@ datum/airlock_maker var/doorname = "airlock" -datum/airlock_maker/New(var/atom/target_loc) +/datum/airlock_maker/New(var/atom/target_loc) linked = new(target_loc) linked.maker = src linked.anchored = 0 @@ -31,7 +31,7 @@ datum/airlock_maker/New(var/atom/target_loc) interact() -datum/airlock_maker/proc/linkpretty(href,desc,active) +/datum/airlock_maker/proc/linkpretty(href,desc,active) if(!desc) var/static/list/defaults = list("No","Yes") desc = defaults[active+1] @@ -39,7 +39,7 @@ datum/airlock_maker/proc/linkpretty(href,desc,active) return "[desc]" return "[desc]" -datum/airlock_maker/proc/interact() +/datum/airlock_maker/proc/interact() var/list/leftcolumn = list() var/list/rightcolumn = list() leftcolumn += "Required Access" @@ -68,7 +68,7 @@ datum/airlock_maker/proc/interact() dat += "
Finalize Airlock Construction | Cancel and Destroy Airlock" usr << browse(dat,"window=airlockmaker") -datum/airlock_maker/Topic(var/href,var/list/href_list) +/datum/airlock_maker/Topic(var/href,var/list/href_list) if(!usr) return if(!src || !linked || !linked.loc) usr << browse(null,"window=airlockmaker") diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 976b992f2be..c55ada2a766 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -2,21 +2,21 @@ var/hsboxspawn = 1 -mob +/mob var/datum/hSB/sandbox = null -mob/proc/CanBuild() +/mob/proc/CanBuild() if(master_mode == "sandbox") sandbox = new/datum/hSB sandbox.owner = src.ckey if(src.client.holder) sandbox.admin = 1 verbs += new/mob/proc/sandbox_panel -mob/proc/sandbox_panel() +/mob/proc/sandbox_panel() set name = "Sandbox Panel" if(sandbox) sandbox.update() -datum/hSB +/datum/hSB var/owner = null var/admin = 0 @@ -32,7 +32,7 @@ datum/hSB /obj/item/device/uplink/hidden, /obj/item/smallDelivery, /obj/item/missile,/obj/item/projectile, /obj/item/borg/sight,/obj/item/borg/overdrive,/obj/item/borg/stun,/obj/item/weapon/robot_module) -datum/hSB/proc/update() +/datum/hSB/proc/update() var/global/list/hrefs = list( "Space Gear", "Suit Up (Space Travel Gear)" = "hsbsuit", @@ -101,7 +101,7 @@ datum/hSB/proc/update() usr << browse(hsbinfo, "window=hsbpanel") -datum/hSB/Topic(href, href_list) +/datum/hSB/Topic(href, href_list) if(!usr || !src || !(src.owner == usr.ckey)) if(usr) usr << browse(null,"window=sandbox") diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index c14ad379d68..7bd0a665f3f 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -1,3 +1,7 @@ +#define LIGHT_DAM_THRESHOLD 4 +#define LIGHT_HEAL_THRESHOLD 2 +#define LIGHT_DAMAGE_TAKEN 10 + /* SHADOWLING: A gamemode based on previously-run events @@ -72,7 +76,7 @@ Made by Xhuis /datum/game_mode/shadowling/announce() world << "The current game mode is - Shadowling!" - world << "There are alien shadowlings on the station. Crew: Kill the shadowlings before they can eat or enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding." + world << "There are alien shadowlings on the station. Crew: Kill the shadowlings before they can eat or enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding." /datum/game_mode/shadowling/pre_setup() if(config.protect_roles_from_antagonist) @@ -81,11 +85,6 @@ Made by Xhuis if(config.protect_assistant_from_antagonist) restricted_jobs += "Assistant" - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs) - if(player.assigned_role == job) - antag_candidates -= player - var/shadowlings = 2 //How many shadowlings there are; hardcoded to 2 while(shadowlings) @@ -94,6 +93,7 @@ Made by Xhuis antag_candidates -= shadow modePlayer += shadow shadow.special_role = "Shadowling" + shadow.restricted_roles = restricted_jobs shadowlings-- return 1 @@ -114,6 +114,7 @@ Made by Xhuis /datum/game_mode/proc/greet_shadow(var/datum/mind/shadow) shadow.current << "Currently, you are disguised as an employee aboard [world.name]." shadow.current << "In your limited state, you have three abilities: Enthrall, Hatch, and Hivemind Commune." + shadow.current << "Any other shadowlings are you allies. You must assist them as they shall assist you." shadow.current << "If you are new to shadowling, or want to read about abilities, check the wiki page at https://tgstation13.org/wiki/Shadowling
" @@ -131,41 +132,27 @@ Made by Xhuis var/mob/living/carbon/human/S = shadow_mind.current shadow_mind.current.verbs += /mob/living/carbon/human/proc/shadowling_hatch shadow_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/enthrall - shadow_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind - if(shadow_mind.assigned_role == "Clown") - S << "Your alien nature has allowed you to overcome your clownishness." - S.dna.remove_mutation(CLOWNMUT) + spawn(0) + shadow_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind + update_shadow_icons_added(shadow_mind) + if(shadow_mind.assigned_role == "Clown") + S << "Your alien nature has allowed you to overcome your clownishness." + S.dna.remove_mutation(CLOWNMUT) /datum/game_mode/proc/add_thrall(datum/mind/new_thrall_mind) if (!istype(new_thrall_mind)) return 0 if(!(new_thrall_mind in thralls)) + update_shadow_icons_added(new_thrall_mind) thralls += new_thrall_mind new_thrall_mind.current.attack_log += "\[[time_stamp()]\] Became a thrall" + new_thrall_mind.memory += "The Shadowlings' Objectives: Ascend to your true form by use of the Ascendance ability. \ + This may only be used with [required_thralls] collective thralls, while hatched, and is unlocked with the Collective Mind ability." + new_thrall_mind.current << "The objectives of your shadowlings:: Ascend to your true form by use of the Ascendance ability. \ + This may only be used with [required_thralls] collective thralls, while hatched, and is unlocked with the Collective Mind ability." + new_thrall_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind return 1 - - -/* - GAME FINISH CHECKS -*/ - - -/datum/game_mode/shadowling/check_finished() - var/shadows_alive = 0 //and then shadowling was kill - for(var/datum/mind/shadow in shadows) //but what if shadowling was not kill? - if(!istype(shadow.current,/mob/living/carbon/human) && !istype(shadow.current,/mob/living/simple_animal/ascendant_shadowling)) - continue - if(shadow.current.stat == DEAD) - continue - shadows_alive++ - if(shadows_alive) - return ..() - else - shadowling_dead = 1 //but shadowling was kill :( - return 1 - - /datum/game_mode/shadowling/proc/check_shadow_victory() var/success = 0 //Did they win? if(shadow_objectives.Find("enthrall")) @@ -175,11 +162,13 @@ Made by Xhuis /datum/game_mode/shadowling/declare_completion() if(check_shadow_victory() && SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) //Doesn't end instantly - this is hacky and I don't know of a better way ~X - world << "The shadowlings have ascended and taken over the station!" + world << "The shadowlings have ascended and taken over the station!" else if(shadowling_dead && !check_shadow_victory()) //If the shadowlings have ascended, they can not lose the round - world << "The shadowlings have been killed by the crew!" + world << "The shadowlings have been killed by the crew!" else if(!check_shadow_victory() && SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) - world << "The crew has escaped the station before the shadowlings could ascend!" + world << "The crew has escaped the station before the shadowlings could ascend!" + else + world << "The shadowlings have failed!" ..() return 1 @@ -187,15 +176,14 @@ Made by Xhuis /datum/game_mode/proc/auto_declare_completion_shadowling() var/text = "" if(shadows.len) - text += "
The shadowlings were:" + text += "
The shadowlings were:" for(var/datum/mind/shadow in shadows) text += printplayer(shadow) + text += "
" if(thralls.len) - text += "
The thralls were:" + text += "
The thralls were:" for(var/datum/mind/thrall in thralls) text += printplayer(thrall) - else - world << "Round-end code broke! Please report this and its circumstances on GitHub at https://github.com/tgstation/-tg-station/issues" text += "
" world << text @@ -224,12 +212,24 @@ Made by Xhuis if(A) if(A.lighting_use_dynamic) light_amount = T.lighting_lumcount else light_amount = 10 - if(light_amount > 2) //Rapid death while in the light, countered by... - H.take_overall_damage(0,6) + if(light_amount > LIGHT_DAM_THRESHOLD) //Not complete blackness - they can live in very small light levels plus starlight + H.take_overall_damage(0, LIGHT_DAMAGE_TAKEN) H << "The light burns you!" H << 'sound/weapons/sear.ogg' - else if (light_amount < 2) //...extreme benefits while in the dark - H.heal_overall_damage(5,3) - H.adjustToxLoss(-3) + else if (light_amount < LIGHT_HEAL_THRESHOLD) + H.heal_overall_damage(5,5) + H.adjustToxLoss(-5) + H.adjustBrainLoss(-25) //gibbering shadowlings are hilarious but also bad to have + H.adjustCloneLoss(-1) H.SetWeakened(0) H.SetStunned(0) + +/datum/game_mode/proc/update_shadow_icons_added(datum/mind/shadow_mind) + var/datum/atom_hud/antag/shadow_hud = huds[ANTAG_HUD_SHADOW] + shadow_hud.join_hud(shadow_mind.current) + set_antag_hud(shadow_mind.current, ((shadow_mind in shadows) ? "shadowling" : "thrall")) + +/datum/game_mode/proc/update_shadow_icons_removed(datum/mind/shadow_mind) //This should never actually occur, but it's here anyway. + var/datum/atom_hud/antag/shadow_hud = huds[ANTAG_HUD_SHADOW] + shadow_hud.leave_hud(shadow_mind.current) + set_antag_hud(shadow_mind.current, null) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index baf3d70c4b2..d6abcab574f 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -21,7 +21,7 @@ usr.visible_message("[usr]'s eyes flash a blinding red!") target.visible_message("[target] freezes in place, their eyes glazing over...") if(in_range(target, usr)) - target << "Your gaze is forcibly drawn into [src]'s eyes, and you are mesmerized by the heavenly lights..." + target << "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by the heavenly lights..." else //Only alludes to the shadowling if the target is close by target << "Red lights suddenly dance in your vision, and you are mesmerized by the heavenly lights..." target.Stun(10) @@ -53,9 +53,26 @@ L.on = 0 L.visible_message("[L] flickers and falls dark.") L.update(0) - for(var/obj/item/device/pda/P in orange(5, usr)) + for(var/obj/item/device/pda/P in T.contents) P.fon = 0 - P.SetLuminosity(0) //failsafe + P.SetLuminosity(0) + for(var/obj/effect/glowshroom/G in orange(2, usr)) //Very small radius + G.visible_message("\The [G] withers away!") + qdel(G) + for(var/mob/living/carbon/human/H in T.contents) + for(var/obj/item/device/flashlight/F in H) + if(is_type_in_list(F, blacklisted_lights)) + F.visible_message("[F] goes slightly dim for a moment.") + return + F.on = 0 + F.visible_message("[F] gutters and falls dark.") + F.update_brightness() + for(var/obj/item/device/pda/P in H) + P.fon = 0 + P.SetLuminosity(0) //failsafe + if(H != usr) + H << "You feel a chill and are plunged into darkness." + H.SetLuminosity(0) //This is required with the object-based lighting @@ -164,11 +181,23 @@ usr.visible_message("[usr] leans over [target], their eyes glowing a deep crimson, and stares into their face.") target << "Your gaze is forcibly drawn into a blinding red light. You fall to the floor as conscious thought is wiped away." target.Weaken(12) + sleep(20) + if(isloyal(target)) + usr << "They are enslaved by Nanotrasen. You begin to shut down the nanobot implant - this will take some time." + usr.visible_message("[usr] halts for a moment, then begins passing its hand over [target]'s body.") + target << "You feel your loyalties begin to weaken!" + sleep(150) //15 seconds - not spawn() so the enthralling takes longer + usr << "The nanobots composing the loyalty implant have been rendered inert. Now to continue." + usr.visible_message("[usr] halts thier hand and resumes staring into [target]'s face.") + for(var/obj/item/weapon/implant/loyalty/L in target) + if(L && L.implanted) + qdel(L) + target << "Your unwavering loyalty to Nanotrasen falters, dims, dies." if(3) usr << "You begin rearranging [target]'s memories." usr.visible_message("[usr]'s eyes flare brightly, and a horrible grin begins to spread across [target]'s face...") target << "Your head cries out. The veil of reality begins to crumple and something evil bleeds through." //Ow the edge - if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling + if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a loyalty implant usr << "The enthralling has been interrupted - your target's mind returns to its previous state." target << "Your thoughts become coherent once more. Already you can barely remember what's happened to you." enthralling = 0 @@ -183,8 +212,6 @@ target.adjustOxyLoss(-200) //In case the shadowling was choking them out ticker.mode.add_thrall(target.mind) target.mind.special_role = "Thrall" - var/datum/mind/thrall_mind = target.mind - thrall_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind //Lets thralls hive-chat @@ -208,6 +235,30 @@ +/obj/effect/proc_holder/spell/targeted/shadowling_regenarmor + name = "Regenerate Chitin" + desc = "Re-forms protective chitin that may be lost during cloning or similar processes." + panel = "Shadowling Abilities" + charge_max = 600 + clothes_req = 0 + range = -1 + include_user = 1 + +/obj/effect/proc_holder/spell/targeted/shadowling_regenarmor/cast(list/targets) + for(var/mob/living/user in targets) + user.visible_message("[user]'s skin suddenly bubbles and begins to shift around their body!", \ + "You regenerate your protective armor and cleanse your form of defects.") + user.equip_to_slot_or_del(new /obj/item/clothing/under/shadowling(usr), slot_w_uniform) + user.equip_to_slot_or_del(new /obj/item/clothing/shoes/shadowling(usr), slot_shoes) + user.equip_to_slot_or_del(new /obj/item/clothing/suit/space/shadowling(usr), slot_wear_suit) + user.equip_to_slot_or_del(new /obj/item/clothing/head/shadowling(usr), slot_head) + user.equip_to_slot_or_del(new /obj/item/clothing/gloves/shadowling(usr), slot_gloves) + user.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/shadowling(usr), slot_wear_mask) + user.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/shadowling(usr), slot_glasses) + hardset_dna(user, null, null, null, null, /datum/species/shadow/ling) //can't be a shadowling without being a shadowling + + + /obj/effect/proc_holder/spell/targeted/collective_mind name = "Collective Hivemind" desc = "Gathers the power of all of your thralls and compares it to what is needed for ascendance. Also gains you new abilities." @@ -254,7 +305,7 @@ user << "The power of your thralls has granted you the Sonic Screech ability. This ability will shatter nearby windows and deafen enemies." user.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/unearthly_screech - if(thralls >= 10 && !thrall_swap_acquired) + if(thralls >= 9 && !thrall_swap_acquired) thrall_swap_acquired = 1 user << "The power of your thralls has granted you the Spatial Relocation ability. This will, allow you to instantly swap places with one of your thralls in \ addition to shattering nearby lights." @@ -304,14 +355,14 @@ S.start() qdel(B) -datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowlings/thralls +/datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowlings/thralls name = "!(%@ ERROR )!@$" id = "blindness_smoke" description = "<::ERROR::> CANNOT ANALYZE REAGENT <::ERROR::>" color = "#000000" //Complete black (RGB: 0, 0, 0) metabolization_rate = 100 //lel -datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) +/datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(!is_shadow_or_thrall(M)) M << "You breathe in the black smoke, and your eyes burn horribly!" @@ -351,7 +402,6 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(iscarbon(target)) var/mob/living/carbon/M = target M << "A spike of pain drives into your head and scrambles your thoughts!" - M.Weaken(2) M.confused += 10 M.setEarDamage(M.ear_damage + 3) else if(issilicon(target)) @@ -364,7 +414,7 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) sp.start() S.Weaken(6) for(var/obj/structure/window/W in T.contents) - W.hit(rand(25,50)) + W.hit(rand(50,100)) @@ -448,7 +498,7 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) charge_counter = charge_max return - for(var/mob/boom in targets) + for(var/mob/living/carbon/human/boom in targets) if(is_shadow_or_thrall(boom)) usr << "Making an ally explode seems unwise." charge_counter = charge_max diff --git a/code/game/gamemodes/shadowling/shadowling_items.dm b/code/game/gamemodes/shadowling/shadowling_items.dm index 683d0a4bb81..01e0f5ae928 100644 --- a/code/game/gamemodes/shadowling/shadowling_items.dm +++ b/code/game/gamemodes/shadowling/shadowling_items.dm @@ -46,7 +46,7 @@ /obj/item/clothing/gloves/shadowling name = "chitin hands" - desc = "An electricity-resistant yet thin covering of the hands." + desc = "An electricity-resistant covering of the hands." icon_state = "golem" item_state = null origin_tech = null @@ -75,10 +75,11 @@ vision_flags = SEE_MOBS darkness_view = 3 invis_view = 2 - flash_protect = 2 + flash_protect = -1 unacidable = 1 flags = ABSTRACT | NODROP + /obj/structure/shadow_vortex name = "vortex" desc = "A swirling hole in the fabric of reality. Eye-watering chimes sound from its depths." diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 472bee1cd61..b1ff12edd22 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -85,6 +85,7 @@ usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadow_walk usr.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/flashfreeze usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/collective_mind + usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_regenarmor @@ -158,4 +159,5 @@ sleep(50) if(!ticker.mode.shadowling_ascended) SSshuttle.emergency.request(null, 0.3) + ticker.mode.shadowling_ascended = 1 qdel(usr) diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index 6ce9c6a44cf..d614da9b9ca 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -5,7 +5,7 @@ required_players = 25 required_enemies = 5 recommended_enemies = 8 - reroll_friendly = 1 + reroll_friendly = 0 traitor_name = "double agent" diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index af52f87a109..6c7b57edd47 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -41,17 +41,13 @@ else num_traitors = max(1, min(num_players(), traitors_possible)) - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs) - if(player.assigned_role == job) - antag_candidates -= player - for(var/j = 0, j < num_traitors, j++) if (!antag_candidates.len) break var/datum/mind/traitor = pick(antag_candidates) traitors += traitor traitor.special_role = traitor_name + traitor.restricted_roles = restricted_jobs log_game("[traitor.key] (ckey) has been selected as a [traitor_name]") antag_candidates.Remove(traitor) @@ -75,15 +71,14 @@ /datum/game_mode/traitor/make_antag_chance(var/mob/living/carbon/human/character) //Assigns traitor to latejoiners var/traitorcap = min(round(joined_player_list.len / (config.traitor_scaling_coeff * 2)) + 2 + num_modifier, round(joined_player_list.len/config.traitor_scaling_coeff) + num_modifier ) - if(traitors.len >= traitorcap) //Upper cap for number of latejoin antagonists + if(ticker.mode.traitors.len >= traitorcap) //Upper cap for number of latejoin antagonists return - if(traitors.len <= (traitorcap - 2) || prob(100 / (config.traitor_scaling_coeff * 2))) + if(ticker.mode.traitors.len <= (traitorcap - 2) || prob(100 / (config.traitor_scaling_coeff * 2))) if(character.client.prefs.be_special & BE_TRAITOR) if(!jobban_isbanned(character.client, "traitor") && !jobban_isbanned(character.client, "Syndicate")) if(age_check(character.client)) - if(!(character.job in ticker.mode.restricted_jobs)) + if(!(character.job in restricted_jobs)) add_latejoin_traitor(character.mind) - ..() /datum/game_mode/traitor/proc/add_latejoin_traitor(var/datum/mind/character) character.make_Traitor() @@ -353,9 +348,9 @@ var/obj/item/weapon/folder/syndicate/folder if(owner == exchange_red) - folder = new/obj/item/weapon/folder/syndicate/red(mob.locs) + folder = new/obj/item/weapon/folder/syndicate/red(mob.loc) else - folder = new/obj/item/weapon/folder/syndicate/blue(mob.locs) + folder = new/obj/item/weapon/folder/syndicate/blue(mob.loc) var/list/slots = list ( "backpack" = slot_in_backpack, diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index cfe5bdcc276..3fb8fe34f4b 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -13,16 +13,17 @@ throwforce = 10 w_class = 3 hitsound = 'sound/weapons/bladeslice.ogg' - var/charged = 1 + var/charges = 1 var/spawn_type = /obj/singularity/narsie/wizard var/spawn_amt = 1 var/activate_descriptor = "reality" var/rend_desc = "You should run now." + var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning /obj/item/weapon/veilrender/attack_self(mob/user as mob) - if(charged) - new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc) - charged = 0 + if(charges > 0) + new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc, spawn_fast) + charges-- user.visible_message("[src] hums with power as [usr] deals a blow to [activate_descriptor] itself!") else user << "The unearthly energies that powered the blade are now dormant." @@ -37,17 +38,20 @@ anchored = 1.0 var/spawn_path = /mob/living/simple_animal/cow //defaulty cows to prevent unintentional narsies var/spawn_amt_left = 20 + var/spawn_fast = 0 -/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc) +/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc, var/spawn_fast) src.spawn_path = spawn_type src.spawn_amt_left = spawn_amt src.desc = desc + src.spawn_fast = spawn_fast SSobj.processing |= src return /obj/effect/rend/process() - if(locate(/mob) in loc) - return + if(!spawn_fast) + if(locate(/mob) in loc) + return new spawn_path(loc) spawn_amt_left-- if(spawn_amt_left <= 0) @@ -136,21 +140,10 @@ hardset_dna(M, null, null, null, null, /datum/species/skeleton) M.revive() spooky_scaries |= M - M << "You have been revived by [user.real_name]!" - M << "They are your master now, assist them even if it costs you your new life!" + M << "You have been revived by [user.real_name]!" + M << "They are your master now, assist them even if it costs you your new life!" - if(prob(33)) - equip_roman_skeleton(M) - - var/mob/living/carbon/human/master = user - - var/datum/objective/protect/protect_master = new /datum/objective/protect - protect_master.owner = M.mind - protect_master.target = master.mind - protect_master.explanation_text = "Protect [master.real_name], your master." - M.mind.objectives += protect_master - ticker.mode.traitors += M.mind - M.mind.special_role = "skeleton-thrall" + equip_roman_skeleton(M) desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" @@ -163,7 +156,7 @@ spooky_scaries.Remove(X) continue var/mob/living/carbon/human/H = X - if(H.stat) + if(H.stat == DEAD) spooky_scaries.Remove(X) continue listclearnulls(spooky_scaries) diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index d0d350d86d7..6f19d7cdd0d 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -60,7 +60,7 @@ else if(mages_made >= max_mages) finished = 1 - return 1 + return ..() else make_more_mages() return ..() diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index b086e9a1d5d..603c2ff0d88 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -1,9 +1,9 @@ //In this file: Summon Magic/Summon Guns/Summon Events /proc/rightandwrong(var/summon_type, var/mob/user, var/survivor_probability) //0 = Summon Guns, 1 = Summon Magic - var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun") - var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying", "necromantic","staffdoor", "special") - var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos") + var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg") + var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying","staffdoor", "special") + var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos", "necromantic") if(user) //in this case either someone holding a spellbook or a badmin user << "You summoned [summon_type ? "magic" : "guns"]!" @@ -55,6 +55,8 @@ new /obj/item/weapon/gun/projectile/shotgun(get_turf(H)) if("combatshotgun") new /obj/item/weapon/gun/projectile/shotgun/combat(get_turf(H)) + if("arg") + new /obj/item/weapon/gun/projectile/automatic/ar(get_turf(H)) if("mateba") new /obj/item/weapon/gun/projectile/revolver/mateba(get_turf(H)) if("boltaction") @@ -85,6 +87,8 @@ if("car") var/obj/item/weapon/gun/projectile/automatic/m90/gat = new(get_turf(H)) gat.pin = new /obj/item/device/firing_pin + playsound(get_turf(H),'sound/magic/Summon_guns.ogg', 50, 1) + else switch (randomizemagic) if("fireball") @@ -130,8 +134,6 @@ if (!(H.dna.check_mutation(XRAY))) H.dna.add_mutation(XRAY) H << "The walls suddenly disappear." - if("necromantic") - new /obj/item/device/necromantic_stone(get_turf(H)) if("special") magiclist -= "special" //only one super OP item per summoning max switch (randomizemagicspecial) @@ -145,7 +147,11 @@ new /obj/item/weapon/antag_spawner/contract(get_turf(H)) if("staffchaos") new /obj/item/weapon/gun/magic/staff/chaos(get_turf(H)) + if("necromantic") + new /obj/item/device/necromantic_stone(get_turf(H)) H << "You suddenly feel lucky." + playsound(get_turf(H),'sound/magic/Summon_Magic.ogg', 50, 1) + /proc/summonevents() if(!SSevent.wizardmode) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 2df1b4cd4ca..351f87f9c37 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -169,6 +169,8 @@ var/mob/living/simple_animal/shade/A = locate() in C if(A) var/construct_class = alert(U, "Please choose which type of construct you wish to create.",,"Juggernaut","Wraith","Artificer") + if(!T || !T.loc) + return switch(construct_class) if("Juggernaut") makeNewConstruct(/mob/living/simple_animal/construct/armored, A, U) @@ -186,7 +188,7 @@ return -proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) +/proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) var/mob/living/simple_animal/construct/newstruct = new ctype(get_turf(target)) newstruct.faction |= "\ref[stoner]" newstruct.key = target.key diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 138a77305c1..8a58076e663 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -1,3 +1,383 @@ +/datum/spellbook_entry + var/name = "Entry Name" + + var/spell_type = null + var/desc = "" + var/category = "Offensive Spells" + var/log_name = "XX" //What it shows up as in logs + var/cost = 1 + var/refundable = 1 + var/surplus = -1 // -1 for infinite, not used by anything atm + var/obj/effect/proc_holder/spell/S = null //Since spellbooks can be used by only one person anyway we can track the actual spell + var/buy_word = "Learn" + +/datum/spellbook_entry/proc/IsAvailible() // For config prefs / gamemode restrictions - these are round applied + return 1 +/datum/spellbook_entry/proc/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) // Specific circumstances + if(book.uses= aspell.level_max)
+ user << "This spell cannot be improved further."
+ return 0
+ else
+ aspell.name = initial(aspell.name)
+ aspell.spell_level++
+ aspell.charge_max = round(initial(aspell.charge_max) - aspell.spell_level * (initial(aspell.charge_max) - aspell.cooldown_min)/ aspell.level_max)
+ if(aspell.charge_max < aspell.charge_counter)
+ aspell.charge_counter = aspell.charge_max
+ switch(aspell.spell_level)
+ if(1)
+ user << "You have improved [aspell.name] into Efficient [aspell.name]."
+ aspell.name = "Efficient [aspell.name]"
+ if(2)
+ user << "You have further improved [aspell.name] into Quickened [aspell.name]."
+ aspell.name = "Quickened [aspell.name]"
+ if(3)
+ user << "You have further improved [aspell.name] into Free [aspell.name]."
+ aspell.name = "Free [aspell.name]"
+ if(4)
+ user << "You have further improved [aspell.name] into Instant [aspell.name]."
+ aspell.name = "Instant [aspell.name]"
+ if(aspell.spell_level >= aspell.level_max)
+ user << "This spell cannot be strengthened any further."
+ return 1
+ //No same spell found - just learn it
+ feedback_add_details("wizard_spell_learned",log_name)
+ user.mind.AddSpell(S)
+ user << "You have learned [S.name]."
+ return 1
+
+/datum/spellbook_entry/proc/CanRefund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
+ if(!refundable)
+ return 0
+ if(!S)
+ S = new spell_type()
+ for(var/obj/effect/proc_holder/spell/aspell in user.mind.spell_list)
+ if(initial(S.name) == initial(aspell.name))
+ return 1
+ return 0
+
+/datum/spellbook_entry/proc/Refund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) //return point value or -1 for failure
+ var/area/wizard_station/A = locate()
+ if(!(user in A.contents))
+ user << "You can only refund spells at the wizard lair"
+ return -1
+ if(!S)
+ S = new spell_type()
+ var/spell_levels = 0
+ for(var/obj/effect/proc_holder/spell/aspell in user.mind.spell_list)
+ if(initial(S.name) == initial(aspell.name))
+ spell_levels = aspell.spell_level
+ user.mind.spell_list.Remove(aspell)
+ del(S)
+ return cost * (spell_levels+1)
+ return -1
+/datum/spellbook_entry/proc/GetInfo()
+ if(!S)
+ S = new spell_type()
+ var/dat =""
+ dat += "[initial(S.name)]"
+ if(S.charge_type == "recharge")
+ dat += " Cooldown:[S.charge_max/10]"
+ dat += " Cost:[cost]
" + dat += "[S.desc][desc]
" + dat += "[S.clothes_req?"Needs wizard garb":"Can be cast without wizard garb"]
" + return dat + +/datum/spellbook_entry/fireball + name = "Fireball" + spell_type = /obj/effect/proc_holder/spell/dumbfire/fireball + log_name = "FB" + +/datum/spellbook_entry/magicm + name = "Magic Missile" + spell_type = /obj/effect/proc_holder/spell/targeted/projectile/magic_missile + log_name = "MM" + +/datum/spellbook_entry/disintegrate + name = "Disintegrate" + spell_type = /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate + log_name = "DG" + +/datum/spellbook_entry/disabletech + name = "Disable Tech" + spell_type = /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech + log_name = "DT" + category = "Utility Spells" + +/datum/spellbook_entry/repulse + name = "Repulse" + spell_type = /obj/effect/proc_holder/spell/aoe_turf/repulse + log_name = "RP" + +/datum/spellbook_entry/smoke + name = "Smoke" + spell_type = /obj/effect/proc_holder/spell/targeted/smoke + log_name = "SM" + category = "Utility Spells" + +/datum/spellbook_entry/blind + name = "Blind" + spell_type = /obj/effect/proc_holder/spell/targeted/trigger/blind + log_name = "BD" + +/datum/spellbook_entry/mindswap + name = "Mindswap" + spell_type = /obj/effect/proc_holder/spell/targeted/mind_transfer + log_name = "MT" + category = "Utility Spells" + +/datum/spellbook_entry/forcewall + name = "Force Wall" + spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall + log_name = "FW" + category = "Utility Spells" + +/datum/spellbook_entry/blink + name = "Blink" + spell_type = /obj/effect/proc_holder/spell/targeted/turf_teleport/blink + log_name = "BL" + category = "Utility Spells" + +/datum/spellbook_entry/teleport + name = "Teleport" + spell_type = /obj/effect/proc_holder/spell/targeted/area_teleport/teleport + log_name = "TP" + category = "Utility Spells" + +/datum/spellbook_entry/mutate + name = "Mutate" + spell_type = /obj/effect/proc_holder/spell/targeted/genetic/mutate + log_name = "MU" + category = "Utility Spells" + +/datum/spellbook_entry/jaunt + name = "Ethereal Jaunt" + spell_type = /obj/effect/proc_holder/spell/targeted/ethereal_jaunt + log_name = "EJ" + category = "Utility Spells" + +/datum/spellbook_entry/knock + name = "Knock" + spell_type = /obj/effect/proc_holder/spell/aoe_turf/knock + log_name = "KN" + category = "Utility Spells" + +/datum/spellbook_entry/fleshtostone + name = "Flesh to Stone" + spell_type = /obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone + log_name = "FS" + +/datum/spellbook_entry/summonitem + name = "Summon Item" + spell_type = /obj/effect/proc_holder/spell/targeted/summonitem + log_name = "IS" + category = "Utility Spells" + +/datum/spellbook_entry/lightningbolt + name = "Lightning Bolt" + spell_type = /obj/effect/proc_holder/spell/targeted/lightning + log_name = "LB" + +/datum/spellbook_entry/barnyard + name = "Barnyard Curse" + spell_type = /obj/effect/proc_holder/spell/targeted/barnyardcurse + log_name = "BC" + +/datum/spellbook_entry/item + name = "Buy Item" + category = "Artifacts" + refundable = 0 + buy_word = "Summon" + var/item_path= null + + +/datum/spellbook_entry/item/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + new item_path(get_turf(user)) + feedback_add_details("wizard_spell_learned",log_name) + return 1 + +/datum/spellbook_entry/item/GetInfo() + var/dat ="" + dat += "[name]" + dat += " Cost:[cost]
" + dat += "[desc]
" + if(surplus>=0) + dat += "[surplus] left.
" + return dat + +/datum/spellbook_entry/item/staffchange + name = "Staff of Change" + desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself." + item_path = /obj/item/weapon/gun/magic/staff/change + log_name = "ST" + +/datum/spellbook_entry/item/staffanimation + name = "Staff of Animation" + desc = "An arcane staff capable of shooting bolts of eldritch energy which cause inanimate objects to come to life. This magic doesn't affect machines." + item_path = /obj/item/weapon/gun/magic/staff/animate + log_name = "SA" + +/datum/spellbook_entry/item/staffchaos + name = "Staff of Chaos" + desc = "A caprious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended." + item_path = /obj/item/weapon/gun/magic/staff/chaos + log_name = "SC" + +/datum/spellbook_entry/item/staffdoor + name = "Staff of Door Creation" + desc = "A particular staff that can mold solid metal into ornate wooden doors. Useful for getting around in the absence of other transportation. Does not work on glass." + item_path = /obj/item/weapon/gun/magic/staff/door + log_name = "SD" + +/datum/spellbook_entry/item/scryingorb + name = "Scrying Orb" + desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision." + item_path = /obj/item/weapon/gun/magic/staff/chaos + log_name = "SO" + +/datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + if(..()) + if (!(user.dna.check_mutation(XRAY))) + user.dna.add_mutation(XRAY) + return 1 + +/datum/spellbook_entry/item/soulstones + name = "Six Soul Stone Shards and the spell Artificer" + desc = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot." + item_path = /obj/item/weapon/storage/belt/soulstone/full + log_name = "SS" + +/datum/spellbook_entry/item/soulstones/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + . =..() + if(.) + user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null)) + return . + +/datum/spellbook_entry/item/necrostone + name = "A Necromantic Stone" + desc = "A Necromantic stone is able to resurrect three dead individuals as skeletal thralls for you to command." + item_path = /obj/item/device/necromantic_stone + log_name = "NS" + +/datum/spellbook_entry/item/wands + name = "Wand Assortment" + desc = "A collection of wands that allow for a wide variety of utility. Wands do not recharge, so be conservative in use. Comes in a handy belt." + item_path = /obj/item/weapon/storage/belt/wands/full + log_name = "WA" + +/datum/spellbook_entry/item/armor + name = "Mastercrafted Armor Set" + desc = "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space." + item_path = /obj/item/clothing/suit/space/hardsuit/wizard + log_name = "HS" + +/datum/spellbook_entry/item/armor/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + . = ..() + if(.) + new /obj/item/clothing/shoes/sandal(get_turf(user)) //In case they've lost them. + new /obj/item/clothing/gloves/color/purple(get_turf(user))//To complete the outfit + +/datum/spellbook_entry/item/contract + name = "Contract of Apprenticeship" + desc = "A magical contract binding an apprentice wizard to your service, using it will summon them to your side." + item_path = /obj/item/weapon/antag_spawner/contract + log_name = "CT" + +/datum/spellbook_entry/summon + name = "Summon Stuff" + category = "Rituals" + refundable = 0 + buy_word = "Cast" + var/active = 0 + +/datum/spellbook_entry/summon/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + return ..() && !active + +/datum/spellbook_entry/summon/GetInfo() + var/dat ="" + dat += "[name]" + if(cost>0) + dat += " Cost:[cost]
" + else + dat += " No Cost
" + dat += "[desc]
" + if(active) + dat += "Already cast!
" + return dat + +/datum/spellbook_entry/summon/guns + name = "Summon Guns" + category = "Challenges" + desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!" + cost = 0 + log_name = "SG" + +/datum/spellbook_entry/summon/guns/IsAvailible() + return !config.no_summon_guns + +/datum/spellbook_entry/summon/guns/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + feedback_add_details("wizard_spell_learned",log_name) + rightandwrong(0, user, 0) + book.uses += 1 + active = 1 + playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1) + user << "You have cast summon guns and gained an extra charge for your spellbook." + return 1 + +/datum/spellbook_entry/summon/magic + name = "Summon Magic" + category = "Challenges" + desc = "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time." + cost = 0 + log_name = "SU" + +/datum/spellbook_entry/summon/magic/IsAvailible() + return !config.no_summon_magic + +/datum/spellbook_entry/summon/magic/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + feedback_add_details("wizard_spell_learned",log_name) + rightandwrong(1, user, 0) + book.uses += 1 + active = 1 + playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1) + user << "You have cast summon magic and gained an extra charge for your spellbook." + return 1 + +/datum/spellbook_entry/summon/events + name = "Summon Events" + desc = "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events." + cost = 1 + log_name = "SE" + var/times = 0 + +/datum/spellbook_entry/summon/events/IsAvailible() + return (ticker.mode.name != "ragin' mages" && !config.no_summon_events) + +/datum/spellbook_entry/summon/events/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + feedback_add_details("wizard_spell_learned",log_name) + summonevents() + times++ + playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1) + user << "You have cast summon events." + return 1 + +/datum/spellbook_entry/summon/events/GetInfo() + . = ..() + if(times>0) + . += "You cast it [times] times.
" + return . + + + /obj/item/weapon/spellbook name = "spell book" desc = "The legendary book of spells of the wizard." @@ -8,188 +388,119 @@ w_class = 1.0 var/uses = 5 var/temp = null - var/max_uses = 5 var/op = 1 - var/activepage - var/list/active_challenges = list() + var/tab = null var/mob/living/carbon/human/owner + var/list/datum/spellbook_entry/entries = list() + var/list/categories = list() + +/obj/item/weapon/spellbook/New() + ..() + var/entry_types = typesof(/datum/spellbook_entry) - /datum/spellbook_entry - /datum/spellbook_entry/item - /datum/spellbook_entry/summon + for(var/T in entry_types) + var/datum/spellbook_entry/E = new T + if(E.IsAvailible()) + entries |= E + categories |= E.category + else + del(E) + tab = categories[1] + /obj/item/weapon/spellbook/attackby(obj/item/O as obj, mob/user as mob, params) if(istype(O, /obj/item/weapon/antag_spawner/contract)) var/obj/item/weapon/antag_spawner/contract/contract = O if(contract.used) - user << "The contract has been used, you can't get your points back now." + user << "The contract has been used, you can't get your points back now!" else - user << "You feed the contract back into the spellbook, refunding your points." - src.max_uses++ + user << "You feed the contract back into the spellbook, refunding your points." src.uses++ qdel(O) +/obj/item/weapon/spellbook/proc/GetCategoryHeader(var/category) + var/dat = "" + switch(category) + if("Offensive Spells") + dat += "Spells that can be reused endlessly.
" + dat += "The number after the spell name is the cooldown time.
" + dat += "You can reduce this number by spending more points on the spell.
" + if("Utility Spells") + dat += "Spells that can be reused endlessly.
" + dat += "The number after the spell name is the cooldown time.
" + dat += "You can reduce this number by spending more points on the spell.
" + if("Artifacts") + dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of uses.
" + dat += "These items are not bound to you and can be stolen. Additionaly they cannot typically be returned once purchased.
" + if("Challenges") + dat += "The Wizard Federation typically has hard limits on the potency and number of spells brought to the station based on risk.
" + dat += "Arming the station against you will increases the risk, but will grant you one more charge for your spellbook.
" + if("Rituals") + dat += "These powerful spells change the very fabric of reality. Not always in your favour.
" + return dat - +/obj/item/weapon/spellbook/proc/wrap(var/content) + var/dat = "" + dat +="Spellbook "
+ dat += {"
+
+
+
+ "}
+ dat += {"[content]"}
+ return dat
/obj/item/weapon/spellbook/attack_self(mob/user as mob)
if(!owner)
- user << "You bind the spellbook to yourself."
+ user << "You bind the spellbook to yourself."
owner = user
return
if(user != owner)
- user << "The [name] does not recognize you as it's owner and refuses to open."
+ user << "The [name] does not recognize you as it's owner and refuses to open!"
return
user.set_machine(src)
- var/dat
- if(temp)
- dat = "[temp]
Clear" - else if (!activepage || activepage == "return") - dat = "The Book of Magic:
" - dat += "Uses remaining: [uses]
" - dat += "
" - dat += "Learn and Improve Magical Abilities
" - dat += "Summon Magical Tools and Weapons
" - if(ticker.mode.name != "ragin' mages") // we totally need summon guns x100 - dat += "Raise The Stakes For More Power
" - dat += "
" - dat += "Re-memorize Spells
" + var/dat = "" - else if (activepage == "spells") - dat += "Spells:
" - dat += "Spells that can be reused endlessly. Unless stated otherwise all spells require full wizard garb as a focus.
" - dat += "The number after the spell name is the cooldown time. You can reduce this number by spending more points on the spell.
" + dat += "
" + else + spell_info+= "Can't [E.buy_word]
" + if(E.CanRefund(user,src)) + spell_info+= "Refund
" + spell_info += "
" + if(cat_dat[E.category]) + cat_dat[E.category] += spell_info - dat += "Magic Missile (15)
" - dat += "This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage.
" + for(var/category in categories) + dat += "
" - dat += "This spell fires a fireball in the direction you're facing and does not require wizard garb. Be careful not to fire it at people that are standing next to you.
" - - dat += "Disintegrate (60)
" - dat += "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown.
" - - dat += "Disable Technology (60)
" - dat += "This spell disables all weapons, cameras and most other technology in range.
" - - dat += "Repulse (40)
" - dat += "This spell throws nearby objects away from you and knocks creatures down.
" - - dat += "Smoke (10)
" - dat += "This spell spawns a cloud of choking smoke at your location and does not require wizard garb.
" - - dat += "Blind (30)
" - dat += "This spell temporarly blinds a single person and does not require wizard garb.
" - - dat += "Mind Transfer (60)
" - dat += "This spell allows the user to switch bodies with a target. Careful to not lose your memory in the process.
" - - dat += "Forcewall (10)
" - dat += "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb.
" - - dat += "Blink (2)
" - dat += "This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience.
" - - dat += "Teleport (60)
" - dat += "This spell teleports you to a type of area of your selection. Very useful if you are in danger, but has a decent cooldown, and is unpredictable.
" - - dat += "Mutate (60)
" - dat += "This spell causes you to turn into a hulk and gain telekinesis for a short while.
" - - dat += "Ethereal Jaunt (30)
" - dat += "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls.
" - - dat += "Knock (10)
" - dat += "This spell opens nearby doors and does not require wizard garb.
" - - dat += "Curse of the Barnyward (15)
" - dat += " This Spell dooms any unlucky soul to the life of a barnyard animal. Well not exactly but you still get to laugh at them when they MOO!. It does not require a wizard garb.
" - - dat += "Flesh to Stone (60)
" - dat += "This spell will curse a person to immediately turn into an unmoving statue. The effect will eventually wear off if the statue is not destroyed.
" - - dat += "Lightning Bolt (30)
" - dat += "Charge up and throw lightning bolt at the nearby enemy. Classic. The longer you charge the more powerful the spell, beware of overcharge however!
" - - dat += "Instant Summons (10)
" - dat += "This spell can be used to bind a valuable item to you, bringing it to your hand at will. Using this spell while holding the bound item will allow you to unbind it. It does not require wizard garb.
" - if(ticker.mode.name != "ragin' mages" && !config.no_summon_events) // we totally need summon greentext x100 - dat += "Summon Events (One time use, persistent global spell)
" - dat += "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events.
" - - dat += "
" - - dat += "Return
" - - else if (activepage == "challenge") - - dat += "Challenges:
" - dat += "The Wizard Federation typically has hard limits on the potency and number of spells brought to the station based on risk.
" - dat += "Arming the station against you will increases the risk, but will grant you one more charge for your spellbook.
" - - dat += "
" - - if(!("summon guns" in active_challenges) && !config.no_summon_guns) - dat += "Summon Guns (Single use only, global spell)
" - dat += "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!
" - - if(!("summon magic" in active_challenges) && !config.no_summon_magic) - dat += "Summon Magic (Single use only, global spell)
" - dat += "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time.
" - - dat += "
" - - dat += "Return
" - - else if (activepage == "artifacts") - - dat += "Artifacts:
" - dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of uses.
" - dat += "These items are not bound to you and can be stolen. Additionaly they cannot typically be returned once purchased.
" - dat += "
" - - dat += "Staff of Change
" - dat += "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself.
" - dat += "
" - - dat += "Staff of Animation
" - dat += "An arcane staff capable of shooting bolts of eldritch energy which cause inanimate objects to come to life. This magic doesn't affect machines.
" - dat += "
" - - dat += "Staff of Door Creation
" - dat += "A particular staff that can mold solid metal into ornate wooden doors. Useful for getting around in the absence of other transportation. Does not work on glass.
" - dat += "
" - - dat += "Staff of Chaos
" - dat += "A caprious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended.
" - dat += "
" - - dat += "Six Soul Stone Shards and the spell Artificer
" - dat += "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot.
" - dat += "
" - - dat += "A Necromantic Stone
" - dat += "A Necromantic stone is able to resurrect three dead individuals as skeletal thralls for you to command." - dat += "
" - - dat += "Wand Assortment
" - dat += "A collection of wands that allow for a wide variety of utility. Wands do not recharge, so be conservative in use. Comes in a handy belt.
" - dat += "
" - - dat += "Mastercrafted Armor Set
" - dat += "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space.
" - dat += "
" - - dat += "Contract of Apprenticeship
" - dat += "A magical contract binding an apprentice wizard to your service, using it will summon them to your side.
" - dat += "
" - - dat += "Scrying Orb
" - dat += "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision.
" - - dat += "
" - - dat += "Return
" - user << browse(dat, "window=radio") - onclose(user, "radio") + user << browse(wrap(dat), "window=spellbook;size=600x300") + onclose(user, "spellbook") return /obj/item/weapon/spellbook/Topic(href, href_list) @@ -205,210 +516,23 @@ temp = "If you got caught sneaking a peak from your teacher's spellbook, you'd likely be expelled from the Wizard Academy. Better not." return + var/datum/spellbook_entry/E = null if(loc == H || (in_range(src, H) && istype(loc, /turf))) H.set_machine(src) - if(href_list["spell_choice"]) - if(href_list["spell_choice"] == "rememorize") - var/area/wizard_station/A = locate() - if(usr in A.contents) - uses = max_uses - H.spellremove(usr) - temp = "All spells have been removed. You may now memorize a new set of spells." - feedback_add_details("wizard_spell_learned","UM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - else - temp = "You may only re-memorize spells whilst located inside the wizard sanctuary." - else if(href_list["spell_choice"] == "spells" || href_list["spell_choice"] == "artifacts" || href_list["spell_choice"] == "challenge" || href_list["spell_choice"] == "return") - activepage = href_list["spell_choice"] - else if(uses >= 1 && max_uses >=1) - uses-- - /* - */ - var/list/available_spells = list(magicmissile = "Magic Missile", fireball = "Fireball", disintegrate = "Disintegrate", disabletech = "Disable Tech", repulse = "Repulse", smoke = "Smoke", blind = "Blind", mindswap = "Mind Transfer", forcewall = "Forcewall", blink = "Blink", teleport = "Teleport", mutate = "Mutate", etherealjaunt = "Ethereal Jaunt", knock = "Knock", barnyardcurse = "The Curse of the Barnyard", fleshtostone = "Flesh to Stone", summonitem = "Instant Summons", summonguns = "Summon Guns", summonmagic = "Summon Magic", summonevents = "Summon Events", staffchange = "Staff of Change", soulstone = "Six Soul Stone Shards and the spell Artificer", necrostone = "A Necromantic Stone", armor = "Mastercrafted Armor Set", staffanimate = "Staff of Animation", staffchaos = "Staff of Chaos", staffdoor = "Staff of Door Creation", wands = "Wand Assortment", lightningbolt = "Lightning Bolt") - var/already_knows = 0 - for(var/obj/effect/proc_holder/spell/aspell in H.mind.spell_list) - if(available_spells[href_list["spell_choice"]] == initial(aspell.name)) - already_knows = 1 - if(aspell.spell_level >= aspell.level_max) - temp = "This spell cannot be improved further." - uses++ - break - else - aspell.name = initial(aspell.name) - aspell.spell_level++ - aspell.charge_max = round(initial(aspell.charge_max) - aspell.spell_level * (initial(aspell.charge_max) - aspell.cooldown_min)/ aspell.level_max) - if(aspell.charge_max < aspell.charge_counter) - aspell.charge_counter = aspell.charge_max - switch(aspell.spell_level) - if(1) - temp = "You have improved [aspell.name] into Efficient [aspell.name]." - aspell.name = "Efficient [aspell.name]" - if(2) - temp = "You have further improved [aspell.name] into Quickened [aspell.name]." - aspell.name = "Quickened [aspell.name]" - if(3) - temp = "You have further improved [aspell.name] into Free [aspell.name]." - aspell.name = "Free [aspell.name]" - if(4) - temp = "You have further improved [aspell.name] into Instant [aspell.name]." - aspell.name = "Instant [aspell.name]" - if(aspell.spell_level >= aspell.level_max) - temp += " This spell cannot be strengthened any further." - /* - */ - if(!already_knows) - switch(href_list["spell_choice"]) - if("magicmissile") - feedback_add_details("wizard_spell_learned","MM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null)) - temp = "You have learned magic missile." - if("fireball") - feedback_add_details("wizard_spell_learned","FB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/dumbfire/fireball(null)) - temp = "You have learned fireball." - if("disintegrate") - feedback_add_details("wizard_spell_learned","DG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(null)) - temp = "You have learned disintegrate." - if("disabletech") - feedback_add_details("wizard_spell_learned","DT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(null)) - temp = "You have learned disable technology." - if("repulse") - feedback_add_details("wizard_spell_learned","RP") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse(null)) - temp = "You have learned repulse." - if("smoke") - feedback_add_details("wizard_spell_learned","SM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/smoke(null)) - temp = "You have learned smoke." - if("blind") - feedback_add_details("wizard_spell_learned","BD") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/trigger/blind(null)) - temp = "You have learned blind." - if("mindswap") - feedback_add_details("wizard_spell_learned","MT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null)) - temp = "You have learned mindswap." - if("forcewall") - feedback_add_details("wizard_spell_learned","FW") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(null)) - temp = "You have learned forcewall." - if("blink") - feedback_add_details("wizard_spell_learned","BL") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(null)) - temp = "You have learned blink." - if("teleport") - feedback_add_details("wizard_spell_learned","TP") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null)) - temp = "You have learned teleport." - if("mutate") - feedback_add_details("wizard_spell_learned","MU") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/genetic/mutate(null)) - temp = "You have learned mutate." - if("etherealjaunt") - feedback_add_details("wizard_spell_learned","EJ") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null)) - temp = "You have learned ethereal jaunt." - if("knock") - feedback_add_details("wizard_spell_learned","KN") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null)) - temp = "You have learned knock." - if("fleshtostone") - feedback_add_details("wizard_spell_learned","FS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone(null)) - temp = "You have learned flesh to stone." - if("summonitem") - feedback_add_details("wizard_spell_learned","IS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/summonitem(null)) - temp = "You have learned instant summons." - if("lightningbolt") - feedback_add_details("wizard_spell_learned","LB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lightning(null)) - temp = "You have learned lightning bolt." - if("summonguns") - feedback_add_details("wizard_spell_learned","SG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - rightandwrong(0, H, 0) - max_uses++ - uses = uses + 2 //refund plus a free point - active_challenges += "summon guns" - temp = "You have cast summon guns and gained an extra charge for your spellbook." - if("summonmagic") - feedback_add_details("wizard_spell_learned","SU") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - rightandwrong(1, H, 0) - max_uses++ - uses = uses + 2 //refund plus a free point - active_challenges += "summon magic" - temp = "You have cast summon magic and gained an extra charge for your spellbook." - if("summonevents") - feedback_add_details("wizard_spell_learned","SE") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - summonevents() - max_uses-- - temp = "You have cast summon events." - if("staffchange") - feedback_add_details("wizard_spell_learned","ST") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/gun/magic/staff/change(get_turf(H)) - temp = "You have purchased a staff of change." - max_uses-- - if("soulstone") - feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/storage/belt/soulstone/full(get_turf(H)) - H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null)) - temp = "You have purchased a belt full of soulstones and have learned the artificer spell." - max_uses-- - if("necrostone") - feedback_add_details("wizard_spell_learned","NS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/device/necromantic_stone(get_turf(H)) - temp = "You have purchased a necromantic stone." - max_uses-- - if("armor") - feedback_add_details("wizard_spell_learned","HS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/clothing/shoes/sandal(get_turf(H)) //In case they've lost them. - new /obj/item/clothing/gloves/color/purple(get_turf(H))//To complete the outfit - new /obj/item/clothing/suit/space/hardsuit/wizard(get_turf(H)) - temp = "You have purchased a suit of wizard armor." - max_uses-- - if("staffanimation") - feedback_add_details("wizard_spell_learned","SA") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/gun/magic/staff/animate(get_turf(H)) - temp = "You have purchased a staff of animation." - max_uses-- - if("staffchaos") - feedback_add_details("wizard_spell_learned","SC") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/gun/magic/staff/chaos(get_turf(H)) - temp = "You have purchased a staff of chaos." - max_uses-- - if("staffdoor") - feedback_add_details("wizard_spell_learned","SD") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/gun/magic/staff/door(get_turf(H)) - temp = "You have purchased a staff of door creation." - max_uses-- - if("barnyard") - feedback_add_details("wizard_spell_learned","BC") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/barnyardcurse(null)) - temp = "You have learned the curse of the barnyard." - if("wands") - feedback_add_details("wizard_spell_learned","WA") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/storage/belt/wands/full(get_turf(H)) - temp = "You have purchased an assortment of wands." - max_uses-- - if("contract") - feedback_add_details("wizard_spell_learned","CT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/antag_spawner/contract(get_turf(H)) - temp = "You have purchased a contract of apprenticeship." - max_uses-- - if("scrying") - feedback_add_details("wizard_spell_learned","SO") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/scrying(get_turf(H)) - if (!(H.dna.check_mutation(XRAY))) - H.dna.add_mutation(XRAY) - temp = "You have purchased a scrying orb, and gained x-ray vision." - max_uses-- - else - if(href_list["temp"]) - temp = null - activepage = null - attack_self(H) - + if(href_list["buy"]) + E = entries[text2num(href_list["buy"])] + if(E && E.CanBuy(H,src)) + if(E.Buy(H,src)) + uses -= E.cost + else if(href_list["refund"]) + E = entries[text2num(href_list["refund"])] + if(E && E.refundable) + var/result = E.Refund(H,src) + if(result > 0) + uses += result + else if(href_list["page"]) + tab = sanitize(href_list["page"]) + attack_self(H) return //Single Use Spellbooks// @@ -419,7 +543,6 @@ var/used = 0 name = "spellbook of " uses = 1 - max_uses = 1 desc = "This template spellbook was never meant for the eyes of man..." /obj/item/weapon/spellbook/oneuse/New() diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 62799672ab5..25f8b25db8c 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -8,8 +8,8 @@ required_players = 20 required_enemies = 1 recommended_enemies = 1 - pre_setup_before_jobs = 1 enemy_minimum_age = 14 + round_ends_with_antag_death = 1 var/use_huds = 0 var/finished = 0 @@ -22,7 +22,7 @@ var/datum/mind/wizard = pick(antag_candidates) wizards += wizard modePlayer += wizard - wizard.assigned_role = "MODE" + wizard.assigned_role = "Wizard" wizard.special_role = "Wizard" if(wizardstart.len == 0) wizard.current << "A starting location for you could not be found, please report this bug!" @@ -171,33 +171,14 @@ /datum/game_mode/wizard/check_finished() - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - - if(round_converted == 1 || !wizards) //No reason to waste resources - return ..() //Check for evacuation/nuke - for(var/datum/mind/wizard in wizards) - if(wizard.current.stat != DEAD) + if(isliving(wizard.current) && wizard.current.stat!=DEAD) return ..() - for(var/datum/mind/traitor in traitors) - if(traitor.current.stat != DEAD) - return ..() - - if(!config.continuous["wizard"]) - return 1 - if(SSevent.wizardmode) //If summon events was active, turn it off SSevent.toggleWizardmode() SSevent.resetFrequency() - if(config.midround_antag["wizard"]) - round_converted = convert_roundtype() - if(!round_converted) - finished = 1 - return 1 - return ..() /datum/game_mode/wizard/declare_completion() diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 1cbffbab51d..6bb063181f0 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -194,13 +194,13 @@ if("Centcom Commander") return get_all_centcom_access() if("Emergency Response Team Commander") - return list(access_cent_general) + return get_ert_access("commander") if("Security Response Officer") - return list(access_cent_general) + return get_ert_access("sec") if("Engineer Response Officer") - return list(access_cent_general) + return get_ert_access("eng") if("Medical Response Officer") - return list(access_cent_general) + return get_ert_access("med") /proc/get_all_accesses() return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_court, @@ -223,11 +223,11 @@ if("commander") return get_all_centcom_access() if("sec") - return list(access_cent_general, access_cent_specops) + return list(access_cent_general, access_cent_specops, access_cent_living) if("eng") - return list(access_cent_general, access_cent_storage) + return list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) if("med") - return list(access_cent_general, access_cent_medical) + return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_living) /proc/get_all_syndicate_access() return list(access_syndicate, access_syndicate) @@ -426,7 +426,7 @@ "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer") -proc/get_all_job_icons() //For all existing HUD icons +/proc/get_all_job_icons() //For all existing HUD icons return get_all_jobs() + list("Prisoner") /proc/get_all_centcom_jobs() diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 26225a71971..53d8be8e8ad 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -18,131 +18,50 @@ Chaplain access = list(access_morgue, access_chapel_office, access_crematorium) minimal_access = list(access_morgue, access_chapel_office, access_crematorium) - //Pretty bible names - var/global/list/biblenames = list("Bible", "Quran", "Scrapbook", "Burning Bible", "Clown Bible", "Banana Bible", "Creeper Bible", "White Bible", "Holy Light", "The God Delusion", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "Melted Bible", "Necronomicon") - - //Bible iconstates - var/global/list/biblestates = list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon") - - //Bible itemstates - var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", "bible", "bible", "syringe_kit", "syringe_kit", "syringe_kit", "syringe_kit", "syringe_kit", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon") - -/datum/job/chaplain/proc/setupbiblespecifics(var/obj/item/weapon/storage/book/bible/B, var/mob/living/carbon/human/H) - switch(B.icon_state) - if("honk1","honk2") - new /obj/item/weapon/grown/bananapeel(B) - new /obj/item/weapon/grown/bananapeel(B) - - if(B.icon_state == "honk1") - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask) - - if("bible") - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = 2 - if("koran") - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = 4 - if("scientology") - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = 8 - if("athiest") - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = 10 - -/datum/job/chaplain/Topic(href, href_list) - if(href_list["seticon"]) - var/iconi = text2num(href_list["seticon"]) - - var/biblename = biblenames[iconi] - var/obj/item/weapon/storage/book/bible/B = locate(href_list["bible"]) - - B.icon_state = biblestates[iconi] - B.item_state = bibleitemstates[iconi] - - //Set biblespecific chapels - setupbiblespecifics(B, usr) - - usr.put_in_hands(B) // Update inhand icon - - if(ticker) - ticker.Bible_icon_state = B.icon_state - ticker.Bible_item_state = B.item_state - ticker.Bible_name = B.name - feedback_set_details("religion_book","[biblename]") - - usr << browse(null, "window=editicon") // Close window - /datum/job/chaplain/equip_items(var/mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) var/obj/item/weapon/storage/book/bible/B = new /obj/item/weapon/storage/book/bible/booze(H) - spawn(0) - var/religion_name = "Christianity" - var/new_religion = copytext(sanitize(input(H, "You are the Chaplain. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)),1,MAX_NAME_LEN) + var/new_religion = "Christianity" + if(H.client && H.client.prefs.custom_names["religion"]) + new_religion = H.client.prefs.custom_names["religion"] - if (!new_religion) - new_religion = religion_name + switch(lowertext(new_religion)) + if("christianity") + B.name = pick("The Holy Bible","The Dead Sea Scrolls") + if("satanism") + B.name = "The Unholy Bible" + if("cthulu") + B.name = "The Necronomicon" + if("islam") + B.name = "Quran" + if("scientology") + B.name = pick("The Biography of L. Ron Hubbard","Dianetics") + if("chaos") + B.name = "The Book of Lorgar" + if("imperium") + B.name = "Uplifting Primer" + if("toolboxia") + B.name = "Toolbox Manifesto" + if("homosexuality") + B.name = "Guys Gone Wild" + if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks") + B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition") + H.setBrainLoss(100) // starts off retarded as fuck + if("science") + B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") + else + B.name = "The Holy Book of [new_religion]" + feedback_set_details("religion_name","[new_religion]") + ticker.Bible_name = B.name - switch(lowertext(new_religion)) - if("christianity") - B.name = pick("The Holy Bible","The Dead Sea Scrolls") - if("satanism") - B.name = "The Unholy Bible" - if("cthulu") - B.name = "The Necronomicon" - if("islam") - B.name = "Quran" - if("scientology") - B.name = pick("The Biography of L. Ron Hubbard","Dianetics") - if("chaos") - B.name = "The Book of Lorgar" - if("imperium") - B.name = "Uplifting Primer" - if("toolboxia") - B.name = "Toolbox Manifesto" - if("homosexuality") - B.name = "Guys Gone Wild" - if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks") - B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition") - H.setBrainLoss(100) // starts off retarded as fuck - if("science") - B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") - else - B.name = "The Holy Book of [new_religion]" - feedback_set_details("religion_name","[new_religion]") + var/new_deity = "Space Jesus" + if(H.client && H.client.prefs.custom_names["deity"]) + new_deity = H.client.prefs.custom_names["deity"] + B.deity_name = new_deity - spawn(1) - var/deity_name = "Space Jesus" - var/new_deity = copytext(sanitize(input(H, "Would you like to change your deity? Default is Space Jesus.", "Name change", deity_name)),1,MAX_NAME_LEN) - - if ((length(new_deity) == 0) || (new_deity == "Space Jesus") ) - new_deity = deity_name - B.deity_name = new_deity - - if(ticker) - ticker.Bible_deity_name = B.deity_name - feedback_set_details("religion_deity","[new_deity]") - - //Open bible selection - var/dat = "Pick Bible Style "
-
- var/i
- for(i = 1, i < biblestates.len, i++)
- var/icon/bibleicon = icon('icons/obj/storage.dmi', biblestates[i])
-
- var/nicename = biblenames[i]
- H << browse_rsc(bibleicon, nicename)
- dat += {"
"
-
- H << browse(dat, "window=editicon;can_close=0;can_minimize=0;size=250x650")
\ No newline at end of file
+ if(ticker)
+ ticker.Bible_deity_name = B.deity_name
+ feedback_set_details("religion_deity","[new_deity]")
+ H.equip_to_slot_or_del(B, slot_in_backpack)
\ No newline at end of file
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 81b6adc491c..590837a40fd 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -215,44 +215,54 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science")
var/department = pick(sec_departments)
sec_departments -= department
var/destination = null
+ var/obj/effect/landmark/start/depsec/spawn_point = null
var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/security(H)
+
switch(department)
if("supply")
default_headset = /obj/item/device/radio/headset/headset_sec/alt/department/supply
dep_access = list(access_mailsorting, access_mining)
destination = /area/security/checkpoint/supply
+ spawn_point = locate(/obj/effect/landmark/start/depsec/supply) in department_security_spawns
U.attachTie(new /obj/item/clothing/tie/armband/cargo())
if("engineering")
default_headset = /obj/item/device/radio/headset/headset_sec/alt/department/engi
dep_access = list(access_construction, access_engine)
destination = /area/security/checkpoint/engineering
+ spawn_point = locate(/obj/effect/landmark/start/depsec/engineering) in department_security_spawns
U.attachTie(new /obj/item/clothing/tie/armband/engine())
if("medical")
default_headset = /obj/item/device/radio/headset/headset_sec/alt/department/med
dep_access = list(access_medical)
destination = /area/security/checkpoint/medical
+ spawn_point = locate(/obj/effect/landmark/start/depsec/medical) in department_security_spawns
U.attachTie(new /obj/item/clothing/tie/armband/medblue())
if("science")
default_headset = /obj/item/device/radio/headset/headset_sec/alt/department/sci
dep_access = list(access_research)
destination = /area/security/checkpoint/science
+ spawn_point = locate(/obj/effect/landmark/start/depsec/science) in department_security_spawns
U.attachTie(new /obj/item/clothing/tie/armband/science())
+
H.equip_to_slot_or_del(U, slot_w_uniform)
var/teleport = 0
if(!config.sec_start_brig)
- if(destination)
- if(!ticker || ticker.current_state <= GAME_STATE_SETTING_UP)
- teleport = 1
+ if(destination || spawn_point)
+ teleport = 1
if(teleport)
var/turf/T
- var/safety = 0
- while(safety < 25)
- T = safepick(get_area_turfs(destination))
- if(T && !H.Move(T))
- safety += 1
- continue
- else
- break
+ if(spawn_point)
+ T = get_turf(spawn_point)
+ H.Move(T)
+ else
+ var/safety = 0
+ while(safety < 25)
+ T = safepick(get_area_turfs(destination))
+ if(T && !H.Move(T))
+ safety += 1
+ continue
+ else
+ break
H << "You have been assigned to [department]!"
return
diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm
index 12ee237aa0d..26ded6705f1 100644
--- a/code/game/machinery/Beacon.dm
+++ b/code/game/machinery/Beacon.dm
@@ -23,6 +23,7 @@
/obj/machinery/bluespace_beacon/Destroy()
if(Beacon)
qdel(Beacon)
+ Beacon = null
..()
// update the invisibility and icon
diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm
index c6c097368c8..66be318890e 100644
--- a/code/game/machinery/Freezer.dm
+++ b/code/game/machinery/Freezer.dm
@@ -113,6 +113,7 @@
..()
src.updateUsrDialog()
+
/obj/machinery/atmospherics/unary/cold_sink/freezer/power_change()
..()
if(stat & NOPOWER)
diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm
index bb9d5db7eee..c563482d147 100644
--- a/code/game/machinery/PDApainter.dm
+++ b/code/game/machinery/PDApainter.dm
@@ -43,7 +43,7 @@
/obj/machinery/pdapainter/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/device/pda))
if(storedpda)
- user << "There is already a PDA inside."
+ user << "There is already a PDA inside!"
return
else
var/obj/item/device/pda/P = usr.get_active_hand()
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index dcae67a797b..76623347eb9 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -18,7 +18,8 @@
var/list/injection_chems = list() //list of injectable chems except ephedrine, coz ephedrine is always avalible
var/list/possible_chems = list(list("morphine", "salbutamol", "salglu_solution"),
list("morphine", "salbutamol", "salglu_solution", "oculine"),
- list("morphine", "salbutamol", "salglu_solution", "oculine", "charcoal", "mutadone", "mannitol", "pen_acid"))
+ list("morphine", "salbutamol", "salglu_solution", "oculine", "charcoal", "mutadone", "mannitol", "pen_acid"),
+ list("morphine", "salbutamol", "salglu_solution", "oculine", "charcoal", "mutadone", "mannitol", "omnizine"))
/obj/machinery/sleeper/New()
..()
component_parts = list()
@@ -47,9 +48,6 @@
efficiency = E
min_health = -E * 25
-/obj/machinery/sleeper/allow_drop()
- return 0
-
/obj/machinery/sleeper/MouseDrop_T(mob/target, mob/user)
if(stat || user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user)|| !iscarbon(target))
return
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index 386c11d09c9..82d9841d328 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -36,7 +36,7 @@
else // trying to unlock the interface
if (src.allowed(usr))
locked = !locked
- user << "You [ locked ? "lock" : "unlock"] the device."
+ user << "You [ locked ? "lock" : "unlock"] the device."
if (locked)
if (user.machine==src)
user.unset_machine()
diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index e132d8a8abe..bc593f7fc69 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -1,14 +1,14 @@
#define AIRLOCK_CONTROL_RANGE 5
// This code allows for airlocks to be controlled externally by setting an id_tag and comm frequency (disables ID access)
-obj/machinery/door/airlock
+/obj/machinery/door/airlock
var/id_tag
var/frequency
var/shockedby = list()
var/datum/radio_frequency/radio_connection
-obj/machinery/door/airlock/receive_signal(datum/signal/signal)
+/obj/machinery/door/airlock/receive_signal(datum/signal/signal)
if(!signal || signal.encryption) return
if(id_tag != signal.data["tag"] || !signal.data["command"]) return
@@ -49,7 +49,7 @@ obj/machinery/door/airlock/receive_signal(datum/signal/signal)
send_status()
-obj/machinery/door/airlock/proc/send_status()
+/obj/machinery/door/airlock/proc/send_status()
if(radio_connection)
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -62,42 +62,42 @@ obj/machinery/door/airlock/proc/send_status()
radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
-obj/machinery/door/airlock/open(surpress_send)
+/obj/machinery/door/airlock/open(surpress_send)
. = ..()
if(!surpress_send) send_status()
-obj/machinery/door/airlock/close(surpress_send)
+/obj/machinery/door/airlock/close(surpress_send)
. = ..()
if(!surpress_send) send_status()
-obj/machinery/door/airlock/proc/set_frequency(new_frequency)
+/obj/machinery/door/airlock/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
if(new_frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
-obj/machinery/door/airlock/initialize()
+/obj/machinery/door/airlock/initialize()
if(frequency)
set_frequency(frequency)
update_icon()
-obj/machinery/door/airlock/New()
+/obj/machinery/door/airlock/New()
..()
if(radio_controller)
set_frequency(frequency)
-obj/machinery/door/airlock/Destroy()
+/obj/machinery/door/airlock/Destroy()
if(frequency && radio_controller)
radio_controller.remove_object(src,frequency)
..()
-obj/machinery/airlock_sensor
+/obj/machinery/airlock_sensor
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off"
name = "airlock sensor"
@@ -115,7 +115,7 @@ obj/machinery/airlock_sensor
var/alert = 0
-obj/machinery/airlock_sensor/update_icon()
+/obj/machinery/airlock_sensor/update_icon()
if(on)
if(alert)
icon_state = "airlock_sensor_alert"
@@ -124,7 +124,7 @@ obj/machinery/airlock_sensor/update_icon()
else
icon_state = "airlock_sensor_off"
-obj/machinery/airlock_sensor/attack_hand(mob/user)
+/obj/machinery/airlock_sensor/attack_hand(mob/user)
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
signal.data["tag"] = master_tag
@@ -133,7 +133,7 @@ obj/machinery/airlock_sensor/attack_hand(mob/user)
radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
flick("airlock_sensor_cycle", src)
-obj/machinery/airlock_sensor/process()
+/obj/machinery/airlock_sensor/process()
if(on)
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -151,82 +151,21 @@ obj/machinery/airlock_sensor/process()
update_icon()
-obj/machinery/airlock_sensor/proc/set_frequency(new_frequency)
+/obj/machinery/airlock_sensor/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
-obj/machinery/airlock_sensor/initialize()
+/obj/machinery/airlock_sensor/initialize()
set_frequency(frequency)
-obj/machinery/airlock_sensor/New()
+/obj/machinery/airlock_sensor/New()
..()
if(radio_controller)
set_frequency(frequency)
-obj/machinery/airlock_sensor/Destroy()
+/obj/machinery/airlock_sensor/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
- ..()
-
-
-obj/machinery/access_button
- icon = 'icons/obj/airlock_machines.dmi'
- icon_state = "access_button_standby"
- name = "access button"
-
- anchored = 1
- power_channel = ENVIRON
-
- var/master_tag
- var/frequency = 1449
- var/command = "cycle"
-
- var/datum/radio_frequency/radio_connection
-
- var/on = 1
-
-
-obj/machinery/access_button/update_icon()
- if(on)
- icon_state = "access_button_standby"
- else
- icon_state = "access_button_off"
-
-
-obj/machinery/access_button/attack_hand(mob/user)
- add_fingerprint(usr)
- if(!allowed(user))
- user << "Access Denied"
-
- else if(radio_connection)
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.data["tag"] = master_tag
- signal.data["command"] = command
-
- radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
- flick("access_button_cycle", src)
-
-
-obj/machinery/access_button/proc/set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
-
-
-obj/machinery/access_button/initialize()
- set_frequency(frequency)
-
-
-obj/machinery/access_button/New()
- ..()
-
- if(radio_controller)
- set_frequency(frequency)
-
-obj/machinery/access_button/Destroy()
- if(radio_controller)
- radio_controller.remove_object(src, frequency)
- ..()
+ ..()
\ No newline at end of file
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index ce624c2abc7..57819a2d177 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -167,8 +167,7 @@
return 0
/obj/machinery/alarm/attack_hand(mob/user)
- . = ..()
- if (.)
+ if (..())
return
user.set_machine(src)
@@ -188,17 +187,41 @@
if(!shorted)
//user << browse(return_text(),"window=air_alarm")
//onclose(user, "air_alarm")
- var/datum/browser/popup = new(user, "air_alarm", "[alarm_area.name] Air Alarm", 500, 400)
+ /*var/datum/browser/popup = new(user, "air_alarm", "[alarm_area.name] Air Alarm", 500, 400)
popup.set_content(return_text())
popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
popup.open()
- refresh_all()
+ refresh_all()*/
+ ui_interact(user)
if(panel_open && (!istype(user, /mob/living/silicon/ai)))
wires.Interact(user)
return
+/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main")
+ if(stat & (BROKEN|NOPOWER))
+ return
+
+ var/data = list()
+
+ data["locked"] = locked
+ data["siliconUser"] = user.has_unlimited_silicon_privilege
+ data["screen"] = screen
+ data["dangerous"] = emagged
+
+ populate_status(data)
+ if (!locked || user.has_unlimited_silicon_privilege)
+ populate_controls(data)
+
+ var/datum/nanoui/ui = SSnano.get_open_ui(user, src, ui_key)
+ if (!ui)
+ ui = new /datum/nanoui(user, src, ui_key, "air_alarm.tmpl", "Air Alarm", 350, 500)
+ ui.set_initial_data(data)
+ ui.open()
+ ui.set_auto_update(1)
+ else
+ ui.push_data(data)
/obj/machinery/alarm/proc/shock(mob/user, prb)
if((stat & (NOPOWER))) // unpowered, no shock
@@ -247,326 +270,165 @@
return 1
-/obj/machinery/alarm/proc/return_text()
- var/dat = ""
- dat += "
[return_controls()]" - return dat - -/obj/machinery/alarm/proc/return_status() - var/turf/location = src.loc +/obj/machinery/alarm/proc/populate_status(var/list/data) + var/turf/location = get_turf(src) + if(!location) + return var/datum/gas_mixture/environment = location.return_air() var/total = environment.oxygen + environment.carbon_dioxide + environment.toxins + environment.nitrogen - var/output = "
-Oxygen: [oxygen_percent]%
-Carbon dioxide: [co2_percent]%
-Toxins: [plasma_percent]%
-"} - if (other_dangerlevel==2) - output += {"Notice: High Concentration of Unknown Particles Detected
"} - else if (other_dangerlevel==1) - output += {"Notice: Low Concentration of Unknown Particles Detected
"} - - output += {" -Temperature: [environment.temperature]K
-"} - - var/display_danger_level = max( - pressure_dangerlevel, - oxygen_dangerlevel, - co2_dangerlevel, - plasma_dangerlevel, - other_dangerlevel, - temperature_dangerlevel - ) - - //Overall status - output += {"Local Status: "} - if(display_danger_level == 2) - output += {"DANGER: Internals Required"} - else if(display_danger_level == 1) - output += {"Caution"} - else if (alarm_area.atmosalm) - output += {"Caution: Atmos alert in area"} - else - output += {"Optimal"} - - return output - -/obj/machinery/alarm/proc/return_safety() - var/output = "" - if(src.emagged) - output += "NOTICE: Safety measures nonfunctional. Device may exhibit abnormal behavior.
" - else - output += "Safety measures functioning properly.
" - return output - - -/obj/machinery/alarm/proc/return_controls() - var/output = ""//"[alarm_zone] Air [name]
" + cur_tlv = TLV["temperature"] + var/temperature_danger = cur_tlv.get_danger_level(environment.temperature) + environment_data += list(list("name" = "Temperature", "value" = environment.temperature, "unit" = "K ([round(environment.temperature - T0C, 0.1)]C)", "danger_level" = temperature_danger)) + data["environment_data"] = environment_data +/obj/machinery/alarm/proc/populate_controls(var/list/data) switch(screen) - if (AALARM_SCREEN_MAIN) - if(alarm_area.atmosalm) - output += {"Reset - Atmospheric Alarm
"} - else - output += {"Activate - Atmospheric Alarm
"} + if(AALARM_SCREEN_MAIN) + data["mode"] = mode + if(AALARM_SCREEN_VENT) + data["vents"] = list() + for(var/id_tag in alarm_area.air_vent_names) + var/long_name = alarm_area.air_vent_names[id_tag] + var/list/info = alarm_area.air_vent_info[id_tag] + if(!info) + continue + data["vents"] += list(list( + "id_tag" = id_tag, + "long_name" = sanitize(long_name), + "power" = info["power"], + "checks" = info["checks"], + "excheck" = info["checks"]&1, + "incheck" = info["checks"]&2, + "direction" = info["direction"], + "external" = info["external"] + )) + if(AALARM_SCREEN_SCRUB) + data["scrubbers"] = list() + for(var/id_tag in alarm_area.air_scrub_names) + var/long_name = alarm_area.air_scrub_names[id_tag] + var/list/info = alarm_area.air_scrub_info[id_tag] + if(!info) + continue + data["scrubbers"] += list(list( + "id_tag" = id_tag, + "long_name" = sanitize(long_name), + "power" = info["power"], + "scrubbing" = info["scrubbing"], + "panic" = info["panic"], + "filter_co2" = info["filter_co2"], + "filter_toxins" = info["filter_toxins"], + "filter_n2o" = info["filter_n2o"] + )) + if(AALARM_SCREEN_MODE) + data["mode"] = mode + data["modes"] = list() + data["modes"] += list(list("name" = "Filtering - Scrubs out contaminants", "mode" = AALARM_MODE_SCRUBBING, "selected" = mode == AALARM_MODE_SCRUBBING, "danger" = 0)) + data["modes"] += list(list("name" = "Draught - Siphons out air while replacing", "mode" = AALARM_MODE_VENTING, "selected" = mode == AALARM_MODE_VENTING, "danger" = 0)) + data["modes"] += list(list("name" = "Cycle - Siphons air before replacing", "mode" = AALARM_MODE_REPLACEMENT, "selected" = mode == AALARM_MODE_REPLACEMENT, "danger" = 1)) + data["modes"] += list(list("name" = "Panic - Siphons air out of the room", "mode" = AALARM_MODE_PANIC, "selected" = mode == AALARM_MODE_PANIC, "danger" = 1)) + data["modes"] += list(list("name" = "Off - Shuts off vents and scrubbers", "mode" = AALARM_MODE_OFF, "selected" = mode == AALARM_MODE_OFF, "danger" = 0)) + if (src.emagged) + data["modes"] += list(list("name" = "Flood - Shuts off scrubbers and opens vents", "mode" = AALARM_MODE_FLOOD, "selected" = mode == AALARM_MODE_FLOOD, "danger" = 1)) + if(AALARM_SCREEN_SENSORS) + var/datum/tlv/selected + var/list/thresholds = list() - output += {" -Scrubbers Control
-Vents Control
-Set Environmentals Mode
-Sensor Settings
-
-"} - if (mode==AALARM_MODE_PANIC) - output += "PANIC SYPHON ACTIVE
Turn syphoning off" - else - output += "ACTIVATE PANIC SYPHON IN AREA" - if (AALARM_SCREEN_VENT) - var/sensor_data = "" - if(alarm_area.air_vent_names.len) - for(var/id_tag in alarm_area.air_vent_names) - var/long_name = alarm_area.air_vent_names[id_tag] - var/list/data = alarm_area.air_vent_info[id_tag] - if(!data) - continue; - var/state = "" - - sensor_data += {" -
-Operating: -[data["power"]?"on":"off"] -
-Pressure checks: -external -internal -
-External pressure bound: -- -- -- -- -[data["external"]] -+ -+ -+ -+ -reset -
-"} - if (data["direction"] == "siphon") - sensor_data += {" -Direction: -siphoning -
-"} - sensor_data += {"
"} - else - sensor_data = "No vents connected.
" - output = {"<< Main Menu
[sensor_data]"} - if (AALARM_SCREEN_SCRUB) - var/sensor_data = "" - if(alarm_area.air_scrub_names.len) - for(var/id_tag in alarm_area.air_scrub_names) - var/long_name = alarm_area.air_scrub_names[id_tag] - var/list/data = alarm_area.air_scrub_info[id_tag] - if(!data) - continue; - var/state = "" - - sensor_data += {" -[long_name][state]
-Operating: -[data["power"]?"on":"off"]
-Type: -[data["scrubbing"]?"scrubbing":"syphoning"]
-"} - - if(data["scrubbing"]) - sensor_data += {" -Filtering: -Carbon Dioxide -[data["filter_co2"]?"on":"off"]; -Toxins -[data["filter_toxins"]?"on":"off"]; -Nitrous Oxide -[data["filter_n2o"]?"on":"off"] -
-"} - sensor_data += {" -Panic syphon: [data["panic"]?"PANIC SYPHON ACTIVATED":""] -Dea":"red'>A")]ctivate
-
-"} - else - sensor_data = "No scrubbers connected.
" - output = {"<< Main Menu
[sensor_data]"} - - if (AALARM_SCREEN_MODE) - output += {" -<< Main Menu
-Air machinery mode for the area:
-Alarm thresholds:
-Partial pressure for gases - -
-
"}
+ "other" = "Other")
+ for (var/g in gas_names)
+ thresholds += list(list("name" = gas_names[g], "settings" = list()))
+ selected = TLV[g]
+ thresholds[thresholds.len]["settings"] += list(list("env" = g, "val" = "min2", "selected" = selected.min2))
+ thresholds[thresholds.len]["settings"] += list(list("env" = g, "val" = "min1", "selected" = selected.min1))
+ thresholds[thresholds.len]["settings"] += list(list("env" = g, "val" = "max1", "selected" = selected.max1))
+ thresholds[thresholds.len]["settings"] += list(list("env" = g, "val" = "max2", "selected" = selected.max2))
- return output
+ selected = TLV["pressure"]
+ thresholds += list(list("name" = "Pressure", "settings" = list()))
+ thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "min2", "selected" = selected.min2))
+ thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "min1", "selected" = selected.min1))
+ thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "max1", "selected" = selected.max1))
+ thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "max2", "selected" = selected.max2))
+
+ selected = TLV["temperature"]
+ thresholds += list(list("name" = "Temperature", "settings" = list()))
+ thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "min2", "selected" = selected.min2))
+ thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "min1", "selected" = selected.min1))
+ thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max1", "selected" = selected.max1))
+ thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max2", "selected" = selected.max2))
+
+
+ data["thresholds"] = thresholds
/obj/machinery/alarm/Topic(href, href_list)
if(..())
return
usr.set_machine(src)
+ if (locked && !usr.has_unlimited_silicon_privilege)
+ return
+
if ( (get_dist(src, usr) > 1 ))
if (!istype(usr, /mob/living/silicon))
usr.unset_machine()
usr << browse(null, "window=air_alarm")
return
-
+ if(href_list["toggleaccess"])
+ if(usr.has_unlimited_silicon_privilege && !wires.IsIndexCut(AALARM_WIRE_IDSCAN))
+ locked = !locked
if(href_list["command"])
var/device_id = href_list["id_tag"]
switch(href_list["command"])
+ if("set_external_pressure")
+ var/input_pressure = input("What pressure you like the system to mantain?", "Pressure Controls") as num|null
+ if(isnum(input_pressure))
+ send_signal(device_id, list(href_list["command"] = input_pressure))
+ return 1
+
+ if("reset_external_pressure")
+ send_signal(device_id, list(href_list["command"] = ONE_ATMOSPHERE))
+ return 1
if(
"power",
"adjust_external_pressure",
- "set_external_pressure",
- "checks",
"co2_scrub",
"tox_scrub",
"n2o_scrub",
@@ -577,12 +439,18 @@ table tr:first-child th:first-child { border: none;}
spawn(3)
src.updateUsrDialog()
+ if ("excheck")
+ send_signal(device_id, list ("checks" = text2num(href_list["val"])^1))
+
+ if ("incheck")
+ send_signal(device_id, list ("checks" = text2num(href_list["val"])^2))
+
//if("adjust_threshold") //was a good idea but required very wide window
if("set_threshold")
var/env = href_list["env"]
var/varname = href_list["var"]
var/datum/tlv/tlv = TLV[env]
- var/newval = input("Enter [varname] for env", "Alarm triggers", tlv.vars[varname]) as num|null
+ var/newval = input("Enter [varname] for [env]", "Alarm triggers", tlv.vars[varname]) as num|null
if (isnull(newval) || ..() || (locked && !(usr.has_unlimited_silicon_privilege)))
return
@@ -804,7 +672,7 @@ table tr:first-child th:first-child { border: none;}
if(2)
if(istype(W, /obj/item/weapon/wirecutters) && panel_open && (wires.wires_status == 27 || wires.wires_status == 31)) //this checks for all wires to be cut, except the syphon wire which is optional.
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
- user << "You cut the final wires."
+ user << "You cut the final wires."
var/obj/item/stack/cable_coil/cable = new /obj/item/stack/cable_coil( src.loc )
cable.amount = 5
buildstage = 1
@@ -814,7 +682,7 @@ table tr:first-child th:first-child { border: none;}
if(istype(W, /obj/item/weapon/screwdriver)) // Opening that Air Alarm up.
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
panel_open = !panel_open
- user << "The wires have been [panel_open ? "exposed" : "unexposed"]"
+ user << "The wires have been [panel_open ? "exposed" : "unexposed"]."
update_icon()
return
@@ -822,19 +690,19 @@ table tr:first-child th:first-child { border: none;}
return src.attack_hand(user)
else if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card
if(stat & (NOPOWER|BROKEN))
- user << "It does nothing"
+ user << "It does nothing!"
else
if(src.allowed(usr) && !wires.IsIndexCut(AALARM_WIRE_IDSCAN))
locked = !locked
- user << "You [ locked ? "lock" : "unlock"] the Air Alarm interface."
+ user << "You [ locked ? "lock" : "unlock"] the air alarm interface."
src.updateUsrDialog()
else
- user << "Access denied."
+ user << "Access denied."
return
if(1)
if(istype(W, /obj/item/weapon/crowbar))
- user.visible_message("[user.name] removes the electronics from [src.name].",\
- "You start prying out the circuit.")
+ user.visible_message("[user.name] removes the electronics from [src.name].",\
+ "You start prying out the circuit...")
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
if (do_after(user, 20))
if (buildstage == 1)
@@ -848,10 +716,10 @@ table tr:first-child th:first-child { border: none;}
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/cable = W
if(cable.get_amount() < 5)
- user << "You need five lengths of cable to wire the fire alarm."
+ user << "You need five lengths of cable to wire the fire alarm!"
return
- user.visible_message("[user.name] wires the air alarm.", \
- "You start wiring the air alarm.")
+ user.visible_message("[user.name] wires the air alarm.", \
+ "You start wiring the air alarm...")
if (do_after(user, 20))
if (cable.get_amount() >= 5 && buildstage == 1)
cable.use(5)
@@ -867,7 +735,7 @@ table tr:first-child th:first-child { border: none;}
return
if(0)
if(istype(W, /obj/item/weapon/airalarm_electronics))
- user << "You insert the circuit!"
+ user << "You insert the circuit."
buildstage = 1
update_icon()
user.drop_item()
@@ -875,7 +743,7 @@ table tr:first-child th:first-child { border: none;}
return
if(istype(W, /obj/item/weapon/wrench))
- user << "You detach \the [src] from the wall!"
+ user << "You detach \the [src] from the wall."
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
new /obj/item/alarm_frame( user.loc )
qdel(src)
@@ -896,7 +764,7 @@ table tr:first-child th:first-child { border: none;}
/obj/machinery/alarm/emag_act(mob/user as mob)
if(!emagged)
src.emagged = 1
- user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.")
+ user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.")
playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1)
return
@@ -945,10 +813,10 @@ Code shamelessly copied from apc_frame
var/turf/loc = get_turf(usr)
var/area/A = loc.loc
if (!istype(loc, /turf/simulated/floor))
- usr << "Air Alarm cannot be placed on this spot."
+ usr << "Air Alarm cannot be placed on this spot!"
return
if (A.requires_power == 0 || A.name == "Space")
- usr << "Air Alarm cannot be placed in this area."
+ usr << "Air Alarm cannot be placed in this area!"
return
if(gotwallitem(loc, ndir))
@@ -1025,7 +893,7 @@ FIRE ALARM
/obj/machinery/firealarm/emag_act(mob/user as mob)
if(!emagged)
src.emagged = 1
- user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its thermal sensors.")
+ user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its thermal sensors.")
playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1)
return
@@ -1056,7 +924,7 @@ FIRE ALARM
if (istype(W, /obj/item/weapon/screwdriver) && buildstage == 2)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
panel_open = !panel_open
- user << "The wires have been [panel_open ? "exposed" : "unexposed"]"
+ user << "The wires have been [panel_open ? "exposed" : "unexposed"]."
update_icon()
return
@@ -1066,9 +934,9 @@ FIRE ALARM
if (istype(W, /obj/item/device/multitool))
src.detecting = !( src.detecting )
if (src.detecting)
- user.visible_message("[user] has reconnected [src]'s detecting unit!", "You have reconnected [src]'s detecting unit.")
+ user.visible_message("[user] has reconnected [src]'s detecting unit!", "You reconnect [src]'s detecting unit.")
else
- user.visible_message("[user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.")
+ user.visible_message("[user] has disconnected [src]'s detecting unit!", "You disconnect [src]'s detecting unit.")
else if (istype(W, /obj/item/weapon/wirecutters))
buildstage = 1
@@ -1076,7 +944,7 @@ FIRE ALARM
var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil()
coil.amount = 5
coil.loc = user.loc
- user << "You cut the wires from \the [src]"
+ user << "You cut the wires from \the [src]."
update_icon()
if(1)
if(istype(W, /obj/item/stack/cable_coil))
@@ -1088,32 +956,32 @@ FIRE ALARM
coil.use(5)
buildstage = 2
- user << "You wire \the [src]!"
+ user << "You wire \the [src]."
update_icon()
else if(istype(W, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
- user.visible_message("[user.name] removes the electronics from [src.name].", \
- "You start prying out the circuit.")
+ user.visible_message("[user.name] removes the electronics from [src.name].", \
+ "You start prying out the circuit...")
if(do_after(user, 20))
if(buildstage == 1)
if(stat & BROKEN)
- user << "You remove the destroyed circuit!"
+ user << "You remove the destroyed circuit."
else
- user << "You pry out the circuit!"
+ user << "You pry out the circuit."
new /obj/item/weapon/firealarm_electronics(user.loc)
buildstage = 0
update_icon()
if(0)
if(istype(W, /obj/item/weapon/firealarm_electronics))
- user << "You insert the circuit!"
+ user << "You insert the circuit."
qdel(W)
buildstage = 1
update_icon()
else if(istype(W, /obj/item/weapon/wrench))
- user.visible_message("[user] removes the fire alarm assembly from the wall!", \
- "You remove the fire alarm assembly from the wall!")
+ user.visible_message("[user] removes the fire alarm assembly from the wall.", \
+ "You remove the fire alarm assembly from the wall.")
var/obj/item/firealarm_frame/frame = new /obj/item/firealarm_frame()
frame.loc = user.loc
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index 46230274a91..87eb95b4f42 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -2,7 +2,7 @@
// AIR SENSOR (found in gaz tanks)
/////////////////////////////////////////////////////////////
-obj/machinery/air_sensor
+/obj/machinery/air_sensor
icon = 'icons/obj/stationobjs.dmi'
icon_state = "gsensor1"
name = "gas sensor"
@@ -26,10 +26,10 @@ obj/machinery/air_sensor
var/datum/radio_frequency/radio_connection
-obj/machinery/air_sensor/update_icon()
+/obj/machinery/air_sensor/update_icon()
icon_state = "gsensor[on]"
-obj/machinery/air_sensor/process()
+/obj/machinery/air_sensor/process_atmos()
if(on)
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -63,21 +63,21 @@ obj/machinery/air_sensor/process()
radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
-obj/machinery/air_sensor/proc/set_frequency(new_frequency)
+/obj/machinery/air_sensor/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
-obj/machinery/air_sensor/initialize()
+/obj/machinery/air_sensor/initialize()
set_frequency(frequency)
-obj/machinery/air_sensor/New()
+/obj/machinery/air_sensor/New()
..()
-
+ SSair.atmos_machinery += src
if(radio_controller)
set_frequency(frequency)
-obj/machinery/air_sensor/Destroy()
+/obj/machinery/air_sensor/Destroy()
if(radio_controller)
radio_controller.remove_object(src,frequency)
..()
@@ -86,7 +86,7 @@ obj/machinery/air_sensor/Destroy()
// GENERAL AIR CONTROL (a.k.a atmos computer)
/////////////////////////////////////////////////////////////
-obj/machinery/computer/general_air_control
+/obj/machinery/computer/general_air_control
icon = 'icons/obj/computer.dmi'
icon_state = "tank"
@@ -99,29 +99,29 @@ obj/machinery/computer/general_air_control
var/list/sensor_information = list()
var/datum/radio_frequency/radio_connection
-obj/machinery/computer/general_air_control/New()
+/obj/machinery/computer/general_air_control/New()
..()
if(radio_controller)
set_frequency(frequency)
-obj/machinery/computer/general_air_control/attack_hand(mob/user)
+/obj/machinery/computer/general_air_control/attack_hand(mob/user)
if(..(user))
return
interact(user) //UpdateDialog() is calling /interact each tick, not attack_hand()
-obj/machinery/computer/general_air_control/interact(mob/user)
+/obj/machinery/computer/general_air_control/interact(mob/user)
var/datum/browser/popup = new(user, "computer", name, 480, 490) //update the content every tick
popup.set_content(return_text())
popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
popup.open()
-obj/machinery/computer/general_air_control/process()
+/obj/machinery/computer/general_air_control/process()
if(..()) //if the computer is not broken or unpowered
src.updateDialog()
-obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal)
+/obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal)
if(!signal || signal.encryption) return
var/id_tag = signal.data["tag"]
@@ -129,7 +129,7 @@ obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal)
sensor_information[id_tag] = signal.data
-obj/machinery/computer/general_air_control/proc/return_text()
+/obj/machinery/computer/general_air_control/proc/return_text()
var/sensor_data
var/count = 0
if(sensors.len)
@@ -177,20 +177,20 @@ obj/machinery/computer/general_air_control/proc/return_text()
return output
-obj/machinery/computer/general_air_control/Destroy()
+/obj/machinery/computer/general_air_control/Destroy()
if(radio_controller)
radio_controller.remove_object(src, frequency)
..()
-obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency)
+/obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
-obj/machinery/computer/general_air_control/initialize()
+/obj/machinery/computer/general_air_control/initialize()
set_frequency(frequency)
-obj/machinery/computer/general_air_control/Topic(href, href_list)
+/obj/machinery/computer/general_air_control/Topic(href, href_list)
if(..())
return
@@ -209,7 +209,7 @@ obj/machinery/computer/general_air_control/Topic(href, href_list)
// LARGE TANK CONTROL
/////////////////////////////////////////////////////////////
-obj/machinery/computer/general_air_control/large_tank_control
+/obj/machinery/computer/general_air_control/large_tank_control
icon = 'icons/obj/computer.dmi'
icon_state = "tank"
@@ -223,7 +223,7 @@ obj/machinery/computer/general_air_control/large_tank_control
var/pressure_setting = ONE_ATMOSPHERE * 45
-obj/machinery/computer/general_air_control/large_tank_control/proc/reconnect(mob/user) //This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this
+/obj/machinery/computer/general_air_control/large_tank_control/proc/reconnect(mob/user) //This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this
var/list/IO = list()
var/datum/radio_frequency/air_freq = radio_controller.return_frequency(1443)
var/datum/radio_frequency/gas_freq = radio_controller.return_frequency(1441)
@@ -263,7 +263,7 @@ obj/machinery/computer/general_air_control/large_tank_control/proc/reconnect(mob
for(var/obj/machinery/atmospherics/unary/vent_pump/U in devices)
U.broadcast_status()
-obj/machinery/computer/general_air_control/large_tank_control/return_text()
+/obj/machinery/computer/general_air_control/large_tank_control/return_text()
var/output = "Reconnect
" if(sensors.len) //if recieving signals from nearby sensors... output += ..() //... get the data. @@ -296,7 +296,7 @@ Rate: [volume_rate] L/sec
"} return output -obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal) +/obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return var/id_tag = signal.data["tag"] @@ -308,7 +308,7 @@ obj/machinery/computer/general_air_control/large_tank_control/receive_signal(dat else ..(signal) -obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list) +/obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list) if(..()) return @@ -352,7 +352,7 @@ obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_l // FUEL INJECTION ///////////////////////////////////////////////////////////// -obj/machinery/computer/general_air_control/fuel_injection +/obj/machinery/computer/general_air_control/fuel_injection icon = 'icons/obj/computer.dmi' icon_state = "atmos" @@ -364,7 +364,7 @@ obj/machinery/computer/general_air_control/fuel_injection var/cutoff_temperature = 2000 var/on_temperature = 1200 -obj/machinery/computer/general_air_control/fuel_injection/process() +/obj/machinery/computer/general_air_control/fuel_injection/process() if(automation) if(!radio_connection) return 0 @@ -393,7 +393,7 @@ obj/machinery/computer/general_air_control/fuel_injection/process() ..() -obj/machinery/computer/general_air_control/fuel_injection/return_text() +/obj/machinery/computer/general_air_control/fuel_injection/return_text() var/output = ..() output += "Fuel Injection System
" @@ -415,7 +415,7 @@ Rate: [volume_rate] L/sec
"} return output -obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal) +/obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return var/id_tag = signal.data["tag"] @@ -425,7 +425,7 @@ obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/s else ..(signal) -obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list) +/obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list) if(..()) return diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 5450c05c626..1ee28a02cbf 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -18,6 +18,7 @@ var/release_log = "" var/update_flag = 0 + /obj/machinery/portable_atmospherics/canister/sleeping_agent name = "canister: \[N2O\]" icon_state = "redws" @@ -123,6 +124,7 @@ update_flag if (src.health <= 10) var/atom/location = src.loc location.assume_air(air_contents) + air_update_turf() src.destroyed = 1 playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) @@ -138,9 +140,9 @@ update_flag else return 1 -/obj/machinery/portable_atmospherics/canister/process() +/obj/machinery/portable_atmospherics/canister/process_atmos() if (destroyed) - return + return PROCESS_KILL ..() @@ -174,9 +176,9 @@ update_flag can_label = 1 else can_label = 0 - +/obj/machinery/portable_atmospherics/canister/process() src.updateDialog() - return + return ..() /obj/machinery/portable_atmospherics/canister/return_air() return air_contents @@ -245,7 +247,7 @@ update_flag transfer_moles = pressure_delta*thejetpack.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)//Actually transfer the gas var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) thejetpack.merge(removed) - user << "You pulse-pressurize your jetpack from the tank." + user << "You pulse-pressurize your jetpack from the tank." return ..() @@ -257,32 +259,34 @@ update_flag return src.attack_hand(user) /obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob) - return src.interact(user) + return src.ui_interact(user) -/obj/machinery/portable_atmospherics/canister/interact(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main") if (src.destroyed) return - user.set_machine(src) - var/holding_text - if(holding) - holding_text = {"
Tank Pressure: [holding.air_contents.return_pressure()] KPa
-Remove Tank
-"} - var/output_text = {"[name][can_label?" relabel":""]
-Pressure: [air_contents.return_pressure()] KPa
-Port Status: [(connected_port)?("Connected"):("Disconnected")] -[holding_text] -
-Release Valve: [valve_open?("Open"):("Closed")]
-Release Pressure: - - - - [release_pressure] + + + +
-
-Close
-"} + var/data = list() + data["name"] = src.name + data["canLabel"] = src.can_label ? 1 : 0 + data["portConnected"] = src.connected_port ? 1 : 0 + data["tankPressure"] = round(src.air_contents.return_pressure() ? src.air_contents.return_pressure() : 0) + data["releasePressure"] = round(src.release_pressure ? src.release_pressure : 0) + data["minReleasePressure"] = round(ONE_ATMOSPHERE/10) + data["maxReleasePressure"] = round(10*ONE_ATMOSPHERE) + data["valveOpen"] = src.valve_open ? 1 : 0 - user << browse("[src] [output_text]", "window=canister;size=600x300")
- onclose(user, "canister")
- return
+ data["hasHoldingTank"] = src.holding ? 1 : 0
+ if (holding)
+ data["holdingTank"] = list("name" = src.holding.name, "tankPressure" = round(src.holding.air_contents.return_pressure()))
+
+ var/datum/nanoui/ui = SSnano.get_open_ui(user, src, ui_key)
+ if (!ui)
+ ui = new /datum/nanoui(user, src, ui_key, "canister.tmpl", "Canister", 480, 400)
+ ui.set_initial_data(data)
+ ui.open()
+ ui.set_auto_update(1)
+ else
+ ui.push_data(data)
/obj/machinery/portable_atmospherics/canister/Topic(href, href_list)
diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm
index 64f7f4c35b4..d8ba823694b 100644
--- a/code/game/machinery/atmoalter/meter.dm
+++ b/code/game/machinery/atmoalter/meter.dm
@@ -14,6 +14,7 @@
/obj/machinery/meter/New()
..()
+ SSair.atmos_machinery += src
src.target = locate(/obj/machinery/atmospherics/pipe) in loc
return 1
@@ -21,7 +22,7 @@
if (!target)
src.target = locate(/obj/machinery/atmospherics/pipe) in loc
-/obj/machinery/meter/process()
+/obj/machinery/meter/process_atmos()
if(!target)
icon_state = "meterX"
return 0
@@ -92,8 +93,8 @@
if (do_after(user, 40))
user.visible_message( \
"[user] unfastens \the [src].", \
- "You have unfastened \the [src].", \
- "You hear ratchet.")
+ "You unfasten \the [src].", \
+ "You hear ratchet.")
new /obj/item/pipe_meter(src.loc)
qdel(src)
return
@@ -114,6 +115,7 @@
return 1
// TURF METER - REPORTS A TILE'S AIR CONTENTS
+// why are you yelling?
/obj/machinery/meter/turf/New()
..()
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index b2dac4a8317..25a2aa88a2d 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -10,25 +10,26 @@
var/destroyed = 0
var/maximum_pressure = 90*ONE_ATMOSPHERE
+ var/lastupdate = 0
/obj/machinery/portable_atmospherics/New()
..()
-
+ SSair.atmos_machinery += src
air_contents.volume = volume
air_contents.temperature = T20C
-
return 1
-/obj/machinery/portable_atmospherics/process()
- if(!connected_port) //only react when pipe_network will ont it do it for you
+/obj/machinery/portable_atmospherics/process_atmos()
+ if(!connected_port) //only react when pipe_network will not it do it for you
//Allow for reactions
air_contents.react()
else
update_icon()
-
+/obj/machinery/portable_atmospherics/process()
+ return
/obj/machinery/portable_atmospherics/Destroy()
- del(air_contents)
-
+ qdel(air_contents)
+ SSair.atmos_machinery -= src
..()
/obj/machinery/portable_atmospherics/update_icon()
diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm
index 2b128e89f67..5f5519fa105 100644
--- a/code/game/machinery/atmoalter/pump.dm
+++ b/code/game/machinery/atmoalter/pump.dm
@@ -43,7 +43,7 @@
..(severity)
-/obj/machinery/portable_atmospherics/pump/process()
+/obj/machinery/portable_atmospherics/pump/process_atmos()
..()
if(on)
var/datum/gas_mixture/environment
@@ -85,7 +85,8 @@
air_contents.merge(removed)
//src.update_icon()
-
+/obj/machinery/portable_atmospherics/pump/process()
+ ..()
src.updateDialog()
return
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index f264701ea04..52cd6e636db 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -38,7 +38,7 @@
name = "[name] (ID [id])"
attack_hand(var/mob/user as mob)
- usr << "You can't directly interact with this machine. Use the area atmos computer."
+ usr << "You can't directly interact with this machine! Use the area atmos computer."
update_icon()
src.overlays = 0
@@ -51,7 +51,7 @@
attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if(istype(W, /obj/item/weapon/wrench))
if(on)
- user << "Turn it off first!"
+ user << "Turn it off first!"
return
anchored = !anchored
@@ -67,7 +67,7 @@
attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if(istype(W, /obj/item/weapon/wrench))
- user << "The bolts are too tight for you to unscrew!"
+ user << "The bolts are too tight for you to unscrew!"
return
..()
@@ -89,7 +89,7 @@
return
-/obj/machinery/portable_atmospherics/scrubber/process()
+/obj/machinery/portable_atmospherics/scrubber/process_atmos()
..()
if(on)
@@ -139,10 +139,15 @@
environment.merge(removed)
else
loc.assume_air(removed)
- //src.update_icon()
+
+/obj/machinery/portable_atmospherics/scrubber/process_atmos()
+ ..()
src.updateDialog()
return
+
+
+
/obj/machinery/portable_atmospherics/scrubber/return_air()
return air_contents
diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm
index 1ce8af7c88c..26bd2cff6c1 100644
--- a/code/game/machinery/atmoalter/zvent.dm
+++ b/code/game/machinery/atmoalter/zvent.dm
@@ -9,7 +9,7 @@
var/on = 0
var/volume_rate = 800
-/obj/machinery/zvent/process()
+/obj/machinery/zvent/process_atmos()
//all this object does, is make its turf share air with the ones above and below it, if they have a vent too.
if (istype(loc,/turf/simulated)) //if we're not on a valid turf, forget it
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 2b82a9e7b1f..c5b55fe62af 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -118,13 +118,16 @@
return 1
if (src.m_amount + O.m_amt > max_m_amount)
- user << "The autolathe is full. Please remove metal from the autolathe in order to insert more."
+ user << "The autolathe is full. Please remove metal from the autolathe in order to insert more."
return 1
if (src.g_amount + O.g_amt > max_g_amount)
- user << "The autolathe is full. Please remove glass from the autolathe in order to insert more."
+ user << "The autolathe is full. Please remove glass from the autolathe in order to insert more."
return 1
- if (O.m_amt == 0 && O.g_amt == 0)
- user << "This object does not contain significant amounts of metal or glass, or cannot be accepted by the autolathe due to size or hazardous materials."
+ if (!O.m_amt && !O.g_amt)
+ user << "This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe."
+ return 1
+ if(!user.unEquip(O))
+ user << "\The [O] is stuck to you and cannot be placed into the autolathe."
return 1
var/amount = 1
@@ -143,14 +146,14 @@
stack.use(amount)
else
if(!user.unEquip(O))
- user << "/the [O] is stuck to your hand, you can't put it in \the [src]!"
+ user << "/the [O] is stuck to your hand, you can't put it in \the [src]!"
O.loc = src
icon_state = "autolathe"
busy = 1
use_power(max(1000, (m_amt+g_amt)*amount/10))
src.m_amount += m_amt * amount
src.g_amount += g_amt * amount
- user << "You insert [amount] sheet[amount>1 ? "s" : ""] to the autolathe."
+ user << "You insert [amount] sheet[amount>1 ? "s" : ""] to the autolathe."
if (O && O.loc == src)
qdel(O)
busy = 0
@@ -211,8 +214,27 @@
if(is_stack)
m_amount -= metal_cost*multiplier
g_amount -= glass_cost*multiplier
- var/obj/item/stack/S = new being_built.build_path(T)
- S.amount = multiplier
+
+ for(var/obj/item/stack/S in T)
+ if(multiplier <= 0)
+ break
+ if(S.amount >= S.max_amount)
+ continue
+ var/to_transfer = S.max_amount - S.amount
+ if(to_transfer < multiplier)
+ S.amount += to_transfer
+ multiplier -= to_transfer
+ S.update_icon()
+ continue
+ else
+ S.amount += multiplier
+ multiplier = 0
+ S.update_icon()
+ break
+ if(multiplier)
+ var/obj/item/stack/N = new being_built.build_path(T)
+ N.amount = multiplier
+ N.update_icon()
else
m_amount -= metal_cost/coeff
g_amount -= glass_cost/coeff
diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index 19883679181..8c6d3893202 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -46,16 +46,14 @@
var/turf/nearest_beacon_loc // the nearest beacon's location
var/beacon_freq = 1445 // navigation beacon frequency
- var/control_freq = 1447 // bot control frequency
-
- var/bot_filter // The radio filter the bot uses to identify itself on the network.
+ var/model = "" //The type of bot it is.
var/bot_type = 0 //The type of bot it is, for radio control.
#define SEC_BOT 1 // Secutritrons (Beepsky) and ED-209s
#define MULE_BOT 2 // MULEbots
- #define FLOOR_BOT 3 // Floorbots
- #define CLEAN_BOT 4 // Cleanbots
- #define MED_BOT 5 // Medibots
+ #define FLOOR_BOT 4 // Floorbots
+ #define CLEAN_BOT 8 // Cleanbots
+ #define MED_BOT 16 // Medibots
#define DEFAULT_SCAN_RANGE 7 //default view range for finding targets.
@@ -69,7 +67,7 @@
#define BOT_SUMMON 6 // summoned by PDA
#define BOT_CLEANING 7 // cleaning (cleanbots)
#define BOT_REPAIRING 8 // repairing hull breaches (floorbots)
- #define BOT_MOVING 9 // for clean/floor bots, when moving.
+ #define BOT_MOVING 9 // for clean/floor/med bots, when moving.
#define BOT_HEALING 10 // healing people (medbots)
#define BOT_RESPONDING 11 // responding to a call from the AI
#define BOT_LOADING 12 // loading/unloading
@@ -79,10 +77,18 @@
#define BOT_NAV 16 // computing navigation
#define BOT_WAIT_FOR_NAV 17 // waiting for nav computation
#define BOT_NO_ROUTE 18 // no destination beacon found (or no route)
- var/list/mode_name = list("In Pursuit","Preparing to Arrest","Arresting","Beginning Patrol","Patrolling","Summoned by PDA", \
- "Cleaning", "Repairing", "Proceeding to work site","Healing","Responding","Loading/Unloading","Navigating to Delivery Location","Navigating to Home", \
- "Waiting for clear path","Calculating navigation path","Pinging beacon network","Unable to reach destination")
- //This holds text for what the bot is mode doing, reported on the AI's bot control interface.
+ var/list/mode_name = list("In Pursuit","Preparing to Arrest", "Arresting", \
+ "Beginning Patrol", "Patrolling", "Summoned by PDA", \
+ "Cleaning", "Repairing", "Proceeding to work site", "Healing", \
+ "Proceeding to AI waypoint", "Loading/Unloading", "Navigating to Delivery Location", "Navigating to Home", \
+ "Waiting for clear path", "Calculating navigation path", "Pinging beacon network", "Unable to reach destination")
+ //This holds text for what the bot is mode doing, reported on the remote bot control interface.
+
+/obj/machinery/bot/proc/get_mode()
+ if(!mode)
+ return "Idle"
+ else
+ return mode_name[mode]
/obj/machinery/bot/proc/turn_on()
if(stat) return 0
@@ -98,25 +104,18 @@
/obj/machinery/bot/New()
..()
SSbot.processing += src //Global bot list
- SSbp.insertBot(src)
botcard = new /obj/item/weapon/card/id(src)
+//This access is so bots can be immediately set to patrol and leave Robotics, instead of having to be let out first.
+ botcard.access += access_robotics
set_custom_texts()
Radio = new /obj/item/device/radio(src)
Radio.listening = 0 //Makes bot radios transmit only so no one hears things while adjacent to one.
/obj/machinery/bot/Destroy()
- if(radio_controller)
- radio_controller.remove_object(src,beacon_freq)
- if(bot_filter)
- radio_controller.remove_object(src,control_freq)
+ qdel(Radio)
+ qdel(botcard)
..()
-/obj/machinery/bot/proc/add_to_beacons(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots.
- if(radio_controller)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
- if(bot_filter)
- radio_controller.add_object(src, control_freq, filter = bot_filter)
-
/obj/machinery/bot/proc/explode()
SSbot.processing -= src
@@ -130,7 +129,7 @@
if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again.
locked = 0
emagged = 1
- user << "You bypass [src]'s controls."
+ user << "You bypass [src]'s controls."
if(!locked && open) //Bot panel is unlocked by ID or emag, and the panel is screwed open. Ready for emagging.
emagged = 2
remote_disabled = 1 //Manually emagging the bot locks out the AI built in panel.
@@ -138,15 +137,15 @@
bot_reset()
turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP.
else //Bot is unlocked, but the maint panel has not been opened with a screwdriver yet.
- user << "You need to open maintenance panel first."
+ user << "You need to open maintenance panel first!"
/obj/machinery/bot/examine(mob/user)
..()
if (health < maxhealth)
if (health > maxhealth/3)
- user << "[src]'s parts look loose."
+ user << "[src]'s parts look loose."
else
- user << "[src]'s parts look very loose."
+ user << "[src]'s parts look very loose!"
else
user << "[src] is in pristine condition."
@@ -193,7 +192,7 @@
switch(href_list["operation"])
if("patrol")
auto_patrol = !auto_patrol
- mode = BOT_IDLE
+ bot_reset()
if("remote")
remote_disabled = !remote_disabled
if("hack")
@@ -250,17 +249,17 @@
user.changeNext_move(CLICK_CD_MELEE)
if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm")
if(health >= maxhealth)
- user << "[src] does not need a repair."
+ user << "[src] does not need a repair!"
return
if(!open)
- user << "Unable to repair with the maintenance panel closed."
+ user << "Unable to repair with the maintenance panel closed!"
return
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0, user))
health = min(maxhealth, health+10)
- user.visible_message("[user] repairs [src]!","You repair [src]!")
+ user.visible_message("[user] repairs [src]!","You repair [src].")
else
- user << "The welder must be on for this task."
+ user << "The welder must be on for this task!"
else
if(W.force) //if force is non-zero
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -288,6 +287,7 @@
s.start()
..()
healthcheck()
+ return 1
return
/obj/machinery/bot/blob_act()
@@ -371,21 +371,22 @@ Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1)
The proc would return a human next to the bot to be set to the patient var.
Pass the desired type path itself, declaring a temporary var beforehand is not required.
*/
-obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range = DEFAULT_SCAN_RANGE)
+/obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range = DEFAULT_SCAN_RANGE)
var/final_result
for (var/scan in view (scan_range, src) ) //Search for something in range!
if(!istype(scan, scan_type)) //Check that the thing we found is the type we want!
continue //If not, keep searching!
- if( !(scan in ignore_list) && (scan != old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness
- var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected.
- if( scan_result )
- final_result = scan_result
- else
- continue //The current element failed assessment, move on to the next.
+ if( (scan in ignore_list) || (scan == old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness
+ continue
+ var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected.
+ if( scan_result )
+ final_result = scan_result
+ else
+ continue //The current element failed assessment, move on to the next.
return final_result
//When the scan finds a target, run bot specific processing to select it for the next step. Empty by default.
-obj/machinery/bot/proc/process_scan(var/scan_target)
+/obj/machinery/bot/proc/process_scan(var/scan_target)
return scan_target
@@ -400,13 +401,18 @@ obj/machinery/bot/proc/process_scan(var/scan_target)
Movement proc for stepping a bot through a path generated through A-star.
Pass a positive integer as an argument to override a bot's default speed.
*/
-obj/machinery/bot/proc/bot_move(var/dest, var/move_speed)
+/obj/machinery/bot/proc/bot_move(var/dest, var/move_speed)
if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set.
path = list()
return 0
- if(get_turf(src) == get_turf(dest)) //We have arrived, no need to move again.
+ dest = get_turf(dest) //We must always compare turfs, so get the turf of the dest var if dest was originally something else.
+ var/turf/last_node = get_turf(path[path.len]) //This is the turf at the end of the path, it should be equal to dest.
+ if(get_turf(src) == dest) //We have arrived, no need to move again.
return 1
+ else if (dest != last_node) //The path should lead us to our given destination. If this is not true, we must stop.
+ path = list()
+ return 0
var/success
var/step_count = move_speed ? move_speed : speed //If a value is passed into move_speed, use that instead of the default speed var.
if(step_count >= 1 && tries < 4)
@@ -423,7 +429,7 @@ obj/machinery/bot/proc/bot_move(var/dest, var/move_speed)
return 1
-obj/machinery/bot/proc/bot_step(var/dest)
+/obj/machinery/bot/proc/bot_step(var/dest)
if(path && path.len > 1)
step_towards(src, path[1])
if(get_turf(src) == path[1]) //Successful move
@@ -449,7 +455,7 @@ obj/machinery/bot/proc/bot_step(var/dest)
var/datum/job/captain/All = new/datum/job/captain
all_access.access = All.get_access()
- path = get_path_to(src, waypoint, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 200, id=all_access)
+ path = get_path_to(src, waypoint, src, /turf/proc/Distance_cardinal, 0, 200, id=all_access)
calling_ai = caller //Link the AI to the bot!
ai_waypoint = waypoint
@@ -503,7 +509,7 @@ obj/machinery/bot/proc/bot_reset()
patrol_step()
return
-obj/machinery/bot/proc/start_patrol()
+/obj/machinery/bot/proc/start_patrol()
if(tries >= 4) //Bot is trapped, so stop trying to patrol.
auto_patrol = 0
@@ -520,12 +526,12 @@ obj/machinery/bot/proc/start_patrol()
spawn(0)
calc_path() // Find a route to it
if(path.len == 0)
- patrol_target = 0
+ patrol_target = null
return
mode = BOT_PATROL
else // no patrol target, so need a new one
- find_patrol_target()
speak("Engaging patrol mode.")
+ find_patrol_target()
tries++
return
@@ -534,8 +540,9 @@ obj/machinery/bot/proc/start_patrol()
/obj/machinery/bot/proc/patrol_step()
if(loc == patrol_target) // reached target
-
- at_patrol_target()
+ //Find the next beacon matching the target.
+ if(!get_next_patrol_target())
+ find_patrol_target() //If it fails, look for the nearest one instead.
return
else if(path.len > 0 && patrol_target) // valid path
@@ -558,7 +565,8 @@ obj/machinery/bot/proc/start_patrol()
spawn(2)
calc_path(next)
if(path.len == 0)
- find_patrol_target()
+ find_patrol_target() //Start looking for the next nearest beacon
+ tries++
else
blockcount = 0
tries = 0
@@ -572,171 +580,75 @@ obj/machinery/bot/proc/start_patrol()
return
-// finds a new patrol target
-/obj/machinery/bot/proc/find_patrol_target()
- send_status()
- if(awaiting_beacon) // awaiting beacon response
- awaiting_beacon++
- if(awaiting_beacon > 5) // wait 5 secs for beacon response
- find_nearest_beacon() // then go to nearest instead
- return
- if(next_destination)
- set_destination(next_destination)
- else
-
- find_nearest_beacon()
- return
-
-
// finds the nearest beacon to self
-// signals all beacons matching the patrol code
-/obj/machinery/bot/proc/find_nearest_beacon()
+/obj/machinery/bot/proc/find_patrol_target()
nearest_beacon = null
- new_destination = "__nearest__"
- post_signal(beacon_freq, "findbeacon", "patrol")
- awaiting_beacon = 1
- spawn(10)
- awaiting_beacon = 0
- if(nearest_beacon)
- set_destination(nearest_beacon)
- tries = 0
- else
- auto_patrol = 0
- mode = BOT_IDLE
- speak("Disengaging patrol mode.")
- send_status()
-
-
-/obj/machinery/bot/proc/at_patrol_target()
-
- find_patrol_target()
- return
-
-
-// sets the current destination
-// signals all beacons matching the patrol code
-// beacons will return a signal giving their locations
-/obj/machinery/bot/proc/set_destination(var/new_dest)
- new_destination = new_dest
- post_signal(beacon_freq, "findbeacon", "patrol")
- awaiting_beacon = 1
-
-
-// receive a radio signal
-// used for beacon reception
-
-/obj/machinery/bot/receive_signal(datum/signal/signal)
- //log_admin("DEBUG \[[// world.timeofday]\]: /obj/machinery/bot/receive_signal([signal.debug_print()])")
- if(!on)
- return
-/*
- if(!signal.data["beacon"])
-
- for(var/x in signal.data)
- world << "* [x] = [signal.data[x]]"
- */
-
- var/recv = signal.data["command"]
- // process all-bot input
-
- if(recv=="bot_status")
- send_status()
-
- // check to see if we are the commanded bot
- if(signal.data["active"] == src)
- if(emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands.
- return
- // process control input
- switch(recv)
- if("stop")
- bot_reset() //HOLD IT!!
- auto_patrol = 0
- return
-
- if("go")
- auto_patrol = 1
- return
-
- if("summon")
- bot_reset()
- var/list/user_access = signal.data["useraccess"]
- summon_target = signal.data["target"] //Location of the user
- if(user_access.len != 0)
- botcard.access = user_access + prev_access //Adds the user's access, if any.
- mode = BOT_SUMMON
- calc_summon_path()
- speak("Responding.", radio_frequency)
- return
-
- // receive response from beacon
- recv = signal.data["beacon"]
- var/valid = signal.data["patrol"]
- if(!recv || !valid)
- return
- if(recv == new_destination) // if the recvd beacon location matches the set destination
- // the we will navigate there
- destination = new_destination
- patrol_target = signal.source.loc
- next_destination = signal.data["next_patrol"]
- awaiting_beacon = 0
-
- // if looking for nearest beacon
- else if(new_destination == "__nearest__")
- var/dist = get_dist(src,signal.source.loc)
- if(nearest_beacon)
- // note we ignore the beacon we are located at
- if(dist>1 && dist 1)
- nearest_beacon = recv
- nearest_beacon_loc = signal.source.loc
- return
-
-
-// send a radio signal with a single data key/value pair
-/obj/machinery/bot/proc/post_signal(var/freq, var/key, var/value)
- post_signal_multiple(freq, list("[key]" = value) )
-
-// send a radio signal with multiple data key/values
-/obj/machinery/bot/proc/post_signal_multiple(var/freq, var/list/keyval)
- if(!z || z != 1) //Bot control will only work on station.
- return
- var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
-
- if(!frequency) return
-
- var/datum/signal/signal = new()
- signal.source = src
- signal.transmission_method = 1
-// for(var/key in keyval)
-// signal.data[key] = keyval[key]
- signal.data = keyval
-// world << "sent [key],[keyval[key]] on [freq]"
- if(signal.data["findbeacon"])
- frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- else if(signal.data["type"] == bot_type)
- frequency.post_signal(src, signal, filter = bot_filter)
+ new_destination = null
+ find_nearest_beacon()
+ if(nearest_beacon)
+ patrol_target = nearest_beacon_loc
+ destination = next_destination
else
- frequency.post_signal(src, signal)
+ auto_patrol = 0
+ mode = BOT_IDLE
+ speak("Disengaging patrol mode.")
-// signals bot status etc. to controller
-/obj/machinery/bot/proc/send_status()
- if(remote_disabled || emagged == 2)
- return
- var/list/kv = list(
- "type" = bot_type,
- "name" = name,
- "loca" = get_area(src), // area
- "mode" = mode
- )
- post_signal_multiple(control_freq, kv)
+/obj/machinery/bot/proc/get_next_patrol_target()
+ // search the beacon list for the next target in the list.
+ for(var/obj/machinery/navbeacon/NB in navbeacons)
+ if(NB.location == next_destination) //Does the Beacon location text match the destination?
+ destination = new_destination //We now know the name of where we want to go.
+ patrol_target = NB.loc //Get its location and set it as the target.
+ next_destination = NB.codes["next_patrol"] //Also get the name of the next beacon in line.
+ return 1
+
+/obj/machinery/bot/proc/find_nearest_beacon()
+ for(var/obj/machinery/navbeacon/NB in navbeacons)
+ var/dist = get_dist(src, NB)
+ if(nearest_beacon) //Loop though the beacon net to find the true closest beacon.
+ //Ignore the beacon if were are located on it.
+ if(dist>1 && dist 1) //Begin the search, save this one for comparison on the next loop.
+ nearest_beacon = NB.location
+ nearest_beacon_loc = NB.loc
+ patrol_target = nearest_beacon_loc
+ destination = nearest_beacon
+
+//PDA control. Some bots, especially MULEs, may have more parameters.
+/obj/machinery/bot/proc/bot_control(var/command, mob/user, var/turf/user_turf, var/list/user_access = list())
+ if(!on || emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands.
+ return 1 //ACCESS DENIED
+ // process control input
+ switch(command)
+ if("patroloff")
+ bot_reset() //HOLD IT!!
+ auto_patrol = 0
+ return
+
+ if("patrolon")
+ auto_patrol = 1
+ return
+
+ if("summon")
+ bot_reset()
+ summon_target = user_turf
+ if(user_access.len != 0)
+ botcard.access = user_access + prev_access //Adds the user's access, if any.
+ mode = BOT_SUMMON
+ speak("Responding.", radio_frequency)
+ calc_summon_path()
+ return
-obj/machinery/bot/proc/bot_summon()
+ return
+
+
+/obj/machinery/bot/proc/bot_summon()
// summoned to PDA
summon_step()
return
@@ -745,14 +657,15 @@ obj/machinery/bot/proc/bot_summon()
// given an optional turf to avoid
/obj/machinery/bot/proc/calc_path(var/turf/avoid)
check_bot_access()
- path = get_path_to(loc, patrol_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid)
+ path = get_path_to(loc, patrol_target, src, /turf/proc/Distance_cardinal, 0, 120, id=botcard, exclude=avoid)
/obj/machinery/bot/proc/calc_summon_path(var/turf/avoid)
check_bot_access()
- path = get_path_to(loc, summon_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 150, id=botcard, exclude=avoid)
- if(!path.len || tries >= 5) //Cannot reach target. Give up and announce the issue.
- speak("Summon command failed, destination unreachable.",radio_frequency)
- bot_reset()
+ spawn()
+ path = get_path_to(loc, summon_target, src, /turf/proc/Distance_cardinal, 0, 150, id=botcard, exclude=avoid)
+ if(!path.len || tries >= 5) //Cannot reach target. Give up and announce the issue.
+ speak("Summon command failed, destination unreachable.",radio_frequency)
+ bot_reset()
/obj/machinery/bot/proc/summon_step()
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index b9b28435749..f1dd0e405c3 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -27,7 +27,6 @@
var/blood = 1
var/list/target_types = list()
var/obj/effect/decal/cleanable/target
- var/obj/effect/decal/cleanable/oldtarget
var/max_targets = 50 //Maximum number of targets a cleanbot can ignore.
var/oldloc = null
req_one_access = list(access_janitor, access_robotics)
@@ -40,7 +39,7 @@
var/next_dest_loc
radio_frequency = SERV_FREQ //Service
bot_type = CLEAN_BOT
- bot_filter = RADIO_CLEANBOT
+ model = "Cleanbot"
/obj/machinery/bot/cleanbot/New()
..()
@@ -48,12 +47,9 @@
icon_state = "cleanbot[on]"
var/datum/job/janitor/J = new/datum/job/janitor
- botcard.access = J.get_access()
+ botcard.access += J.get_access()
prev_access = botcard.access
- spawn(5)
- add_to_beacons(bot_filter)
-
/obj/machinery/bot/cleanbot/turn_on()
..()
icon_state = "cleanbot[on]"
@@ -68,7 +64,6 @@
..()
ignore_list = list() //Allows the bot to clean targets it previously ignored due to being unreachable.
target = null
- oldtarget = null
oldloc = null
/obj/machinery/bot/cleanbot/set_custom_texts()
@@ -109,10 +104,6 @@ text("[on ? "On" : "Off"]"))
blood =!blood
get_targets()
updateUsrDialog()
- if("freq")
- var/freq = text2num(input("Select frequency for navigation beacons", "Frequency", num2text(beacon_freq / 10))) * 10
- if (freq > 0)
- beacon_freq = freq
updateUsrDialog()
/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user as mob, params)
@@ -163,26 +154,19 @@ text("[on ? "On" : "Off"]"))
visible_message("[src] makes an excited beeping booping sound!")
if(!target) //Search for cleanables it can see.
- target = scan(/obj/effect/decal/cleanable/, oldtarget)
- oldtarget = target
+ target = scan(/obj/effect/decal/cleanable/)
- if(!target)
- if(loc != oldloc)
- oldtarget = null
+ if(!target && auto_patrol) //Search for cleanables it can see.
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
- if(auto_patrol)
- if(mode == BOT_IDLE || mode == BOT_START_PATROL)
- start_patrol()
-
- if(mode == BOT_PATROL)
- bot_patrol()
-
- return
+ if(mode == BOT_PATROL)
+ bot_patrol()
if(target)
if(!path || path.len == 0) //No path, need a new one
//Try to produce a path to the target, and ignore airlocks to which it has access.
- path = get_path_to(loc, target.loc, /turf/proc/AdjacentTurfsWithAccess, /turf/proc/Distance, 0, 30, id=botcard)
+ path = get_path_to(loc, target.loc, src, /turf/proc/Distance, 0, 30, id=botcard)
if (!bot_move(target))
add_to_ignore(target)
target = null
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index 87f53d40a0c..b4ecddd72c7 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -35,7 +35,7 @@
var/shoot_sound = 'sound/weapons/Taser.ogg'
radio_frequency = SEC_FREQ
bot_type = SEC_BOT
- bot_filter = RADIO_SECBOT
+ model = "ED-209"
/obj/item/weapon/ed209_assembly
@@ -59,11 +59,9 @@
set_weapon() //giving it the right projectile and firing sound.
spawn(3)
var/datum/job/detective/J = new/datum/job/detective
- botcard.access = J.get_access()
+ botcard.access += J.get_access()
prev_access = botcard.access
-
- add_to_beacons(bot_filter)
if(lasercolor)
shot_delay = 6//Longer shot delay because JESUS CHRIST
check_records = 0//Don't actively target people set to arrest
@@ -270,7 +268,7 @@ Auto Patrol[]"},
var/area/location = get_area(src)
speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency)
target.visible_message("[src] has stunned [target]!",\
- "[src] has stunned [target]! ")
+ "[src] has stunned you!")
mode = BOT_PREP_ARREST
anchored = 1
@@ -300,7 +298,7 @@ Auto Patrol[]"},
mode = BOT_ARREST
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
target.visible_message("[src] is trying to put zipties on [target]!",\
- "[src] is trying to put zipties on [target]!")
+ "[src] is trying to put zipties on you!")
spawn(60)
if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing.
@@ -588,7 +586,7 @@ Auto Patrol[]"},
if(WT.remove_fuel(0,user))
build_step++
name = "shielded frame assembly"
- user << "You welded the vest to [src]."
+ user << "You weld the vest to [src]."
if(4)
switch(lasercolor)
if("b")
@@ -625,7 +623,7 @@ Auto Patrol[]"},
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = W
if (coil.get_amount() < 1)
- user << "You need one length of cable to wire the ED-209."
+ user << "You need one length of cable to wire the ED-209!"
return
user << "You start to wire [src]..."
if (do_after(user, 40))
@@ -662,7 +660,7 @@ Auto Patrol[]"},
if(istype(W, /obj/item/weapon/screwdriver))
playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
var/turf/T = get_turf(user)
- user << "Now attaching the gun to the frame..."
+ user << "You start attaching the gun to the frame..."
sleep(40)
if(get_turf(user) == T)
build_step++
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index 17ccdcc5830..cfb4f7e5aed 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -45,13 +45,12 @@
var/nagged = 0 //Prevents the Floorbot nagging more than once per refill.
var/max_targets = 50
var/turf/target
- var/turf/oldtarget
var/oldloc = null
req_one_access = list(access_construction, access_robotics)
var/targetdirection
radio_frequency = ENG_FREQ //Engineering channel
bot_type = FLOOR_BOT
- bot_filter = RADIO_FLOORBOT
+ model = "Floorbot"
var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details.
#define HULL_BREACH 1
#define BRIDGE_MODE 2
@@ -64,12 +63,9 @@
..()
updateicon()
var/datum/job/engineer/J = new/datum/job/engineer
- botcard.access = J.get_access()
+ botcard.access += J.get_access()
prev_access = botcard.access
- spawn(5)
- add_to_beacons(bot_filter)
-
/obj/machinery/bot/floorbot/turn_on()
. = ..()
updateicon()
@@ -83,7 +79,6 @@
/obj/machinery/bot/floorbot/bot_reset()
..()
target = null
- oldtarget = null
oldloc = null
ignore_list = list()
nagged = 0
@@ -145,7 +140,7 @@
nagged = 0
updateicon()
else
- user << "You need at least one floor tile to put into [src]"
+ user << "You need at least one floor tile to put into [src]!"
else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if(allowed(user) && !open && !emagged)
locked = !locked
@@ -209,11 +204,11 @@
if(amount <= 0 && !target) //Out of tiles! We must refill!
if(eattiles) //Configured to find and consume floortiles!
- target = scan(/obj/item/stack/tile/plasteel, oldtarget)
+ target = scan(/obj/item/stack/tile/plasteel)
process_type = null
if(!target && maketiles) //We did not manage to find any floor tiles! Scan for metal stacks and make our own!
- target = scan(/obj/item/stack/sheet/metal, oldtarget)
+ target = scan(/obj/item/stack/sheet/metal)
process_type = null
return
else
@@ -232,24 +227,24 @@
target = T
else //Find a space tile farther way!
- target = scan(/turf/space, oldtarget)
+ target = scan(/turf/space)
process_type = BRIDGE_MODE
if(!target)
process_type = HULL_BREACH //Ensures the floorbot does not try to "fix" space areas or shuttle docking zones.
- target = scan(/turf/space, oldtarget)
+ target = scan(/turf/space)
if(!target && replacetiles) //Finds a floor without a tile and gives it one.
process_type = REPLACE_TILE //The target must be the floor and not a tile. The floor must not already have a floortile.
- target = scan(/turf/simulated/floor, oldtarget)
+ target = scan(/turf/simulated/floor)
if(!target && fixfloors) //Repairs damaged floors and tiles.
process_type = FIX_TILE
- target = scan(/turf/simulated/floor, oldtarget)
+ target = scan(/turf/simulated/floor)
if(!target && emagged == 2) //We are emagged! Time to rip up the floors!
process_type = TILE_EMAG
- target = scan(/turf/simulated/floor, oldtarget)
+ target = scan(/turf/simulated/floor)
if(!target)
@@ -261,27 +256,20 @@
if(mode == BOT_PATROL)
bot_patrol()
- if(!target)
- if(loc != oldloc)
- oldtarget = null
- return
-
if(target)
if(path.len == 0)
if(!istype(target, /turf/))
var/turf/TL = get_turf(target)
- path = get_path_to(loc, TL, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
+ path = get_path_to(loc, TL, src, /turf/proc/Distance, 0, 30, id=botcard)
else
- path = get_path_to(loc, target, /turf/proc/AdjacentTurfsSpace, /turf/proc/Distance, 0, 30, id=botcard)
+ path = get_path_to(loc, target, src, /turf/proc/Distance, 0, 30, id=botcard)
if(!bot_move(target))
add_to_ignore(target)
- oldtarget = target
target = null
mode = BOT_IDLE
return
else if( !bot_move(target) )
- oldtarget = target
target = null
mode = BOT_IDLE
return
@@ -479,7 +467,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
..()
return
if(contents.len >= 1)
- user << "They won't fit in, as there is already stuff inside."
+ user << "They won't fit in, as there is already stuff inside!"
return
if(T.use(10))
if(user.s_active)
@@ -490,7 +478,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
user.unEquip(src, 1)
qdel(src)
else
- user << "You need 10 floor tiles to start building a floorbot."
+ user << "You need 10 floor tiles to start building a floorbot!"
return
/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob, params)
@@ -500,7 +488,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor()
B.created_name = created_name
user.put_in_hands(B)
- user << "You add the sensor to the toolbox and tiles!"
+ user << "You add the sensor to the toolbox and tiles."
user.unEquip(src, 1)
qdel(src)
@@ -520,7 +508,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
var/turf/T = get_turf(user.loc)
var/obj/machinery/bot/floorbot/A = new /obj/machinery/bot/floorbot(T)
A.name = created_name
- user << "You add the robot arm to the odd looking toolbox assembly! Boop beep!"
+ user << "You add the robot arm to the odd looking toolbox assembly. Boop beep!"
user.unEquip(src, 1)
qdel(src)
else if (istype(W, /obj/item/weapon/pen))
diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index 4445626eb5e..3040c71c68f 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -40,7 +40,7 @@
var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
var/shut_up = 0 //self explanatory :)
bot_type = MED_BOT
- bot_filter = RADIO_MEDBOT
+ model = "Medibot"
/obj/machinery/bot/medbot/mysterious
name = "\improper Mysterious Medibot"
@@ -98,13 +98,10 @@
if(skin)
overlays += image('icons/obj/aibots.dmi', "medskin_[skin]")
- if(isnull(botcard_access) || (botcard_access.len < 1))
- var/datum/job/doctor/J = new/datum/job/doctor
- botcard.access = J.get_access()
- else
- botcard.access = botcard_access
+ var/datum/job/doctor/J = new/datum/job/doctor
+ botcard.access += J.get_access()
prev_access = botcard.access
- add_to_beacons(bot_filter)
+
/obj/machinery/bot/medbot/turn_on()
. = ..()
@@ -124,6 +121,12 @@
last_found = world.time
declare_cooldown = 0
+/obj/machinery/bot/medbot/proc/soft_reset() //Allows the medibot to still actively perform its medical duties without being completely halted as a hard reset does.
+ path = list()
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
+
/obj/machinery/bot/medbot/set_custom_texts()
text_hack = "You corrupt [name]'s reagent processor circuits."
@@ -230,16 +233,16 @@
if(emagged)
user << "ERROR"
if(open)
- user << "Please close the access panel before locking it."
+ user << "Please close the access panel before locking it!"
else
user << "Access denied."
else if (istype(W, /obj/item/weapon/reagent_containers/glass))
if(locked)
- user << "You cannot insert a beaker because the panel is locked."
+ user << "You cannot insert a beaker because the panel is locked!"
return
if(!isnull(reagent_glass))
- user << "There is already a beaker loaded."
+ user << "There is already a beaker loaded!"
return
user.drop_item()
@@ -260,7 +263,7 @@
if(emagged == 2)
declare_crit = 0
if(user)
- user << "You short out [src]'s reagent synthesis circuits."
+ user << "You short out [src]'s reagent synthesis circuits."
spawn(0)
audible_message("[src] buzzes oddly!")
flick("medibot_spark", src)
@@ -271,7 +274,7 @@
if (H.stat == 2)
return
- if ((H == oldpatient) && (world.time < last_found + 100))
+ if ((H == oldpatient) && (world.time < last_found + 200))
return
if(assess_patient(H))
@@ -306,10 +309,7 @@
if(frustration > 8)
oldpatient = patient
- patient = null
- mode = BOT_IDLE
- last_found = world.time
- path = list()
+ soft_reset()
if(!patient)
if(!shut_up && prob(1))
@@ -334,21 +334,19 @@
last_found = world.time
else if(stationary_mode && patient) //Since we cannot move in this mode, ignore the patient and wait for another.
- patient = null
- mode = BOT_IDLE
- last_found = world.time
+ soft_reset()
return
if(patient && path.len == 0 && (get_dist(src,patient) > 1))
- spawn(0)
- path = get_path_to(loc, get_turf(patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 30,id=botcard)
+ path = get_path_to(loc, get_turf(patient), src, /turf/proc/Distance_cardinal, 0, 30,id=botcard)
+ mode = BOT_MOVING
+ if(!path.len) //Do not chase a patient we cannot reach.
+ soft_reset()
if(path.len > 0 && patient)
if(!bot_move(patient))
oldpatient = patient
- patient = null
- mode = BOT_IDLE
- last_found = world.time
+ soft_reset()
return
if(path.len > 8 && patient)
@@ -483,7 +481,7 @@
return
else
C.visible_message("[src] is trying to inject [patient]!", \
- "[src] is trying to inject [patient]!")
+ "[src] is trying to inject you!")
spawn(30)
if ((get_dist(src, patient) <= 1) && (on))
@@ -493,8 +491,8 @@
reagent_glass.reagents.reaction(patient, INGEST)
else
patient.reagents.add_reagent(reagent_id,injection_amount)
- C.visible_message("[src] injects [patient] with the syringe!", \
- "[src] injects [patient] with the syringe!")
+ C.visible_message("[src] injects [patient] with its syringe!", \
+ "[src] injects you with its syringe!")
patient = null
mode = BOT_IDLE
@@ -554,7 +552,7 @@
//Making a medibot!
if(contents.len >= 1)
- user << "You need to empty [src] out first."
+ user << "You need to empty [src] out first!"
return
var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly
@@ -599,7 +597,7 @@
user.drop_item()
qdel(W)
build_step++
- user << "You complete the Medibot! Beep boop."
+ user << "You complete the Medibot. Beep boop!"
var/turf/T = get_turf(src)
var/obj/machinery/bot/medbot/S = new /obj/machinery/bot/medbot(T)
S.skin = skin
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
index c810c626fbe..843cd92cc57 100644
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -19,11 +19,8 @@ var/global/mulebot_count = 0
fire_dam_coeff = 0.7
brute_dam_coeff = 0.5
var/atom/movable/load = null // the loaded crate (usually)
- var/list/delivery_beacons = list() //List of beacons that serve as delivery locations.
- beacon_freq = 1400
- control_freq = 1447
bot_type = MULE_BOT
- bot_filter = RADIO_MULEBOT
+ model = "MULE"
blood_DNA = list()
suffix = ""
@@ -71,8 +68,6 @@ var/global/mulebot_count = 0
cell.maxcharge = 2000
spawn(5) // must wait for map loading to finish
- add_to_beacons(bot_filter)
-
mulebot_count += 1
if(!suffix)
suffix = "#[mulebot_count]"
@@ -101,7 +96,7 @@ obj/machinery/bot/mulebot/bot_reset()
updateDialog()
else if(istype(I,/obj/item/weapon/screwdriver))
if(locked)
- user << "The maintenance hatch cannot be opened or closed while the controls are locked."
+ user << "The maintenance hatch cannot be opened or closed while the controls are locked!"
return
open = !open
@@ -118,8 +113,8 @@ obj/machinery/bot/mulebot/bot_reset()
if (health < maxhealth)
health = min(maxhealth, health+25)
user.visible_message(
- "[user] repairs [src]!",
- "You repair [src]!"
+ "[user] repairs [src]!",
+ "You repair [src]."
)
else
user << " [src] does not need a repair!"
@@ -131,7 +126,7 @@ obj/machinery/bot/mulebot/bot_reset()
unload(0)
user.visible_message(" [user] knocks [load] off [src] with \the [I]!", " You knock [load] off [src] with \the [I]!")
else
- user << "You hit [src] with \the [I] but to no effect."
+ user << "You hit [src] with \the [I] but to no effect!"
else
..()
return
@@ -154,13 +149,13 @@ obj/machinery/bot/mulebot/bot_reset()
wires.RandomCut()
return
-/obj/machinery/bot/mulebot/bullet_act()
- if(prob(50) && !isnull(load))
- unload(0)
- if(prob(25))
- visible_message(" Something shorts out inside [src]!")
- wires.RandomCut()
- ..()
+/obj/machinery/bot/mulebot/bullet_act(var/obj/item/projectile/Proj)
+ if(..())
+ if(prob(50) && !isnull(load))
+ unload(0)
+ if(prob(25))
+ visible_message(" Something shorts out inside [src]!")
+ wires.RandomCut()
/obj/machinery/bot/mulebot/attack_ai(var/mob/user)
@@ -221,6 +216,7 @@ obj/machinery/bot/mulebot/bot_reset()
dat += "Toggle Auto Return Home ([auto_return ? "On":"Off"])
" dat += "Toggle Auto Pickup Crate ([auto_pickup ? "On":"Off"])
" dat += "Toggle Delivery Reporting ([report_delivery ? "On" : "Off"])
" + dat += "Toggle Interface Refreshing ([refresh ? "On" : "Off"])
" if(load) dat += "Unload Now
" @@ -241,7 +237,7 @@ obj/machinery/bot/mulebot/bot_reset() //user << browse("M.U.L.E. Mk. III [suffix ? "([suffix])" : ""] [dat]", "window=mulebot;size=350x500")
//onclose(user, "mulebot")
- var/datum/browser/popup = new(user, "mulebot", "M.U.L.E. Mk. V [suffix ? "([suffix])" : ""]", 350, 550)
+ var/datum/browser/popup = new(user, "mulebot", "M.U.L.E. Mk. V [suffix ? "([suffix])" : ""]", 350, 600)
popup.set_content(dat)
popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
popup.open()
@@ -261,6 +257,7 @@ obj/machinery/bot/mulebot/bot_reset()
usr.set_machine(src)
switch(href_list["op"])
+
if("lock", "unlock")
toggle_lock(usr)
@@ -269,7 +266,7 @@ obj/machinery/bot/mulebot/bot_reset()
turn_off()
else if (cell && !open)
if (!turn_on())
- usr << "You can't switch on [src]."
+ usr << "You can't switch on [src]!"
return
else
return
@@ -284,7 +281,7 @@ obj/machinery/bot/mulebot/bot_reset()
cell.add_fingerprint(usr)
cell = null
- usr.visible_message("[usr] removes the power cell from [src].", "You remove the power cell from [src].")
+ usr.visible_message("[usr] removes the power cell from [src].", "You remove the power cell from [src].")
updateDialog()
if("cellinsert")
@@ -296,70 +293,12 @@ obj/machinery/bot/mulebot/bot_reset()
C.loc = src
C.add_fingerprint(usr)
- usr.visible_message("[usr] inserts a power cell into [src].", "You insert the power cell into [src].")
+ usr.visible_message("[usr] inserts a power cell into [src].", "You insert the power cell into [src].")
updateDialog()
+ else
+ bot_control(href_list["op"], usr)
- if("stop")
- if(mode >= BOT_DELIVER)
- bot_reset()
- updateDialog()
-
- if("go")
- if(mode == BOT_IDLE)
- start()
- updateDialog()
-
- if("home")
- if(mode == BOT_IDLE || mode == BOT_DELIVER)
- start_home()
- updateDialog()
-
- if("destination")
- refresh=0
- var/new_dest = input("Select M.U.L.E. Destination", "Mulebot [suffix ? "([suffix])" : ""]", destination) as null|anything in delivery_beacons
- refresh=1
- if(new_dest)
- set_destination(new_dest)
-
-
- if("setid")
- refresh=0
- var/new_id = stripped_input(usr, "Enter new bot ID", "Mulebot [suffix ? "([suffix])" : ""]", suffix, MAX_NAME_LEN)
- refresh=1
- if(new_id)
- suffix = new_id
- name = "\improper Mulebot ([suffix])"
- updateDialog()
-
- if("sethome")
- refresh=0
- var/new_home = stripped_input(usr, "Enter new home tag", "Mulebot [suffix ? "([suffix])" : ""]", home_destination)
- refresh=1
- if(new_home)
- home_destination = new_home
- updateDialog()
-
- if("unload")
- if(load && mode !=1)
- if(loc == target)
- unload(loaddir)
- else
- unload(0)
-
- if("autoret")
- auto_return = !auto_return
-
- if("autopick")
- auto_pickup = !auto_pickup
-
- if("report")
- report_delivery = !report_delivery
-
- if("close")
- usr.unset_machine()
- usr << browse(null,"window=mulebot")
-
updateDialog()
//updateUsrDialog()
else
@@ -367,6 +306,77 @@ obj/machinery/bot/mulebot/bot_reset()
usr.unset_machine()
return
+/obj/machinery/bot/mulebot/bot_control(var/command, mob/user, pda= 0)
+ if(pda && !wires.RemoteRX()) //MULE wireless is controlled by wires.
+ return
+
+ switch(command)
+
+ if("autorefresh")
+ refresh = !refresh
+ updateDialog()
+
+ if("stop")
+ if(mode >= BOT_DELIVER)
+ bot_reset()
+ updateDialog()
+
+ if("go")
+ if(mode == BOT_IDLE)
+ start()
+ updateDialog()
+
+ if("home")
+ if(mode == BOT_IDLE || mode == BOT_DELIVER)
+ start_home()
+ updateDialog()
+
+ if("destination")
+ refresh=0
+ var/new_dest = input(user, "Select M.U.L.E. Destination", "Mulebot [suffix ? "([suffix])" : ""]", destination) as null|anything in deliverybeacontags
+ refresh=1
+ if(new_dest)
+ set_destination(new_dest)
+
+
+ if("setid")
+ refresh=0
+ var/new_id = stripped_input(user, "Enter new bot ID", "Mulebot [suffix ? "([suffix])" : ""]", suffix, MAX_NAME_LEN)
+ refresh=1
+ if(new_id)
+ suffix = new_id
+ name = "\improper Mulebot ([suffix])"
+ updateDialog()
+
+ if("sethome")
+ refresh=0
+ var/new_home = stripped_input(user, "Enter new home tag", "Mulebot [suffix ? "([suffix])" : ""]", home_destination)
+ refresh=1
+ if(new_home)
+ home_destination = new_home
+ updateDialog()
+
+ if("unload")
+ if(load && mode !=1)
+ if(loc == target)
+ unload(loaddir)
+ else
+ unload(0)
+
+ if("autoret")
+ auto_return = !auto_return
+
+ if("autopick")
+ auto_pickup = !auto_pickup
+
+ if("report")
+ report_delivery = !report_delivery
+
+ if("close")
+ usr.unset_machine()
+ usr << browse(null,"window=mulebot")
+
+
// returns true if the bot has power
@@ -402,7 +412,7 @@ obj/machinery/bot/mulebot/bot_reset()
// called to load a crate
/obj/machinery/bot/mulebot/proc/load(var/atom/movable/C)
if(wires.LoadCheck() && !istype(C,/obj/structure/closet/crate))
- visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
return // if not emagged, only allow crates to be loaded
@@ -441,7 +451,6 @@ obj/machinery/bot/mulebot/bot_reset()
M.client.eye = src
mode = BOT_IDLE
- send_status()
// called to unload the bot
// argument is optional direction to unload
@@ -578,9 +587,6 @@ obj/machinery/bot/mulebot/bot_reset()
path -= loc
- if(mode == BOT_BLOCKED)
- spawn(1)
- send_status()
if(destination == home_destination)
mode = BOT_GO_HOME
@@ -596,25 +602,25 @@ obj/machinery/bot/mulebot/bot_reset()
blockcount++
mode = BOT_BLOCKED
if(blockcount == 3)
- visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
if(blockcount > 10) // attempt 10 times before recomputing
// find new path excluding blocked turf
- visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
spawn(2)
calc_path(next)
if(path.len > 0)
- visible_message("[src] makes a delighted ping!", "You hear a ping.")
+ visible_message("[src] makes a delighted ping!", "You hear a ping.")
playsound(loc, 'sound/machines/ping.ogg', 50, 0)
mode = BOT_BLOCKED
mode = BOT_WAIT_FOR_NAV
return
return
else
- visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
//world << "Bad turf."
mode = BOT_NAV
@@ -634,11 +640,11 @@ obj/machinery/bot/mulebot/bot_reset()
if(path.len > 0)
blockcount = 0
mode = BOT_BLOCKED
- visible_message("[src] makes a delighted ping!", "You hear a ping.")
+ visible_message("[src] makes a delighted ping!", "You hear a ping.")
playsound(loc, 'sound/machines/ping.ogg', 50, 0)
else
- visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
mode = BOT_NO_ROUTE
@@ -653,17 +659,16 @@ obj/machinery/bot/mulebot/bot_reset()
// calculates a path to the current destination
// given an optional turf to avoid
/obj/machinery/bot/mulebot/calc_path(var/turf/avoid = null)
- path = get_path_to(loc, target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 250, id=botcard, exclude=avoid)
+ path = get_path_to(loc, target, src, /turf/proc/Distance_cardinal, 0, 250, id=botcard, exclude=avoid)
// sets the current destination
// signals all beacons matching the delivery code
// beacons will return a signal giving their locations
-/obj/machinery/bot/mulebot/set_destination(var/new_dest)
- spawn(0)
- new_destination = new_dest
- post_signal(beacon_freq, "findbeacon", "delivery")
- updateDialog()
+/obj/machinery/bot/mulebot/proc/set_destination(var/new_dest)
+ new_destination = new_dest
+ get_nav()
+ updateDialog()
// starts bot moving to current destination
/obj/machinery/bot/mulebot/proc/start()
@@ -672,6 +677,7 @@ obj/machinery/bot/mulebot/bot_reset()
else
mode = BOT_DELIVER
icon_state = "mulebot[(wires.MobAvoid() != 0)]"
+ get_nav()
// starts bot moving to home
// sends a beacon query to find
@@ -685,7 +691,7 @@ obj/machinery/bot/mulebot/bot_reset()
/obj/machinery/bot/mulebot/proc/at_target()
if(!reached_target)
radio_frequency = SUPP_FREQ //Supply channel
- visible_message("[src] makes a chiming sound!", "You hear a chime.")
+ visible_message("[src] makes a chiming sound!", "You hear a chime.")
playsound(loc, 'sound/machines/chime.ogg', 50, 0)
reached_target = 1
@@ -698,7 +704,8 @@ obj/machinery/bot/mulebot/bot_reset()
radio_frequency = AIPRIV_FREQ //Report on AI Private instead if the AI is controlling us.
if(load) // if loaded, unload at target
- speak("Destination [destination] reached. Unloading [load].",radio_frequency)
+ if(report_delivery)
+ speak("Destination [destination] reached. Unloading [load].",radio_frequency)
unload(loaddir)
else
// not loaded
@@ -724,8 +731,6 @@ obj/machinery/bot/mulebot/bot_reset()
else
bot_reset() // otherwise go idle
- send_status() // report status to anyone listening
-
return
// called when bot bumps into anything
@@ -774,73 +779,19 @@ obj/machinery/bot/mulebot/bot_reset()
unload(0)
return
-// receive a radio signal
-// used for control and beacon reception
-/obj/machinery/bot/mulebot/receive_signal(datum/signal/signal)
-
- if(!on)
+//Update navigation data. Called when commanded to deliver, return home, or a route update is needed...
+/obj/machinery/bot/mulebot/proc/get_nav()
+//Formerly the beacon reception proc, except that it is no longer a potential lag bomb called TEN TIMES A SECOND OR MORE in some cases!
+ if(!on || !wires.BeaconRX())
return
- /*
- world << "rec signal: [signal.source]"
- for(var/x in signal.data)
- world << "* [x] = [signal.data[x]]"
- */
- var/recv = signal.data["command"]
- // process all-bot input
- if(recv=="bot_status" && wires.RemoteRX())
- send_status()
-
-
- recv = signal.data["command [suffix]"]
- if(wires.RemoteRX())
- // process control input
- switch(recv)
- if("stop")
- bot_reset()
- return
-
- if("go")
- start()
- return
-
- if("target")
- set_destination(signal.data["destination"] )
- return
-
- if("unload")
- if(loc == target)
- unload(loaddir)
- else
- unload(0)
- return
-
- if("home")
- start_home()
- return
-
- if("bot_status")
- send_status()
- return
-
- if("autoret")
- auto_return = text2num(signal.data["value"])
- return
-
- if("autopick")
- auto_pickup = text2num(signal.data["value"])
- return
-
- // receive response from beacon
- recv = signal.data["beacon"]
-
- if(wires.BeaconRX())
- if(recv == new_destination) // if the recvd beacon location matches the set destination
+ for(var/obj/machinery/navbeacon/NB in deliverybeacons)
+ if(NB.location == new_destination) // if the beacon location matches the set destination
// the we will navigate there
destination = new_destination
- target = signal.source.loc
- var/direction = signal.data["dir"] // this will be the load/unload dir
+ target = NB.loc
+ var/direction = NB.dir // this will be the load/unload dir
if(direction)
loaddir = text2num(direction)
else
@@ -850,60 +801,6 @@ obj/machinery/bot/mulebot/bot_reset()
calc_path()
updateDialog()
- //Detects and stores current active delivery beacons.
- if(signal.data["beacon"])
- if(!delivery_beacons)
- delivery_beacons = new()
- delivery_beacons[signal.data["beacon"] ] = signal.source
-
-// send a radio signal with a single data key/value pair
-/obj/machinery/bot/mulebot/post_signal(var/freq, var/key, var/value)
- post_signal_multiple(freq, list("[key]" = value) )
-
-// send a radio signal with multiple data key/values
-/obj/machinery/bot/mulebot/post_signal_multiple(var/freq, var/list/keyval)
-
- if(freq == beacon_freq && !(wires.BeaconRX()))
- return
- if(freq == control_freq && !(wires.RemoteTX()))
- return
-
- var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
-
- if(!frequency) return
-
-
-
- var/datum/signal/signal = new()
- signal.source = src
- signal.transmission_method = 1
- //for(var/key in keyval)
- // signal.data[key] = keyval[key]
- signal.data = keyval
- //world << "sent [key],[keyval[key]] on [freq]"
- if (signal.data["findbeacon"])
- frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
- else if (signal.data["type"] == MULE_BOT)
- frequency.post_signal(src, signal, filter = RADIO_MULEBOT)
- else
- frequency.post_signal(src, signal)
-
-// signals bot status etc. to controller
-/obj/machinery/bot/mulebot/send_status()
- var/list/kv = list(
- "type" = MULE_BOT,
- "name" = suffix,
- "loca" = get_area(src),
- "mode" = mode,
- "powr" = (cell ? cell.percent() : 0),
- "dest" = destination,
- "home" = home_destination,
- "load" = load,
- "retn" = auto_return,
- "pick" = auto_pickup,
- )
- post_signal_multiple(control_freq, kv)
-
/obj/machinery/bot/mulebot/emp_act(severity)
if (cell)
cell.emp_act(severity)
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index 0596bbe5b5e..d45db2442fe 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -25,7 +25,7 @@
var/arrest_type = 0 //If true, don't handcuff
radio_frequency = SEC_FREQ //Security channel
bot_type = SEC_BOT
- bot_filter = RADIO_SECBOT
+ model = "Securitron"
/obj/machinery/bot/secbot/beepsky
name = "Officer Beep O'sky"
@@ -56,9 +56,8 @@
spawn(3)
var/datum/job/detective/J = new/datum/job/detective
- botcard.access = J.get_access()
+ botcard.access += J.get_access()
prev_access = botcard.access
- add_to_beacons(bot_filter)
/obj/machinery/bot/secbot/turn_on()
@@ -232,7 +231,7 @@ Auto Patrol: []"},
var/area/location = get_area(src)
speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag [target] in [location].", radio_frequency)
target.visible_message("[src] has stunned [target]!",\
- "[src] has stunned [target]!")
+ "[src] has stunned you!")
mode = BOT_PREP_ARREST
anchored = 1
@@ -262,7 +261,7 @@ Auto Patrol: []"},
mode = BOT_ARREST
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
target.visible_message("[src] is trying to put zipties on [target]!",\
- "[src] is trying to put zipties on [target]!")
+ "[src] is trying to put zipties on you!")
spawn(60)
if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing.
return
@@ -397,10 +396,10 @@ Auto Patrol: []"},
return
if(!helmetCam) //I am so sorry for this. I could not think of a less terrible (and lazy) way.
- user << "[src] needs to have a camera attached first."
+ user << "[src] needs to have a camera attached first!"
return
if(F) //Has a flashlight. Player must remove it, else it will be lost forever.
- user << "The mounted flashlight is in the way, remove it first."
+ user << "The mounted flashlight is in the way, remove it first!"
return
if(S.secured)
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index f93b7f48696..ca4b9fdd034 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -133,7 +133,7 @@
//user << "You start to [panel_open ? "close" : "open"] the camera's panel."
//if(toggle_panel(user)) // No delay because no one likes screwdrivers trying to be hip and have a duration cooldown
panel_open = !panel_open
- user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!",
+ user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!",
"You screw the camera's panel [panel_open ? "open" : "closed"].")
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
@@ -142,7 +142,7 @@
else if(istype(W, /obj/item/weapon/weldingtool) && wires.CanDeconstruct())
if(weld(W, user))
- user << "You unweld the camera leaving it as just a frame screwed to the wall."
+ user << "You unweld the camera leaving it as just a frame screwed to the wall."
if(!assembly)
assembly = new()
assembly.loc = src.loc
@@ -191,13 +191,15 @@
P = W
itemname = P.name
info = P.notehtml
- U << "You hold \the [itemname] up to the camera ..."
+ U << "You hold \the [itemname] up to the camera..."
U.changeNext_move(CLICK_CD_MELEE)
for(var/mob/O in player_list)
if(istype(O, /mob/living/silicon/ai))
var/mob/living/silicon/ai/AI = O
- if(U.name == "Unknown") AI << "[U] holds \a [itemname] up to one of your cameras ..."
- else AI << "[U] holds \a [itemname] up to one of your cameras ..."
+ if(U.name == "Unknown")
+ AI << "[U] holds \a [itemname] up to one of your cameras ..."
+ else
+ AI << "[U] holds \a [itemname] up to one of your cameras ..."
AI.last_paper_seen = "[itemname] [info]"
else if (O.client && O.client.eye == src)
O << "[U] holds \a [itemname] up to one of the cameras ..."
@@ -321,7 +323,7 @@
if(!WT.remove_fuel(0, user))
return 0
- user << "You start to weld [src]."
+ user << "You start to weld [src]..."
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
busy = 1
if(do_after(user, 100))
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 10d4c1716b6..e5544d1d410 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -30,7 +30,7 @@
// State 0
if(istype(W, /obj/item/weapon/wrench) && isturf(src.loc))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "You wrench the assembly into place."
+ user << "You wrench the assembly into place."
anchored = 1
state = 1
update_icon()
@@ -41,14 +41,14 @@
// State 1
if(istype(W, /obj/item/weapon/weldingtool))
if(weld(W, user))
- user << "You weld the assembly securely into place."
+ user << "You weld the assembly securely into place."
anchored = 1
state = 2
return
else if(istype(W, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "You unattach the assembly from its place."
+ user << "You unattach the assembly from its place."
anchored = 0
update_icon()
state = 0
@@ -62,14 +62,14 @@
user << "You add wires to the assembly."
state = 3
else
- user << "You need two lengths of cable to wire a camera."
+ user << "You need two lengths of cable to wire a camera!"
return
return
else if(istype(W, /obj/item/weapon/weldingtool))
if(weld(W, user))
- user << "You unweld the assembly from its place."
+ user << "You unweld the assembly from its place."
state = 1
anchored = 1
return
@@ -82,12 +82,12 @@
var/input = stripped_input(usr, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13")
if(!input)
- usr << "No input found please hang up and try your call again."
+ usr << "No input found, please hang up and try your call again!"
return
var/list/tempnetwork = text2list(input, ",")
if(tempnetwork.len < 1)
- usr << "No network found please hang up and try your call again."
+ usr << "No network found, please hang up and try your call again!"
return
state = 4
@@ -115,13 +115,13 @@
new/obj/item/stack/cable_coil(get_turf(src), 2)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
- user << "You cut the wires from the circuits."
+ user << "You cut the wires from the circuits."
state = 2
return
// 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.
- user << "You attach \the [W] into the assembly inner circuits."
+ user << "You attach \the [W] into the assembly inner circuits."
upgrades += W
user.drop_item()
W.loc = src
@@ -131,7 +131,7 @@
else if(istype(W, /obj/item/weapon/crowbar) && upgrades.len)
var/obj/U = locate(/obj) in upgrades
if(U)
- user << "You unattach an upgrade from the assembly."
+ user << "You unattach an upgrade from the assembly."
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
U.loc = get_turf(src)
upgrades -= U
@@ -156,7 +156,7 @@
if(!WT.remove_fuel(0, user))
return 0
- user << "You start to weld \the [src].."
+ user << "You start to weld \the [src]..."
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
busy = 1
if(do_after(user, 20))
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 3e0dac86a35..95664e9a49f 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -73,11 +73,10 @@
//Cameras can't track people wearing an agent card or a ninja hood.
if(H.wear_id && istype(H.wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
continue
- //Generic variable who's existance is to blame on shitty old ninja code
- if(istype(H.head, /obj/item/clothing/head))
- var/obj/item/clothing/head/hat = H.head
- if(hat.blockTracking)
- continue
+ if(istype(H.head, /obj/item/clothing/head))
+ var/obj/item/clothing/head/hat = H.head
+ if(hat.blockTracking)
+ continue
// Now, are they viewable by a camera? (This is last because it's the most intensive check)
if(!near_camera(M))
@@ -99,7 +98,7 @@
return targets
-/mob/living/silicon/ai/verb/ai_camera_track(var/target_name as null|anything in trackable_mobs())
+/mob/living/silicon/ai/verb/ai_camera_track(var/target_name in trackable_mobs())
set name = "track"
set hidden = 1 //Don't display it on the verb lists. This verb exists purely so you can type "track Oldman Robustin" and follow his ass
@@ -113,7 +112,6 @@
/mob/living/silicon/ai/proc/ai_actual_track(mob/living/target as mob)
if(!istype(target)) return
var/mob/living/silicon/ai/U = usr
-
U.cameraFollow = target
//U << text("Now tracking [] on camera.", target.name)
//if (U.machine == null)
@@ -130,10 +128,10 @@
U << "Follow camera mode terminated."
U.cameraFollow = null
return
- if(istype(H.head, /obj/item/clothing/head))
- var/obj/item/clothing/head/hat = H.head
- if(hat.blockTracking)
- U << "Follow camera mode terminated."
+ if(istype(H.head, /obj/item/clothing/head))
+ var/obj/item/clothing/head/hat = H.head
+ if(hat.blockTracking)
+ U << "Follow camera mode terminated."
U.cameraFollow = null
return
if(H.digitalcamo)
@@ -194,4 +192,4 @@
else
if (sorttext(a.c_tag, b.c_tag) < 0)
L.Swap(j, j + 1)
- return L
\ No newline at end of file
+ return L
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index 59731eaa01b..e1b05f5c6c8 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -38,25 +38,25 @@
if(istype(W, /obj/item/weapon/stock_parts/cell) && anchored)
if(charging)
- user << "There is already a cell in the charger."
+ user << "There is already a cell in the charger!"
return
else
var/area/a = loc.loc // Gets our locations location, like a dream within a dream
if(!isarea(a))
return
if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power!
- user << "The [name] blinks red as you try to insert the cell!"
+ user << "The [name] blinks red as you try to insert the cell!"
return
user.drop_item()
W.loc = src
charging = W
- user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.")
+ user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.")
chargelevel = -1
updateicon()
else if(istype(W, /obj/item/weapon/wrench))
if(charging)
- user << "Remove the cell first!"
+ user << "Remove the cell first!"
return
anchored = !anchored
@@ -76,7 +76,7 @@
user.put_in_hands(charging)
charging.add_fingerprint(user)
- user.visible_message("[user] removes the cell from the charger.", "You remove the cell from the charger.")
+ user.visible_message("[user] removes the cell from the charger.", "You remove the cell from the charger.")
removecell()
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index ab45982bb34..f04424c08a7 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -83,7 +83,7 @@
/obj/item/weapon/disk/data/attack_self(mob/user as mob)
read_only = !read_only
- user << "You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"]."
+ user << "You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"]."
/obj/item/weapon/disk/data/examine(mob/user)
..()
@@ -224,7 +224,7 @@
use_power(7500) //This might need tweaking.
return
- else if((src.occupant.cloneloss <= (100 - src.heal_level)) && (!src.eject_wait))
+ else if((src.occupant.cloneloss <= (100 - src.heal_level)) && (!src.eject_wait) || src.occupant.health >= 100)
src.connected_message("Cloning Process Complete.")
src.locked = 0
src.go_out()
@@ -270,7 +270,7 @@
/obj/machinery/clonepod/emag_act(user as mob)
if (isnull(src.occupant))
return
- user << "You force an emergency ejection."
+ user << "You force an emergency ejection."
src.locked = 0
src.go_out()
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index c96493032e7..bc10565b0b4 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -308,7 +308,7 @@
if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
var/obj/item/weapon/grab/G = W
if(G.state < GRAB_AGGRESSIVE)
- user << " You need a better grip to do that!"
+ user << " You need a better grip to do that!"
return
G.affecting.loc = src.loc
G.affecting.Weaken(5)
@@ -390,21 +390,20 @@
//BASKETBALL OBJECTS
-/obj/item/weapon/beach_ball/holoball
+/obj/item/toy/beach_ball/holoball
name = "basketball"
icon = 'icons/obj/basketball.dmi'
icon_state = "basketball"
item_state = "basketball"
desc = "Here's your chance, do your dance at the Space Jam."
- w_class = 4 //Stops people from hiding it in their bags/pockets
-/obj/item/weapon/beach_ball/holoball/dodgeball
+/obj/item/toy/beach_ball/holoball/dodgeball
name = "dodgeball"
icon_state = "dodgeball"
item_state = "dodgeball"
desc = "Used for playing the most violent and degrading of childhood games."
-/obj/item/weapon/beach_ball/holoball/dodgeball/throw_impact(atom/hit_atom)
+/obj/item/toy/beach_ball/holoball/dodgeball/throw_impact(atom/hit_atom)
..()
if((ishuman(hit_atom)))
var/mob/living/carbon/M = hit_atom
@@ -427,7 +426,7 @@
if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2)
var/obj/item/weapon/grab/G = W
if(G.state < GRAB_AGGRESSIVE)
- user << "You need a better grip to do that!"
+ user << "You need a better grip to do that!"
return
G.affecting.loc = src.loc
G.affecting.Weaken(5)
@@ -474,7 +473,7 @@
return
/obj/machinery/readybutton/attack_paw(mob/user as mob)
- user << "You are too primitive to use this device"
+ user << "You are too primitive to use this device!"
return
/obj/machinery/readybutton/New()
@@ -486,7 +485,7 @@
/obj/machinery/readybutton/attack_hand(mob/user as mob)
if(user.stat || stat & (NOPOWER|BROKEN))
- user << "This device is not powered."
+ user << "This device is not powered!"
return
currentarea = get_area(src.loc)
@@ -494,7 +493,7 @@
qdel(src)
if(eventstarted)
- usr << "The event has already begun!"
+ usr << "The event has already begun!"
return
ready = !ready
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 696952e9b89..801e2f82332 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -15,6 +15,7 @@
if(0)
if(istype(P, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "You start wrenching the frame into place..."
if(do_after(user, 20))
user << "You wrench the frame into place."
anchored = 1
@@ -22,9 +23,10 @@
if(istype(P, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = P
if(!WT.isOn())
- user << "The welder must be on for this task."
+ user << "The welder must be on for this task!"
return
playsound(loc, 'sound/items/Welder.ogg', 50, 1)
+ user << "You start to deconstruct the frame..."
if(do_after(user, 20))
if(!src || !WT.remove_fuel(0, user)) return
user << "You deconstruct the frame."
@@ -33,6 +35,7 @@
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "You start to unfasten the frame..."
if(do_after(user, 20))
user << "You unfasten the frame."
anchored = 0
@@ -66,6 +69,7 @@
var/obj/item/stack/cable_coil/C = P
if(C.get_amount() >= 5)
playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ user << "You start to add cables to the frame..."
if(do_after(user, 20))
if (C.get_amount() >= 5 && state == 2)
C.use(5)
@@ -73,12 +77,12 @@
state = 3
icon_state = "3"
else
- user << "You need five lengths of cable to wire the AI core."
+ user << "You need five lengths of cable to wire the AI core!"
return
if(3)
if(istype(P, /obj/item/weapon/wirecutters))
if (brain)
- user << "Get that brain out of there first."
+ user << "Get that brain out of there first!"
else
playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1)
user << "You remove the cables."
@@ -91,6 +95,7 @@
var/obj/item/stack/sheet/rglass/G = P
if(G.get_amount() >= 2)
playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
+ user << "You start to put in the glass panel..."
if(do_after(user, 20))
if (G.get_amount() >= 2 && state == 3)
G.use(2)
@@ -98,7 +103,7 @@
state = 4
icon_state = "4"
else
- user << "You need two sheets of reinforced glass to insert them into AI core."
+ user << "You need two sheets of reinforced glass to insert them into AI core!"
return
if(istype(P, /obj/item/weapon/aiModule/core/full)) //Allows any full core boards to be applied to AI cores.
@@ -123,22 +128,26 @@
if(istype(P, /obj/item/device/mmi))
var/obj/item/device/mmi/M = P
if(!M.brainmob)
- user << "Sticking an empty MMI into the frame would sort of defeat the purpose."
+ user << "Sticking an empty MMI into the frame would sort of defeat the purpose!"
return
- if(M.brainmob.stat == 2)
- user << "Sticking a dead brain into the frame would sort of defeat the purpose."
+ if(M.brainmob.stat == DEAD)
+ user << "Sticking a dead brain into the frame would sort of defeat the purpose!"
+ return
+
+ if(!M.brainmob.client)
+ user << "Sticking an inactive brain into the frame would sort of defeat the purpose."
return
if((config) && (!config.allow_ai))
- user << "This MMI does not seem to fit."
+ user << "This MMI does not seem to fit!"
return
if(jobban_isbanned(M.brainmob, "AI"))
- user << "This MMI does not seem to fit."
+ user << "This MMI does not seem to fit!"
return
if(!M.brainmob.mind)
- user << "This MMI is mindless."
+ user << "This MMI is mindless!"
return
ticker.mode.remove_cultist(M.brainmob.mind, 1)
@@ -175,9 +184,7 @@
user << "You connect the monitor."
if(!laws.inherent.len) //If laws isn't set to null but nobody supplied a board, the AI would normally be created lawless. We don't want that.
laws = null
- var/mob/living/silicon/ai/A = new /mob/living/silicon/ai (loc, laws, brain)
- if(A) //if there's no brain, the mob is deleted and a structure/AIcore is created
- A.rename_self("ai", 1)
+ new /mob/living/silicon/ai (loc, laws, brain)
feedback_inc("cyborg_ais_created",1)
qdel(src)
@@ -193,10 +200,12 @@
A.transfer_ai("INACTIVE","AICARD",src,user)
if(istype(A, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user.visible_message("[user] [anchored ? "fastens" : "unfastens"] [src].", \
+ "You start to [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor...")
switch(anchored)
if(0)
if(do_after(user, 20))
- user << "You wrench the core into place."
+ user << "You fasten the core into place."
anchored = 1
if(1)
if(do_after(user, 20))
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 76d084ffba7..23f042caebf 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -31,7 +31,8 @@
/obj/item/toy/foamblade = 2,
/obj/item/toy/redbutton = 2,
/obj/item/toy/owl = 2,
- /obj/item/toy/griffin = 2
+ /obj/item/toy/griffin = 2,
+ /obj/item/weapon/coin/antagtoken = 2,
)
/obj/machinery/computer/arcade/New()
@@ -486,7 +487,7 @@
playsound(src.loc, 'sound/effects/bang.ogg', 100, 1)
var/turf/simulated/floor/F
for(F in orange(1, src))
- F.ChangeTurf(/turf/space)
+ F.ChangeTurf(F.baseturf)
src.visible_message("Something slams into the floor around [src], exposing it to space!")
if(hull)
sleep(10)
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 0250b8575d7..be509355564 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -218,6 +218,9 @@
/obj/item/weapon/circuitboard/mining_shuttle
name = "circuit Board (Mining Shuttle)"
build_path = /obj/machinery/computer/shuttle/mining
+/obj/item/weapon/circuitboard/white_ship
+ name = "circuit Board (White Ship)"
+ build_path = /obj/machinery/computer/shuttle/white_ship
/obj/item/weapon/circuitboard/HolodeckControl // Not going to let people get this, but it's just here for future
name = "circuit board (Holodeck Control)"
build_path = /obj/machinery/computer/HolodeckControl
@@ -303,31 +306,31 @@
if(0)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "You start wrenching the frame into place."
+ user << "You start wrenching the frame into place..."
if(do_after(user, 20))
- user << "You've wrenched the frame into place."
+ user << "You wrench the frame into place."
anchored = 1
state = 1
if(istype(P, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = P
if(!WT.remove_fuel(0, user))
if(!WT.isOn())
- user << "The welding tool must be on to complete this task."
+ user << "The welding tool must be on to complete this task!"
return
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
- user << "You start deconstructing the frame."
+ user << "You start deconstructing the frame..."
if(do_after(user, 20))
if(!src || !WT.isOn()) return
- user << "You've deconstructed the frame."
+ user << "You deconstruct the frame."
var/obj/item/stack/sheet/metal/M = new (loc, 5)
M.add_fingerprint(user)
qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "You start to unfasten the frame."
+ user << "You start to unfasten the frame..."
if(do_after(user, 20))
- user << "You've unfastened the frame."
+ user << "You unfasten the frame."
anchored = 0
state = 0
if(istype(P, /obj/item/weapon/circuitboard) && !circuit)
@@ -365,15 +368,15 @@
var/obj/item/stack/cable_coil/C = P
if(C.get_amount() >= 5)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
- user << "You start adding cables to the frame."
+ user << "You start adding cables to the frame..."
if(do_after(user, 20))
if(C.get_amount() >= 5 && state == 2)
C.use(5)
- user << "You've added cables to the frame."
+ user << "You add cables to the frame."
state = 3
icon_state = "3"
else
- user << "You need five lengths of cable to wire the frame."
+ user << "You need five lengths of cable to wire the frame!"
if(3)
if(istype(P, /obj/item/weapon/wirecutters))
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
@@ -387,15 +390,15 @@
if(istype(P, /obj/item/stack/sheet/glass))
var/obj/item/stack/sheet/glass/G = P
if(G.get_amount() < 2)
- user << "You need two glass sheets to continue construction."
+ user << "You need two glass sheets to continue construction!"
return
else
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
- user << "You start to put in the glass panel."
+ user << "You start to put in the glass panel..."
if(do_after(user, 20))
if(G.get_amount() >= 2 && state == 3)
G.use(2)
- user << "You've put in the glass panel."
+ user << "You put in the glass panel."
state = 4
src.icon_state = "4"
if(4)
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
new file mode 100644
index 00000000000..169100a2ab8
--- /dev/null
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -0,0 +1,157 @@
+/obj/machinery/computer/camera_advanced
+ name = "advanced camera console"
+ desc = "Used to access the various cameras on the station."
+ icon_state = "cameras"
+ //circuit = /obj/item/weapon/circuitboard/security
+ var/mob/camera/aiEye/remote/eyeobj
+ var/mob/living/carbon/human/current_user = null
+ var/list/networks = list("SS13")
+ var/datum/action/camera_off/off_action = new
+ var/datum/action/camera_jump/jump_action = new
+
+/obj/machinery/computer/camera_advanced/proc/CreateEye()
+ eyeobj = new()
+ eyeobj.origin = src
+
+/obj/machinery/computer/camera_advanced/proc/GrantActions(var/mob/living/carbon/user)
+ off_action.target = user
+ off_action.Grant(user)
+ jump_action.target = user
+ jump_action.Grant(user)
+
+/obj/machinery/computer/camera_advanced/check_eye(var/mob/user as mob)
+ if (get_dist(user, src) > 1 || user.eye_blind)
+ off_action.Activate()
+ return 0
+ return 1
+
+/obj/machinery/computer/camera_advanced/attack_hand(var/mob/user as mob)
+ if(..())
+ return
+ if(!iscarbon(user))
+ return
+ var/mob/living/carbon/L = user
+
+ if(!current_user)
+ if(!eyeobj)
+ CreateEye()
+ GrantActions(user)
+ current_user = user
+ eyeobj.user = user
+ eyeobj.name = "Camere Eye ([user.name])"
+ L.remote_view = 1
+ L.remote_control = eyeobj
+ L.client.perspective = EYE_PERSPECTIVE
+ if(!eyeobj.initialized)
+ for(var/obj/machinery/camera/C in cameranet.cameras)
+ if(!C.can_use())
+ continue
+ if(C.network&networks)
+ eyeobj.setLoc(get_turf(C))
+ break
+ eyeobj.initialized = 1
+ else
+ eyeobj.setLoc(eyeobj.loc)
+ else
+ user << "The console is already in use!"
+
+/mob/camera/aiEye/remote
+ name = "Inactive Camera Eye"
+ var/sprint = 10
+ var/cooldown = 0
+ var/acceleration = 1
+ var/mob/living/carbon/human/user = null
+ var/obj/machinery/computer/camera_advanced/origin
+ var/initialized = 0
+ var/visible_icon = 0
+ var/image/user_image = null
+
+/mob/camera/aiEye/remote/GetViewerClient()
+ if(user)
+ return user.client
+ return null
+
+/mob/camera/aiEye/remote/setLoc(var/T)
+ if(user)
+ if(!isturf(user.loc))
+ return
+ T = get_turf(T)
+ loc = T
+ cameranet.visibility(src)
+ if(user.client)
+ if(visible_icon)
+ user.client.images -= user_image
+ user_image = image(icon,loc,icon_state,FLY_LAYER)
+ user.client.images += user_image
+ user.client.eye = src
+
+/mob/camera/aiEye/remote/relaymove(mob/user,direct)
+ var/initial = initial(sprint)
+ var/max_sprint = 50
+
+ if(cooldown && cooldown < world.timeofday) // 3 seconds
+ sprint = initial
+
+ for(var/i = 0; i < max(sprint, initial); i += 20)
+ var/turf/step = get_turf(get_step(src, direct))
+ if(step)
+ src.setLoc(step)
+
+ cooldown = world.timeofday + 5
+ if(acceleration)
+ sprint = min(sprint + 0.5, max_sprint)
+ else
+ sprint = initial
+
+/datum/action/camera_off
+ name = "End Camera View"
+ action_type = AB_INNATE
+ button_icon_state = "camera_off"
+
+/datum/action/camera_off/Activate()
+ if(!target || !iscarbon(target))
+ return
+ var/mob/living/carbon/C = target
+ var/mob/camera/aiEye/remote/remote_eye = C.remote_control
+ C.remote_view = 0
+ remote_eye.origin.current_user = null
+ remote_eye.origin.jump_action.Remove(C)
+ if(C.client)
+ C.client.perspective = MOB_PERSPECTIVE
+ C.client.eye = src
+ C.client.images -= remote_eye.user_image
+ C.remote_control = null
+ C.unset_machine()
+ src.Remove(C)
+
+/datum/action/camera_jump
+ name = "Jump To Camera"
+ action_type = AB_INNATE
+ button_icon_state = "camera_jump"
+
+/datum/action/camera_jump/Activate()
+ if(!target || !iscarbon(target))
+ return
+ var/mob/living/carbon/C = target
+ var/mob/camera/aiEye/remote/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin
+
+ var/list/L = list()
+
+ for (var/obj/machinery/camera/cam in cameranet.cameras)
+ L.Add(cam)
+
+ camera_sort(L)
+
+ var/list/T = list()
+
+ for (var/obj/machinery/camera/netcam in L)
+ var/list/tempnetwork = netcam.network&origin.networks
+ if (tempnetwork.len)
+ T[text("[][]", netcam.c_tag, (netcam.can_use() ? null : " (Deactivated)"))] = netcam
+
+
+ var/camera = input("Choose which camera you want to view", "Cameras") as null|anything in T
+ var/obj/machinery/camera/final = T[camera]
+ if(final)
+ remote_eye.setLoc(get_turf(final))
\ No newline at end of file
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index acc6cccc4db..180f3dc2fd5 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -354,7 +354,7 @@ var/time_last_changed_position = 0
if(region_access)
authenticated = 1
else if ((!( authenticated ) && (istype(usr, /mob/living/silicon))) && (!modify))
- usr << "You can't modify an ID without an ID inserted to modify. Once one is in the modify slot on the computer, you can log in."
+ usr << "You can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in."
if ("logout")
region_access = null
head_subordinates = null
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 240cdaa11b7..38489cb1497 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -79,7 +79,7 @@
user.drop_item()
W.loc = src
src.diskette = W
- user << "You insert [W]."
+ user << "You insert [W]."
src.updateUsrDialog()
return
else
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 1c0138f4c66..c335d4ad6f6 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -103,11 +103,11 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
feedback_inc("alert_comms_blue",1)
tmp_alertlevel = 0
else:
- usr << "You are not authorized to do this."
+ usr << "You are not authorized to do this!"
tmp_alertlevel = 0
state = STATE_DEFAULT
else
- usr << "You need to swipe your ID."
+ usr << "You need to swipe your ID!"
if("announce")
if(src.authenticated==2 && !message_cooldown)
@@ -333,7 +333,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
src.emagged = 1
if(authenticated == 1)
authenticated = 2
- user << "You scramble the communication routing circuits!"
+ user << "You scramble the communication routing circuits."
/obj/machinery/computer/communications/attack_hand(var/mob/user as mob)
if(..())
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index a284f291fd0..18f8925050f 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -97,7 +97,7 @@
/obj/machinery/computer/attackby(I as obj, user as mob, params)
if(istype(I, /obj/item/weapon/screwdriver) && circuit)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << " You start to disconnect the monitor."
+ user << " You start to disconnect the monitor..."
if(do_after(user, 20))
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
A.circuit = circuit
@@ -127,12 +127,12 @@
if(prob(10))
user.visible_message("[user.name] smashes the [src.name] with its paws.",\
"You smash the [src.name] with your paws.",\
- "You hear a smashing sound.")
+ "You hear a smashing sound.")
set_broken()
return
user.visible_message("[user.name] smashes against the [src.name] with its paws.",\
"You smash against the [src.name] with your paws.",\
- "You hear a clicking sound.")
+ "You hear hear a clicking sound.")
/obj/machinery/computer/attack_alien(mob/living/user)
user.do_attack_animation(src)
@@ -140,9 +140,9 @@
if(prob(80))
user.visible_message("[user.name] smashes the [src.name] with its claws.",\
"You smash the [src.name] with your claws.",\
- "You hear a smashing sound.")
+ "You hear a smashing sound.")
set_broken()
return
user.visible_message("[user.name] smashes against the [src.name] with its claws.",\
"You smash against the [src.name] with your claws.",\
- "You hear a clicking sound.")
+ "You hear a clicking sound.")
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index dd5674f8f30..1f5862fc01c 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -33,7 +33,7 @@
return
-proc/crewmonitor(mob/user,var/atom/source)
+/proc/crewmonitor(mob/user,var/atom/source)
var/jobs[0]
jobs["Captain"] = 00
jobs["Head of Personnel"] = 50
@@ -138,7 +138,7 @@ proc/crewmonitor(mob/user,var/atom/source)
popup.open()
-proc/crewscan()
+/proc/crewscan()
var/list/tracked = list()
for(var/mob/living/carbon/human/H in mob_list)
if(istype(H.w_uniform, /obj/item/clothing/under))
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index c314be68b5e..0ab00973dd5 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -10,7 +10,7 @@
if(src.stat & (NOPOWER|BROKEN|MAINT))
return
if(!current)
- user << "You haven't selected anything to transmit laws to!"
+ user << "You haven't selected anything to transmit laws to!"
return
if(!can_upload_to(current))
user << "Upload failed! Check to make sure [current.name] is functioning properly."
@@ -43,7 +43,7 @@
src.current = select_active_ai(user)
if (!src.current)
- user << "No active AIs detected."
+ user << "No active AIs detected!"
else
user << "[src.current.name] selected for law changes."
@@ -68,7 +68,7 @@
src.current = select_active_free_borg(user)
if(!src.current)
- user << "No active unslaved cyborgs detected."
+ user << "No active unslaved cyborgs detected!"
else
user << "[src.current.name] selected for law changes."
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index bc686b127d9..8a52e787827 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -24,7 +24,7 @@
usr.drop_item()
O.loc = src
scan = O
- user << "You insert [O]."
+ user << "You insert [O]."
else
..()
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index 29aabf85107..19b4fdd5169 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -23,7 +23,6 @@
//Computer properties
var/screen = 0 // 0 = Main menu, 1 = Message Logs, 2 = Hacked screen, 3 = Custom Message
var/hacking = 0 // Is it being hacked into by the AI/Cyborg
- var/emag = 0 // When it is emagged.
var/message = "System bootup complete. Please select an option." // The message that shows on the main menu.
var/auth = 0 // Are they authenticated?
var/optioncount = 7
@@ -33,25 +32,18 @@
var/customjob = "Admin"
var/custommessage = "This is a test, please ignore."
-
/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O as obj, mob/living/user as mob, params)
- if(stat & (NOPOWER|BROKEN))
- return
- if(!istype(user))
- return
- if(istype(O, /obj/item/weapon/screwdriver) && emag)
+ if(istype(O, /obj/item/weapon/screwdriver) && emagged)
//Stops people from just unscrewing the monitor and putting it back to get the console working again.
user << "It is too hot to mess with!"
return
-
..()
- return
/obj/machinery/computer/message_monitor/emag_act(user as mob)
- if(!emag)
+ if(!emagged)
if(!isnull(src.linkedServer))
icon_state = hack_icon // An error screen I made in the computers.dmi
- emag = 1
+ emagged = 1
screen = 2
spark_system.set_up(5, 0, src)
src.spark_system.start()
@@ -68,7 +60,7 @@
..()
if(stat & (NOPOWER|BROKEN))
return
- if(emag || hacking)
+ if(emagged || hacking)
icon_state = hack_icon
else
icon_state = normal_icon
@@ -84,7 +76,7 @@
if(..())
return
//If the computer is being hacked or is emagged, display the reboot message.
- if(hacking || emag)
+ if(hacking || emagged)
message = rebootmsg
var/dat = "/ "
@@ -95,7 +87,7 @@
dat += "
"
- if(hacking || emag)
+ if(hacking || emagged)
screen = 2
else if(!auth || !linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN))) message = noserver
@@ -276,7 +268,7 @@
/obj/machinery/computer/message_monitor/proc/UnmagConsole()
src.icon_state = normal_icon
- src.emag = 0
+ src.emagged = 0
/obj/machinery/computer/message_monitor/proc/ResetMessage()
customsender = "System Administrator"
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index d58f416f99c..c021d2e158a 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -132,7 +132,7 @@
var/obj/item/weapon/implant/I = locate(href_list["warn"])
if((I)&&(I.imp_in))
var/mob/living/carbon/R = I.imp_in
- R << "You hear a voice in your head saying: '[warning]'"
+ R << "You hear a voice in your head saying: '[warning]'"
log_say("[usr]/[usr.ckey] sent an implant message to [R]/[R.ckey]: '[warning]'")
src.add_fingerprint(usr)
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 3f677d16775..305e8d9ea58 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -111,7 +111,7 @@
R.SetLockdown(!R.lockcharge)
R << "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]"
if(R.connected_ai)
- R.connected_ai << "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
" + R.connected_ai << "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
" else usr << "Access Denied." diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index f4f5f3c9d00..3ac9f1abf03 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -28,7 +28,7 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + user << "You insert [O]." else ..() diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 692bf826437..87e1389167d 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -87,7 +87,7 @@ return prob(60) var/obj/structure/stool/bed/B = A - if (istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass + if (istype(A, /obj/structure/stool/bed) && (B.buckled_mob || B.density))//if it's a bed/chair and is dense or someone is buckled, it will not pass return 0 else if(istype(A, /mob/living)) // You Shall Not Pass! @@ -159,3 +159,10 @@ var/temp = null var/reqtime = 0 //Cooldown for requisitions - Quarxink var/last_viewed_group = "categories" + +/obj/machinery/computer/shuttle/white_ship + name = "White Ship Console" + desc = "Used to control the White Ship." + circuit = /obj/item/weapon/circuitboard/white_ship + shuttleId = "whiteship" + possible_destinations = "whiteship_ss13;whiteship_home;whiteship_z4" diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 5c823178fad..5530c7cc5a1 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -55,31 +55,57 @@ /obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob, params) if(P.crit_fail) - user << "This part is faulty, you cannot add this to the machine!" + user << "This part is faulty, you cannot add this to the machine!" return switch(state) if(1) + if(istype(P, /obj/item/weapon/circuitboard)) + user << "The frame needs wiring first!" + return if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = P if(C.get_amount() >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You start to add cables to the frame." - if(do_after(user, 20)) + user << "You start to add cables to the frame..." + if(do_after(user, 20, target = src)) if(C.get_amount() >= 5 && state == 1) C.use(5) user << "You add cables to the frame." state = 2 icon_state = "box_1" else - user << "You need five length of cable to wire the frame." + user << "You need five length of cable to wire the frame!" return + if(istype(P, /obj/item/weapon/screwdriver) && !anchored) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) + user.visible_message("[user] disassembles the frame.", \ + "You start to disassemble the frame...", "You hear banging and clanking.") + if(do_after(user, 40, target = src)) + if(state == 1) + user << "You disassemble the frame." + var/obj/item/stack/sheet/metal/M = new (loc, 5) + M.add_fingerprint(user) + qdel(src) if(istype(P, /obj/item/weapon/wrench)) + user << "You start [anchored ? "un" : ""]securing [name]..." playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - user << "You dismantle the frame." - new /obj/item/stack/sheet/metal(src.loc, 5) - qdel(src) + if(do_after(user, 40, target = src)) + if(state == 1) + user << "You [anchored ? "un" : ""]secure [name]." + anchored = !anchored + if(2) + if(istype(P, /obj/item/weapon/wrench)) + user << "You start [anchored ? "un" : ""]securing [name]..." + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) + if(do_after(user, 40, target = src)) + user << "You [anchored ? "un" : ""]secure [name]." + anchored = !anchored + if(istype(P, /obj/item/weapon/circuitboard)) + if(!anchored) + user << "The frame needs to be secured first!" + return var/obj/item/weapon/circuitboard/B = P if(B.board_type == "machine") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -94,7 +120,7 @@ update_namelist() update_req_desc() else - user << "This frame does not accept circuit boards of this type!" + user << "This frame does not accept circuit boards of this type!" if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You remove the cables." @@ -177,7 +203,7 @@ if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CP = P if (CP.get_amount() < 1) - user << "You need more cable!" + user << "You need more cable!" return var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src, 1, CP.item_color) if(CP.use(1)) @@ -192,7 +218,7 @@ update_req_desc() return 1 if(!success) - user << "You cannot add that to the machine!" + user << "You cannot add that to the machine!" return 0 @@ -239,6 +265,15 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/stock_parts/cell = 5, /obj/item/weapon/stock_parts/capacitor = 1) +/obj/item/weapon/circuitboard/emitter + name = "circuit board (Emitter)" + build_path = /obj/machinery/power/emitter + board_type = "machine" + origin_tech = "programming=4;powerstorage=5;engineering=5" + req_components = list( + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + /obj/item/weapon/circuitboard/power_compressor name = "circuit board (Power Compressor)" build_path = /obj/machinery/power/compressor @@ -358,6 +393,7 @@ to destroy them and players will be able to make replacements. origin_tech = "programming=1;biotech=1" req_components = list( /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/manipulator = 1, /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/microwave @@ -367,9 +403,71 @@ to destroy them and players will be able to make replacements. origin_tech = "programming=1" req_components = list( /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/stack/cable_coil = 2, /obj/item/weapon/stock_parts/console_screen = 1) +/obj/item/weapon/circuitboard/gibber + name = "circuit board (Gibber)" + build_path = /obj/machinery/gibber + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/processor + name = "circuit board (Food processor)" + build_path = /obj/machinery/processor + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/recycler + name = "circuit board (Recycler)" + build_path = /obj/machinery/recycler + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/seed_extractor + name = "circuit board (Seed Extractor)" + build_path = /obj/machinery/seed_extractor + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/smartfridge + name = "circuit board (Smartfridge)" + build_path = /obj/machinery/smartfridge + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1) + +/obj/item/weapon/circuitboard/monkey_recycler + name = "circuit board (Monkey Recycler)" + build_path = /obj/machinery/monkey_recycler + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/holopad + name = "circuit board (AI Holopad)" + build_path = /obj/machinery/hologram/holopad + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/capacitor = 1) + /obj/item/weapon/circuitboard/chem_dispenser name = "circuit board (Portable Chem Dispenser)" build_path = /obj/machinery/chem_dispenser/constructable @@ -381,7 +479,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/stock_parts/manipulator = 1, /obj/item/weapon/stock_parts/console_screen = 1, /obj/item/weapon/stock_parts/cell = 1) - + /obj/item/weapon/circuitboard/chem_master name = "circuit board (Chem Master 2999)" build_path = /obj/machinery/chem_master/constructable @@ -613,6 +711,8 @@ obj/item/weapon/circuitboard/rdserver req_components = list( /obj/item/weapon/stock_parts/console_screen = 1, /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/manipulator = 1, /obj/item/device/assembly/igniter = 1) /obj/item/weapon/circuitboard/mining_equipment_vendor diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 6c57394b1ef..f84c488f930 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -25,7 +25,7 @@ component_parts += new /obj/item/weapon/stock_parts/console_screen(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) component_parts += new /obj/item/stack/cable_coil(null, 1) - RefreshParts() + /obj/machinery/atmospherics/unary/cryo_cell/construction() ..(dir,dir) @@ -40,10 +40,18 @@ /obj/machinery/atmospherics/unary/cryo_cell/Destroy() var/turf/T = loc T.contents += contents - var/obj/item/weapon/reagent_containers/glass/B = beaker + if(beaker) - B.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube + beaker.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube + beaker = null ..() +/obj/machinery/atmospherics/unary/cryo_cell/process_atmos() + ..() + if(air_contents) + temperature_archived = air_contents.temperature + heat_gas_contents() + if(abs(temperature_archived-air_contents.temperature) > 1) + parent.update = 1 /obj/machinery/atmospherics/unary/cryo_cell/process() ..() @@ -54,19 +62,15 @@ playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) if(!node || !is_operational()) return + if(!on) updateDialog() return if(air_contents) - temperature_archived = air_contents.temperature - heat_gas_contents() - expel_gas() - - if(occupant) + if (occupant) process_occupant() - if(abs(temperature_archived-air_contents.temperature) > 1) - parent.update = 1 + expel_gas() updateDialog() return 1 @@ -76,11 +80,7 @@ return close_machine(target) -/obj/machinery/atmospherics/unary/cryo_cell/allow_drop() - return 0 - /obj/machinery/atmospherics/unary/cryo_cell/relaymove(var/mob/user) - ..() open_machine() /obj/machinery/atmospherics/unary/cryo_cell/container_resist() @@ -102,6 +102,9 @@ open_machine() add_fingerprint(usr) else + if(!istype(usr, /mob/living) || usr.stat) + usr << "You can't do that!" + return open_machine() /obj/machinery/atmospherics/unary/cryo_cell/examine(mob/user) @@ -229,14 +232,16 @@ /obj/machinery/atmospherics/unary/cryo_cell/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/glass)) + if(isrobot(user)) + return if(beaker) - user << "A beaker is already loaded into [src]." + user << "A beaker is already loaded into [src]!" return beaker = I user.drop_item() I.loc = src - user.visible_message("[user] places [I] in [src].", \ + user.visible_message("[user] places [I] in [src].", \ "You place [I] in [src].") if(!(on || occupant || state_open)) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 98c7cf1fff0..471818ca3c4 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -67,11 +67,11 @@ for reference: user.changeNext_move(CLICK_CD_MELEE) if (istype(W, /obj/item/stack/sheet/mineral/wood)) if (src.health < src.maxhealth) - visible_message("[user] begins to repair \the [src]!") + visible_message("[user] begins to repair \the [src]!", "You begin to repair \the [src]...") if(do_after(user,20)) src.health = src.maxhealth W:use(1) - visible_message("[user] repairs \the [src]!") + visible_message("[user] repairs \the [src]!", "You repair \the [src].") return else return @@ -84,7 +84,7 @@ for reference: src.health -= W.force * 0.75 else if (src.health <= 0) - visible_message("The barricade is smashed apart!") + visible_message("The barricade is smashed apart!") new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) @@ -94,13 +94,13 @@ for reference: /obj/structure/barricade/wooden/ex_act(severity, target) switch(severity) if(1.0) - visible_message("The barricade is blown apart!") + visible_message("The barricade is blown apart!") qdel(src) return if(2.0) src.health -= 25 if (src.health <= 0) - visible_message("The barricade is blown apart!") + visible_message("The barricade is blown apart!") new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) @@ -110,7 +110,7 @@ for reference: /obj/structure/barricade/wooden/blob_act() src.health -= 25 if (src.health <= 0) - visible_message("The blob eats through the barricade!") + visible_message("The blob eats through the barricade!") qdel(src) return @@ -196,7 +196,7 @@ for reference: if (src.emagged == 0) src.emagged = 1 src.req_access = null - user << "You break the ID authentication lock on \the [src]." + user << "You break the ID authentication lock on \the [src]." var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() @@ -204,7 +204,7 @@ for reference: return else if (src.emagged == 1) src.emagged = 2 - user << "You short out the anchoring mechanism on \the [src]." + user << "You short out the anchoring mechanism on \the [src]." var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 2b1ef80ccff..c7b8dc92fe8 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -164,7 +164,6 @@ opacity = 0 doortype = /obj/structure/door_assembly/door_assembly_research/glass glass = 1 - heat_proof = 1 /obj/machinery/door/airlock/glass_mining name = "maintenance hatch" @@ -215,7 +214,7 @@ /obj/machinery/door/airlock/uranium/proc/radiate() for(var/mob/living/L in range (3,src)) - L.apply_effect(15,IRRADIATE,0) + L.irradiate(15) return /obj/machinery/door/airlock/plasma @@ -306,6 +305,23 @@ About the new airlock wires panel: */ // You can find code for the airlock wires in the wire datum folder. +/obj/machinery/door/airlock/proc/bolt() + if(locked) + return + locked = 1 + update_icon() + +/obj/machinery/door/airlock/proc/unbolt() + if(!locked) + return + locked = 0 + update_icon() + +/obj/machinery/door/airlock/Destroy() + if(id_tag) + for(var/obj/machinery/doorButtons/D in world) + D.removeMe(src) + ..() /obj/machinery/door/airlock/bumpopen(mob/living/user as mob) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) @@ -530,9 +546,9 @@ About the new airlock wires panel: if(src.isWireCut(AIRLOCK_WIRE_LIGHT)) t1 += text("Door bolt lights wire is cut.
\n") else if(!src.lights) - t1 += text("Door lights are off. Enable?
\n", src) + t1 += text("Door bolt lights are off. Enable?
\n", src) else - t1 += text("Door lights are on. Disable?
\n", src) + t1 += text("Door bolt lights are on. Disable?
\n", src) if(src.isWireCut(AIRLOCK_WIRE_ELECTRIFY)) t1 += text("Electrification wire is cut.
\n") @@ -640,7 +656,7 @@ About the new airlock wires panel: playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) if(!istype(H.head, /obj/item/clothing/head/helmet)) H.visible_message("[user] headbutts the airlock.", \ - "[user] headbutts the airlock!") + "You headbutt the airlock!") var/obj/item/organ/limb/affecting = H.get_organ("head") H.Stun(5) H.Weaken(5) @@ -889,9 +905,9 @@ About the new airlock wires panel: if((istype(C, /obj/item/weapon/weldingtool) && !( src.operating ) && src.density)) var/obj/item/weapon/weldingtool/W = C if(W.remove_fuel(0,user)) - user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ - "You begin [welded ? "unwelding":"welding"] the airlock...", \ - "You hear welding.") + user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ + "You begin [welded ? "unwelding":"welding"] the airlock...", \ + "You hear welding.") playsound(loc, 'sound/items/Welder.ogg', 40, 1) if(do_after(user,40,5,1)) if(density && !operating)//Door must be closed to weld. @@ -899,8 +915,8 @@ About the new airlock wires panel: return playsound(loc, 'sound/items/Welder2.ogg', 50, 1) welded = !welded - user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ - "You've [welded ? "welded the airlock shut":"unwelded the airlock"].") + user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ + "You [welded ? "weld the airlock shut":"unweld the airlock"].") update_icon() return else if(istype(C, /obj/item/weapon/screwdriver)) @@ -924,18 +940,19 @@ About the new airlock wires panel: beingcrowbarred = 0 if( beingcrowbarred && (density && welded && !operating && src.p_open && (!hasPower()) && !src.locked) ) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] removes the electronics from the airlock assembly.", \ - "You start to remove electronics from the airlock assembly.") + user.visible_message("[user] removes the electronics from the airlock assembly.", \ + "You start to remove electronics from the airlock assembly...") if(do_after(user,40)) if(src.loc) if(src.doortype) - new src.doortype(src.loc) + var/obj/structure/door_assembly/A = new src.doortype(src.loc) + A.heat_proof_finished = src.heat_proof //tracks whether there's rglass in if(emagged) user << "You discard the damaged electronics." qdel(src) return - user << "You removed the airlock electronics!" + user << "You remove the airlock electronics." var/obj/item/weapon/airlock_electronics/ae if(!electronics) @@ -953,9 +970,9 @@ About the new airlock wires panel: qdel(src) return else if(hasPower()) - user << " The airlock's motors resist your efforts to force it." + user << " The airlock's motors resist your efforts to force it!" else if(locked) - user << " The airlock's bolts prevent it from being forced." + user << " The airlock's bolts prevent it from being forced!" else if( !welded && !operating) if(density) if(beingcrowbarred == 0) //being fireaxe'd @@ -963,7 +980,7 @@ About the new airlock wires panel: if(F:wielded) spawn(0) open(2) else - user << "You need to be wielding the Fire axe to do that." + user << "You need to be wielding the fire axe to do that!" else spawn(0) open(2) else @@ -972,7 +989,7 @@ About the new airlock wires panel: if(F:wielded) spawn(0) close(2) else - user << "You need to be wielding the Fire axe to do that." + user << "You need to be wielding the fire axe to do that!" else spawn(0) close(2) @@ -1069,7 +1086,7 @@ About the new airlock wires panel: update_freelook_sight() if(locate(/mob/living) in get_turf(src)) open() - return + return 1 /obj/machinery/door/airlock/New() ..() @@ -1114,35 +1131,27 @@ About the new airlock wires panel: if("Default") icon = 'icons/obj/doors/Doorglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_glass - heat_proof = 0 if("Engineering") icon = 'icons/obj/doors/Doorengglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_eng/glass - heat_proof = 0 if("Atmospherics") icon = 'icons/obj/doors/Dooratmoglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_atmo/glass - heat_proof = 0 if("Security") icon = 'icons/obj/doors/Doorsecglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_sec/glass - heat_proof = 0 if("Command") icon = 'icons/obj/doors/Doorcomglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_com/glass - heat_proof = 0 if("Medical") icon = 'icons/obj/doors/Doormedglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_med/glass - heat_proof = 0 if("Research") icon = 'icons/obj/doors/Doorresearchglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_research/glass - heat_proof = 1 if("Mining") icon = 'icons/obj/doors/Doorminingglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_min/glass - heat_proof = 0 else //These airlocks have a regular version. var optionlist = list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security") @@ -1152,47 +1161,36 @@ About the new airlock wires panel: if("Default") icon = 'icons/obj/doors/Doorint.dmi' doortype = /obj/structure/door_assembly/door_assembly_0 - heat_proof = 0 if("Engineering") icon = 'icons/obj/doors/Dooreng.dmi' doortype = /obj/structure/door_assembly/door_assembly_eng - heat_proof = 0 if("Atmospherics") icon = 'icons/obj/doors/Dooratmo.dmi' doortype = /obj/structure/door_assembly/door_assembly_atmo - heat_proof = 0 if("Security") icon = 'icons/obj/doors/Doorsec.dmi' doortype = /obj/structure/door_assembly/door_assembly_sec - heat_proof = 0 if("Command") icon = 'icons/obj/doors/Doorcom.dmi' doortype = /obj/structure/door_assembly/door_assembly_com - heat_proof = 0 if("Medical") icon = 'icons/obj/doors/Doormed.dmi' doortype = /obj/structure/door_assembly/door_assembly_med - heat_proof = 0 if("Research") icon = 'icons/obj/doors/Doorresearch.dmi' doortype = /obj/structure/door_assembly/door_assembly_research - heat_proof = 0 if("Mining") icon = 'icons/obj/doors/Doormining.dmi' doortype = /obj/structure/door_assembly/door_assembly_min - heat_proof = 0 if("Maintenance") icon = 'icons/obj/doors/Doormaint.dmi' doortype = /obj/structure/door_assembly/door_assembly_mai - heat_proof = 0 if("External") icon = 'icons/obj/doors/Doorext.dmi' doortype = /obj/structure/door_assembly/door_assembly_ext - heat_proof = 0 if("High Security") icon = 'icons/obj/doors/hightechsecurity.dmi' doortype = /obj/structure/door_assembly/door_assembly_highsecurity - heat_proof = 0 update_icon() /obj/machinery/door/airlock/CanAStarPass(var/obj/item/weapon/card/id/ID) diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 5db76850d2d..0264ae95312 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -17,6 +17,7 @@ /obj/machinery/door/airlock/alarmlock/Destroy() if(radio_controller) radio_controller.remove_object(src,air_frequency) + air_connection = null ..() /obj/machinery/door/airlock/alarmlock/initialize() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 86434159b81..84e06f843ad 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -15,9 +15,10 @@ var/operating = 0 var/glass = 0 var/normalspeed = 1 - var/heat_proof = 0 // For glass airlocks/opacity firedoors + var/heat_proof = 0 // For rglass-windowed airlocks and firedoors var/emergency = 0 // Emergency access override var/sub_door = 0 // 1 if it's meant to go under another door. + var/closingLayer = 3.1 /obj/machinery/door/New() ..() @@ -236,7 +237,7 @@ operating = 1 do_animate("closing") - src.layer = 3.1 + src.layer = closingLayer sleep(5) src.density = 1 sleep(5) @@ -274,7 +275,7 @@ /obj/machinery/door/proc/hasPower() return !(stat & NOPOWER) -/obj/machinery/door/BlockSuperconductivity() +/obj/machinery/door/BlockSuperconductivity() // All non-glass airlocks block heat, this is intended. if(opacity || heat_proof) return 1 return 0 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 9a4e57c97f3..85f6dac25e8 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -13,7 +13,7 @@ var/blocked = 0 var/nextstate = null sub_door = 1 - + closingLayer = 3.11 /obj/machinery/door/firedoor/Bumped(atom/AM) if(p_open || operating) return diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index ac30218b651..e558ccbac61 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -6,12 +6,15 @@ var/id = 1 var/auto_close = 0 // Time in seconds to automatically close when opened, 0 if it doesn't. sub_door = 1 + heat_proof = 1 /obj/machinery/door/poddoor/preopen icon_state = "open" density = 0 opacity = 0 +/obj/machinery/door/poddoor/ert + desc = "A heavy duty blast door that only opens for dire emergencies." /obj/machinery/door/poddoor/Bumped(atom/AM) if(density) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 412048bb8a5..c679e37cd4c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -22,9 +22,11 @@ density = 0 if(health == 0) playsound(src, "shatter", 70, 1) + electronics = null ..() + /obj/machinery/door/window/proc/open_and_close() open() if(src.check_access(null)) @@ -213,8 +215,8 @@ return user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - user.visible_message("[user] smashes against the [src.name].", \ - "[user] smashes against the [src.name].") + user.visible_message("[user] smashes against the [src.name]!", \ + "You smash against the [src.name]!") take_damage(damage) /obj/machinery/door/window/attack_alien(mob/living/user as mob) @@ -247,7 +249,7 @@ /obj/machinery/door/window/emag_act(mob/user as mob) if(density && !emagged) - operating = -1 + operating = 0 flick("[src.base_state]spark", src) sleep(6) desc += "
Its access panel is smoking slightly." @@ -264,7 +266,7 @@ if(istype(I, /obj/item/weapon/screwdriver)) if(src.density || src.operating) - user << "You need to open the door to access the maintenance panel." + user << "You need to open the door to access the maintenance panel!" return playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) src.p_open = !( src.p_open ) @@ -274,8 +276,8 @@ if(istype(I, /obj/item/weapon/crowbar)) if(p_open && !src.density && !src.operating) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] removes the electronics from the [src.name].", \ - "You start to remove electronics from the [src.name].") + user.visible_message("[user] removes the electronics from the [src.name].", \ + "You start to remove electronics from the [src.name]...") if(do_after(user,40)) if(src.p_open && !src.density && !src.operating && src.loc) var/obj/structure/windoor_assembly/WA = new /obj/structure/windoor_assembly(src.loc) @@ -302,7 +304,7 @@ qdel(src) return - user << "You removed the airlock electronics!" + user << "You remove the airlock electronics." var/obj/item/weapon/airlock_electronics/ae if(!electronics) @@ -358,6 +360,13 @@ return +/obj/machinery/door/window/attack_hulk(mob/user) + ..(user, 1) + user.visible_message("[user] smashes through the windoor!", \ + "You tear through the windoor!") + user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) + playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1) + take_damage(health) /obj/machinery/door/window/brigdoor diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index d91d360f5e5..0e54a939366 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -1,213 +1,296 @@ -//States for airlock_control -#define ACCESS_STATE_INTERNAL -1 -#define ACCESS_STATE_LOCKED 0 -#define ACCESS_STATE_EXTERNAL 1 +#define CLOSING 1 +#define OPENING 2 +#define CYCLE 3 +#define CYCLE_EXTERIOR 4 +#define CYCLE_INTERIOR 5 -datum/computer/file/embedded_program/access_controller - var/id_tag - var/exterior_door_tag - var/interior_door_tag +/obj/machinery/doorButtons + power_channel = ENVIRON + anchored = 1 + use_power = 1 + idle_power_usage = 2 + active_power_usage = 4 + var/idSelf - state = ACCESS_STATE_LOCKED - var/target_state = ACCESS_STATE_LOCKED +/obj/machinery/doorButtons/attackby(obj/O, mob/user) + attack_hand(user) -datum/computer/file/embedded_program/access_controller/receive_signal(datum/signal/signal, receive_method, receive_param) - var/receive_tag = signal.data["tag"] - if(!receive_tag) return +/obj/machinery/doorButtons/proc/findObjsByTag() + return - if(receive_tag==exterior_door_tag) - if(signal.data["door_status"] == "closed") - if(signal.data["lock_status"] == "locked") - memory["exterior_status"] = "locked" +/obj/machinery/doorButtons/initialize() + findObjsByTag() + +/obj/machinery/doorButtons/proc/removeMe() + + +/obj/machinery/doorButtons/access_button + icon = 'icons/obj/airlock_machines.dmi' + icon_state = "access_button_standby" + name = "access button" + var/idDoor + var/obj/machinery/door/airlock/door + var/obj/machinery/doorButtons/airlock_controller/controller + var/busy + +/obj/machinery/doorButtons/access_button/findObjsByTag() + for(var/obj/machinery/doorButtons/airlock_controller/A in world) + if(A.idSelf == idSelf) + controller = A + break + for(var/obj/machinery/door/airlock/I in world) + if(I.id_tag == idDoor) + door = I + break + +/obj/machinery/doorButtons/access_button/attack_hand(mob/user) + if(..()) + return + if(busy) + return + if(controller && !controller.busy && door) + if(controller.stat & NOPOWER) + return + busy = 1 + update_icon() + if(door.density) + if(!controller.exteriorAirlock || !controller.interiorAirlock) + controller.onlyOpen(door) else - memory["exterior_status"] = "closed" - else - memory["exterior_status"] = "open" - - else if(receive_tag==interior_door_tag) - if(signal.data["door_status"] == "closed") - if(signal.data["lock_status"] == "locked") - memory["interior_status"] = "locked" - else - memory["interior_status"] = "closed" - else - memory["interior_status"] = "open" - - else if(receive_tag==id_tag) - switch(signal.data["command"]) - if("cycle_interior") - target_state = ACCESS_STATE_INTERNAL - if("cycle_exterior") - target_state = ACCESS_STATE_EXTERNAL - if("cycle") - if(state < ACCESS_STATE_LOCKED) - target_state = ACCESS_STATE_EXTERNAL + if(controller.exteriorAirlock.density && controller.interiorAirlock.density) + controller.onlyOpen(door) else - target_state = ACCESS_STATE_INTERNAL + controller.cycleClose(door) + else + controller.onlyClose(door) + sleep(20) + busy = 0 + update_icon() -datum/computer/file/embedded_program/access_controller/receive_user_command(command) - switch(command) - if("cycle_closed") - target_state = ACCESS_STATE_LOCKED - if("cycle_exterior") - target_state = ACCESS_STATE_EXTERNAL - if("cycle_interior") - target_state = ACCESS_STATE_INTERNAL +/obj/machinery/doorButtons/access_button/update_icon() + if(stat & NOPOWER) + icon_state = "access_button_off" + else + if(busy) + icon_state = "access_button_cycle" + else + icon_state = "access_button_standby" -datum/computer/file/embedded_program/access_controller/process() - var/process_again = 1 - while(process_again) - process_again = 0 - switch(state) - if(ACCESS_STATE_INTERNAL) // state -1 - if(target_state > state) - if(memory["interior_status"] == "locked") - state = ACCESS_STATE_LOCKED - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - if(memory["interior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) +/obj/machinery/doorButtons/access_button/power_change() + ..() + update_icon() - if(ACCESS_STATE_LOCKED) - if(target_state < state) - if(memory["exterior_status"] != "locked") - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - if(memory["exterior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) - else - if(memory["interior_status"] == "closed" || memory["interior_status"] == "open") - state = ACCESS_STATE_INTERNAL - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) - else if(target_state > state) - if(memory["interior_status"] != "locked") - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - if(memory["interior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) - else - if(memory["exterior_status"] == "closed" || memory["exterior_status"] == "open") - state = ACCESS_STATE_EXTERNAL - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) - else - if(memory["interior_status"] != "locked") - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - if(memory["interior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) - else if(memory["exterior_status"] != "locked") - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - if(memory["exterior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) - - if(ACCESS_STATE_EXTERNAL) //state 1 - if(target_state < state) - if(memory["exterior_status"] == "locked") - state = ACCESS_STATE_LOCKED - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - if(memory["exterior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) +/obj/machinery/doorButtons/access_button/removeMe(obj/O) + if(O == door) + door = null - return 1 - -obj/machinery/embedded_controller/radio/access_controller +/obj/machinery/doorButtons/airlock_controller icon = 'icons/obj/airlock_machines.dmi' icon_state = "access_control_standby" - name = "access console" - density = 0 - power_channel = ENVIRON + var/obj/machinery/door/airlock/interiorAirlock + var/obj/machinery/door/airlock/exteriorAirlock + var/idInterior + var/idExterior + var/busy + var/lostPower - frequency = 1449 +/obj/machinery/doorButtons/airlock_controller/removeMe(obj/O) + if(O == interiorAirlock) + interiorAirlock = null + else if(O == exteriorAirlock) + exteriorAirlock = null - // Setup parameters only - var/id_tag - var/exterior_door_tag - var/interior_door_tag - -obj/machinery/embedded_controller/radio/access_controller/initialize() +/obj/machinery/doorButtons/airlock_controller/Destroy() + for(var/obj/machinery/doorButtons/access_button/A in world) + if(A.controller == src) + A.controller = null ..() - var/datum/computer/file/embedded_program/access_controller/new_prog = new +/obj/machinery/doorButtons/airlock_controller/Topic(href, href_list) + if(..()) + return + if(busy) + return + switch(href_list["command"]) + if("close_exterior") + onlyClose(exteriorAirlock) + if("close_interior") + onlyClose(interiorAirlock) + if("cycle_exterior") + cycleClose(exteriorAirlock) + if("cycle_interior") + cycleClose(interiorAirlock) + if("open_exterior") + onlyOpen(exteriorAirlock) + if("open_interior") + onlyOpen(interiorAirlock) - new_prog.id_tag = id_tag - new_prog.exterior_door_tag = exterior_door_tag - new_prog.interior_door_tag = interior_door_tag +/obj/machinery/doorButtons/airlock_controller/proc/onlyOpen(obj/machinery/door/airlock/A) + if(A) + busy = CLOSING + update_icon() + openDoor(A) - new_prog.master = src - program = new_prog +/obj/machinery/doorButtons/airlock_controller/proc/onlyClose(obj/machinery/door/airlock/A) + if(A) + busy = CLOSING + closeDoor(A) -obj/machinery/embedded_controller/radio/access_controller/update_icon() - if(on && program) - if(program.memory["processing"]) - icon_state = "access_control_process" +/obj/machinery/doorButtons/airlock_controller/proc/closeDoor(obj/machinery/door/airlock/A) + if(A.density) + goIdle() + return 0 + update_icon() + A.unbolt() + spawn() + if(A && A.close()) + if(stat & NOPOWER || lostPower || !A || A.gc_destroyed) + goIdle(1) + return + A.bolt() + if(busy == CLOSING) + goIdle(1) else - icon_state = "access_control_standby" + goIdle(1) + return 1 + +/obj/machinery/doorButtons/airlock_controller/proc/cycleClose(obj/machinery/door/airlock/A) + if(!A || !exteriorAirlock || !interiorAirlock) + return + if(exteriorAirlock.density == interiorAirlock.density || !A.density) + return + busy = CYCLE + update_icon() + if(A == interiorAirlock) + if(closeDoor(exteriorAirlock)) + busy = CYCLE_INTERIOR else + if(closeDoor(interiorAirlock)) + busy = CYCLE_EXTERIOR + +/obj/machinery/doorButtons/airlock_controller/proc/cycleOpen(obj/machinery/door/airlock/A) + if(!A) + goIdle(1) + if(A == exteriorAirlock) + if(interiorAirlock) + if(!interiorAirlock.density || !interiorAirlock.locked) + return + else + if(exteriorAirlock) + if(!exteriorAirlock.density || !exteriorAirlock.locked) + return + if(busy != OPENING) + busy = OPENING + openDoor(A) + +/obj/machinery/doorButtons/airlock_controller/proc/openDoor(obj/machinery/door/airlock/A) + if(exteriorAirlock && interiorAirlock && (!exteriorAirlock.density || !interiorAirlock.density)) + goIdle(1) + return + A.unbolt() + spawn() + if(A && A.open()) + if(stat | (NOPOWER) && !lostPower && A && !A.gc_destroyed) + A.bolt() + goIdle(1) + +/obj/machinery/doorButtons/airlock_controller/proc/goIdle(var/update) + lostPower = 0 + busy = 0 + if(update) + update_icon() + updateUsrDialog() + +/obj/machinery/doorButtons/airlock_controller/process() + if(stat & NOPOWER) + return + if(busy == CYCLE_EXTERIOR) + cycleOpen(exteriorAirlock) + else if(busy == CYCLE_INTERIOR) + cycleOpen(interiorAirlock) + +/obj/machinery/doorButtons/airlock_controller/power_change() + ..() + if(stat & NOPOWER) + lostPower = 1 + else + if(!busy) + lostPower = 0 + update_icon() + +/obj/machinery/doorButtons/airlock_controller/findObjsByTag() + for(var/obj/machinery/door/airlock/A in world) + if(A.id_tag == idInterior) + interiorAirlock = A + else if(A.id_tag == idExterior) + exteriorAirlock = A + +/obj/machinery/doorButtons/airlock_controller/update_icon() + if(stat & NOPOWER) icon_state = "access_control_off" + return + if(busy || lostPower) + icon_state = "access_control_process" + else + icon_state = "access_control_standby" + +/obj/machinery/doorButtons/airlock_controller/attack_hand(mob/user) + if(..()) + return + var/datum/browser/popup = new(user, "computer", name) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.set_content(returnText()) + popup.open() + +/obj/machinery/doorButtons/airlock_controller/proc/returnText() + var/output + if(!exteriorAirlock && !interiorAirlock) + return "ERROR ERROR ERROR ERROR" + if(lostPower) + output = "Initializing..." + else + if(!exteriorAirlock || !interiorAirlock) + if(!exteriorAirlock) + if(interiorAirlock.density) + output = "Open Interior Airlock
" + else + output = "Close Interior Airlock
" + else + if(exteriorAirlock.density) + output = "Open Exterior Airlock
" + else + output = "Close Exterior Airlock
" + else + if(exteriorAirlock.density) + if(interiorAirlock.density) + output = {"Open Exterior Airlock
+ Open Interior Airlock
"} + else + output = {"Cycle to Exterior Airlock
+ Close Interior Airlock
"} + else + if(interiorAirlock.density) + output = {"Close Exterior Airlock
+ Cycle to Interior Airlock
"} + else + output = {"Close Exterior Airlock
+ Close Interior Airlock
"} -obj/machinery/embedded_controller/radio/access_controller/return_text() - var/state_options = null + output = {"Access Control Console
+ [output]
"} + if(exteriorAirlock) + output += "Exterior Door: [exteriorAirlock.density ? "closed" : "open"]
" + if(interiorAirlock) + output += "Interior Door: [interiorAirlock.density ? "closed" : "open"]
" - var/state = 0 - var/exterior_status = "----" - var/interior_status = "----" - if(program) - state = program.state - exterior_status = program.memory["exterior_status"] - interior_status = program.memory["interior_status"] + return output - switch(state) - if(ACCESS_STATE_INTERNAL) - state_options = {"Lock Interior Airlock
-Cycle to Exterior Airlock
"} - if(ACCESS_STATE_LOCKED) - state_options = {"Unlock Interior Airlock
-Unlock Exterior Airlock
"} - if(ACCESS_STATE_EXTERNAL) - state_options = {"Cycle to Interior Airlock
-Lock Exterior Airlock
"} - - var/output = {"Access Control Console
-[state_options]
-Exterior Door: [exterior_status]
-Interior Door: [interior_status]
"} - - return output \ No newline at end of file +#undef CLOSING +#undef OPENING +#undef CYCLE +#undef CYCLE_EXTERIOR +#undef CYCLE_INTERIOR \ No newline at end of file diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 1e702ac8c24..6ef3d8e0dd6 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -5,7 +5,7 @@ #define AIRLOCK_STATE_DEPRESSURIZE 1 #define AIRLOCK_STATE_OUTOPEN 2 -datum/computer/file/embedded_program/airlock_controller +/datum/computer/file/embedded_program/airlock_controller var/id_tag var/exterior_door_tag var/interior_door_tag @@ -17,7 +17,7 @@ datum/computer/file/embedded_program/airlock_controller var/target_state = AIRLOCK_STATE_CLOSED var/sensor_pressure = null -datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param) +/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param) var/receive_tag = signal.data["tag"] if(!receive_tag) return @@ -45,7 +45,7 @@ datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/sig else target_state = AIRLOCK_STATE_INOPEN -datum/computer/file/embedded_program/airlock_controller/receive_user_command(command) +/datum/computer/file/embedded_program/airlock_controller/receive_user_command(command) switch(command) if("cycle_closed") target_state = AIRLOCK_STATE_CLOSED @@ -56,7 +56,7 @@ datum/computer/file/embedded_program/airlock_controller/receive_user_command(com if("abort") target_state = AIRLOCK_STATE_CLOSED -datum/computer/file/embedded_program/airlock_controller/process() +/datum/computer/file/embedded_program/airlock_controller/process() var/process_again = 1 while(process_again) process_again = 0 @@ -201,7 +201,7 @@ datum/computer/file/embedded_program/airlock_controller/process() return 1 -obj/machinery/embedded_controller/radio/airlock_controller +/obj/machinery/embedded_controller/radio/airlock_controller icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_control_standby" @@ -219,7 +219,7 @@ obj/machinery/embedded_controller/radio/airlock_controller var/sensor_tag var/sanitize_external -obj/machinery/embedded_controller/radio/airlock_controller/initialize() +/obj/machinery/embedded_controller/radio/airlock_controller/initialize() ..() var/datum/computer/file/embedded_program/airlock_controller/new_prog = new @@ -234,7 +234,7 @@ obj/machinery/embedded_controller/radio/airlock_controller/initialize() new_prog.master = src program = new_prog -obj/machinery/embedded_controller/radio/airlock_controller/update_icon() +/obj/machinery/embedded_controller/radio/airlock_controller/update_icon() if(on && program) if(program.memory["processing"]) icon_state = "airlock_control_process" @@ -244,7 +244,7 @@ obj/machinery/embedded_controller/radio/airlock_controller/update_icon() icon_state = "airlock_control_off" -obj/machinery/embedded_controller/radio/airlock_controller/return_text() +/obj/machinery/embedded_controller/radio/airlock_controller/return_text() var/state_options = null var/state = 0 diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 6f9b91169b0..ac2b9b6ff7d 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -1,23 +1,23 @@ -datum/computer/file/embedded_program +/datum/computer/file/embedded_program var/list/memory = list() var/state var/obj/machinery/embedded_controller/master -datum/computer/file/embedded_program/proc/post_signal(datum/signal/signal, comm_line) +/datum/computer/file/embedded_program/proc/post_signal(datum/signal/signal, comm_line) if(master) master.post_signal(signal, comm_line) else del(signal) -datum/computer/file/embedded_program/proc/receive_user_command(command) +/datum/computer/file/embedded_program/proc/receive_user_command(command) -datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param) +/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param) return null -datum/computer/file/embedded_program/process() +/datum/computer/file/embedded_program/process() return 0 -obj/machinery/embedded_controller +/obj/machinery/embedded_controller var/datum/computer/file/embedded_program/program name = "embedded controller" @@ -26,7 +26,7 @@ obj/machinery/embedded_controller var/on = 1 -obj/machinery/embedded_controller/interact(mob/user as mob) +/obj/machinery/embedded_controller/interact(mob/user as mob) //user << browse(return_text(), "window=computer") //onclose(user, "computer") user.set_machine(src) @@ -35,24 +35,24 @@ obj/machinery/embedded_controller/interact(mob/user as mob) popup.set_content(return_text()) popup.open() -obj/machinery/embedded_controller/attack_hand(mob/user as mob) +/obj/machinery/embedded_controller/attack_hand(mob/user as mob) interact(user) -obj/machinery/embedded_controller/update_icon() +/obj/machinery/embedded_controller/update_icon() -obj/machinery/embedded_controller/proc/return_text() +/obj/machinery/embedded_controller/proc/return_text() -obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line) +/obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line) return 0 -obj/machinery/embedded_controller/receive_signal(datum/signal/signal, receive_method, receive_param) +/obj/machinery/embedded_controller/receive_signal(datum/signal/signal, receive_method, receive_param) if(!signal || signal.encryption) return if(program) program.receive_signal(signal, receive_method, receive_param) //spawn(5) program.process() //no, program.process sends some signals and machines respond and we here again and we lag -rastaf0 -obj/machinery/embedded_controller/Topic(href, href_list) +/obj/machinery/embedded_controller/Topic(href, href_list) if(..()) return 0 @@ -63,33 +63,33 @@ obj/machinery/embedded_controller/Topic(href, href_list) usr.set_machine(src) spawn(5) src.updateDialog() -obj/machinery/embedded_controller/process() +/obj/machinery/embedded_controller/process() if(program) program.process() update_icon() src.updateDialog() -obj/machinery/embedded_controller/radio +/obj/machinery/embedded_controller/radio var/frequency var/datum/radio_frequency/radio_connection -obj/machinery/embedded_controller/radio/Destroy() +/obj/machinery/embedded_controller/radio/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() -obj/machinery/embedded_controller/radio/initialize() +/obj/machinery/embedded_controller/radio/initialize() set_frequency(frequency) -obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal) +/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal) signal.transmission_method = TRANSMISSION_RADIO if(radio_connection) return radio_connection.post_signal(src, signal) else signal = null -obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency) +/obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index f575ccd7778..fdea6d8469f 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -40,23 +40,23 @@ /obj/machinery/flasher/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wirecutters)) if (bulb) - user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb.") + user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb...") playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) if(do_after(user, 30) && bulb) - user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb!") + user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb.") bulb.loc = src.loc bulb = null power_change() else if (istype(W, /obj/item/device/flash/handheld)) if (!bulb) - user.visible_message("[user] installs [W] into [src].", "You install [W] into [src].") + user.visible_message("[user] installs [W] into [src].", "You install [W] into [src].") user.drop_item() W.loc = src bulb = W power_change() else - user << "A flashbulb is already installed in [src]." + user << "A flashbulb is already installed in [src]!" add_fingerprint(user) //Let the AI trigger them directly. diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 6f20b8ce9f6..299a8c01b38 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -42,6 +42,35 @@ var/const/HOLOPAD_MODE = RANGE_BASED var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating. var/temp = "" +/obj/machinery/hologram/holopad/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/holopad(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + RefreshParts() + +/obj/machinery/hologram/holopad/RefreshParts() + var/holograph_range = 4 + for(var/obj/item/weapon/stock_parts/capacitor/B in component_parts) + holograph_range += 1 * B.rating + holo_range = holograph_range + +/obj/machinery/hologram/holopad/attackby(obj/item/P as obj, mob/user as mob, params) + if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P)) + return + + if(exchange_parts(user, P)) + return + + if(default_pry_open(P)) + return + + if(default_unfasten_wrench(user, P)) + return + + default_deconstruction_crowbar(P) + + /obj/machinery/hologram/holopad/attack_hand(var/mob/living/carbon/human/user) //Carn: Hologram requests. if(!istype(user)) return diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index aa9be627ab2..0354e94eac4 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -76,10 +76,10 @@ add_fingerprint(user) src.disable = !src.disable if (src.disable) - user.visible_message("[user] has disabled \the [src]!", "You disable the connection to \the [src].") + user.visible_message("[user] has disabled \the [src]!", "You disable the connection to \the [src].") icon_state = "[base_state]-d" if (!src.disable) - user.visible_message("[user] has reconnected \the [src]!", "You fix the connection to \the [src].") + user.visible_message("[user] has reconnected \the [src]!", "You fix the connection to \the [src].") if(src.powered()) icon_state = "[base_state]" else diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index b56321f9588..8d07ebf090d 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -53,35 +53,35 @@ return if(attached) - visible_message("[attached] is detached from \the [src]") + visible_message("[attached] is detached from \the [src].") attached = null update_icon() return if(!ishuman(target)) - usr << "The drip beeps: Warning, human patients only!" + usr << "The drip beeps: Warning, human patients only!" return if(Adjacent(target) && usr.Adjacent(target)) if(beaker) - visible_message("[usr] attaches \the [src] to \the [target].") + usr.visible_message("[usr] attaches \the [src] to \the [target].", "You attach \the [src] to \the [target].") attached = target SSmachine.processing.Add(src) update_icon() else - usr << "There's nothing attached to the IV drip!" + usr << "There's nothing attached to the IV drip!" /obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/reagent_containers)) if(!isnull(beaker)) - user << "There is already a reagent container loaded!" + user << "There is already a reagent container loaded!" return user.drop_item() W.loc = src beaker = W - user << "You attach \the [W] to \the [src]." + user << "You attach \the [W] to \the [src]." update_icon() return else @@ -107,7 +107,7 @@ if(istype(beaker, /obj/item/weapon/reagent_containers/blood)) // speed up transfer on blood packs transfer_amount = 4 - beaker.reagents.reaction(attached, INGEST, 0,0) //make reagents reacts, but don't spam messages + beaker.reagents.reaction(attached, INGEST, 1,0) //make reagents reacts, but don't spam messages beaker.reagents.trans_to(attached, transfer_amount) update_icon() @@ -163,7 +163,7 @@ set src in view(1) if(!istype(usr, /mob/living)) - usr << "You can't do that." + usr << "You can't do that!" return if(usr.stat) @@ -180,7 +180,7 @@ set src in view(1) if(!istype(usr, /mob/living)) - usr << "You can't do that." + usr << "You can't do that!" return if(usr.stat) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index bfa9f68ef65..1498fa14fe8 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -82,9 +82,12 @@ Class Procs: Called by machine to assign a value to the uid variable. process() 'game/machinery/machine.dm' - Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. + Called by the 'machinery subsystem' once per machinery tick for each machine that is listed in its 'machines' list. - is_operational() + process_atmos() + Called by the 'air subsystem' once per atmos tick for each machine that is listed in its 'atmos_machines' list. + + is_operational() Returns 0 if the machine is unpowered, broken or undergoing maintenance, something else if not Compiled by Aygar @@ -94,6 +97,7 @@ Class Procs: name = "machinery" icon = 'icons/obj/stationobjs.dmi' verb_yell = "blares" + pressure_resistance = 10 var/stat = 0 var/emagged = 0 var/use_power = 1 @@ -132,6 +136,9 @@ Class Procs: /obj/machinery/process()//If you dont use process or power why are you here return PROCESS_KILL +/obj/machinery/proc/process_atmos()//If you dont use process why are you here + return PROCESS_KILL + /obj/machinery/emp_act(severity) if(use_power && stat == 0) use_power(7500/severity) @@ -227,7 +234,7 @@ Class Procs: if(be_close && in_range(M, src)) return 1 else - src << "You don't have the dexterity to do this!" + src << "You don't have the dexterity to do this!" return /mob/living/carbon/human/canUseTopic(atom/movable/M, be_close = 0) @@ -275,31 +282,28 @@ Class Procs: //set_machine must be 0 if clicking the machinery doesn't bring up a dialog /obj/machinery/attack_hand(mob/user as mob, var/check_power = 1, var/set_machine = 1) - if(check_power && stat & NOPOWER) - user << "\The [src] seems unpowered." - return 1 - if(!interact_offline && stat & (BROKEN|MAINT)) - user << "\The [src] seems broken." - return 1 if(user.lying || user.stat) return 1 if(!user.IsAdvancedToolUser()) - usr << "You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return 1 -/* - //distance checks are made by atom/proc/DblClick - if ((get_dist(src, user) > 1 || !istype(src.loc, /turf)) && !istype(user, /mob/living/silicon)) - return 1 -*/ if (ishuman(user)) var/mob/living/carbon/human/H = user if(H.getBrainLoss() >= 60) visible_message("[H] stares cluelessly at [src] and drools.") return 1 else if(prob(H.getBrainLoss())) - user << "You momentarily forget how to use [src]." + user << "You momentarily forget how to use [src]!" return 1 - + if(panel_open) + src.add_fingerprint(user) + return 0 + if(check_power && stat & NOPOWER) + user << "\The [src] seems unpowered." + return 1 + if(!interact_offline && stat & (BROKEN|MAINT)) + user << "\The [src] seems broken." + return 1 src.add_fingerprint(user) if(set_machine) user.set_machine(src) @@ -361,10 +365,10 @@ Class Procs: /obj/machinery/proc/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20) if(istype(W)) - user << "Now [anchored ? "un" : ""]securing [name]." + user << "You begin [anchored ? "un" : ""]securing [name]..." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, time)) - user << "You've [anchored ? "un" : ""]secured [name]." + user << "You [anchored ? "un" : ""]secure [name]." anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) return 1 @@ -373,9 +377,13 @@ Class Procs: /obj/machinery/proc/exchange_parts(mob/user, obj/item/weapon/storage/part_replacer/W) var/shouldplaysound = 0 if(istype(W) && component_parts) - if(panel_open) + if(panel_open || W.works_from_distance) var/obj/item/weapon/circuitboard/CB = locate(/obj/item/weapon/circuitboard) in component_parts var/P + if(W.works_from_distance) + user << "Following parts detected in the machine:" + for(var/var/obj/item/C in component_parts) + user << " [C.name]" for(var/obj/item/weapon/stock_parts/A in component_parts) for(var/D in CB.req_components) if(ispath(A.type, D)) @@ -405,3 +413,6 @@ Class Procs: //called on machinery construction (i.e from frame to machinery) but not on initialization /obj/machinery/proc/construction() return + +/obj/machinery/allow_drop() + return 0 \ No newline at end of file diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 490280f4edc..41ebba50ddb 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -46,6 +46,7 @@ if(radio_controller) radio_controller.remove_object(src, freq) ..() + center = null // update the invisibility and icon /obj/machinery/magnetic_module/hide(var/intact) @@ -244,6 +245,8 @@ if(radio_controller) radio_controller.remove_object(src, frequency) ..() + magnets = null + rpath = null /obj/machinery/magnetic_controller/process() if(magnets.len == 0 && autolink) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 3851c577c72..e23456392ae 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -1,5 +1,5 @@ // Navigation beacon for AI robots -// Functions as a transponder: looks for incoming signal matching +// No longer exists on the radio controller, it is managed by a global list. /obj/machinery/navbeacon @@ -18,7 +18,7 @@ var/list/codes // assoc. list of transponder codes var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value" - req_access = list(access_engine) + req_access = list(access_engine, access_robotics) /obj/machinery/navbeacon/New() ..() @@ -27,14 +27,15 @@ var/turf/T = loc hide(T.intact) - - spawn(5) // must wait for map loading to finish - if(radio_controller) - radio_controller.add_object(src, freq, RADIO_NAVBEACONS) + if(codes["patrol"]) + navbeacons += src //Register with the patrol list! + if(codes["delivery"]) + deliverybeacons += src + deliverybeacontags += location /obj/machinery/navbeacon/Destroy() - if(radio_controller) - radio_controller.remove_object(src, freq) + navbeacons &= src //Remove from beacon list, if in one. + deliverybeacons &= src ..() // set the transponder codes assoc list from codes_txt @@ -72,38 +73,6 @@ else icon_state = "[state]" - -// look for a signal of the form "findbeacon=X" -// where X is any -// or the location -// or one of the set transponder keys -// if found, return a signal -/obj/machinery/navbeacon/receive_signal(datum/signal/signal) - - var/request = signal.data["findbeacon"] - if(request && ((request in codes) || request == "any" || request == location)) - spawn(1) - post_signal() - -// return a signal giving location and transponder codes - -/obj/machinery/navbeacon/proc/post_signal() - - var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq) - - if(!frequency) return - - var/datum/signal/signal = new() - signal.source = src - signal.transmission_method = 1 - signal.data["beacon"] = location - - for(var/key in codes) - signal.data[key] = codes[key] - - frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS) - - /obj/machinery/navbeacon/attackby(var/obj/item/I, var/mob/user, params) var/turf/T = loc if(T.intact) @@ -112,7 +81,7 @@ if(istype(I, /obj/item/weapon/screwdriver)) open = !open - user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") + user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") updateicon() @@ -120,12 +89,12 @@ if(open) if (src.allowed(user)) src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + user << "Controls are now [src.locked ? "locked" : "unlocked"]." else user << "Access denied." updateDialog() else - user << "You must open the cover first!" + user << "You must open the cover first!" return /obj/machinery/navbeacon/attack_ai(var/mob/user) @@ -143,7 +112,7 @@ return // prevent intraction when T-scanner revealed if(!open && !ai) // can't alter controls if not open, unless you're an AI - user << "The beacon's control cover is closed." + user << "The beacon's control cover is closed!" return @@ -152,7 +121,6 @@ if(locked && !ai) t = {"Navigation Beacon
(swipe card to unlock controls)
-Frequency: [format_frequency(freq)]
Location: [location ? location : "(none)"]
Transponder Codes:
"
return output
+/obj/mecha/working/ripley/proc/update_pressure()
+ var/turf/T = get_turf(loc)
+ var/datum/gas_mixture/environment = T.return_air()
+ var/pressure = environment.return_pressure()
+ if(pressure < 20)
+ step_in = 3
+ for(var/obj/item/mecha_parts/mecha_equipment/tool/drill/drill in equipment)
+ drill.equip_cooldown = initial(drill.equip_cooldown)/2
+ else
+ step_in = 5
+ for(var/obj/item/mecha_parts/mecha_equipment/tool/drill/drill in equipment)
+ drill.equip_cooldown = initial(drill.equip_cooldown)
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index ffc4db6400c..43cd9f186cf 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -34,7 +34,11 @@
if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || (buckle_requires_restraints && !M.restrained()))
return 0
- if (isslime(M))
+ if (isslime(M) || isAI(M))
+ if(M == usr)
+ M << "You are unable to buckle yourself to the [src]!"
+ else
+ usr << "You are unable to buckle [M] to the [src]!"
return 0
M.buckled = src
@@ -74,14 +78,14 @@
if(buckle_mob(M))
if(M == user)
M.visible_message(\
- "[M.name] buckles themselves to [src].",\
+ "[M.name] buckles themselves to [src].",\
"You buckle yourself to [src].",\
- "You hear metal clanking.")
+ "You hear metal clanking.")
else
M.visible_message(\
- "[M.name] is buckled to [src] by [user.name]!",\
+ "[M.name] is buckled to [src] by [user.name]!",\
"You are buckled to [src] by [user.name]!",\
- "You heat metal clanking.")
+ "You heat metal clanking.")
/obj/proc/user_unbuckle_mob(mob/user)
var/mob/living/M = unbuckle_mob()
@@ -89,14 +93,14 @@
if(M)
if(M != user)
M.visible_message(\
- "[M.name] was unbuckled by [user.name]!",\
+ "[M.name] was unbuckled by [user.name].",\
"You were unbuckled from [src] by [user.name].",\
- "You hear metal clanking.")
+ "You hear metal clanking.")
else
M.visible_message(\
"[M.name] unbuckled themselves!",\
"You unbuckled yourself from [src].",\
- "You hear metal clanking.")
+ "You hear metal clanking.")
add_fingerprint(user)
return M
diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
index 6d62cbeebfb..8e0343348e6 100644
--- a/code/game/objects/effects/aliens.dm
+++ b/code/game/objects/effects/aliens.dm
@@ -7,6 +7,10 @@
* effect/acid
*/
+#define WEED_NORTH_EDGING "north"
+#define WEED_SOUTH_EDGING "south"
+#define WEED_EAST_EDGING "east"
+#define WEED_WEST_EDGING "west"
/obj/structure/alien
icon = 'icons/mob/alien.dmi'
@@ -21,8 +25,11 @@
density = 1
opacity = 1
anchored = 1
+ canSmoothWith = list(/obj/structure/alien/resin)
var/health = 200
var/resintype = null
+
+
/obj/structure/alien/resin/New(location)
relativewall_neighbours()
..()
@@ -50,8 +57,8 @@
resintype = "wall"
/obj/structure/alien/resin/wall/New()
- relativewall_neighbours()
..()
+ relativewall_neighbours()
/obj/structure/alien/resin/wall/BlockSuperconductivity()
return 1
@@ -167,6 +174,7 @@
layer = 2
var/health = 15
var/obj/structure/alien/weeds/node/linked_node = null
+ var/static/list/weedImageCache
/obj/structure/alien/weeds/New(pos, node)
@@ -187,6 +195,7 @@
loc = null
for (var/obj/structure/alien/weeds/W in range(1,T))
W.updateWeedOverlays()
+ linked_node = null
..()
/obj/structure/alien/weeds/proc/Life()
@@ -250,22 +259,31 @@
/obj/structure/alien/weeds/proc/updateWeedOverlays()
overlays.Cut()
+
+ if(!weedImageCache || !weedImageCache.len)
+ weedImageCache = list()
+ weedImageCache.len = 4
+ weedImageCache[WEED_NORTH_EDGING] = image('icons/mob/alien.dmi', "weeds_side_n", layer=2.11, pixel_y = -32)
+ weedImageCache[WEED_SOUTH_EDGING] = image('icons/mob/alien.dmi', "weeds_side_s", layer=2.11, pixel_y = 32)
+ weedImageCache[WEED_EAST_EDGING] = image('icons/mob/alien.dmi', "weeds_side_e", layer=2.11, pixel_x = -32)
+ weedImageCache[WEED_WEST_EDGING] = image('icons/mob/alien.dmi', "weeds_side_w", layer=2.11, pixel_x = 32)
+
var/turf/N = get_step(src, NORTH)
var/turf/S = get_step(src, SOUTH)
var/turf/E = get_step(src, EAST)
var/turf/W = get_step(src, WEST)
if(!locate(/obj/structure/alien) in N.contents)
if(istype(N, /turf/simulated/floor))
- src.overlays += image('icons/mob/alien.dmi', "weeds_side_s", layer=2.11, pixel_y = 32)
+ overlays += weedImageCache[WEED_SOUTH_EDGING]
if(!locate(/obj/structure/alien) in S.contents)
if(istype(S, /turf/simulated/floor))
- src.overlays += image('icons/mob/alien.dmi', "weeds_side_n", layer=2.11, pixel_y = -32)
+ overlays += weedImageCache[WEED_NORTH_EDGING]
if(!locate(/obj/structure/alien) in E.contents)
if(istype(E, /turf/simulated/floor))
- src.overlays += image('icons/mob/alien.dmi', "weeds_side_w", layer=2.11, pixel_x = 32)
+ overlays += weedImageCache[WEED_WEST_EDGING]
if(!locate(/obj/structure/alien) in W.contents)
if(istype(W, /turf/simulated/floor))
- src.overlays += image('icons/mob/alien.dmi', "weeds_side_e", layer=2.11, pixel_x = -32)
+ overlays += weedImageCache[WEED_EAST_EDGING]
/obj/structure/alien/weeds/proc/fullUpdateWeedOverlays()
@@ -493,4 +511,9 @@
spawn(1)
if(src)
- tick()
\ No newline at end of file
+ tick()
+
+#undef WEED_NORTH_EDGING
+#undef WEED_SOUTH_EDGING
+#undef WEED_EAST_EDGING
+#undef WEED_WEST_EDGING
\ No newline at end of file
diff --git a/code/game/objects/effects/decals/Cleanable/aliens.dm b/code/game/objects/effects/decals/Cleanable/aliens.dm
index 4b51be4a825..5778ec117d5 100644
--- a/code/game/objects/effects/decals/Cleanable/aliens.dm
+++ b/code/game/objects/effects/decals/Cleanable/aliens.dm
@@ -16,6 +16,7 @@
/obj/effect/decal/cleanable/xenoblood/Destroy()
for(var/datum/disease/D in viruses)
D.cure(0)
+ viruses = null
..()
/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(var/list/directions)
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index f7b073c5fc7..c2054cf07a0 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -14,6 +14,7 @@
/obj/effect/decal/cleanable/blood/Destroy()
for(var/datum/disease/D in viruses)
D.cure(0)
+ viruses = null
..()
/obj/effect/decal/cleanable/blood/New()
diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
index c6bb4c6a737..71d209de6a6 100644
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -106,6 +106,7 @@
/obj/effect/decal/cleanable/vomit/Destroy()
for(var/datum/disease/D in viruses)
D.cure(0)
+ viruses = null
..()
/obj/effect/decal/cleanable/tomato_smudge
diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm
index 5f9eda868f6..d7710921b4e 100644
--- a/code/game/objects/effects/decals/Cleanable/robots.dm
+++ b/code/game/objects/effects/decals/Cleanable/robots.dm
@@ -58,6 +58,7 @@
/obj/effect/decal/cleanable/oil/Destroy()
for(var/datum/disease/D in viruses)
D.cure(0)
+ viruses = null
..()
/obj/effect/decal/cleanable/oil/streak
diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm
index 00615da6e0e..e24d2ec12d2 100644
--- a/code/game/objects/effects/decals/contraband.dm
+++ b/code/game/objects/effects/decals/contraband.dm
@@ -72,7 +72,7 @@
//############################## THE ACTUAL DECALS ###########################
-obj/structure/sign/poster
+/obj/structure/sign/poster
name = "poster"
desc = "A large piece of space-resistant printed paper."
icon = 'icons/obj/contraband.dmi'
@@ -81,7 +81,7 @@ obj/structure/sign/poster
var/ruined = 0
var/subtype = 0
-obj/structure/sign/poster/New(serial,subtype)
+/obj/structure/sign/poster/New(serial,subtype)
serial_number = serial
if(serial_number == loc)
@@ -302,7 +302,7 @@ obj/structure/sign/poster/New(serial,subtype)
desc += " This is a bug, please report the circumstances under which you encountered this poster at https://github.com/NTStation/NTstation13/issues."
..()
-obj/structure/sign/poster/attackby(obj/item/I, mob/user, params)
+/obj/structure/sign/poster/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wirecutters))
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
if(ruined)
@@ -322,7 +322,7 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params)
if("Yes")
if( user.loc != temp_loc || ruined )
return
- visible_message("[user] rips [src] in a single, decisive motion!" )
+ visible_message("[user] rips [src] in a single, decisive motion!" )
playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1)
ruined = 1
icon_state = "poster_ripped"
@@ -346,11 +346,11 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params)
var/stuff_on_wall = 0
for(var/obj/O in contents) //Let's see if it already has a poster on it or too much stuff
if(istype(O,/obj/structure/sign/poster))
- user << "The wall is far too cluttered to place a poster!"
+ user << "The wall is far too cluttered to place a poster!"
return
stuff_on_wall++
if(stuff_on_wall == 3)
- user << "The wall is far too cluttered to place a poster!"
+ user << "The wall is far too cluttered to place a poster!"
return
user << "You start placing the poster on the wall..." //Looks like it's uncluttered enough. Place the poster.
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 0ff875dd2f7..8aca6f11748 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -18,6 +18,9 @@
name = e_name
desc = "A [name] drawn in crayon."
+ if(type == "poseur tag")
+ gang_name() //Generate gang names so they get removed from the pool
+ type = pick(gang_name_pool)
icon_state = type
var/matrix/M = matrix()
@@ -25,3 +28,40 @@
src.transform = M
color = main
+
+/obj/effect/decal/cleanable/crayon/gang
+ layer = 3.6 //Harder to hide
+ var/gang
+
+/obj/effect/decal/cleanable/crayon/gang/New(location, var/type, var/e_name = "gang tag", var/rotation = 0)
+ if(!type)
+ qdel(src)
+
+ var/area/territory = get_area(location)
+ var/color
+
+ if(type == "A")
+ gang = type
+ color = "#00b4ff"
+ icon_state = gang_name("A")
+ ticker.mode.A_territory_new |= list(territory.type = territory.name)
+ ticker.mode.A_territory_lost -= territory.type
+ else if(type == "B")
+ gang = type
+ color = "#ff3232"
+ icon_state = gang_name("B")
+ ticker.mode.B_territory_new |= list(territory.type = territory.name)
+ ticker.mode.B_territory_lost -= territory.type
+
+ ..(location, color, icon_state, e_name, rotation)
+
+/obj/effect/decal/cleanable/crayon/gang/Destroy()
+ var/area/territory = get_area(src)
+
+ if(gang == "A")
+ ticker.mode.A_territory_new -= territory.type
+ ticker.mode.A_territory_lost |= list(territory.type = territory.name)
+ if(gang == "B")
+ ticker.mode.B_territory_new -= territory.type
+ ticker.mode.B_territory_lost |= list(territory.type = territory.name)
+ ..()
\ No newline at end of file
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index e150828bc99..eb84812588f 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -15,8 +15,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
/obj/effect/effect/Destroy()
..()
- PlaceInPool(src)
- return 1
+ return QDEL_HINT_PUTINPOOL
/datum/effect/effect/proc/fadeOut(var/atom/A, var/frames = 16)
if(A.alpha == 0) //Handle already transparent case
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 8bb92d6e51e..96d7433cead 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -211,28 +211,54 @@
return
-/obj/structure/foamedmetal/attack_animal(var/mob/living/simple_animal/M)
- if(M.environment_smash >= 1)
- M.do_attack_animation(src)
- M << "You smash apart the foam wall."
+/obj/structure/foamedmetal/attack_animal(var/mob/living/simple_animal/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ if(user.environment_smash >= 1)
+ user.do_attack_animation(src)
+ user << "You smash apart the foam wall."
qdel(src)
return
/obj/structure/foamedmetal/attack_hulk(mob/living/carbon/human/user)
..(user, 1)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
if(prob(75 - metal*25))
- user.visible_message("[user] smashes through the foamed metal.", \
- "You smash through the metal foam wall.")
+ user.visible_message("[user] smashes through the foamed metal!", \
+ "You smash through the metal foam wall!")
qdel(src)
return 1
+/obj/structure/foamedmetal/attack_alien(var/mob/living/carbon/alien/humanoid/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ if(prob(75 - metal*25))
+ user.visible_message("[user] smashes through the foamed metal!", \
+ "You smash through the metal foam wall!")
+ qdel(src)
+
+/obj/structure/foamedmetal/attack_slime(var/mob/living/simple_animal/slime/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ if(!user.is_adult)
+ attack_hand(user)
+ return
+ if(prob(75 - metal*25))
+ user.visible_message("[user] smashes through the foamed metal!", \
+ "You smash through the metal foam wall!")
+ qdel(src)
/obj/structure/foamedmetal/attack_hand(var/mob/user)
- user << "You hit the metal foam but bounce off it."
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ user << "You hit the metal foam but bounce off it!"
/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
if (istype(I, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = I
G.affecting.loc = src.loc
@@ -242,11 +268,11 @@
return
if(prob(I.force*20 - metal*25))
- user.visible_message("[user] smashes through the foamed metal.", \
- "You smash through the foamed metal with \the [I].")
+ user.visible_message("[user] smashes through the foamed metal!", \
+ "You smash through the foamed metal with \the [I]!")
qdel(src)
else
- user << "You hit the metal foam to no effect."
+ user << "You hit the metal foam to no effect!"
/obj/structure/foamedmetal/CanPass(atom/movable/mover, turf/target, height=1.5)
diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm
index 0b54d310233..30f2be1dd2d 100644
--- a/code/game/objects/effects/effect_system/effects_other.dm
+++ b/code/game/objects/effects/effect_system/effects_other.dm
@@ -57,9 +57,11 @@
var/amount // TNT equivalent
var/flashing = 0 // does explosion creates flash effect?
var/flashing_factor = 0 // factor of how powerful the flash effect relatively to the explosion
+ var/explosion_message = 1 //whether we show a message to mobs.
-/datum/effect/effect/system/reagents_explosion/set_up (amt, loc, flash = 0, flash_fact = 0)
+/datum/effect/effect/system/reagents_explosion/set_up (amt, loc, flash = 0, flash_fact = 0, message = 1)
amount = amt
+ explosion_message = message
if(istype(loc, /turf/))
location = loc
else
@@ -71,13 +73,14 @@
return
/datum/effect/effect/system/reagents_explosion/start()
+ if(explosion_message)
+ location.visible_message("The solution violently explodes!", \
+ "You hear an explosion!")
if (amount <= 2)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(2, 1, location)
s.start()
- location.visible_message("The solution violently explodes!", \
- "You hear an explosion!")
for(var/mob/M in viewers(1, location))
if (prob (50 * amount))
M << "The explosion knocks you down."
@@ -99,10 +102,7 @@
if (round(amount/3) > 0)
light = min (MAX_EX_LIGHT_RANGE, light + round(amount/3))
- if (flash && flashing_factor)
+ if (flashing && flashing_factor)
flash += (round(amount/4) * flashing_factor)
- location.visible_message("The solution violently explodes!", \
- "You hear an explosion!")
-
explosion(location, devastation, heavy, light, flash)
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index d8a4a1804a6..2d7cba31150 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -227,9 +227,9 @@
R.my_atom = chemholder
/datum/effect/effect/system/chem_smoke_spread/Destroy()
- PlaceInPool(chemholder)
chemholder = null
..()
+ return QDEL_HINT_PUTINPOOL
/datum/effect/effect/system/chem_smoke_spread/set_up(var/datum/reagents/carry = null, n = 5, c = 0, loca, direct, silent = 0)
if(n > 20)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index cf4b7fdab27..09a2858268d 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -55,10 +55,6 @@
secequipment += loc
qdel(src)
return
- if("Deathsquad")
- deathsquadspawn += loc
- qdel(src)
- return
if("Emergencyresponseteam")
emergencyresponseteamspawn += loc
qdel(src)
@@ -87,6 +83,9 @@
start_landmarks_list += src
return 1
+/obj/effect/landmark/start/Destroy()
+ ..()
+ start_landmarks_list -= src
//Costume spawner landmarks
@@ -234,4 +233,25 @@
/obj/effect/landmark/costume/sexymime/New()
new /obj/item/clothing/mask/gas/sexymime(src.loc)
new /obj/item/clothing/under/sexymime(src.loc)
- qdel(src)
\ No newline at end of file
+ qdel(src)
+
+//Department Security spawns
+
+/obj/effect/landmark/start/depsec
+ name = "department_sec"
+
+/obj/effect/landmark/start/depsec/New()
+ ..()
+ department_security_spawns |= src
+
+/obj/effect/landmark/start/depsec/supply
+ name = "supply_sec"
+
+/obj/effect/landmark/start/depsec/medical
+ name = "medical_sec"
+
+/obj/effect/landmark/start/depsec/engineering
+ name = "engineering_sec"
+
+/obj/effect/landmark/start/depsec/science
+ name = "science_sec"
\ No newline at end of file
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 7d401160b80..e1c0f16074a 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -1,16 +1,15 @@
/obj/effect/mine
- name = "proximity mine"
+ name = "dummy mine"
desc = "Better stay away from that thing."
density = 0
anchored = 1
layer = 3
icon = 'icons/obj/weapons.dmi'
icon_state = "uglymine"
- var/minepayload = "explosive"
var/triggered = 0
-/obj/effect/mine/New()
- icon_state = "uglyminearmed"
+/obj/effect/mine/proc/mineEffect(mob/victim)
+ victim << "*click*"
/obj/effect/mine/Crossed(AM as mob|obj)
if(isanimal(AM))
@@ -24,48 +23,72 @@
if(triggered) return
visible_message("[AM] sets off \icon[src] [src]!")
- triggermine(AM, minepayload)
+ triggermine(AM)
-/obj/effect/mine/proc/triggermine(mob/victim, var/triggertype)
+/obj/effect/mine/proc/triggermine(mob/victim)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
-
- switch(triggertype)
- if("explosive")
- explosion(loc, 0, 1, 2, 3)
- if("triggerkick")
- if(isliving(victim) && victim.client)
- victim << "You have been kicked FOR NO REISIN!"
- del(victim.client)
- if("triggerplasma")
- atmos_spawn_air(SPAWN_TOXINS, 360)
- if("triggern2o")
- atmos_spawn_air(SPAWN_N2O, 360)
- if("triggerstun")
- if(isliving(victim))
- victim.Weaken(8)
-
-
+ mineEffect(victim)
triggered = 1
qdel(src)
-/obj/effect/mine/plasma
- name = "plasma mine"
- icon_state = "uglymine"
- minepayload = "triggerplasma"
-/obj/effect/mine/n2o
- name = "\improper N2O mine"
- icon_state = "uglymine"
- minepayload = "triggern2o"
+/obj/effect/mine/explosive
+ name = "explosive mine"
+ var/range_devastation = 0
+ var/range_heavy = 1
+ var/range_light = 2
+ var/range_flash = 3
+
+/obj/effect/mine/explosive/mineEffect(mob/victim)
+ explosion(loc, range_devastation, range_heavy, range_light, range_flash)
+
/obj/effect/mine/stun
name = "stun mine"
- icon_state = "uglymine"
- minepayload = "triggerstun"
+ var/stun_time = 8
+
+/obj/effect/mine/stun/mineEffect(mob/victim)
+ if(isliving(victim))
+ victim.Weaken(stun_time)
/obj/effect/mine/kickmine
name = "kick mine"
- icon_state = "uglymine"
- minepayload = "triggerkick"
\ No newline at end of file
+
+/obj/effect/mine/kickmine/mineEffect(mob/victim)
+ if(isliving(victim) && victim.client)
+ victim << "You have been kicked FOR NO REISIN!"
+ del(victim.client)
+
+
+/obj/effect/mine/gas
+ name = "oxygen mine"
+ var/gas_amount = 360
+ var/gas_type = SPAWN_OXYGEN
+
+/obj/effect/mine/gas/mineEffect(mob/victim)
+ atmos_spawn_air(gas_type, gas_amount)
+
+
+/obj/effect/mine/gas/plasma
+ name = "plasma mine"
+ gas_type = SPAWN_TOXINS
+
+
+/obj/effect/mine/gas/n2o
+ name = "\improper N2O mine"
+ gas_type = SPAWN_N2O
+
+
+/obj/effect/mine/sound
+ name = "honkblaster 1000"
+ var/sound = 'sound/items/bikehorn.ogg'
+
+/obj/effect/mine/sound/mineEffect(mob/victim)
+ playsound(loc, sound, 100, 1)
+
+
+/obj/effect/mine/sound/bwoink
+ name = "bwoink mine"
+ sound = 'sound/effects/adminhelp.ogg'
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index c2f590c5613..4d621cf0fdd 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -5,4 +5,31 @@
icon = 'icons/obj/items.dmi'
icon_state = "strangepresent"
density = 1
- anchored = 0
\ No newline at end of file
+ anchored = 0
+
+/obj/effect/mark
+ var/mark = ""
+ icon = 'icons/misc/mark.dmi'
+ icon_state = "blank"
+ anchored = 1
+ layer = 99
+ mouse_opacity = 0
+ unacidable = 1//Just to be sure.
+
+/obj/effect/beam
+ name = "beam"
+ unacidable = 1//Just to be sure.
+ var/def_zone
+ pass_flags = PASSTABLE
+
+/obj/effect/spawner
+ name = "object spawner"
+
+/obj/effect/list_container
+ name = "list container"
+
+/obj/effect/list_container/mobl
+ name = "mobl"
+ var/master = null
+
+ var/list/container = list( )
\ No newline at end of file
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index ded891ee6cd..780c9a58ab8 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -33,6 +33,7 @@
else if(istype(creator, /obj/item/weapon/gun/energy/wormhole_projector))
var/obj/item/weapon/gun/energy/wormhole_projector/P = creator
P.portal_destroyed(src)
+ creator = null
return ..()
/obj/effect/portal/proc/teleport(atom/movable/M as mob|obj)
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index 5e1ef66ee32..2557171bcbc 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -1,110 +1,3 @@
-/* The old single tank bombs that dont really work anymore
-/obj/effect/spawner/bomb
- name = "bomb"
- icon = 'icons/mob/screen_gen.dmi'
- icon_state = "x"
- var/btype = 0 //0 = radio, 1= prox, 2=time
- var/explosive = 1 // 0= firebomb
- var/btemp = 500 // bomb temperature (degC)
- var/active = 0
-
-/obj/effect/spawner/bomb/radio
- btype = 0
-
-/obj/effect/spawner/bomb/proximity
- btype = 1
-
-/obj/effect/spawner/bomb/timer
- btype = 2
-
-/obj/effect/spawner/bomb/timer/syndicate
- btemp = 450
-
-/obj/effect/spawner/bomb/suicide
- btype = 3
-
-/obj/effect/spawner/bomb/New()
- ..()
-
- switch (src.btype)
- // radio
- if (0)
- var/obj/item/assembly/r_i_ptank/R = new /obj/item/assembly/r_i_ptank(src.loc)
- var/obj/item/weapon/tank/internals/plasma/p3 = new /obj/item/weapon/tank/internals/plasma(R)
- var/obj/item/device/radio/signaler/p1 = new /obj/item/device/radio/signaler(R)
- var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
- R.part1 = p1
- R.part2 = p2
- R.part3 = p3
- p1.master = R
- p2.master = R
- p3.master = R
- R.status = explosive
- p1.b_stat = 0
- p2.secured = 1
- p3.air_contents.temperature = btemp + T0C
-
- // proximity
- if (1)
- var/obj/item/assembly/m_i_ptank/R = new /obj/item/assembly/m_i_ptank(src.loc)
- var/obj/item/weapon/tank/internals/plasma/p3 = new /obj/item/weapon/tank/internals/plasma(R)
- var/obj/item/device/prox_sensor/p1 = new /obj/item/device/prox_sensor(R)
- var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
- R.part1 = p1
- R.part2 = p2
- R.part3 = p3
- p1.master = R
- p2.master = R
- p3.master = R
- R.status = explosive
-
- p3.air_contents.temperature = btemp + T0C
- p2.secured = 1
-
- if(src.active)
- R.part1.secured = 1
- R.part1.icon_state = text("motion[]", 1)
- R.c_state(1, src)
-
- // timer
- if (2)
- var/obj/item/assembly/t_i_ptank/R = new /obj/item/assembly/t_i_ptank(src.loc)
- var/obj/item/weapon/tank/internals/plasma/p3 = new /obj/item/weapon/tank/internals/plasma(R)
- var/obj/item/device/timer/p1 = new /obj/item/device/timer(R)
- var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
- R.part1 = p1
- R.part2 = p2
- R.part3 = p3
- p1.master = R
- p2.master = R
- p3.master = R
- R.status = explosive
-
- p3.air_contents.temperature = btemp + T0C
- p2.secured = 1
- //bombvest
- if(3)
- var/obj/item/clothing/suit/armor/a_i_a_ptank/R = new /obj/item/clothing/suit/armor/a_i_a_ptank(src.loc)
- var/obj/item/weapon/tank/internals/plasma/p4 = new /obj/item/weapon/tank/internals/plasma(R)
- var/obj/item/device/healthanalyzer/p1 = new /obj/item/device/healthanalyzer(R)
- var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R)
- var/obj/item/clothing/suit/armor/vest/p3 = new /obj/item/clothing/suit/armor/vest(R)
- R.part1 = p1
- R.part2 = p2
- R.part3 = p3
- R.part4 = p4
- p1.master = R
- p2.master = R
- p3.master = R
- p4.master = R
- R.status = explosive
-
- p4.air_contents.temperature = btemp + T0C
- p2.secured = 1
-
- qdel(src)
-*/
-
/obj/effect/spawner/newbomb
name = "bomb"
icon = 'icons/mob/screen_gen.dmi'
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index e68ef779d94..b680e468d13 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -141,7 +141,7 @@
var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents)
if(prob(50))
visible_message("[src] scrambles into the ventillation ducts!", \
- "You hear something squeezing through the ventilation ducts.")
+ "You hear something scampering through the ventilation ducts.")
spawn(rand(20,60))
loc = exit_vent
@@ -154,7 +154,7 @@
return
if(prob(50))
- audible_message("You hear something squeezing through the ventilation ducts.")
+ audible_message("You hear something scampering through the ventilation ducts.")
sleep(travel_time)
if(!exit_vent || exit_vent.welded)
@@ -190,13 +190,35 @@
var/mob/living/simple_animal/hostile/poison/giant_spider/S = new grow_as(src.loc)
if(player_spiders)
var/list/candidates = get_candidates(BE_ALIEN, ALIEN_AFK_BRACKET)
- var/client/C = null
- if(candidates.len)
- C = pick(candidates)
+ shuffle(candidates)
+
+ var/time_passed = world.time
+ var/list/consenting_candidates = list()
+
+ for(var/candidate in candidates)
+
+ spawn(0)
+ switch(alert(candidate, "Would you like to play as [S.name]? Please choose quickly!","Confirmation","Yes","No"))
+ if("Yes")
+ if((world.time-time_passed)>=50 || !src)
+ return
+ consenting_candidates += candidate
+
+ sleep(50)
+
+ if(!src)
+ return
+
+ if(consenting_candidates.len)
+ var/client/C = null
+ C = pick(consenting_candidates)
S.key = C.key
qdel(src)
+
+
+
/obj/effect/spider/cocoon
name = "cocoon"
desc = "Something wrapped in silky spider web"
@@ -211,7 +233,7 @@
var/breakout_time = 2
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
- user << "You struggle against the tight bonds! (This will take about [breakout_time] minutes.)"
+ user << "You struggle against the tight bonds... (This will take about [breakout_time] minutes.)"
visible_message("You see something struggling and writhing in \the [src]!")
if(do_after(user,(breakout_time*60*10)))
if(!user || user.stat != CONSCIOUS || user.loc != src)
@@ -221,7 +243,7 @@
/obj/effect/spider/cocoon/Destroy()
- src.visible_message("\The [src] splits open.")
+ src.visible_message("\The [src] splits open.")
for(var/atom/movable/A in contents)
A.loc = src.loc
..()
diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index f6369e0c1af..69085aca0cc 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -20,6 +20,17 @@
return
Trigger(H)
+/* Sends a message to mob when triggered*/
+
+/obj/effect/step_trigger/message
+ var/message //the message to give to the mob
+ var/once = 1
+
+/obj/effect/step_trigger/message/Trigger(mob/M as mob)
+ if(M.client)
+ M << "[message]"
+ if(once)
+ qdel(src)
/* Tosses things in a certain direction */
@@ -117,6 +128,42 @@
A.y = rand(teleport_y, teleport_y_offset)
A.z = rand(teleport_z, teleport_z_offset)
+/* Fancy teleporter, creates sparks and smokes when used */
+
+/obj/effect/step_trigger/teleport_fancy
+ var/locationx
+ var/locationy
+ var/uses = 1 //0 for infinite uses
+ var/entersparks = 0
+ var/exitsparks = 0
+ var/entersmoke = 0
+ var/exitsmoke = 0
+
+/obj/effect/step_trigger/teleport_fancy/Trigger(mob/M as mob)
+ var/dest = locate(locationx, locationy, z)
+ M.Move(dest)
+
+ if(entersparks)
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(4, 1, src)
+ s.start()
+ if(exitsparks)
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(4, 1, dest)
+ s.start()
+
+ if(entersmoke)
+ var/datum/effect/effect/system/harmless_smoke_spread/s = new /datum/effect/effect/system/harmless_smoke_spread
+ s.set_up(4, 1, src, 0)
+ s.start()
+ if(exitsmoke)
+ var/datum/effect/effect/system/harmless_smoke_spread/s = new /datum/effect/effect/system/harmless_smoke_spread
+ s.set_up(4, 1, dest, 0)
+ s.start()
+
+ uses--
+ if(uses == 0)
+ qdel(src)
/* Simple sound player, Mapper friendly! */
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index 4f6350832ae..f881f095ae0 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -1,4 +1,4 @@
-proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
+/proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
if(!epicenter) return
if(!istype(epicenter, /turf))
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index 45efaba9b5e..63620b72676 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -6,7 +6,7 @@
if(dx>=dy) return dx + (0.5*dy) //The longest side add half the shortest side approximates the hypotenuse
else return dy + (0.5*dx)
-proc/trange(var/Dist=0,var/turf/Center=null)//alternative to range (ONLY processes turfs and thus less intensive)
+/proc/trange(var/Dist=0,var/turf/Center=null)//alternative to range (ONLY processes turfs and thus less intensive)
if(Center==null) return
//var/x1=((Center.x-Dist)<1 ? 1 : Center.x-Dist)
@@ -19,7 +19,7 @@ proc/trange(var/Dist=0,var/turf/Center=null)//alternative to range (ONLY process
return block(x1y1,x2y2)
-proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0 ,silent = 0)
+/proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0 ,silent = 0)
src = null //so we don't abort once src is deleted
epicenter = get_turf(epicenter)
@@ -73,8 +73,10 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
far_volume += (dist <= far_dist * 0.5 ? 50 : 0) // add 50 volume if the mob is pretty close to the explosion
M.playsound_local(epicenter, 'sound/effects/explosionfar.ogg', far_volume, 1, frequency, falloff = 5)
- //postpone light processing for a bit
- SSlighting.postpone()
+ //postpone processing for a bit
+ var/postponeCycles = max(round(devastation_range/8),1)
+ SSlighting.postpone(postponeCycles)
+ SSmachine.postpone(postponeCycles)
if(heavy_impact_range > 1)
var/datum/effect/system/explosion/E = new/datum/effect/system/explosion()
@@ -103,7 +105,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
if(T)
if(flame_dist && prob(40) && !istype(T, /turf/space) && !T.density)
- new/obj/effect/hotspot(T) //Mostly for ambience!
+ PoolOrNew(/obj/effect/hotspot, T) //Mostly for ambience!
if(dist > 0)
T.ex_act(dist)
@@ -112,10 +114,11 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
var/throw_dir = get_dir(epicenter,T)
for(var/obj/item/I in T)
spawn(0) //Simultaneously not one at a time
- var/throw_range = rand(throw_dist, max_range)
- var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
- I.throw_speed = 4 //Temporarily change their throw_speed for embedding purposes (Reset when it finishes throwing, regardless of hitting anything)
- I.throw_at(throw_at, throw_range, 2)//Throw it at 2 speed, this is purely visual anyway.
+ if(I)
+ var/throw_range = rand(throw_dist, max_range)
+ var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
+ I.throw_speed = 4 //Temporarily change their throw_speed for embedding purposes (Reset when it finishes throwing, regardless of hitting anything)
+ I.throw_at(throw_at, throw_range, 2)//Throw it at 2 speed, this is purely visual anyway.
var/took = (world.timeofday-start)/10
@@ -132,6 +135,6 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
-proc/secondaryexplosion(turf/epicenter, range)
+/proc/secondaryexplosion(turf/epicenter, range)
for(var/turf/tile in trange(range, epicenter))
- tile.ex_act(2)
\ No newline at end of file
+ tile.ex_act(2)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index b61814d4b85..cdedfe0733f 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -13,7 +13,7 @@
var/w_class = 3.0
var/slot_flags = 0 //This is used to determine on which slots an item can fit.
pass_flags = PASSTABLE
- pressure_resistance = 5
+ pressure_resistance = 3
var/obj/item/master = null
var/heat_protection = 0 //flags which determine which body parts are protected from heat. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm
@@ -52,6 +52,8 @@
var/suittoggled = 0
var/hooded = 0
+ /obj/item/mouse_drag_pointer = MOUSE_ACTIVE_POINTER //the icon to indicate this object is being dragged
+
//So items can have custom embedd values
//Because customisation is king
var/embed_chance = EMBED_CHANCE
@@ -69,7 +71,10 @@
/obj/structure/closet,
/obj/item/weapon/storage,
/obj/structure/safe,
- /obj/machinery/disposal
+ /obj/machinery/disposal,
+ /obj/machinery/r_n_d/destructive_analyzer,
+ /obj/machinery/r_n_d/experimentor,
+ /obj/machinery/autolathe
)
/obj/item/proc/check_allowed_items(atom/target, not_inside)
if((src in target) || ((!istype(target.loc, /turf)) && (!istype(target, /turf)) && (not_inside)) || is_type_in_list(target, can_be_placed_into))
@@ -190,10 +195,10 @@
/obj/item/attack_alien(mob/user as mob)
var/mob/living/carbon/alien/A = user
- if(!A.has_fine_manipulation || w_class >= 4)
+ if(!A.has_fine_manipulation)
if(src in A.contents) // To stop Aliens having items stuck in their pockets
A.unEquip(src)
- user << "Your claws aren't capable of such fine manipulation."
+ user << "Your claws aren't capable of such fine manipulation!"
return
attack_paw(A)
@@ -235,7 +240,7 @@
else if(success)
user << "You put some things [S.preposition] [S]."
else
- user << "You fail to pick anything up with [S]."
+ user << "You fail to pick anything up with [S]!"
else if(S.can_be_inserted(src))
S.handle_item_insertion(src)
@@ -289,7 +294,7 @@
set category = "Object"
set name = "Pick up"
- if(!usr.canmove || usr.stat || usr.restrained() || !Adjacent(usr))
+ if(usr.stat || usr.restrained() || !Adjacent(usr) || usr.stunned || usr.weakened || usr.lying)
return
if(ishuman(usr) || ismonkey(usr))
@@ -302,7 +307,7 @@
usr << "\red You already have something in your hand."
*/
else
- usr << "This mob type can't use this verb."
+ usr << "This mob type can't use this verb!"
//This proc is executed when someone clicks the on-screen UI button. To make the UI button show, set the 'action_button_name'.
//The default action is attack_self().
@@ -318,26 +323,30 @@
/obj/item/proc/eyestab(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
- var/mob/living/carbon/human/H = M
- if(istype(H) && ( \
- (H.head && H.head.flags & HEADCOVERSEYES) || \
+ var/is_human_victim = 0
+ if(ishuman(M))
+ is_human_victim = 1
+ var/mob/living/carbon/human/H = M
+ if((H.head && H.head.flags & HEADCOVERSEYES) || \
(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
- (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
- ))
- // you can't stab someone in the eyes wearing a mask!
- user << "You're going to need to remove that mask/helmet/glasses first."
- return
+ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES))
+ // you can't stab someone in the eyes wearing a mask!
+ user << "You're going to need to remove that mask/helmet/glasses first!"
+ return
- var/mob/living/carbon/monkey/Mo = M
- if(istype(Mo) && ( \
- (Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
- ))
- // you can't stab someone in the eyes wearing a mask!
- user << "You're going to need to remove that mask/helmet/glasses first."
- return
+ if(ismonkey(M))
+ var/mob/living/carbon/monkey/Mo = M
+ if(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES)
+ // you can't stab someone in the eyes wearing a mask!
+ user << "You're going to need to remove that mask/helmet/glasses first!"
+ return
if(isalien(M))//Aliens don't have eyes./N slimes also don't have eyes!
- user << "You cannot locate any eyes on this creature!"
+ user << "You cannot locate any eyes on this creature!"
+ return
+
+ if(isbrain(M))
+ user << "You cannot locate any organic eyes on this brain!"
return
add_logs(user, M, "attacked", object="[src.name]", addition="(INTENT: [uppertext(user.a_intent)])")
@@ -352,7 +361,7 @@
"[user] has stabbed themself in the eyes with [src]!", \
"You stab yourself in the eyes with [src]!" \
)
- if(istype(M, /mob/living/carbon/human))
+ if(is_human_victim)
var/mob/living/carbon/human/U = M
var/obj/item/organ/limb/affecting = U.get_organ("head")
if(affecting.take_damage(7))
@@ -360,6 +369,7 @@
else
M.take_organ_damage(7)
+
M.eye_blurry += rand(3,4)
M.eye_stat += rand(2,4)
if (M.eye_stat >= 10)
@@ -403,6 +413,9 @@
/obj/item/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
. = 1
+ if(unacidable)
+ return
+
for(var/V in armor)
if(armor[V] > 0)
.-- //it survives the acid...
@@ -429,7 +442,7 @@
if(istype(A, /mob/living/carbon/human))
var/mob/living/carbon/human/H = A
if(can_embed(src))
- if(prob(embed_chance))
+ if(prob(embed_chance) && !(PIERCEIMMUNE in H.dna.species.specflags))
H.throw_alert("embeddedobject")
var/obj/item/organ/limb/L = pick(H.organs)
L.embedded_objects |= src
@@ -441,4 +454,13 @@
//Reset regardless of if we hit a human.
throw_speed = initial(throw_speed) //explosions change this.
- ..()
\ No newline at end of file
+ ..()
+
+/obj/item/proc/remove_item_from_storage(atom/newLoc) //please use this if you're going to snowflake an item out of a obj/item/weapon/storage
+ if(!newLoc)
+ return 0
+ if(istype(loc,/obj/item/weapon/storage))
+ var/obj/item/weapon/storage/S = loc
+ S.remove_from_storage(src,newLoc)
+ return 1
+ return 0
\ No newline at end of file
diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm
index af2552dded1..be9e287bb22 100644
--- a/code/game/objects/items/apc_frame.dm
+++ b/code/game/objects/items/apc_frame.dm
@@ -22,22 +22,22 @@
var/turf/loc = get_turf(usr)
var/area/A = loc.loc
if (!istype(loc, /turf/simulated/floor))
- usr << "APC cannot be placed on this spot."
+ usr << "APC cannot be placed on this spot!"
return
if (A.requires_power == 0 || istype(A, /area/space))
- usr << "APC cannot be placed in this area."
+ usr << "APC cannot be placed in this area!"
return
if (A.get_apc())
- usr << "This area already has APC."
+ usr << "This area already has APC!"
return //only one APC per area
for(var/obj/machinery/power/terminal/T in loc)
if (T.master)
- usr << "There is another network terminal here."
+ usr << "There is another network terminal here!"
return
else
var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc)
C.amount = 10
- usr << "You cut the cables and disassemble the unused power terminal."
+ usr << "You cut the cables and disassemble the unused power terminal."
qdel(T)
new /obj/machinery/power/apc(loc, ndir, 1)
qdel(src)
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index d8389f36327..aeb17f0df26 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -155,6 +155,7 @@
A.power_light = 0
A.power_environ = 0
A.always_unpowered = 0
+ A.valid_territory = 0
move_turfs_to_area(turfs, A)
A.SetDynamicLighting()
@@ -205,8 +206,6 @@
/obj/item/areaeditor/proc/check_tile_is_border(var/turf/T2,var/dir)
if (istype(T2, /turf/space))
return BORDER_SPACE //omg hull breach we all going to die here
- if (istype(T2, /turf/simulated/shuttle))
- return BORDER_SPACE
if (get_area_type(T2.loc)!=AREA_SPACE)
return BORDER_BETWEEN
if (istype(T2, /turf/simulated/wall))
diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm
index b1ab40cb28b..2be31698d51 100644
--- a/code/game/objects/items/body_egg.dm
+++ b/code/game/objects/items/body_egg.dm
@@ -26,6 +26,7 @@
H.med_hud_set_status()
spawn(0)
RemoveInfectionImages(affected_mob)
+ affected_mob = null
..()
/obj/item/body_egg/process()
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 4fb943c698f..731a7324b81 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -38,7 +38,7 @@
desc = "A very sad-looking crayon."
colour = "#FFFFFF"
colourName = "mime"
- uses = 0
+ uses = -1
/obj/item/toy/crayon/mime/attack_self(mob/living/user as mob)
update_window(user)
@@ -63,7 +63,7 @@
icon_state = "crayonrainbow"
colour = "#FFF000"
colourName = "rainbow"
- uses = 0
+ uses = -1
/obj/item/toy/crayon/rainbow/attack_self(mob/living/user as mob)
update_window(user)
@@ -88,23 +88,35 @@
/obj/item/toy/crayon/spraycan
icon_state = "spraycan_cap"
+ item_state = "spraycan"
desc = "A metallic container containing tasty paint."
var/capped = 1
instant = 1
+ edible = 0
validSurfaces = list(/turf/simulated/floor,/turf/simulated/wall)
/obj/item/toy/crayon/spraycan/New()
..()
- name = "NanoTrasen-brand Rapid Paint Applicator"
+ if(gang)
+ name = "Modified Paint Applicator"
+ else
+ name = "NanoTrasen-brand Rapid Paint Applicator"
update_icon()
+/obj/item/toy/crayon/spraycan/examine(mob/user)
+ ..()
+ if(uses)
+ user << "It has [uses] uses left."
+ else
+ user << "It is empty."
+
/obj/item/toy/crayon/spraycan/attack_self(mob/living/user as mob)
- var/choice = input(user,"Spraycan options") in list("Toggle Cap","Change Drawing","Change Color")
+ var/choice = input(user,"Spraycan options") as null|anything in list("Toggle Cap","Change Drawing","Change Color")
switch(choice)
if("Toggle Cap")
user << "You [capped ? "Remove" : "Replace"] the cap of the [src]"
capped = capped ? 0 : 1
- icon_state = "spraycan[capped ? "_cap" : ""]"
+ icon_state = "spraycan[gang ? "_gang" : ""][capped ? "_cap" : ""]"
update_icon()
if("Change Drawing")
..()
@@ -119,10 +131,11 @@
return
else
if(iscarbon(target))
- if(uses-10 > 0)
- uses = uses - 10
+ if(uses)
+ playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5)
var/mob/living/carbon/human/C = target
- user.visible_message(" [user] sprays [src] into the face of [target]!")
+ user.visible_message("[user] sprays [src] into the face of [target]!")
+ target << "[user] sprays [src] into your face!"
if(C.client)
C.eye_blurry = max(C.eye_blurry, 3)
C.eye_blind = max(C.eye_blind, 1)
@@ -132,7 +145,7 @@
C.lip_style = "spray_face"
C.lip_color = colour
C.update_body()
- playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5)
+ uses = max(0,uses-10)
..()
/obj/item/toy/crayon/spraycan/update_icon()
@@ -140,3 +153,10 @@
var/image/I = image('icons/obj/crayons.dmi',icon_state = "[capped ? "spraycan_cap_colors" : "spraycan_colors"]")
I.color = colour
overlays += I
+
+/obj/item/toy/crayon/spraycan/gang
+ desc = "A suspicious-looking spraycan modified to use special paint used by gangsters to mark territory."
+ icon_state = "spraycan_gang_cap"
+ gang = 1
+ uses = 20
+ instant = -1
diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm
index f69e9025637..f5ec0d9db5d 100644
--- a/code/game/objects/items/dehy_carp.dm
+++ b/code/game/objects/items/dehy_carp.dm
@@ -38,6 +38,11 @@
sleep(6)
// Make space carp
var/mob/living/simple_animal/hostile/carp/C = new /mob/living/simple_animal/hostile/carp(get_turf(src))
- // Make carp non-hostile to user, yes this means
- C.faction |= "\ref[owner]"
+ // Make carp non-hostile to user, and their allies
+ if(owner)
+ var/list/factions = owner.faction
+ for(var/F in factions)
+ if(F == "neutral")
+ factions -= F
+ C.faction = factions
qdel(src)
\ No newline at end of file
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index e383f8633dc..18376a20ea0 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -160,6 +160,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/roboticist
icon_state = "pda-roboticist"
+ default_cartridge = /obj/item/weapon/cartridge/roboticist
/obj/item/device/pda/librarian
icon_state = "pda-library"
@@ -318,42 +319,32 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "1
"
var/len = length(viable_occupant.dna.struc_enzymes)
@@ -806,7 +809,7 @@
if(istype(buffer_slot))
buffer_slot.Cut()
if("transferbuffer")
- if(num && viable_occupant)
+ if(num && viable_occupant && viable_occupant.stat != DEAD)
num = Clamp(num, 1, NUMBER_OF_BUFFERS)
var/list/buffer_slot = buffer[num]
if(istype(buffer_slot)) //15 and 40 are just magic numbers that were here before so i didnt touch them, they are initial boundaries of damage
@@ -951,7 +954,7 @@
//value in range 1 to values. values must be greater than 0
//all arguments assumed to be positive integers
-proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE)
+/proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE)
var/width = round((16**blocksize)/values)
if(value < 1)
value = 1
@@ -959,7 +962,7 @@ proc/construct_block(value, values, blocksize=DNA_BLOCK_SIZE)
return num2hex(value, blocksize)
//value is hex
-proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE)
+/proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE)
var/width = round((16**blocksize)/values)
value = round(hex2num(value) / width) + 1
if(value > values)
diff --git a/code/game/gamemodes/abduction/abduction.dm b/code/game/gamemodes/abduction/abduction.dm
new file mode 100644
index 00000000000..502d4300932
--- /dev/null
+++ b/code/game/gamemodes/abduction/abduction.dm
@@ -0,0 +1,392 @@
+/datum/game_mode
+ var/list/datum/mind/abductors = list()
+
+/datum/game_mode/abduction
+ name = "Abduction"
+ config_tag = "abduction"
+ antag_flag = BE_ABDUCTOR
+ recommended_enemies = 2
+ required_players = 15
+ var/max_teams = 4
+ var/teams = 1
+ var/list/datum/mind/scientists = list()
+ var/list/datum/mind/agents = list()
+ var/list/datum/objective/team_objectives = list()
+ var/list/team_names = list()
+ var/finished = 0
+
+/datum/game_mode/abduction/announce()
+ world << "The current game mode is - Abduction!"
+
+/datum/game_mode/abduction/pre_setup()
+ teams = max(1, min(max_teams,round(num_players()/config.abductor_scaling_coeff)))
+ var/possible_teams = max(1,round(antag_candidates.len / 2))
+ teams = min(teams,possible_teams)
+
+ abductors.len = 2*teams
+ scientists.len = teams
+ agents.len = teams
+ team_objectives.len = teams
+ team_names.len = teams
+
+ for(var/i=1,i<=teams,i++)
+ if(!make_abductor_team(i))
+ return 0
+
+ return 1
+
+/datum/game_mode/abduction/proc/make_abductor_team(var/team_number,var/preset_agent=null,var/preset_scientist=null)
+ //Team Name
+ team_names[team_number] = "Mothership [pick(possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names
+ //Team Objective
+ var/datum/objective/experiment/team_objective = new
+ team_objective.team = team_number
+ team_objectives[team_number] = team_objective
+ //Team Members
+
+ if(!preset_agent || !preset_scientist)
+ if(antag_candidates.len <=2)
+ return 0
+
+ var/datum/mind/scientist
+ var/datum/mind/agent
+
+ if(!preset_scientist)
+ scientist = pick(antag_candidates)
+ antag_candidates -= scientist
+ else
+ scientist = preset_scientist
+
+ if(!preset_agent)
+ agent = pick(antag_candidates)
+ antag_candidates -= agent
+ else
+ agent = preset_agent
+
+
+ scientist.assigned_role = "Abductor"
+ scientist.special_role = "Abductor"
+ log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.")
+
+ agent.assigned_role = "Abductor"
+ agent.special_role = "Abductor"
+ log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.")
+
+ abductors |= agent
+ abductors |= scientist
+ scientists[team_number] = scientist
+ agents[team_number] = agent
+ return 1
+
+/datum/game_mode/abduction/post_setup()
+ //Spawn Team
+ var/list/obj/effect/landmark/abductor/agent_landmarks = new
+ var/list/obj/effect/landmark/abductor/scientist_landmarks = new
+ agent_landmarks.len = max_teams
+ scientist_landmarks.len = max_teams
+ for(var/obj/effect/landmark/abductor/A in landmarks_list)
+ if(istype(A,/obj/effect/landmark/abductor/agent))
+ agent_landmarks[text2num(A.team)] = A
+ else if(istype(A,/obj/effect/landmark/abductor/scientist))
+ scientist_landmarks[text2num(A.team)] = A
+
+ var/datum/mind/agent
+ var/obj/effect/landmark/L
+ var/datum/mind/scientist
+ var/team_name
+ var/mob/living/carbon/human/H
+ var/datum/species/abductor/S
+ for(var/team_number=1,team_number<=teams,team_number++)
+ team_name = team_names[team_number]
+ agent = agents[team_number]
+ H = agent.current
+ L = agent_landmarks[team_number]
+ H.loc = L.loc
+ hardset_dna(H, null, null, null, null, /datum/species/abductor)
+ S = H.dna.species
+ S.agent = 1
+ S.team = team_number
+ H.real_name = team_name + " Agent"
+ equip_common(H,team_number)
+ equip_agent(H,team_number)
+ greet_agent(agent,team_number)
+ H.regenerate_icons()
+
+ scientist = scientists[team_number]
+ H = scientist.current
+ L = scientist_landmarks[team_number]
+ H.loc = L.loc
+ hardset_dna(H, null, null, null, null, /datum/species/abductor)
+ S = H.dna.species
+ S.scientist = 1
+ S.team = team_number
+ H.real_name = team_name + " Scientist"
+ equip_common(H,team_number)
+ equip_scientist(H,team_number)
+ greet_scientist(scientist,team_number)
+ H.regenerate_icons()
+ return ..()
+
+//Used for create antag buttons
+/datum/game_mode/abduction/proc/post_setup_team(var/team_number)
+ var/list/obj/effect/landmark/abductor/agent_landmarks = new
+ var/list/obj/effect/landmark/abductor/scientist_landmarks = new
+ agent_landmarks.len = max_teams
+ scientist_landmarks.len = max_teams
+ for(var/obj/effect/landmark/abductor/A in landmarks_list)
+ if(istype(A,/obj/effect/landmark/abductor/agent))
+ agent_landmarks[text2num(A.team)] = A
+ else if(istype(A,/obj/effect/landmark/abductor/scientist))
+ scientist_landmarks[text2num(A.team)] = A
+
+ var/datum/mind/agent
+ var/obj/effect/landmark/L
+ var/datum/mind/scientist
+ var/team_name
+ var/mob/living/carbon/human/H
+ var/datum/species/abductor/S
+
+ team_name = team_names[team_number]
+ agent = agents[team_number]
+ H = agent.current
+ L = agent_landmarks[team_number]
+ H.loc = L.loc
+ hardset_dna(H, null, null, null, null, /datum/species/abductor)
+ S = H.dna.species
+ S.agent = 1
+ S.team = team_number
+ H.real_name = team_name + " Agent"
+ equip_common(H,team_number)
+ equip_agent(H,team_number)
+ greet_agent(agent,team_number)
+ H.regenerate_icons()
+
+ scientist = scientists[team_number]
+ H = scientist.current
+ L = scientist_landmarks[team_number]
+ H.loc = L.loc
+ hardset_dna(H, null, null, null, null, /datum/species/abductor)
+ S = H.dna.species
+ S.scientist = 1
+ S.team = team_number
+ H.real_name = team_name + " Scientist"
+ equip_common(H,team_number)
+ equip_scientist(H,team_number)
+ greet_scientist(scientist,team_number)
+ H.regenerate_icons()
+
+
+/datum/game_mode/abduction/proc/greet_agent(var/datum/mind/abductor,var/team_number)
+ abductor.objectives += team_objectives[team_number]
+ var/team_name = team_names[team_number]
+
+ abductor.current << "You are an Abductor Agent of [team_name]!"
+ abductor.current << "With the help of your teammate kidnap and experiment on station members!"
+ abductor.current << "Use your stealth technology and equipment to incapacitate humans for your scientist to retrieve."
+
+ var/obj_count = 1
+ for(var/datum/objective/objective in abductor.objectives)
+ abductor.current << "Objective #[obj_count]: [objective.explanation_text]"
+ obj_count++
+ return
+
+/datum/game_mode/abduction/proc/greet_scientist(var/datum/mind/abductor,var/team_number)
+ abductor.objectives += team_objectives[team_number]
+ var/team_name = team_names[team_number]
+
+ abductor.current << "You are an Abductor Scientist of [team_name]!"
+ abductor.current << "With the help of your teammate kidnap and experiment on station members!"
+ abductor.current << "Use your tool and ship consoles to support the agent and retrieve human specimens."
+
+ var/obj_count = 1
+ for(var/datum/objective/objective in abductor.objectives)
+ abductor.current << "Objective #[obj_count]: [objective.explanation_text]"
+ obj_count++
+ return
+
+/datum/game_mode/abduction/proc/equip_common(var/mob/living/carbon/human/agent,var/team_number)
+ var/radio_freq = SYND_FREQ
+
+ var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(agent)
+ R.set_frequency(radio_freq)
+ agent.equip_to_slot_or_del(R, slot_ears)
+ agent.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(agent), slot_shoes)
+ agent.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(agent), slot_w_uniform) //they're greys gettit
+ agent.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(agent), slot_back)
+
+/datum/game_mode/abduction/proc/get_team_console(var/team)
+ var/obj/machinery/abductor/console/console
+ for(var/obj/machinery/abductor/console/c in machines)
+ if(c.team == team)
+ console = c
+ break
+ return console
+
+/datum/game_mode/abduction/proc/equip_agent(var/mob/living/carbon/human/agent,var/team_number)
+ if(!team_number)
+ var/datum/species/abductor/S = agent.dna.species
+ team_number = S.team
+
+ var/obj/machinery/abductor/console/console = get_team_console(team_number)
+ var/obj/item/clothing/suit/armor/abductor/vest/V = new /obj/item/clothing/suit/armor/abductor/vest(agent)
+ if(console!=null)
+ console.vest = V
+ V.flags |= NODROP
+ agent.equip_to_slot_or_del(V, slot_wear_suit)
+ agent.equip_to_slot_or_del(new /obj/item/weapon/abductor_baton(agent), slot_in_backpack)
+ agent.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/decloner/alien(agent), slot_belt)
+ agent.equip_to_slot_or_del(new /obj/item/device/abductor/silencer(agent), slot_in_backpack)
+ agent.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/abductor(agent), slot_head)
+
+
+/datum/game_mode/abduction/proc/equip_scientist(var/mob/living/carbon/human/scientist,var/team_number)
+ if(!team_number)
+ var/datum/species/abductor/S = scientist.dna.species
+ team_number = S.team
+
+ var/obj/machinery/abductor/console/console = get_team_console(team_number)
+ var/obj/item/device/abductor/gizmo/G = new /obj/item/device/abductor/gizmo(scientist)
+ if(console!=null)
+ console.gizmo = G
+ G.console = console
+ scientist.equip_to_slot_or_del(G, slot_in_backpack)
+
+ var/obj/item/weapon/implant/abductor/beamplant = new /obj/item/weapon/implant/abductor(scientist)
+ beamplant.imp_in = scientist
+ beamplant.implanted = 1
+ beamplant.implanted(scientist)
+ beamplant.home = console.pad
+
+
+/datum/game_mode/abduction/check_finished()
+ if(!finished)
+ for(var/team_number=1,team_number<=teams,team_number++)
+ var/obj/machinery/abductor/console/con = get_team_console(team_number)
+ var/datum/objective/objective = team_objectives[team_number]
+ if (con.experiment.points > objective.target_amount)
+ SSshuttle.emergency.request(null, 0.5)
+ finished = 1
+ return ..()
+ return ..()
+
+/datum/game_mode/abduction/declare_completion()
+ world << "The Abductors were:" + for(var/team_number=1,team_number<=teams,team_number++) + var/obj/machinery/abductor/console/console = get_team_console(team_number) + var/datum/objective/objective = team_objectives[team_number] + var/team_name = team_names[team_number] + var/datum/mind/amind = agents[team_number] + var/datum/mind/smind = scientists[team_number] + var/mob/living/carbon/human/agent = amind.current + var/mob/living/carbon/human/scientist = smind.current + if (console.experiment.points > objective.target_amount) + world << "[team_name] team fullfilled its mission! " + world << "Team Members : [agent.name]([agent.ckey]),[scientist.name]([scientist.ckey])" + else + world << "[team_name] team failed its mission! " + world << "Team Members: [agent.name]([agent.ckey])
[scientist.name]([scientist.ckey])" + + world << "
The Abductees were:" + display_abductees(console) + + ..() + return 1 + +/datum/game_mode/abduction/proc/display_abductees(var/obj/machinery/abductor/console/console) + var/list/mob/living/abductees = console.experiment.history + for(var/mob/living/abductee in abductees) + if(!abductee.mind) + continue + world << printplayer(abductee.mind) + world << printobjectives(abductee.mind) + +/datum/game_mode/proc/auto_declare_completion_abduction() + if(abductors.len && ticker.mode.config_tag != "abduction") // no repeating for the gamemode + world << "
The Abductors were:" + for(var/datum/mind/M in abductors) + world << "Abductor [M.current ? M.current.name : "Abductor"]([M.key])" + world << printobjectives(M) + world << "
The Abductees were:" + var/list/full_history = list() + for(var/obj/machinery/abductor/console/C in machines) + full_history |= C.experiment.history + for(var/mob/living/abductee in full_history) + if(!abductee.mind) + continue + world << printplayer(abductee.mind) + world << printobjectives(abductee.mind) + return + +//Landmarks +// TODO: Split into seperate landmarks for prettier ships +/obj/effect/landmark/abductor + var/team = 1 + +/obj/effect/landmark/abductor/console/New() + var/obj/machinery/abductor/console/c = new /obj/machinery/abductor/console(src.loc) + c.team = team + + spawn(5) // I'd do this properly when i got some time, temporary hack for mappers + c.Initialize() + qdel(src) + + +/obj/effect/landmark/abductor/agent +/obj/effect/landmark/abductor/scientist + + +// OBJECTIVES +/datum/objective/experiment + dangerrating = 10 + target_amount = 6 + var/team + +/datum/objective/experiment/New() + explanation_text = "Experiment on [target_amount] humans" + +/datum/objective/experiment/check_completion() + if(!owner.current || !ishuman(owner.current)) + return 0 + var/mob/living/carbon/human/H = owner.current + if(!H.dna || !H.dna.species || !(H.dna.species.id == "abductor")) + return 0 + var/datum/species/abductor/S = H.dna.species + var/ab_team = S.team + for(var/obj/machinery/abductor/experiment/E in machines) + if(E.team == ab_team) + if(E.points >= target_amount) + return 1 + else + return 0 + return 0 + +/datum/objective/abductee + dangerrating = 5 + completed = 1 + +/datum/objective/abductee/steal + explanation_text = "Steal all" + +/datum/objective/abductee/steal/New() + var/target = pick(list("Pets","Lights","Monkeys","Fruits","Shoes","Soap Bars")) + explanation_text+=" [target]" + +/datum/objective/abductee/capture + explanation_text = "Capture" + +/datum/objective/abductee/capture/New() + var/list/jobs = SSjob.occupations + for(var/datum/job/J in jobs) + if(J.current_positions < 1) + jobs -= J + if(jobs.len > 0) + var/datum/job/target = pick(jobs) + explanation_text += " \a [target.title]." + else + explanation_text += " someone." + +/datum/objective/abductee/shuttle + explanation_text = "You must escape the station! Get the shuttle called!" + +/datum/objective/abductee/noclone + explanation_text = "Don't allow anyone to be cloned." \ No newline at end of file diff --git a/code/game/gamemodes/abduction/abduction_gear.dm b/code/game/gamemodes/abduction/abduction_gear.dm new file mode 100644 index 00000000000..a13b347907c --- /dev/null +++ b/code/game/gamemodes/abduction/abduction_gear.dm @@ -0,0 +1,560 @@ +#define VEST_STEALTH 1 +#define VEST_COMBAT 2 +#define GIZMO_SCAN 1 +#define GIZMO_MARK 2 + +//AGENT VEST +/obj/item/clothing/suit/armor/abductor/vest + name = "Agent Vest" + desc = "Vest outfitted with alien stealth technology." + icon = 'icons/obj/abductor.dmi' + icon_state = "vest_stealth" + item_state = "armor" + blood_overlay_type = "armor" + origin_tech = "materials=5;biotech=4;powerstorage=5" + armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15) + action_button_name = "Activate" + action_button_is_hands_free = 1 + var/mode = VEST_STEALTH + var/stealth_active = 0 + var/combat_cooldown = 10 + var/datum/icon_snapshot/disguise + var/stealth_armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15) + var/combat_armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 50, rad = 50) + + var/obj/machinery/camera/portable/vest_cam = null + + +/obj/item/clothing/suit/armor/abductor/vest/New() + ..() + vest_cam = new /obj/machinery/camera/portable(src) + vest_cam.c_tag = "Agent Vest Cam" + vest_cam.network = list("Abductor") + +/obj/item/clothing/suit/armor/abductor/vest/proc/flip_mode() + switch(mode) + if(VEST_STEALTH) + mode = VEST_COMBAT + DeactivateStealth() + armor = combat_armor + icon_state = "vest_combat" + if(istype(loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = loc + H.update_inv_wear_suit() + return + if(VEST_COMBAT)// TO STEALTH + mode = VEST_STEALTH + armor = stealth_armor + icon_state = "vest_stealth" + if(istype(loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = loc + H.update_inv_wear_suit() + return + + + +/obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(var/datum/icon_snapshot/entry) + disguise = entry + +/obj/item/clothing/suit/armor/abductor/vest/proc/ActivateStealth() + if(disguise == null) + return + stealth_active = 1 + if(istype(src.loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/M = src.loc + spawn(0) + anim(M.loc,M,'icons/mob/mob.dmi',,"cloak",,M.dir) + + M.name_override = disguise.name + M.icon = disguise.icon + M.icon_state = disguise.icon_state + M.overlays = disguise.overlays + M.update_inv_r_hand() + M.update_inv_l_hand() + return + +/obj/item/clothing/suit/armor/abductor/vest/proc/DeactivateStealth() + if(!stealth_active) + return + stealth_active = 0 + if(istype(src.loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/M = src.loc + spawn(0) + anim(M.loc,M,'icons/mob/mob.dmi',,"uncloak",,M.dir) + M.name_override = null + M.overlays.Cut() + M.regenerate_icons() + return + +/obj/item/clothing/suit/armor/abductor/vest/IsShield() + DeactivateStealth() + return 0 +/obj/item/clothing/suit/armor/abductor/vest/IsReflect() + DeactivateStealth() + return 0 + +/obj/item/clothing/suit/armor/abductor/vest/ui_action_click() + switch(mode) + if(VEST_COMBAT) + Adrenaline() + if(VEST_STEALTH) + if(stealth_active) + DeactivateStealth() + else + ActivateStealth() + +/obj/item/clothing/suit/armor/abductor/vest/proc/Adrenaline() + if(istype(src.loc, /mob/living/carbon/human)) + if(combat_cooldown != initial(combat_cooldown)) + src.loc << "Combat injection is still recharging." + var/mob/living/carbon/human/M = src.loc + M.stat = 0 + M.SetParalysis(0) + M.SetStunned(0) + M.SetWeakened(0) + M.lying = 0 + M.update_canmove() + M.adjustStaminaLoss(-75) + combat_cooldown = 0 + SSobj.processing |= src + +/obj/item/clothing/suit/armor/abductor/vest/process() + combat_cooldown++ + if(combat_cooldown==initial(combat_cooldown)) + SSobj.processing.Remove(src) + +/obj/item/device/abductor/proc/IsAbductor(var/user) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.dna.species.id != "abductor") + return 0 + return 1 + return 0 + +/obj/item/device/abductor/proc/AbductorCheck(var/user) + if(IsAbductor(user)) + return 1 + user << "You can't figure how this works!" + return 0 + +/obj/item/device/abductor/proc/ScientistCheck(var/user) + var/mob/living/carbon/human/H = user + var/datum/species/abductor/S = H.dna.species + return S.scientist + +/obj/item/device/abductor/gizmo + name = "Science Tool" + desc = "Alien science is 90% dissections 10% probings." + icon = 'icons/obj/abductor.dmi' + icon_state = "gizmo_scan" + item_state = "silencer" + origin_tech = "materials=5;magnets=5;bluespace=6" + var/mode = GIZMO_SCAN + var/mob/living/marked = null + var/obj/machinery/abductor/console/console + +/obj/item/device/abductor/gizmo/attack_self(mob/user) + if(!AbductorCheck(user)) + return + if(!ScientistCheck(user)) + user << "You're not trained to use this!" + return + if(mode == GIZMO_SCAN) + mode = GIZMO_MARK + icon_state = "gizmo_mark" + else + mode = GIZMO_SCAN + icon_state = "gizmo_scan" + user << "You switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE" + +/obj/item/device/abductor/gizmo/attack(mob/living/M, mob/user) + if(!AbductorCheck(user)) + return + if(!ScientistCheck(user)) + user << "You're not trained to use this" + return + switch(mode) + if(GIZMO_SCAN) + scan(M, user) + if(GIZMO_MARK) + mark(M, user) + + +/obj/item/device/abductor/gizmo/afterattack(var/atom/target, var/mob/living/user, flag, params) + if(flag) + return + if(!AbductorCheck(user)) + return + if(!ScientistCheck(user)) + user << "You're not trained to use this" + return + switch(mode) + if(GIZMO_SCAN) + scan(target, user) + if(GIZMO_MARK) + mark(target, user) + +/obj/item/device/abductor/gizmo/proc/scan(var/atom/target, var/mob/living/user) + if(istype(target,/mob/living/carbon/human)) + if(console!=null) + console.AddSnapshot(target) + user << "You scan and add the being to the database" + +/obj/item/device/abductor/gizmo/proc/mark(var/atom/target, var/mob/living/user) + if(marked == target) + user << "This specimen is already marked!" + return + if(istype(target,/mob/living/carbon/human)) + if(IsAbductor(target)) + marked = target + user << "You mark the target for future retrieval." + else + prepare(target,user) + else + prepare(target,user) + +/obj/item/device/abductor/gizmo/proc/prepare(var/atom/target, var/mob/living/user) + if(get_dist(target,user)>1) + user << "You need to be next to the specimen to prepare it for transport!" + return + user << "You start preparing the specimen for transport..." + if(do_after(user, 100)) + marked = target + user << "You finish preparing the specimen for transport." + + +/obj/item/device/abductor/silencer + name = "Abductor Silencer" + desc = "Device used to break communication equipment" + icon = 'icons/obj/abductor.dmi' + icon_state = "silencer" + item_state = "gizmo" + origin_tech = "materials=5;magnets=5" + +/obj/item/device/abductor/silencer/attack(mob/living/M, mob/user) + if(!AbductorCheck(user)) + return + radio_off(M, user) + +/obj/item/device/abductor/silencer/afterattack(var/atom/target, var/mob/living/user, flag, params) + if(flag) + return + if(!AbductorCheck(user)) + return + radio_off(target, user) + +/obj/item/device/abductor/silencer/proc/radio_off(var/atom/target, var/mob/living/user) + if( !(user in (viewers(7,target))) ) + return + + var/turf/targloc = get_turf(target) + + var/mob/living/carbon/human/M + for(M in view(2,targloc)) + if(M == user) + continue + user << "You silence [M.name] radio devices." + radio_off_mob(M) + +/obj/item/device/abductor/silencer/proc/radio_off_mob(var/mob/living/carbon/human/M) + var/list/all_items = M.GetAllContents() + + for(var/obj/I in all_items) + if(istype(I,/obj/item/device/radio/)) + var/obj/item/device/radio/r = I + r.listening = 0 + if(!istype(I,/obj/item/device/radio/headset)) + r.broadcasting = 0 //goddamned headset hacks + + +/obj/item/weapon/implant/abductor + name = "Emergency Beam" + desc = "Gets you back on the ship." + icon = 'icons/obj/abductor.dmi' + icon_state = "implant" + activated = 1 + var/obj/machinery/abductor/pad/home + var/cooldown = 30 + +/obj/item/weapon/implant/abductor/activate() + if(cooldown == initial(cooldown)) + home.Retrieve(imp_in,1) + cooldown = 0 + SSobj.processing |= src + else + imp_in << "The emergency beam is still recharging!" + return + +/obj/item/weapon/implant/abductor/process() + if(cooldown < initial(cooldown)) + cooldown++ + if(cooldown == initial(cooldown)) + SSobj.processing.Remove(src) + + +/obj/item/device/firing_pin/alien + name = "alien-looking pin" + desc = "Only non-humans can use this pin" + fail_message = "Human DNA detected! Authorization revoked!" + +/obj/item/device/firing_pin/alien/pin_auth(mob/living/user) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(H.dna.species.id == "human") //stealth lizard buff go + return 0 + return 1 + +/obj/item/weapon/gun/energy/decloner/alien + ammo_type = list(/obj/item/ammo_casing/energy/declone) + pin = /obj/item/device/firing_pin/alien + icon_state = "alienpistol" + item_state = "alienpistol" + +/obj/item/weapon/gun/energy/decloner/alien/update_icon() // No charge levels + return + +/obj/item/weapon/paper/abductor + name = "Dissection Guide" + info = {"Dissection for Dummies
+
+ 1.Acquire fresh specimen.
+ 2.Put the specimen on operating table
+ 3.Apply surgical drapes preparing for dissection
+ 4.Apply scalpel to specimen torso
+ 5.Stop the bleeders and retract skin
+ 6.Cut out organs you find with a scalpel
+ 7.Use your hands to remove the remaining organs
+ 8.Insert replacement gland (Retrieve one from gland storage)
+ 9.Consider dressing the specimen back to not disturb the habitat
+ 10.Put the specimen in the experiment machinery
+ 11.Choose one of the machine options and follow displayed instructions
+
+Congratulations! You are now trained for xenobiology research!"} + +#define BATON_STUN 0 +#define BATON_SLEEP 1 +#define BATON_CUFF 2 +#define BATON_PROBE 3 +#define BATON_MODES 4 + +/obj/item/weapon/abductor_baton + name = "Advanced Baton" + var/mode = BATON_STUN + icon = 'icons/obj/abductor.dmi' + icon_state = "wonderprod" + item_state = "wonderprod" + slot_flags = SLOT_BELT + origin_tech = "materials=6;combat=5;biotech=7" + force = 7 + w_class = 3 + action_button_name = "Toggle Mode" + +/obj/item/weapon/abductor_baton/proc/toggle(mob/living/user=usr) + mode = (mode+1)%BATON_MODES + var/txt + switch(mode) + if(BATON_STUN) + txt = "stun" + if(BATON_SLEEP) + txt = "sleep inducment" + if(BATON_CUFF) + txt = "restraining" + if(BATON_PROBE) + txt = "probing" + + usr << "You switch the baton to [txt] mode" + update_icon() + +/obj/item/weapon/abductor_baton/update_icon() + switch(mode) + if(BATON_STUN) + icon_state = "wonderprod" + if(BATON_SLEEP) + icon_state = "wonderprod" + if(BATON_CUFF) + icon_state = "wonderprod" + if(BATON_PROBE) + icon_state = "wonderprod" + +/obj/item/weapon/abductor_baton/proc/IsAbductor(var/mob/living/user) + if(!ishuman(user)) + return 0 + var/mob/living/carbon/human/H = user + if(!H.dna) + return 0 + if(H.dna.species.id != "abductor") + return 0 + return 1 + +/obj/item/weapon/abductor_baton/attack(mob/target as mob, mob/living/user as mob) + if(!IsAbductor(user)) + return + + if(isrobot(target)) + ..() + return + + if(!isliving(target)) + return + + var/mob/living/L = target + + user.do_attack_animation(L) + switch(mode) + if(BATON_STUN) + StunAttack(L,user) + if(BATON_SLEEP) + SleepAttack(L,user) + if(BATON_CUFF) + CuffAttack(L,user) + if(BATON_PROBE) + ProbeAttack(L,user) + +/obj/item/weapon/abductor_baton/attack_self(mob/living/user) + toggle(user) + +/obj/item/weapon/abductor_baton/proc/StunAttack(mob/living/L,mob/living/user) + user.lastattacked = L + L.lastattacker = user + + L.Stun(7) + L.Weaken(7) + L.apply_effect(STUTTER, 7) + + L.visible_message("[user] has stunned [L] with [src]!", \ + "[user] has stunned you with [src]!") + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + + if(ishuman(L)) + var/mob/living/carbon/human/H = L + H.forcesay(hit_appends) + + add_logs(user, L, "stunned") + return + +/obj/item/weapon/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) + if(L.stunned) + L.SetSleeping(60) + L.visible_message("[user] has induced sleep in [L] with [src]!", \ + "You suddenly feel very drowsy!") + playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) + + add_logs(user, L, "put to sleep") + return + +/obj/item/weapon/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user) + if(!iscarbon(L)) + return + var/mob/living/carbon/C = L + if(!C.handcuffed) + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + C.visible_message("[user] is trying to put energy cuffs on [C]!", \ + "[user] is trying to put energy cuffs on [C]!") + if(do_mob(user, C, 30)) + if(!C.handcuffed) + C.handcuffed = new /obj/item/weapon/restraints/handcuffs/energy/used(C) + C.update_inv_handcuffed(0) + user << "You handcuff [C]." + add_logs(user, C, "handcuffed") + else + user << "You fail to handcuff [C]." + return + +/obj/item/weapon/abductor_baton/proc/ProbeAttack(mob/living/L,mob/living/user) + L.visible_message("[user] probes [L] with [src]!", \ + "[user] probed [L]!") + + var/species = "Unknown Species" + if(ishuman(L)) + var/mob/living/carbon/human/H = L + if(H.dna && H.dna.species) + species = "[H.dna.species.name]" + if(L.mind && L.mind.changeling) + species = "Changeling Lifeform" + user << "Probing Result:[species]" + +/obj/item/weapon/restraints/handcuffs/energy + name = "energy cuffs" + desc = "Energy field restraining the hands." + icon_state = "cuff_white" // Needs sprite + breakouttime = 450 + trashtype = /obj/item/weapon/restraints/handcuffs/energy/used + +/obj/item/weapon/restraints/handcuffs/energy/used + desc = "Energy Discharge" + +/obj/item/weapon/restraints/handcuffs/energy/used/dropped(mob/user) + user.visible_message("[user] cuffs break in a discharge of energy!", \ + "[user] cuffs break in a discharge of energy!") + var/datum/effect/effect/system/spark_spread/S = new + S.set_up(4,0,user.loc) + S.start() + qdel(src) + +/obj/item/weapon/abductor_baton/examine(mob/user) + ..() + switch(mode) + if(BATON_STUN) + user <<"The baton is in stun mode." + if(BATON_SLEEP) + user <<"The baton is in sleep induction mode." + if(BATON_CUFF) + user <<"The baton is in restrain mode." + + +/obj/item/weapon/scalpel/alien + name = "alien scalpel" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/hemostat/alien + name = "alien hemostat" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/retractor/alien + name = "alien retractor" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/circular_saw/alien + name = "alien saw" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/surgicaldrill/alien + name = "alien drill" + icon = 'icons/obj/abductor.dmi' + +/obj/item/weapon/cautery/alien + name = "alien cautery" + icon = 'icons/obj/abductor.dmi' + +/obj/item/clothing/head/helmet/abductor + name = "Agent Headgear" + desc = "Abducting with style. Spiky style. Prevents digital tracking." + icon_state = "alienhelmet" + item_state = "alienhelmet" + blockTracking = 1 + origin_tech = "materials=6;magnets=5" + +// Operating Table / Beds / Lockers + +/obj/structure/optable/abductor + icon = 'icons/obj/abductor.dmi' + icon_state = "bed" + can_buckle = 1 + buckle_lying = 1 + +/obj/structure/stool/bed/abductor + name = "resting contraption" + desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?" + icon = 'icons/obj/abductor.dmi' + icon_state = "bed" + +/obj/structure/table/abductor + name = "alien table" + desc = "Advanced flat surface technology at work!" + icon_state = "alientable" + +/obj/structure/closet/abductor + name = "alien locker" + desc = "Contains secrets of the universe" + icon_state = "abductor" + icon_door = "abductor" \ No newline at end of file diff --git a/code/game/gamemodes/abduction/abduction_surgery.dm b/code/game/gamemodes/abduction/abduction_surgery.dm new file mode 100644 index 00000000000..a618e1d2544 --- /dev/null +++ b/code/game/gamemodes/abduction/abduction_surgery.dm @@ -0,0 +1,47 @@ +/datum/surgery/organ_extraction + name = "experimental dissection" + steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin,/datum/surgery_step/incise, /datum/surgery_step/extract_organ ,/datum/surgery_step/gland_insert) + species = list(/mob/living/carbon/human) + location = "chest" + user_species_restricted = 1 + user_species_ids = list("abductor") + ignore_clothes = 1 + +/datum/surgery_step/extract_organ + accept_hand = 1 + time = 32 + var/obj/item/IC = null + var/list/organ_types = list(/obj/item/organ/heart) + +/datum/surgery_step/extract_organ/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + for(var/obj/item/I in target.internal_organs) + if(I.type in organ_types) + IC = I + break + user.visible_message("[user] starts to remove [target]'s organs.", "You start to remove [target]'s organs...") + +/datum/surgery_step/extract_organ/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + if(IC) + user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "You pull [IC] out of [target]'s [target_zone].") + user.put_in_hands(IC) + target.internal_organs -= IC + return 1 + else + user << "You don't find anything in [target]'s [target_zone]!" + return 0 + +/datum/surgery_step/gland_insert + implements = list(/obj/item/gland = 100) + time = 32 + +/datum/surgery_step/gland_insert/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + user.visible_message("[user] starts to insert [tool] into [target].", "You start to insert [tool] into [target]...") + +/datum/surgery_step/gland_insert/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) + user.visible_message("[user] inserts [tool] into [target].", "You insert [tool] into [target].") + user.drop_item() + var/obj/item/gland/gland = tool + gland.Inject(target) + return 1 + + diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm new file mode 100644 index 00000000000..ccb60820159 --- /dev/null +++ b/code/game/gamemodes/abduction/gland.dm @@ -0,0 +1,255 @@ +/obj/item/gland/ + name = "Fleshy mass" + desc = "Eww" + icon = 'icons/obj/abductor.dmi' + icon_state = "gland" + var/cooldown_low = 300 + var/cooldown_high = 300 + var/next_activation = 0 + var/uses // -1 For inifinite + var/active = 0 + var/mob/living/carbon/human/host + +/obj/item/gland/proc/HostCheck() + if(ishuman(host) && host == src.loc) + if(host.stat != DEAD) + return 1 + return 0 + +/obj/item/gland/proc/Start() + active = 1 + next_activation = world.time + rand(cooldown_low,cooldown_high) + SSobj.processing |= src + +/obj/item/gland/proc/Inject(var/mob/living/carbon/human/target) + host = target + target.internal_organs += src + src.loc = target + +/obj/item/gland/process() + if(!active) + SSobj.processing.Remove(src) + return + if(next_activation <= world.time) + //This gives a chance to transplant the gland active into someone else if you're fast + if(!HostCheck()) + active = 0 + return + activate() + uses-- + next_activation = world.time + rand(cooldown_low,cooldown_high) + if(uses == 0) + active = 0 + +/obj/item/gland/proc/activate() + return + +/obj/item/gland/heals + cooldown_low = 200 + cooldown_high = 400 + uses = -1 + icon_state = "health" + +/obj/item/gland/heals/activate() + host << "You feel weird." + host.adjustBruteLoss(-20) + host.adjustOxyLoss(-20) + host.adjustFireLoss(-20) + +/obj/item/gland/slime + cooldown_low = 600 + cooldown_high = 1200 + uses = -1 + icon_state = "slime" + +/obj/item/gland/slime/activate() + host << "You feel weird." + + host.visible_message("[host] vomits on the floor!", \ + "You throw up on the floor!") + + host.nutrition -= 20 + host.adjustToxLoss(-3) + + var/turf/pos = get_turf(host) + pos.add_vomit_floor(host) + playsound(pos, 'sound/effects/splat.ogg', 50, 1) + + var/mob/living/simple_animal/slime/Slime = new/mob/living/simple_animal/slime(pos) + Slime.Friends = list(host) + Slime.Leader = host + +/obj/item/gland/mindshock + cooldown_low = 300 + cooldown_high = 300 + uses = -1 + icon_state = "mindshock" + +/obj/item/gland/mindshock/activate() + host << "You feel weird." + + var/turf/T = get_turf(host) + for(var/mob/living/carbon/human/H in orange(4,T)) + if(H == host) + continue + H << " You hear a buzz in your head " + H.confused += 20 + +/obj/item/gland/pop + cooldown_low = 900 + cooldown_high = 1800 + uses = 6 + icon_state = "species" + +/obj/item/gland/pop/activate() + host << "You feel weird." + var/species = pick(list(/datum/species/lizard,/datum/species/slime,/datum/species/plant/pod,/datum/species/fly)) + hardset_dna(host, null, null, null, null, species) + host.regenerate_icons() + return + +/obj/item/gland/ventcrawling + cooldown_low = 1800 + cooldown_high = 2400 + uses = 1 + icon_state = "vent" + +/obj/item/gland/ventcrawling/activate() + host << "You feel weird." + host << "You feel very stretchy." + host.ventcrawler = 2 + return + + +/obj/item/gland/viral + cooldown_low = 1800 + cooldown_high = 2400 + uses = 1 + icon_state = "viral" + +/obj/item/gland/viral/activate() + var/virus_type = pick(/datum/disease/beesease, /datum/disease/brainrot, /datum/disease/magnitis) + var/datum/disease/D = new virus_type() + D.carrier = 1 + host.viruses += D + D.affected_mob = host + D.holder = host + host.med_hud_set_status() + + +/obj/item/gland/emp //TODO : Replace with something more interesting + cooldown_low = 900 + cooldown_high = 1600 + uses = 10 + icon_state = "emp" + +/obj/item/gland/emp/activate() + empulse(get_turf(host), 2, 5, 1) + +/obj/item/gland/spiderman + cooldown_low = 450 + cooldown_high = 900 + uses = 10 + icon_state = "spider" + +/obj/item/gland/spiderman/activate() + if(uses == initial(uses)) + host.faction += "spiders" + new /obj/effect/spider/spiderling(host.loc) + +/obj/item/gland/egg + cooldown_low = 300 + cooldown_high = 600 + uses = -1 + icon_state = "egg" + +/obj/item/gland/egg/activate() + var/obj/item/weapon/reagent_containers/food/snacks/egg/egg = new(host.loc) + egg.reagents.add_reagent("sacid",20) + egg.desc += " It smells bad." + +/obj/item/gland/bloody + cooldown_low = 200 + cooldown_high = 400 + uses = -1 + +/obj/item/gland/bloody/activate() + host.adjustBruteLoss(15) + + host.visible_message("[host] skin erupts with blood!",\ + "Your skin erupts with blood! It hurts!") + + for(var/turf/T in oview(3,host)) //Make this respect walls and such + T.add_blood_floor(host) + for(var/mob/living/carbon/human/H in oview(3,host)) //Blood decals for simple animals would be neat. aka Carp with blood on it. + if(H.wear_suit) + H.wear_suit.add_blood(host) + H.update_inv_wear_suit(0) + else if(H.w_uniform) + H.w_uniform.add_blood(host) + H.update_inv_w_uniform(0) + +/obj/item/gland/bodysnatch + cooldown_low = 600 + cooldown_high = 600 + uses = 1 + +/obj/item/gland/bodysnatch/activate() + //spawn cocoon with clone greytide snpc inside + var/obj/effect/cocoon/abductor/C = new (get_turf(host)) + C.Copy(host) + C.Start() + host.gib() + return + +/obj/effect/cocoon/abductor + name = "Slimy cocoon" + desc = "You can see something moving inside" + icon = 'icons/effects/effects.dmi' + icon_state = "cocoon_large3" + color = rgb(10,120,10) + density = 1 + var/hatch_time = 0 + +/obj/effect/cocoon/abductor/proc/Copy(var/mob/living/carbon/human/H) + var/mob/living/carbon/human/interactive/greytide/clone = new(src) + hardset_dna(clone,H.dna.uni_identity,H.dna.struc_enzymes,H.real_name, H.dna.blood_type, H.dna.species.type, H.dna.mutant_color) + + //There's no define for this / get all items ? + var/list/slots = list(slot_back,slot_w_uniform,slot_wear_suit,\ + slot_wear_mask,slot_head,slot_shoes,slot_gloves,slot_ears,\ + slot_glasses,slot_belt,slot_s_store,slot_l_store,slot_r_store,slot_wear_id) + + for(var/slot in slots) + var/obj/item/I = H.get_item_by_slot(slot) + if(I) + clone.equip_to_slot_if_possible(I,slot) + +/obj/effect/cocoon/abductor/proc/Start() + hatch_time = world.time + 600 + SSobj.processing |= src + +/obj/effect/cocoon/abductor/process() + if(world.time > hatch_time) + SSobj.processing.Remove(src) + for(var/mob/M in contents) + src.visible_message("[src] hatches!") + M.loc = src.loc + qdel(src) + +/obj/item/gland/plasma + cooldown_low = 1200 + cooldown_high = 2400 + uses = 1 + +/obj/item/gland/plasma/activate() + host << "You feel bloated." + sleep(150) + host << "Your stomach feels about to explode!" + sleep(50) + host.visible_message("[host] explodes in a cloud of plasma!") + var/turf/simulated/T = get_turf(host) + if(istype(T)) + T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C,300) + host.gib() + return diff --git a/code/game/gamemodes/abduction/machinery/camera.dm b/code/game/gamemodes/abduction/machinery/camera.dm new file mode 100644 index 00000000000..52773d60e1a --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/camera.dm @@ -0,0 +1,142 @@ +/obj/machinery/computer/camera_advanced/abductor + name = "Human Observation Console" + var/team = 0 + networks = list("SS13","Abductor") + off_action = new/datum/action/camera_off/abductor //specific datum + var/datum/action/teleport_in/tele_in_action = new + var/datum/action/teleport_out/tele_out_action = new + var/datum/action/teleport_self/tele_self_action = new + var/datum/action/vest_mode_swap/vest_mode_action = new + var/datum/action/vest_disguise_swap/vest_disguise_action = new + var/obj/machinery/abductor/console/console + + icon = 'icons/obj/abductor.dmi' + icon_state = "camera" + +/obj/machinery/computer/camera_advanced/abductor/CreateEye() + ..() + eyeobj.visible_icon = 1 + eyeobj.icon = 'icons/obj/abductor.dmi' + eyeobj.icon_state = "camera_target" + +/obj/machinery/computer/camera_advanced/abductor/GrantActions(var/mob/living/carbon/user) + off_action.target = user + off_action.Grant(user) + + jump_action.target = user + jump_action.Grant(user) + //TODO : add null checks + tele_in_action.target = console.pad + tele_in_action.Grant(user) + + tele_out_action.target = console + tele_out_action.Grant(user) + + tele_self_action.target = console.pad + tele_self_action.Grant(user) + + vest_mode_action.target = console + vest_mode_action.Grant(user) + + vest_disguise_action.target = console + vest_disguise_action.Grant(user) + +/obj/machinery/computer/camera_advanced/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) + return H.dna.species.id == "abductor" + +/obj/machinery/computer/camera_advanced/abductor/proc/IsScientist(var/mob/living/carbon/human/H) + var/datum/species/abductor/S = H.dna.species + return S.scientist + +/obj/machinery/computer/camera_advanced/abductor/attack_hand(var/mob/user as mob) + if(!iscarbon(user) || !IsAbductor(user)) + return + return ..() + +/datum/action/camera_off/abductor/Activate() + if(!target || !iscarbon(target)) + return + var/mob/living/carbon/C = target + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/computer/camera_advanced/abductor/origin = remote_eye.origin + C.remote_view = 0 + origin.current_user = null + origin.jump_action.Remove(C) + origin.tele_in_action.Remove(C) + origin.tele_out_action.Remove(C) + origin.tele_self_action.Remove(C) + origin.vest_mode_action.Remove(C) + origin.vest_disguise_action.Remove(C) + if(C.client) + C.client.perspective = MOB_PERSPECTIVE + C.client.eye = src + C.client.images -= remote_eye.user_image + C.remote_control = null + C.unset_machine() + src.Remove(C) + + +/datum/action/teleport_in + name = "Send To" + action_type = AB_INNATE + button_icon_state = "beam_down" + +/datum/action/teleport_in/Activate() + if(!target || !iscarbon(owner)) + return + var/mob/living/carbon/human/C = owner + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/abductor/pad/P = target + + if(cameranet.checkTurfVis(remote_eye.loc)) + P.PadToLoc(remote_eye.loc) + +/datum/action/teleport_out + name = "Retrieve" + action_type = AB_INNATE + button_icon_state = "beam_up" + +/datum/action/teleport_out/Activate() + if(!target || !iscarbon(owner)) + return + var/obj/machinery/abductor/console/console = target + + console.TeleporterRetrieve() + +/datum/action/teleport_self + name = "Send Self" + action_type = AB_INNATE + button_icon_state = "beam_down" + +/datum/action/teleport_self/Activate() + if(!target || !iscarbon(owner)) + return + var/mob/living/carbon/human/C = owner + var/mob/camera/aiEye/remote/remote_eye = C.remote_control + var/obj/machinery/abductor/pad/P = target + + if(cameranet.checkTurfVis(remote_eye.loc)) + P.MobToLoc(remote_eye.loc,C) + +/datum/action/vest_mode_swap + name = "Switch Vest Mode" + action_type = AB_INNATE + button_icon_state = "vest_mode" + +/datum/action/vest_mode_swap/Activate() + if(!target || !iscarbon(owner)) + return + var/obj/machinery/abductor/console/console = target + console.FlipVest() + + +/datum/action/vest_disguise_swap + name = "Switch Vest Disguise" + action_type = AB_INNATE + button_icon_state = "vest_disguise" + +/datum/action/vest_disguise_swap/Activate() + if(!target || !iscarbon(owner)) + return + var/obj/machinery/abductor/console/console = target + console.SelectDisguise(remote=1) diff --git a/code/game/gamemodes/abduction/machinery/console.dm b/code/game/gamemodes/abduction/machinery/console.dm new file mode 100644 index 00000000000..89f37c05ccf --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/console.dm @@ -0,0 +1,212 @@ +//Common + +/obj/machinery/abductor + var/team = 0 + +/obj/machinery/abductor/proc/IsAbductor(var/mob/living/carbon/human/H) + if(!H.dna) + return 0 + return H.dna.species.id == "abductor" + +/obj/machinery/abductor/proc/IsAgent(var/mob/living/carbon/human/H) + if(H.dna.species.id == "abductor") + var/datum/species/abductor/S = H.dna.species + return S.agent + return 0 + +/obj/machinery/abductor/proc/IsScientist(var/mob/living/carbon/human/H) + if(H.dna.species.id == "abductor") + var/datum/species/abductor/S = H.dna.species + return S.scientist + return 0 + +//Console + +/obj/machinery/abductor/console + name = "Abductor console" + desc = "Ship command center." + icon = 'icons/obj/abductor.dmi' + icon_state = "console" + density = 1 + anchored = 1.0 + var/obj/item/device/abductor/gizmo/gizmo + var/obj/item/clothing/suit/armor/abductor/vest/vest + var/obj/machinery/abductor/experiment/experiment + var/obj/machinery/abductor/pad/pad + var/obj/machinery/computer/camera_advanced/abductor/camera + var/list/datum/icon_snapshot/disguises = list() + +/obj/machinery/abductor/console/attack_hand(var/mob/user as mob) + if(..()) + return + if(!IsAbductor(user)) + user << "You start mashing alien buttons at random!" + if(do_after(user,100)) + TeleporterSend() + return + user.set_machine(src) + var/dat = "" + dat += "
Abductsoft 3000
" + + if(experiment != null) + var/points = experiment.points + dat += "Collected Samples : [points]" + dat += "Transfer data in exchange for supplies:
" + dat += "Advanced Baton
" + dat += "Agent Helmet
" + dat += "Radio Silencer
" + dat += "Science Tool
" + else + dat += "NO EXPERIMENT MACHINE DETECTED
" + + if(pad!=null) + dat += "Emergency Teleporter System." + dat += "Consider using primary observation console first." + dat += "Activate Teleporter
" + dat += "Set Teleporter
" + if(gizmo!=null && gizmo.marked!=null) + dat += "Retrieve Mark
" + else + dat += "Retrieve Mark
" + else + dat += "NO TELEPAD DETECTED" + + if(vest!=null) + dat += "
Agent Vest Mode
" + var/mode = vest.mode + if(mode == VEST_STEALTH) + dat += "Combat" + dat += "Stealth" + else + dat += "Combat" + dat += "Stealth" + + dat+="
" + dat += "Select Agent Vest Disguise
" + else + dat += "NO AGENT VEST DETECTED" + var/datum/browser/popup = new(user, "computer", "Abductor Console", 400, 500) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/abductor/console/Topic(href, href_list) + if(..()) + return + + usr.set_machine(src) + if(href_list["teleporter_set"]) + TeleporterSet() + else if(href_list["teleporter_send"]) + TeleporterSend() + else if(href_list["teleporter_retrieve"]) + TeleporterRetrieve() + else if(href_list["flip_vest"]) + FlipVest() + else if(href_list["select_disguise"]) + SelectDisguise() + else if(href_list["dispense"]) + switch(href_list["dispense"]) + if("baton") + Dispense(/obj/item/weapon/abductor_baton,cost=2) + if("helmet") + Dispense(/obj/item/clothing/head/helmet/abductor) + if("silencer") + Dispense(/obj/item/device/abductor/silencer) + if("tool") + Dispense(/obj/item/device/abductor/gizmo) + src.updateUsrDialog() + +/obj/machinery/abductor/console/proc/TeleporterSet() + var/A = null + A = input("Select area to teleport to", "Teleport", A) in teleportlocs + if(pad!=null && in_range(usr,src)) + pad.teleport_target = teleportlocs[A] + return + +/obj/machinery/abductor/console/proc/TeleporterRetrieve() + if(gizmo!=null && pad!=null && gizmo.marked) + pad.Retrieve(gizmo.marked) + return + +/obj/machinery/abductor/console/proc/TeleporterSend() + if(pad!=null) + pad.Send() + return + +/obj/machinery/abductor/console/proc/FlipVest() + if(vest!=null) + vest.flip_mode() + return + +/obj/machinery/abductor/console/proc/SelectDisguise(var/remote=0) + var/list/entries = list() + var/tempname + var/datum/icon_snapshot/temp + for(var/i = 1; i <= disguises.len; i++) + temp = disguises[i] + tempname = temp.name + entries["[tempname]"] = disguises[i] + var/entry_name = input( "Choose Disguise", "Disguise") in entries + var/datum/icon_snapshot/chosen = entries[entry_name] + if(chosen && (remote || in_range(usr,src))) + vest.SetDisguise(chosen) + return + +/obj/machinery/abductor/console/proc/Initialize() + + for(var/obj/machinery/abductor/pad/p in machines) + if(p.team == team) + pad = p + break + + for(var/obj/machinery/abductor/experiment/e in machines) + if(e.team == team) + experiment = e + e.console = src + + for(var/obj/machinery/computer/camera_advanced/abductor/c in machines) + if(c.team == team) + camera = c + c.console = src + +/obj/machinery/abductor/console/proc/AddSnapshot(var/mob/living/carbon/human/target) + var/datum/icon_snapshot/entry = new + entry.name = target.name + entry.icon = target.icon + entry.icon_state = target.icon_state + entry.overlays = target.get_overlays_copy(list(L_HAND_LAYER,R_HAND_LAYER)) + for(var/i=1,i<=disguises.len,i++) + var/datum/icon_snapshot/temp = disguises[i] + if(temp.name == entry.name) + disguises[i] = entry + return + disguises.Add(entry) + return + +/obj/machinery/abductor/console/attackby(O as obj, user as mob, params) + if(istype(O, /obj/item/device/abductor/gizmo)) + var/obj/item/device/abductor/gizmo/G = O + user << "You link the tool to the console." + gizmo = G + G.console = src + else if(istype(O, /obj/item/clothing/suit/armor/abductor/vest)) + var/obj/item/clothing/suit/armor/abductor/vest/V = O + user << "You link the vest to the console." + vest = V + else + ..() + +/obj/machinery/abductor/console/proc/Dispense(var/item,var/cost=1) + if(experiment && experiment.points >= cost) + experiment.points-=cost + say("Incoming supply!") + if(pad) + flick("alien-pad", pad) + new item(pad.loc) + else + new item(src.loc) + else + say("Insufficent data!") + return \ No newline at end of file diff --git a/code/game/gamemodes/abduction/machinery/dispenser.dm b/code/game/gamemodes/abduction/machinery/dispenser.dm new file mode 100644 index 00000000000..d346e0366a5 --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/dispenser.dm @@ -0,0 +1,82 @@ +/obj/machinery/abductor/gland_dispenser + name = "Replacement Organ Storage" + desc = "A tank filled with replacement organs" + icon = 'icons/obj/abductor.dmi' + icon_state = "dispenser" + density = 1 + anchored = 1 + var/list/gland_types + var/list/gland_colors + var/list/amounts + +/obj/machinery/abductor/gland_dispenser/proc/random_color() + //TODO : replace with presets or spectrum + return rgb(rand(0,255),rand(0,255),rand(0,255)) + +/obj/machinery/abductor/gland_dispenser/New() + gland_types = typesof(/obj/item/gland) - /obj/item/gland + gland_types = shuffle(gland_types) + gland_colors = new/list(gland_types.len) + amounts = new/list(gland_types.len) + for(var/i=1,i<=gland_types.len,i++) + gland_colors[i] = random_color() + amounts[i] = rand(1,5) + +/obj/machinery/abductor/gland_dispenser/attack_hand(var/mob/user as mob) + if(..()) + return + if(!IsAbductor(user)) + return + user.set_machine(src) + var/box_css = {" + "} + var/dat = "" + var/item_count = 0 + for(var/i=1,i<=gland_colors.len,i++) + item_count++ + var/g_color = gland_colors[i] + var/amount = amounts[i] + dat += "[amount]" + if(item_count == 3) // Three boxes per line + dat +="" + item_count = 0 + var/datum/browser/popup = new(user, "glands", "Gland Dispenser", 200, 200) + popup.add_head_content(box_css) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() + return + +/obj/machinery/abductor/gland_dispenser/attackby(obj/item/weapon/W, mob/user, params) + if(istype(W, /obj/item/gland)) + user.drop_item() + W.loc = src + for(var/i=1,i<=gland_colors.len,i++) + if(gland_types[i] == W.type) + amounts[i]++ + +/obj/machinery/abductor/gland_dispenser/Topic(href, href_list) + if(..()) + return + usr.set_machine(src) + + if(href_list["dispense"]) + Dispense(text2num(href_list["dispense"])) + src.updateUsrDialog() + +/obj/machinery/abductor/gland_dispenser/proc/Dispense(var/count) + if(amounts[count]>0) + amounts[count]-- + var/T = gland_types[count] + new T(get_turf(src)) \ No newline at end of file diff --git a/code/game/gamemodes/abduction/machinery/experiment.dm b/code/game/gamemodes/abduction/machinery/experiment.dm new file mode 100644 index 00000000000..3d79a64b56b --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/experiment.dm @@ -0,0 +1,202 @@ +/obj/machinery/abductor/experiment + name = "Experimental machinery" + desc = "A human-sized coffin sporting wide array of automatic surgery tools" + icon = 'icons/obj/abductor.dmi' + icon_state = "experiment-open" + density = 0 + anchored = 1 + state_open = 1 + var/points = 0 + var/list/history = list() + var/list/abductee_minds = list() + var/flash = " - || - " + var/obj/machinery/abductor/console/console + +/obj/machinery/abductor/experiment/MouseDrop_T(mob/target, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target)) + return + if(IsAbductor(target)) + return + close_machine(target) + +/obj/machinery/abductor/experiment/attack_hand(mob/user) + if(..()) + return + + experimentUI(user) + +/obj/machinery/abductor/experiment/open_machine() + if(!state_open && !panel_open) + ..() + +/obj/machinery/abductor/experiment/close_machine(mob/target) + for(var/mob/living/carbon/C in loc) + if(IsAbductor(C)) + return + if(state_open && !panel_open) + ..(target) + +/obj/machinery/abductor/experiment/proc/dissection_icon(var/mob/living/carbon/human/H) + var/icon/photo = null + var/g = (H.gender == FEMALE) ? "f" : "m" + if(!config.mutant_races || H.dna.species.use_skintones) + photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.skin_tone]_[g]_s") + else + photo = icon("icon" = 'icons/mob/human.dmi', "icon_state" = "[H.dna.species.id]_[g]_s") + photo.Blend("#[H.dna.mutant_color]", ICON_MULTIPLY) + + var/icon/eyes_s + if(EYECOLOR in H.dna.species.specflags) + eyes_s = icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "[H.dna.species.eyes]_s") + eyes_s.Blend("#[H.eye_color]", ICON_MULTIPLY) + + var/datum/sprite_accessory/S + S = hair_styles_list[H.hair_style] + if(S && (HAIR in H.dna.species.specflags)) + var/icon/hair_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") + hair_s.Blend("#[H.hair_color]", ICON_MULTIPLY) + eyes_s.Blend(hair_s, ICON_OVERLAY) + + S = facial_hair_styles_list[H.facial_hair_style] + if(S && (FACEHAIR in H.dna.species.specflags)) + var/icon/facial_s = icon("icon" = S.icon, "icon_state" = "[S.icon_state]_s") + facial_s.Blend("#[H.facial_hair_color]", ICON_MULTIPLY) + eyes_s.Blend(facial_s, ICON_OVERLAY) + + if(eyes_s) + photo.Blend(eyes_s, ICON_OVERLAY) + + var/icon/splat = icon("icon" = 'icons/mob/dam_human.dmi',"icon_state" = "chest30") + photo.Blend(splat,ICON_OVERLAY) + + return photo + +/obj/machinery/abductor/experiment/proc/experimentUI(mob/user) + var/dat + dat += "
Experiment
" + if(occupant) + var/obj/item/weapon/photo/P = new + P.photocreate(null, icon(dissection_icon(occupant), dir = SOUTH)) + user << browse_rsc(P.img, "dissection_img") + dat += "| "
+ dat += " | "
+ dat += "Probe " + dat += "Dissect " + dat += "Analyze " + dat += " |
Machine Unoccupied
" + else + dat += "Subject Status :
" + dat += "[occupant.name] => " + switch(occupant.stat) + if(0) + dat += "Conscious" + if(1) + dat += "Unconscious" + else + dat += "DEAD" + dat += "" + dat += "[flash]" + dat += "
" + dat += "Scan" + dat += "Close" : "open=1'>Open"]" + var/datum/browser/popup = new(user, "experiment", "Probing Console", 300, 300) + popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) + popup.set_content(dat) + popup.open() + +/obj/machinery/abductor/experiment/Topic(href, href_list) + if(..() || usr == occupant) + return + usr.set_machine(src) + if(href_list["refresh"]) + updateUsrDialog() + return + if(href_list["open"]) + open_machine() + return + if(href_list["close"]) + close_machine() + return + if(occupant && occupant.stat != DEAD) + if(href_list["experiment"]) + flash = Experiment(occupant,href_list["experiment"]) + updateUsrDialog() + add_fingerprint(usr) + +/obj/machinery/abductor/experiment/proc/Experiment(var/mob/occupant,var/type) + var/mob/living/carbon/human/H = occupant + var/point_reward = 0 + if(H in history) + return "Specimen already in the database" + if(H.stat == DEAD) + say("Specimen deceased - please provide fresh sample.") + return "Specimen Deceased" + var/obj/item/gland/GlandTest = locate() in H + if(!GlandTest) + say("Experimental dissection not detected!") + return "No glands detected!" + if(H.mind != null && H.ckey != null) + history += H + abductee_minds += H.mind + say("Processing Specimen...") + sleep(5) + switch(text2num(type)) + if(1) + H << "You feel violated." + if(2) + H << "You feel being sliced and put back together." + if(3) + H << "You feel under intense scrutiny." + sleep(5) + H << "Your mind snaps!" + var/objtype = pick(typesof(/datum/objective/abductee/) - /datum/objective/abductee/) + var/datum/objective/abductee/O = new objtype() + H.mind.objectives += O + var/obj_count = 1 + H << "Your current objectives:" + for(var/datum/objective/objective in H.mind.objectives) + H << "Objective #[obj_count]: [objective.explanation_text]" + obj_count++ + + for(var/obj/item/gland/G in H) + G.Start() + point_reward++ + if(point_reward > 0) + open_machine() + SendBack(H) + playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) + points += point_reward + return "Experiment Successfull! [point_reward] new data-points collected." + else + playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) + return "Experiment Failed! No replacement organ detected." + else + say("Brain Activity Nonexistant - Disposing Sample...") + open_machine() + SendBack(H) + return "Specimen Braindead - Disposed" + return "ERROR" + + +/obj/machinery/abductor/experiment/proc/SendBack(var/mob/living/carbon/human/H) + H.Sleeping(8) + var/area/A + if(console && console.pad && console.pad.teleport_target) + A = console.pad.teleport_target + if(A.safe) // right now crew areas are safe - being locked behind closed doors is not fun + TeleportToArea(H,A) + //Area not chosen / It's not safe area - teleport to arrivals + H.forceMove(pick(latejoin)) + + +/obj/machinery/abductor/experiment/update_icon() + if(state_open) + icon_state = "experiment-open" + else + icon_state = "experiment" diff --git a/code/game/gamemodes/abduction/machinery/pad.dm b/code/game/gamemodes/abduction/machinery/pad.dm new file mode 100644 index 00000000000..b586874397d --- /dev/null +++ b/code/game/gamemodes/abduction/machinery/pad.dm @@ -0,0 +1,86 @@ +/obj/machinery/abductor/pad + name = "Alien Telepad" + desc = "Use this to transport to and from human habitat" + icon = 'icons/obj/abductor.dmi' + icon_state = "alien-pad-idle" + anchored = 1 + var/area/teleport_target + +/obj/machinery/abductor/proc/TeleportToArea(var/mob/living/target,var/area/thearea) + var/list/L = list() + for(var/turf/T in get_area_turfs(thearea.type)) + if(!T.density) + var/clear = 1 + for(var/obj/O in T) + if(O.density) + clear = 0 + break + if(clear) + L+=T + if(!L.len) + return + + if(target && target.buckled) + target.buckled.unbuckle_mob() + + var/list/tempL = L + var/attempt = null + var/success = 0 + while(tempL.len) + attempt = pick(tempL) + target.Move(attempt) + if(get_turf(target) == attempt) + success = 1 + break + else + tempL.Remove(attempt) + if(!success) + target.loc = pick(L) + +/obj/machinery/abductor/pad/proc/Warp(var/mob/living/target) + target.Move(src.loc) + +/obj/machinery/abductor/pad/proc/Send() + if(teleport_target == null) + teleport_target = teleportlocs[pick(teleportlocs)] + flick("alien-pad", src) + for(var/mob/living/target in src.loc) + TeleportToArea(target,teleport_target) + spawn(0) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + +/obj/machinery/abductor/pad/proc/Retrieve(var/mob/living/target) + flick("alien-pad", src) + spawn(0) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + Warp(target) + +/obj/machinery/abductor/pad/proc/MobToLoc(var/place,var/mob/living/target) + var/obj/effect/teleport_abductor/F = new(place) + var/datum/effect/effect/system/spark_spread/S = new + S.set_up(10,0,place) + S.start() + sleep(80) + qdel(F) + flick("alien-pad", src) + target.forceMove(place) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + +/obj/machinery/abductor/pad/proc/PadToLoc(var/place) + var/obj/effect/teleport_abductor/F = new(place) + var/datum/effect/effect/system/spark_spread/S = new + S.set_up(10,0,place) + S.start() + sleep(80) + qdel(F) + flick("alien-pad", src) + for(var/mob/living/target in src.loc) + target.forceMove(place) + spawn(0) + anim(target.loc,target,'icons/mob/mob.dmi',,"uncloak",,target.dir) + + +/obj/effect/teleport_abductor + name = "Huh" + icon = 'icons/obj/abductor.dmi' + icon_state = "teleport" diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 207805d235b..c629c157f98 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -15,6 +15,7 @@ var/list/blob_nodes = list() required_enemies = 1 recommended_enemies = 1 + round_ends_with_antag_death = 1 restricted_jobs = list("Cyborg", "AI") var/declared = 0 @@ -33,17 +34,13 @@ var/list/blob_nodes = list() blobwincount = initial(blobwincount) * cores_to_spawn - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs)//Removing robots from the list - if(player.assigned_role == job) - antag_candidates -= player - for(var/j = 0, j < cores_to_spawn, j++) if (!antag_candidates.len) break var/datum/mind/blob = pick(antag_candidates) infected_crew += blob blob.special_role = "Blob" + blob.restricted_roles = restricted_jobs log_game("[blob.key] (ckey) has been selected as a Blob") antag_candidates -= blob @@ -140,6 +137,7 @@ var/list/blob_nodes = list() core.overmind.mind.name = blob.name infected_crew -= blob infected_crew += core.overmind.mind + core.overmind.mind.special_role = "Blob Overmind" /datum/game_mode/blob/post_setup() diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index cc0ddf0eb9a..743196fbb2a 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -1,28 +1,19 @@ /datum/game_mode/blob/check_finished() - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - if(round_converted) - return ..() if(infected_crew.len > burst)//Some blobs have yet to burst return 0 if(blobwincount <= blobs.len)//Blob took over return 1 if(!blob_cores.len) // blob is dead if(config.continuous["blob"]) + continuous_sanity_checked = 1 //Nonstandard definition of "alive" gets past the check otherwise + SSshuttle.emergencyNoEscape = 0 if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) SSshuttle.emergency.mode = SHUTTLE_DOCKED SSshuttle.emergency.timer = world.time priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") - - if(config.midround_antag["blob"]) - round_converted = convert_roundtype() - if(!round_converted) - return 1 return ..() return 1 - if(station_was_nuked)//Nuke went off - return 1 - return 0 + return ..() /datum/game_mode/blob/declare_completion() @@ -49,7 +40,7 @@ ..() return 1 -datum/game_mode/proc/auto_declare_completion_blob() +/datum/game_mode/proc/auto_declare_completion_blob() if(istype(ticker.mode,/datum/game_mode/blob) ) var/datum/game_mode/blob/blob_mode = src if(blob_mode.infected_crew.len) diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 9d6de20b142..d08526eda5d 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -54,9 +54,10 @@ var/door = 0 var/grille = 0 var/mach = 0 + var/num_territories = 1//Number of total valid territories for gang mode -/datum/station_state/proc/count() +/datum/station_state/proc/count(var/count_territories) for(var/turf/T in block(locate(1,1,1), locate(world.maxx,world.maxy,1))) if(istype(T,/turf/simulated/floor)) @@ -88,6 +89,16 @@ else if(istype(O, /obj/machinery)) src.mach += 1 + if(count_territories) + var/list/valid_territories = list() + for(var/area/A in world) //First, collect all area types on the station zlevel + if(A.z == ZLEVEL_STATION) + if(!(A.type in valid_territories) && A.valid_territory) + valid_territories |= A.type + if(valid_territories.len) + num_territories = valid_territories.len //Add them all up to make the total number of area types + else + world << "ERROR: NO VALID TERRITORIES" /datum/station_state/proc/score(var/datum/station_state/result) if(!result) return 0 diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 04508a5e2d0..7dcd49f1821 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -113,6 +113,7 @@ /mob/living/simple_animal/hostile/blob/blobspore/Destroy() if(factory) factory.spores -= src + factory = null if(contents) for(var/mob/M in contents) M.loc = src.loc diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index b57568953fa..bf8822c40f5 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -38,6 +38,7 @@ blob_cores -= src if(overmind) overmind.blob_core = null + overmind = null SSobj.processing.Remove(src) ..() @@ -105,6 +106,8 @@ B.blob_core = src src.overmind = B color = overmind.blob_reagent_datum.color + if(B.mind && !B.mind.special_role) + B.mind.special_role = "Blob Overmind" spawn(0) if(is_offspring) B.verbs -= /mob/camera/blob/verb/split_consciousness diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index 872dafad212..3ab5874c176 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -17,6 +17,7 @@ for(var/mob/living/simple_animal/hostile/blob/blobspore/spore in spores) if(spore.factory == src) spore.factory = null + spores = null ..() /obj/effect/blob/factory/PulseAnimation(var/activate = 0) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 2ca962f00df..840e16b90f5 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -65,12 +65,12 @@ /mob/camera/blob/proc/update_health() if(blob_core) - hud_used.blobhealthdisplay.maptext = "
[blob_core.health]
"
+ hud_used.blobhealthdisplay.maptext = " [round(blob_core.health)]
"
/mob/camera/blob/proc/add_points(var/points)
if(points != 0)
blob_points = Clamp(blob_points + points, 0, max_blob_points)
- hud_used.blobpwrdisplay.maptext = " [src.blob_points]
"
+ hud_used.blobpwrdisplay.maptext = " [round(src.blob_points)]
"
/mob/camera/blob/say(var/message)
if (!message)
diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm
index 43c17da6211..a9e9bb233ae 100644
--- a/code/game/gamemodes/blob/powers.dm
+++ b/code/game/gamemodes/blob/powers.dm
@@ -2,7 +2,7 @@
/mob/camera/blob/proc/can_buy(var/cost = 15)
if(blob_points < cost)
- src << "You cannot afford this."
+ src << "You cannot afford this!"
return 0
add_points(-cost)
return 1
@@ -192,7 +192,7 @@
var/mob/living/simple_animal/hostile/blob/blobbernaut/blobber = new /mob/living/simple_animal/hostile/blob/blobbernaut (get_turf(B))
if(blobber)
- B.Destroy()
+ qdel(B)
blobber.color = blob_reagent_datum.color
blobber.overmind = src
blob_mobs.Add(blobber)
@@ -243,7 +243,7 @@
src << "Unable to remove this blob."
return
- B.Destroy()
+ qdel(B)
return
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index c2c7d247809..b7dcf10b6f6 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -171,7 +171,7 @@
return
/obj/effect/blob/proc/take_damage(damage, damage_type)
- if(!damage) // Avoid divide by zero errors
+ if(!damage || damage_type == STAMINA) // Avoid divide by zero errors
return
switch(damage_type)
if(BRUTE)
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index 17e34ff67e9..b7eec7d9187 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -54,17 +54,13 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
else
num_changelings = max(1, min(num_players(), changeling_amount))
- for(var/datum/mind/player in antag_candidates)
- for(var/job in restricted_jobs)//Removing robots from the list
- if(player.assigned_role == job)
- antag_candidates -= player
-
if(antag_candidates.len>0)
for(var/i = 0, i < num_changelings, i++)
if(!antag_candidates.len) break
var/datum/mind/changeling = pick(antag_candidates)
antag_candidates -= changeling
changelings += changeling
+ changeling.restricted_roles = restricted_jobs
modePlayer += changelings
return 1
else
@@ -82,15 +78,14 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
/datum/game_mode/changeling/make_antag_chance(var/mob/living/carbon/human/character) //Assigns changeling to latejoiners
var/changelingcap = min( round(joined_player_list.len/(config.changeling_scaling_coeff*2))+2, round(joined_player_list.len/config.changeling_scaling_coeff) )
- if(changelings.len >= changelingcap) //Caps number of latejoin antagonists
+ if(ticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists
return
- if(changelings.len <= (changelingcap - 2) || prob(100 - (config.changeling_scaling_coeff*2)))
+ if(ticker.mode.changelings.len <= (changelingcap - 2) || prob(100 - (config.changeling_scaling_coeff*2)))
if(character.client.prefs.be_special & BE_CHANGELING)
if(!jobban_isbanned(character.client, "changeling") && !jobban_isbanned(character.client, "Syndicate"))
if(age_check(character.client))
- if(!(character.job in ticker.mode.restricted_jobs))
+ if(!(character.job in restricted_jobs))
character.mind.make_Changling()
- ..()
/datum/game_mode/proc/forge_changeling_objectives(var/datum/mind/changeling)
//OBJECTIVES - random traitor objectives. Unique objectives "steal brain" and "identity theft".
diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm
index 51e51392e59..9ce3ed0590a 100644
--- a/code/game/gamemodes/changeling/changeling_power.dm
+++ b/code/game/gamemodes/changeling/changeling_power.dm
@@ -61,7 +61,7 @@
if(req_stat < user.stat)
user << "We are incapacitated."
return 0
- if((user.status_flags & FAKEDEATH) && name!="Revive")
+ if((user.status_flags & FAKEDEATH) && name != "Regenerate")
user << "We are incapacitated."
return 0
if(c.geneticdamage > max_genetic_damage)
diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm
index e8caa412086..7989c3fe92a 100644
--- a/code/game/gamemodes/changeling/evolution_menu.dm
+++ b/code/game/gamemodes/changeling/evolution_menu.dm
@@ -393,6 +393,9 @@ var/list/sting_paths
for(var/obj/effect/proc_holder/changeling/p in mind.changeling.purchasedpowers)
if(!(p.dna_cost == 0 && keep_free_powers))
mind.changeling.purchasedpowers -= p
+ if(istype(p,/obj/effect/proc_holder/changeling/augmented_eyesight))
+ permanent_sight_flags -= SEE_MOBS
+ sight -= SEE_MOBS
if(hud_used)
hud_used.lingstingdisplay.icon_state = null
hud_used.lingstingdisplay.invisibility = 101
diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm
index 081db162a22..913b6dd295d 100644
--- a/code/game/gamemodes/changeling/powers/absorb.dm
+++ b/code/game/gamemodes/changeling/powers/absorb.dm
@@ -17,10 +17,10 @@
var/obj/item/weapon/grab/G = user.get_active_hand()
if(!istype(G))
- user << "We must be grabbing a creature in our active hand to absorb them."
+ user << "We must be grabbing a creature in our active hand to absorb them!"
return
if(G.state <= GRAB_NECK)
- user << "We must have a tighter grip to absorb this creature."
+ user << "We must have a tighter grip to absorb this creature!"
return
var/mob/living/carbon/target = G.affecting
@@ -38,12 +38,10 @@
if(1)
user << "This creature is compatible. We must hold still..."
if(2)
- user << "We extend a proboscis."
- user.visible_message("[user] extends a proboscis!")
+ user.visible_message("[user] extends a proboscis!", "We extend a proboscis.")
if(3)
- user << "We stab [target] with the proboscis."
- user.visible_message("[user] stabs [target] with the proboscis!")
- target << "You feel a sharp stabbing pain!"
+ user.visible_message("[user] stabs [target] with the proboscis!", "We stab [target] with the proboscis.")
+ target << "You feel a sharp stabbing pain!"
target.take_overall_damage(40)
feedback_add_details("changeling_powers","A[stage]")
@@ -52,9 +50,8 @@
changeling.isabsorbing = 0
return
- user << "We have absorbed [target]!"
- user.visible_message("[user] sucks the fluids from [target]!")
- target << "You have been absorbed by the changeling!"
+ user.visible_message("[user] sucks the fluids from [target]!", "We have absorbed [target].")
+ target << "You are absorbed by the changeling!"
if(!changeling.has_dna(target.dna))
changeling.absorb_dna(target, user)
diff --git a/code/game/gamemodes/changeling/powers/adrenaline.dm b/code/game/gamemodes/changeling/powers/adrenaline.dm
new file mode 100644
index 00000000000..ed7496be1d2
--- /dev/null
+++ b/code/game/gamemodes/changeling/powers/adrenaline.dm
@@ -0,0 +1,56 @@
+/obj/effect/proc_holder/changeling/adrenaline
+ name = "Adrenaline Sacs"
+ desc = "We evolve additional sacs of adrenaline throughout our body."
+ helptext = "Removes all stuns instantly and adds a short-term reduction in further stuns. Can be used while unconscious. Continued use poisons the body."
+ chemical_cost = 30
+ dna_cost = 2
+ req_human = 1
+ req_stat = UNCONSCIOUS
+
+//Recover from stuns.
+/obj/effect/proc_holder/changeling/adrenaline/sting_action(var/mob/living/user)
+ user << "Energy rushes through us.[user.lying ? " We arise." : ""]"
+ user.stat = 0
+ user.SetParalysis(0)
+ user.SetStunned(0)
+ user.SetWeakened(0)
+ user.lying = 0
+ user.update_canmove()
+ user.reagents.add_reagent("changelingAdrenaline", 10)
+ user.reagents.add_reagent("changelingAdrenaline2", 2) //For a really quick burst of speed
+ user.adjustStaminaLoss(-75)
+ feedback_add_details("changeling_powers","UNS")
+ return 1
+
+/datum/reagent/medicine/changelingAdrenaline
+ name = "Adrenaline"
+ id = "changelingAdrenaline"
+ description = "Reduces stun times. Also deals toxin damage at high amounts."
+ color = "#C8A5DC"
+ overdose_threshold = 30
+
+/datum/reagent/medicine/changelingAdrenaline/on_mob_life(var/mob/living/M as mob)
+ M.AdjustParalysis(-1)
+ M.AdjustStunned(-1)
+ M.AdjustWeakened(-1)
+ M.adjustStaminaLoss(-1)
+ ..()
+ return
+
+/datum/reagent/medicine/changelingAdrenaline/overdose_process(var/mob/living/M as mob)
+ M.adjustToxLoss(1)
+ ..()
+ return
+
+/datum/reagent/medicine/changelingAdrenaline2
+ name = "Adrenaline"
+ id = "changelingAdrenaline2"
+ description = "Drastically increases movement speed."
+ color = "#C8A5DC"
+ metabolization_rate = 1
+
+/datum/reagent/medicine/changelingAdrenaline2/on_mob_life(var/mob/living/M as mob)
+ M.status_flags |= GOTTAGOREALLYFAST
+ M.adjustToxLoss(2)
+ ..()
+ return
diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
index e76ed33827c..66dcd7c20b9 100644
--- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
+++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
@@ -14,13 +14,15 @@
if(active)
user << "We feel a minute twitch in our eyes, and darkness creeps away."
user.weakeyes = 1
+ user.sight |= SEE_MOBS
+ user.permanent_sight_flags |= SEE_MOBS
+ user.see_in_dark = 8
+ user.see_invisible = SEE_INVISIBLE_MINIMUM
else
user << "Our vision dulls. Shadows gather."
- user.sight -= SEE_MOBS
user.weakeyes = 0
- while(active)
- user.see_in_dark = 8
- user.see_invisible = 2
- user.sight |= SEE_MOBS
- sleep(1) //BAD THINGS HAPPEN WITHOUT THIS.
+ user.sight -= SEE_MOBS
+ user.permanent_sight_flags -= SEE_MOBS
+ user.see_in_dark = 0
+ user.see_invisible = SEE_INVISIBLE_LIVING
return 1
diff --git a/code/game/gamemodes/changeling/powers/epinephrine.dm b/code/game/gamemodes/changeling/powers/epinephrine.dm
deleted file mode 100644
index 107bf5a96f8..00000000000
--- a/code/game/gamemodes/changeling/powers/epinephrine.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-/obj/effect/proc_holder/changeling/epinephrine
- name = "Epinephrine Overdose"
- desc = "We evolve additional sacs of adrenaline throughout our body."
- helptext = "Removes all stuns instantly and adds a short-term reduction in further stuns. Can be used while unconscious. Continued use poisons the body."
- chemical_cost = 30
- dna_cost = 2
- req_human = 1
- req_stat = UNCONSCIOUS
-
-//Recover from stuns.
-/obj/effect/proc_holder/changeling/epinephrine/sting_action(var/mob/living/user)
-
- if(user.lying)
- user << "We arise."
- else
- user << "Adrenaline rushes through us."
- user.stat = 0
- user.SetParalysis(0)
- user.SetStunned(0)
- user.SetWeakened(0)
- user.lying = 0
- user.update_canmove()
- user.reagents.add_reagent("synaptizine", 20)
- user.adjustStaminaLoss(-75)
-
- feedback_add_details("changeling_powers","UNS")
- return 1
diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm
index d9a7b33254b..f09eeceb54d 100644
--- a/code/game/gamemodes/changeling/powers/fakedeath.dm
+++ b/code/game/gamemodes/changeling/powers/fakedeath.dm
@@ -1,5 +1,5 @@
/obj/effect/proc_holder/changeling/fakedeath
- name = "Revival Stasis"
+ name = "Regenerative Stasis"
desc = "We fall into a stasis, allowing us to regenerate and trick our enemies."
chemical_cost = 15
dna_cost = 0
@@ -10,27 +10,25 @@
//Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay.
/obj/effect/proc_holder/changeling/fakedeath/sting_action(var/mob/living/user)
-
user << "We begin our stasis, preparing energy to arise once more."
-
user.status_flags |= FAKEDEATH //play dead
user.update_canmove()
-
if(user.stat != DEAD)
user.emote("deathgasp")
user.tod = worldtime2text()
-
spawn(800)
if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers)
user << "We are ready to regenerate."
user.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null)
-
feedback_add_details("changeling_powers","FD")
return 1
/obj/effect/proc_holder/changeling/fakedeath/can_sting(var/mob/user)
if(user.status_flags & FAKEDEATH)
+ user << "We are already regenerating."
return
- if(!user.stat && alert("Are we sure we wish to fake our death?",,"Yes","No") == "No")//Confirmation for living changelings if they want to fake their death
- return
+ if(!user.stat) //Confirmation for living changelings if they want to fake their death
+ switch(alert("Are we sure we wish to fake our own death?",,"Yes", "No"))
+ if("No")
+ return
return ..()
\ No newline at end of file
diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm
index 5970b10de9c..a04b48ce627 100644
--- a/code/game/gamemodes/changeling/powers/headcrab.dm
+++ b/code/game/gamemodes/changeling/powers/headcrab.dm
@@ -1,6 +1,6 @@
/obj/effect/proc_holder/changeling/headcrab
name = "Last Resort"
- desc = "We sacrifce our current body in a moment of need, stunning and damaging everyone nearby. If a dead body is nearby we infect it to raise again."
+ desc = "We sacrifice our current body in a moment of need, stunning and damaging everyone nearby. If a dead body is nearby we infect it to raise again."
chemical_cost = 20
dna_cost = 1
req_human = 1
@@ -11,6 +11,9 @@
spawn(5) // So it's not killed in explosion
var/mob/living/simple_animal/hostile/headcrab/crab = new(turf)
crab.origin = user.mind
+ if(user.mind)
+ user.mind.transfer_to(crab)
+ crab << "You burst out of the remains of your former body in a shower of gore!"
user.gib()
feedback_add_details("changeling_powers","LR")
return 1
\ No newline at end of file
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index eb77d14ef3d..fc897feff6b 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -23,19 +23,19 @@
/obj/effect/proc_holder/changeling/weapon/try_to_sting(var/mob/user, var/mob/target)
if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh
qdel(user.l_hand)
- user.visible_message("With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "", "We assimilate the [weapon_name_simple] back into our body.", "", "We assimilate the [weapon_name_simple] back into our body.", "", "We assimilate the [weapon_name_simple] back into our body.", "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!"
return
var/obj/item/W = new weapon_type(user)
user.put_in_hands(W)
@@ -64,7 +64,7 @@
var/mob/living/carbon/human/H = user
if(istype(H.wear_suit, suit_type) || istype(H.head, helmet_type))
- H.visible_message("[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!")
+ H.visible_message("[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!")
qdel(H.wear_suit)
qdel(H.head)
H.update_inv_wear_suit()
@@ -108,7 +108,7 @@
/obj/effect/proc_holder/changeling/weapon/arm_blade
name = "Arm Blade"
desc = "We reform one of our arms into a deadly blade."
- helptext = "Cannot be used while in lesser form."
+ helptext = "We may retract our armblade in the same manner as we form it. Cannot be used while in lesser form."
chemical_cost = 20
dna_cost = 2
genetic_damage = 10
@@ -133,10 +133,10 @@
/obj/item/weapon/melee/arm_blade/New()
..()
if(ismob(loc))
- loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!")
+ loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!")
/obj/item/weapon/melee/arm_blade/dropped(mob/user)
- user.visible_message("With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate the blade back into our body.", "", "We assimilate the blade back into our body.", "The airlock's motors resist our efforts to force it."
+ user << "The airlock's motors resist our efforts to force it!"
return
else if(A.locked)
- user << "The airlock's bolts prevent it from being forced."
+ user << "The airlock's bolts prevent it from being forced!"
return
else
//user.say("Heeeeeeeeeerrre's Johnny!")
- user.visible_message("[user] forces the door to open with \his [src]!", "We force the door to open.", "You hear a metal screeching sound.")
+ user.visible_message("[user] forces the door to open with \his [src]!", "We force the door to open.", "You hear a metal screeching sound.")
A.open(1)
@@ -176,7 +176,7 @@
/obj/effect/proc_holder/changeling/weapon/shield
name = "Organic Shield"
desc = "We reform one of our arms into a hard shield."
- helptext = "Organic tissue cannot resist damage forever, the shield will break after it is hit too much. The more genomes we absorb, the stronger it is. Cannot be used while in lesser form."
+ helptext = "Organic tissue cannot resist damage forever; the shield will break after it is hit too much. The more genomes we absorb, the stronger it is. Cannot be used while in lesser form."
chemical_cost = 20
dna_cost = 1
genetic_damage = 12
@@ -207,7 +207,7 @@
/obj/item/weapon/melee/shield/New()
..()
if(ismob(loc))
- loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!")
+ loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!")
/obj/item/clothing/head/helmet/space/changeling/dropped()
qdel(src)
@@ -216,7 +216,7 @@
if(remaining_uses < 1)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
- H.visible_message("With a sickening crunch, [H] reforms his shield into an arm!", "We assimilate our shield into our body", "", "We assimilate our shield into our body", "", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!")
+ loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!")
SSobj.processing += src
/obj/item/clothing/suit/space/changeling/dropped()
@@ -312,7 +312,7 @@
/obj/item/clothing/suit/armor/changeling/New()
..()
if(ismob(loc))
- loc.visible_message("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!")
+ loc.visible_message("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!")
/obj/item/clothing/suit/armor/changeling/dropped()
qdel(src)
diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm
index 0acb082e057..7e9aaa79c37 100644
--- a/code/game/gamemodes/changeling/powers/revive.dm
+++ b/code/game/gamemodes/changeling/powers/revive.dm
@@ -1,15 +1,13 @@
/obj/effect/proc_holder/changeling/revive
- name = "Revive"
+ name = "Regenerate"
desc = "We regenerate, healing all damage from our form."
req_stat = DEAD
//Revive from revival stasis
/obj/effect/proc_holder/changeling/revive/sting_action(var/mob/living/carbon/user)
-
if(user.stat == DEAD)
dead_mob_list -= user
living_mob_list += user
- user.stat = CONSCIOUS
user.tod = null
user.setToxLoss(0)
user.setOxyLoss(0)
@@ -25,11 +23,11 @@
H.restore_blood()
H.remove_all_embedded_objects()
user << "We have regenerated."
-
user.status_flags &= ~(FAKEDEATH)
user.update_canmove()
user.mind.changeling.purchasedpowers -= src
user.med_hud_set_status()
user.med_hud_set_health()
feedback_add_details("changeling_powers","CR")
+ user.stat = CONSCIOUS
return 1
diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm
index 2309d3ed850..936f3f47662 100644
--- a/code/game/gamemodes/changeling/powers/tiny_prick.dm
+++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm
@@ -40,7 +40,7 @@
return
if(get_dist(user, target) > (user.mind.changeling.sting_range))
return //sanity check as AStar is still throwing insane stunts
- if(!AStar(user.loc, target.loc, /turf/proc/AdjacentTurfs, /turf/proc/Distance, user.mind.changeling.sting_range))
+ if(!AStar(user.loc, target.loc, null, /turf/proc/Distance, user.mind.changeling.sting_range))
return //hope this ancient magic still works
if(target.mind && target.mind.changeling)
sting_feedback(user,target)
@@ -96,7 +96,7 @@
feedback_add_details("changeling_powers","TS")
return 1
-obj/effect/proc_holder/changeling/sting/extract_dna
+/obj/effect/proc_holder/changeling/sting/extract_dna
name = "Extract DNA Sting"
desc = "We stealthily sting a target and extract their DNA."
helptext = "Will give you the DNA of your target, allowing you to transform into them."
@@ -115,7 +115,7 @@ obj/effect/proc_holder/changeling/sting/extract_dna
feedback_add_details("changeling_powers","ED")
return 1
-obj/effect/proc_holder/changeling/sting/mute
+/obj/effect/proc_holder/changeling/sting/mute
name = "Mute Sting"
desc = "We silently sting a human, completely silencing them for a short time."
helptext = "Does not provide a warning to the victim that they have been stung, until they try to speak and cannot."
@@ -129,7 +129,7 @@ obj/effect/proc_holder/changeling/sting/mute
feedback_add_details("changeling_powers","MS")
return 1
-obj/effect/proc_holder/changeling/sting/blind
+/obj/effect/proc_holder/changeling/sting/blind
name = "Blind Sting"
desc = "Temporarily blinds the target."
helptext = "This sting completely blinds a target for a short time."
@@ -146,7 +146,7 @@ obj/effect/proc_holder/changeling/sting/blind
feedback_add_details("changeling_powers","BS")
return 1
-obj/effect/proc_holder/changeling/sting/LSD
+/obj/effect/proc_holder/changeling/sting/LSD
name = "Hallucination Sting"
desc = "Causes terror in the target."
helptext = "We evolve the ability to sting a target with a powerful hallucinogenic chemical. The target does not notice they have been stung, and the effect occurs after 30 to 60 seconds."
@@ -162,7 +162,7 @@ obj/effect/proc_holder/changeling/sting/LSD
feedback_add_details("changeling_powers","HS")
return 1
-obj/effect/proc_holder/changeling/sting/cryo
+/obj/effect/proc_holder/changeling/sting/cryo
name = "Cryogenic Sting"
desc = "We silently sting a human with a cocktail of chemicals that freeze them."
helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing."
diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm
index e567eaac5bf..7b13ecf03da 100644
--- a/code/game/gamemodes/changeling/powers/transform.dm
+++ b/code/game/gamemodes/changeling/powers/transform.dm
@@ -17,7 +17,7 @@
user.dna = chosen_dna
user.real_name = chosen_dna.real_name
- user.dna.species = new chosen_dna.species.type(user)
+ hardset_dna(user, null, null, null, null, chosen_dna.species.type)
user.dna.mutant_color = chosen_dna.mutant_color
updateappearance(user)
domutcheck(user)
diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm
index 292cbe9d52a..2e0b22314b8 100644
--- a/code/game/gamemodes/changeling/traitor_chan.dm
+++ b/code/game/gamemodes/changeling/traitor_chan.dm
@@ -39,11 +39,6 @@
else
num_changelings = max(1, min(num_players(), changeling_amount/2))
- for(var/datum/mind/player in possible_changelings)
- for(var/job in restricted_jobs)//Removing robots from the list
- if(player.assigned_role == job)
- possible_changelings -= player
-
if(possible_changelings.len>0)
for(var/j = 0, j < num_changelings, j++)
if(!possible_changelings.len) break
@@ -51,6 +46,7 @@
possible_changelings -= changeling
changelings += changeling
modePlayer += changelings
+ changeling.restricted_roles = restricted_jobs
return ..()
else
return 0
@@ -66,13 +62,13 @@
/datum/game_mode/traitor/changeling/make_antag_chance(var/mob/living/carbon/human/character) //Assigns changeling to latejoiners
var/changelingcap = min( round(joined_player_list.len/(config.changeling_scaling_coeff*4))+2, round(joined_player_list.len/(config.changeling_scaling_coeff*2)) )
- if(changelings.len >= changelingcap) //Caps number of latejoin antagonists
+ if(ticker.mode.changelings.len >= changelingcap) //Caps number of latejoin antagonists
..()
return
- if(changelings.len <= (changelingcap - 2) || prob(100 / (config.changeling_scaling_coeff * 4)))
+ if(ticker.mode.changelings.len <= (changelingcap - 2) || prob(100 / (config.changeling_scaling_coeff * 4)))
if(character.client.prefs.be_special & BE_CHANGELING)
if(!jobban_isbanned(character.client, "changeling") && !jobban_isbanned(character.client, "Syndicate"))
if(age_check(character.client))
- if(!(character.job in ticker.mode.restricted_jobs))
+ if(!(character.job in restricted_jobs))
character.mind.make_Changling()
..()
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 3e31c0f573b..990e9d1bdb5 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -19,6 +19,26 @@
if(mind.current == ticker.mode.sacrifice_target) return 0
return 1
+/proc/cultist_commune(var/mob/living/user, var/clear = 0, var/say = 0, var/message)
+ if(!message)
+ return
+ if(say)
+ user.say("O bidai nabora se[pick("'","`")]sma!")
+ else
+ user.whisper("O bidai nabora se[pick("'","`")]sma!")
+ sleep(10)
+ if(say)
+ user.say(message)
+ else
+ user.whisper(message)
+ for(var/mob/M in mob_list)
+ if(iscultist(M) || (M in dead_mob_list))
+ if(clear || !ishuman(user))
+ M << "[(ishuman(user) ? "Acolyte" : "Construct")] [user]: [message]"
+ else //Emergency comms
+ M << "Acolyte ???: [message]"
+
+
/datum/game_mode/cult
name = "cult"
@@ -66,10 +86,6 @@
if(config.protect_assistant_from_antagonist)
restricted_jobs += "Assistant"
- for(var/datum/mind/player in antag_candidates)
- for(var/job in restricted_jobs)//Removing heads and such from the list
- if(player.assigned_role == job)
- antag_candidates -= player
for(var/cultists_number = 1 to recommended_enemies)
if(!antag_candidates.len)
@@ -78,6 +94,7 @@
antag_candidates -= cultist
cult += cultist
cultist.special_role = "Cultist"
+ cultist.restricted_roles = restricted_jobs
log_game("[cultist.key] (ckey) has been selected as a cultist")
return (cult.len>=required_enemies)
@@ -157,6 +174,10 @@
else
mob << "You have a talisman in your [where], one that will help you start the cult on this station. Use it well and remember - there are others."
mob.update_icons()
+ if(where == "backpack")
+ var/obj/item/weapon/storage/B = mob.back
+ B.orient2hud(mob)
+ B.show_to(mob)
return 1
@@ -279,7 +300,7 @@
acolytes_survived = 0
for(var/datum/mind/cult_mind in cult)
if (cult_mind.current && cult_mind.current.stat != DEAD)
- if(cult_mind.current.onCentcom())
+ if(cult_mind.current.onCentcom() || cult_mind.current.onSyndieBase())
acolytes_survived++
if(acolytes_survived>=acolytes_needed)
return 0
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 32ae9b5a7e0..18a63e3ed4f 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -42,28 +42,23 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
return
if(ishuman(usr) || ismonkey(usr)) //Damage only applies to humans and monkeys, to allow constructs to communicate
- usr.visible_message("[usr.name] starts clawing at his arms like a mad man!")
- apply_damage(25,BRUTE, "l_arm")
- apply_damage(25,BRUTE, "r_arm")
+ usr.visible_message("[usr.name] starts clawing at \his arms with \his fingernails!", "You begin slicing open your arms with your fingers!")
+ apply_damage(10,BRUTE, "l_arm")
+ apply_damage(10,BRUTE, "r_arm")
sleep(50)
if(usr.incapacitated())
return //Hard to drawn intrinsic symbols when you're bleeding out in your cell.
var/turf/location = loc
if(istype(location, /turf/simulated)) // tearing your arms apart is going to spill a bit of blood, in fact thats the idea
location.add_blood(usr) // TO-DO change this to a badly drawn rune
- apply_damage(15,BRUTE, "l_arm") // does a metric fuck ton of damage because this meant to be an emergency method of communication.
- apply_damage(15,BRUTE, "r_arm")
+ apply_damage(10,BRUTE, "l_arm") // does a metric fuck ton of damage because this meant to be an emergency method of communication.
+ apply_damage(10,BRUTE, "r_arm")
if(usr.incapacitated())
return
- usr.visible_message("[usr.name] paints strange symbols with their own blood")
+ usr.visible_message("[usr.name] paints strange symbols with their own blood.", "You paint a messy rune with your own blood.")
sleep(20)
- usr.say("O bidai nabora se[pick("'","`")]sma!")
- sleep(10)
- usr.say("[input]")
- for(var/mob/M in mob_list)
- if((M.mind && (M.mind in ticker.mode.cult)) || (M in dead_mob_list))
- M << "[input]"
+ cultist_commune(usr, 0, 1, input)
return
@@ -164,9 +159,9 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
/obj/effect/rune/attack_hand(mob/living/user as mob) // OH GOD this is horrible
if(!iscultist(user))
- user << "You can't mouth the arcane scratchings without fumbling over them."
+ user << "You can't mouth the arcane scratchings without fumbling over them!"
return
- var/message = "You are unable to speak the words of the rune."
+ var/message = "You are unable to speak the words of the rune!"
if(!user.can_speak(message) && (user.mind && !user.mind.miming))
user << message
return
@@ -186,8 +181,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
return emp(src.loc,3)
if(word1 == wordtravel && word2 == wordblood && word3 == wordself)
return drain()
- if(word1 == wordsee && word2 == wordhell && word3 == wordjoin)
- return seer()
if(word1 == wordblood && word2 == wordjoin && word3 == wordhell)
return raise()
if(word1 == wordhide && word2 == wordsee && word3 == wordblood)
@@ -236,7 +229,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
cultist.say(gibberish)
else
cultist.whisper(gibberish)
- visible_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2)
+ visible_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2)
return
/obj/effect/rune/proc/check_icon()
@@ -518,7 +511,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
return
M.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit
M.visible_message("[user] beats [M] with the arcane tome!", \
- "You feel searing heat inside!")
+ "[user] beats you with the tome, and you feel a searing heat inside you!")
/obj/item/weapon/tome/attack_self(mob/living/user as mob)
@@ -544,11 +537,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")
if(!input)
return
- usr.whisper("O bidai nabora se[pick("'","`")]sma!")
- usr.whisper("[input]")
- for(var/datum/mind/H in ticker.mode.cult)
- if (H.current)
- H.current << "[input]"
+ cultist_commune(user, 1, 0, input)
return
if("Notes")
if(usr.get_active_hand() != src)
@@ -637,8 +626,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
return
for (var/mob/V in viewers(src))
- V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2)
- user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world."
+ V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2)
+ user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world."
user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage
if(do_after(user, 50))
if(usr.get_active_hand() != src)
@@ -670,7 +659,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
// if(M == user)
for(var/entry in words)
words[entry] = T.words[entry]
- user << "You copy the translation notes from your tome."
+ user << "You copy the translation notes from your tome."
/obj/item/weapon/tome/examine(mob/user)
@@ -690,7 +679,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
var/r
if (!istype(user.loc,/turf))
user << "You do not have enough space to write a proper rune."
- var/list/runes = list("teleport", "itemport", "tome", "armor", "convert", "tear in reality", "emp", "drain", "seer", "raise", "obscure", "reveal", "astral journey", "manifest", "imbue talisman", "sacrifice", "wall", "freedom", "cultsummon", "deafen", "blind", "bloodboil", "communicate", "stun", "summon shell")
+ var/list/runes = list("teleport", "itemport", "tome", "armor", "convert", "tear in reality", "emp", "drain", "raise", "obscure", "reveal", "astral journey", "manifest", "imbue talisman", "sacrifice", "wall", "freedom", "cultsummon", "deafen", "blind", "bloodboil", "communicate", "stun", "summon shell")
r = input("Choose a rune to scribe", "Rune Scribing") in runes //not cancellable.
var/obj/effect/rune/R = new /obj/effect/rune
if(istype(user, /mob/living/carbon/human))
@@ -754,12 +743,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
R.word3=wordself
R.loc = user.loc
R.check_icon()
- if("seer")
- R.word1=wordsee
- R.word2=wordhell
- R.word3=wordjoin
- R.loc = user.loc
- R.check_icon()
if("raise")
R.word1=wordblood
R.word2=wordjoin
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index babeb58ab51..059f9b1ca2b 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -1,7 +1,11 @@
var/list/sacrificed = list()
/obj/effect/rune
-/////////////////////////////////////////FIRST RUNE
+
+
+///Teleport: Teleports the user to a random teleport rune with the same rune. Can be imbued into a talisman.
+
+
/obj/effect/rune/proc/teleport(var/key)
var/mob/living/user = usr
var/allrunesloc[]
@@ -26,8 +30,8 @@ var/list/sacrificed = list()
else
user.whisper("Sas[pick("'","`")]so c'arta forbici!")
user.visible_message("[user] disappears in a flash of red light!", \
- "You feel as your body gets dragged through the dimension of Nar-Sie!", \
- "You hear a sickening crunch and sloshing of viscera.")
+ "You feel as your body gets dragged through the dimension of Nar-Sie!", \
+ "You hear a sickening crunch and sloshing of viscera.")
user.loc = allrunesloc[rand(1,index)]
return
if(istype(src,/obj/effect/rune))
@@ -37,6 +41,7 @@ var/list/sacrificed = list()
return
+//Subtype of teleport, teleports any items and mobs on top of the rune rather than the user themselves
/obj/effect/rune/proc/itemport(var/key)
// var/allrunesloc[]
// allrunesloc = new/list()
@@ -53,7 +58,7 @@ var/list/sacrificed = list()
IP = R
runecount++
if(runecount >= 2)
- user << "You feel pain, as the rune disappears in reality shift caused by too much wear of space-time fabric"
+ user << "You feel pain, as the rune disappears in reality shift caused by too much wear of space-time fabric"
if (istype(user, /mob/living))
user.take_overall_damage(5, 0)
qdel(src)
@@ -76,7 +81,9 @@ var/list/sacrificed = list()
return fizzle(user)
-/////////////////////////////////////////SECOND RUNE
+
+///Summon Tome: Summons a completely untranslated tome.
+
/obj/effect/rune/proc/tomesummon()
if(istype(src,/obj/effect/rune))
@@ -85,7 +92,7 @@ var/list/sacrificed = list()
usr.whisper("N[pick("'","`")]ath reth sh'yro eth d'raggathnor!")
usr.visible_message("Rune disappears with a flash of red light, and in its place now a book lies.", \
"You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a book.", \
- "You hear a pop and smell ozone.")
+ "You hear a pop and smell ozone.")
if(istype(src,/obj/effect/rune))
new /obj/item/weapon/tome(src.loc)
else
@@ -94,8 +101,8 @@ var/list/sacrificed = list()
return
+///Convert: The primary method of gaining new followers. Requires three cultists, doesn't work on loyalty implanted people, captains, or chaplains.
-/////////////////////////////////////////THIRD RUNE
/obj/effect/rune/proc/convert()
var/list/mob/living/cultsinrange = list()
@@ -110,29 +117,13 @@ var/list/sacrificed = list()
C.say("Mah[pick("'","`")]weyh pleggh at e'ntrath!")
if(cultsinrange.len >= 3)
M.visible_message("[M] writhes in pain as the markings below him glow a bloody red.", \
- "AAAAAAHHHH!", \
- "You hear an anguished scream.")
+ "AAAAAAHHHH!", \
+ "You hear an anguished scream.")
if(is_convertable_to_cult(M.mind))
ticker.mode.add_cultist(M.mind)
M.mind.special_role = "Cultist"
M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root."
M << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back."
-/*//convert no longer gives words
- //picking which word to use
- if(usr.mind.cult_words.len != ticker.mode.allwords.len) // No point running if they already know everything
- var/convert_word
- for(var/i=1, i<=3, i++)
- convert_word = pick(ticker.mode.grantwords)
- if(convert_word in usr.mind.cult_words)
- if(i==3) convert_word = null //NOTE: If max loops is changed ensure this condition is changed to match /Mal
- else
- break
- if(!convert_word)
- usr << "\red This Convert was unworthy of knowledge of the other side!"
- else
- usr << "\red The Geometer of Blood is pleased to see his followers grow in numbers."
- ticker.mode.grant_runeword(usr, convert_word)
- return 1 */
else
M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root."
M << "And not a single fuck was given, exterminate the cult at all costs."
@@ -147,11 +138,11 @@ var/list/sacrificed = list()
return fizzle()
+///Summon Nar-Sie: Summons the avatar of Nar-Sie to wreak havoc on the station. Will turn walls and floors to cult version and make anyone it touches into a harvester.
-/////////////////////////////////////////FOURTH RUNE
/obj/effect/rune/proc/tearreality()
- var/list/mob/living/carbon/human/cultist_count = list()
+ var/list/mob/living/cultist_count = list()
var/mob/living/user = usr
user.say("Tok-lyr rqa'nap g[pick("'","`")]lt-ulotf!")
for(var/mob/M in range(1,src))
@@ -189,7 +180,9 @@ var/list/sacrificed = list()
else
return fizzle()
-/////////////////////////////////////////FIFTH RUNE
+
+///EMP: Lets out a large EMP blast
+
/obj/effect/rune/proc/emp(var/U,var/range_red) //range_red - var which determines by which number to reduce the default emp range, U is the source loc, needed because of talisman emps which are held in hand at the moment of using and that apparently messes things up -- Urist
if(istype(src,/obj/effect/rune))
@@ -204,7 +197,7 @@ var/list/sacrificed = list()
empulse(U, (range_red - 2), range_red)
qdel(rune)
-/////////////////////////////////////////SIXTH RUNE
+///Blood Drain: Deals 1-25 damage to someone on top of it and heals an equivalent amount of brute damage to the user. Can be stacked. Too much blood drain = blood hunger that must be sated.
/obj/effect/rune/proc/drain()
var/drain = 0
@@ -221,14 +214,14 @@ var/list/sacrificed = list()
usr.say ("Yu[pick("'","`")]gular faras desdae. Havas mithum javara. Umathar uf'kal thenar!")
usr.visible_message("Blood flows from the rune into [usr]!", \
"The blood starts flowing from the rune and into your frail mortal body. You feel... empowered.", \
- "You hear a liquid flowing.")
+ "You hear a liquid flowing.")
var/mob/living/user = usr
if(user.bhunger)
user.bhunger = max(user.bhunger-2*drain,0)
if(drain>=50)
user.visible_message("[user]'s eyes give off eerie red glow!", \
"...but it wasn't nearly enough. You crave, crave for more. The hunger consumes you from within.", \
- "You hear a heartbeat.")
+ "You hear a heartbeat.")
user.bhunger += drain
src = user
spawn()
@@ -244,32 +237,9 @@ var/list/sacrificed = list()
return
+///Raise Dead: Requires two corpses. Brings one to life and gibs the other.
-
-
-/////////////////////////////////////////SEVENTH RUNE
-
-/obj/effect/rune/proc/seer()
- if(usr.loc==src.loc)
- usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium vivira. Itonis al'ra matum!")
- var/mob/living/carbon/human/user = usr
- if(user.see_invisible!=25 || (istype(user) && user.glasses)) //check for non humans
- user << "The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision."
- else
- user << "The world beyond opens to your eyes."
- var/see_temp = user.see_invisible
- user.see_invisible = SEE_INVISIBLE_OBSERVER
- user.seer = 1
- while(user.loc==src.loc)
- sleep(30)
- user.seer = 0
- user.see_invisible = see_temp
- return
- return fizzle()
-
-/////////////////////////////////////////EIGHTH RUNE
-
/obj/effect/rune/proc/raise()
var/mob/living/carbon/human/corpse_to_raise
var/mob/living/carbon/human/body_to_sacrifice
@@ -328,40 +298,31 @@ var/list/sacrificed = list()
corpse_to_raise.SetStunned(0)
corpse_to_raise.SetWeakened(0)
corpse_to_raise.radiation = 0
-// corpse_to_raise.buckled = null
-// if(corpse_to_raise.handcuffed)
-// qdel(corpse_to_raise.handcuffed)
-// corpse_to_raise.update_inv_handcuffed(0)
corpse_to_raise.stat = CONSCIOUS
corpse_to_raise.updatehealth()
corpse_to_raise.update_damage_overlays(0)
corpse_to_raise.key = ghost.key //the corpse will keep its old mind! but a new player takes ownership of it (they are essentially possessed)
//This means, should that player leave the body, the original may re-enter
- usr.say("Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!")
+ if(usr.real_name == "Herbert West")
+ usr.say("To life, to life, I bring them!")
+ else
+ usr.say("Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!")
corpse_to_raise.visible_message("[corpse_to_raise]'s eyes glow with a faint red as he stands up, slowly starting to breathe again.", \
"Life... I'm alive again...", \
- "You hear a faint, slightly familiar whisper.")
+ "You hear a faint, slightly familiar whisper.")
body_to_sacrifice.visible_message("[body_to_sacrifice] is torn apart, a black smoke swiftly dissipating from his remains!", \
- "You feel as your blood boils, tearing you apart.", \
- "You hear a thousand voices, all crying in pain.")
+ "You feel a horrible sensation of being torn apart, and--", \
+ "You hear a thousand voices, all crying in pain.")
body_to_sacrifice.gib()
-
-// if(ticker.mode.name == "cult")
-// ticker.mode:add_cultist(corpse_to_raise.mind)
-// else
-// ticker.mode.cult |= corpse_to_raise.mind
-
corpse_to_raise << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root."
corpse_to_raise << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back."
return
+///Veil: Makes all surrounding runes invisible. They cannot be used directly but still used indirectly (i.e. teleport...)
-
-/////////////////////////////////////////NINETH RUNE
-
/obj/effect/rune/proc/obscure(var/rad)
var/S=0
for(var/obj/effect/rune/R in orange(rad,src))
@@ -388,7 +349,9 @@ var/list/sacrificed = list()
call(/obj/effect/rune/proc/fizzle)()
return
-/////////////////////////////////////////TENTH RUNE
+
+///Astral Journey: Lets a player explore around as a ghost but does 10 brute damage for every tick they are like that. If they are moved from the rune they cannot return.
+
/obj/effect/rune/proc/ajourney() //some bits copypastaed from admin tools - Urist
if(usr.loc==src.loc)
@@ -396,7 +359,7 @@ var/list/sacrificed = list()
usr.say("Fwe[pick("'","`")]sh mah erl nyag r'ya!")
usr.visible_message("[usr]'s eyes glow blue as \he freezes in place, absolutely motionless.", \
"The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this is a great sight, being here strains your mind and body. Hurry...", \
- "You hear only complete silence for a moment.")
+ "You hear only complete silence for a moment.")
usr.ghostize(1)
L.ajourn = 1
while(L)
@@ -409,10 +372,9 @@ var/list/sacrificed = list()
return fizzle()
+///Manifest: User must be standing on rune. When invoked, makes a culted human spawn. The user takes damage depending on how many humans there are. If the user moves, all manifested humans are killed.
-/////////////////////////////////////////ELEVENTH RUNE
-
/obj/effect/rune/proc/manifest()
var/obj/effect/rune/this_rune = src
src = null
@@ -431,7 +393,7 @@ var/list/sacrificed = list()
var/mob/living/carbon/human/dummy/D = new(this_rune.loc)
usr.visible_message("A shape forms in the center of the rune. A shape of... a man.", \
"A shape forms in the center of the rune. A shape of... a man.", \
- "You hear liquid flowing.")
+ "You hear liquid flowing.")
D.real_name = "[pick(first_names_male)] [pick(last_names)]"
D.status_flags = CANSTUN|CANWEAKEN|CANPARALYSE|CANPUSH
@@ -453,16 +415,14 @@ var/list/sacrificed = list()
if(D)
D.visible_message("[D] slowly dissipates into dust and bones.", \
"You feel pain, as bonds formed between your soul and this homunculus break.", \
- "You hear faint rustle.")
+ "You hear faint rustle.")
D.dust()
return
+///Imbue Talisman: Put a compatible rune near this one and a paper on top of the imbue rune. Activate, and the compatible rune will be imbued into the paper.
-
-/////////////////////////////////////////TWELFTH RUNE
-
/obj/effect/rune/proc/talisman()//only hide, emp, teleport, deafen, blind and tome runes can be imbued atm
var/obj/item/weapon/paper/newtalisman
var/unsuitable_newtalisman = 0
@@ -542,52 +502,24 @@ var/list/sacrificed = list()
else
return fizzle()
-/////////////////////////////////////////THIRTEENTH RUNE
-/obj/effect/rune/proc/mend()
- var/mob/living/user = usr
- src = null
- user.say("Uhrast ka'hfa heldsagen ver[pick("'","`")]lot!")
- user.take_overall_damage(200, 0)
- runedec+=10
- user.visible_message("[user] keels over dead, his blood glowing blue as it escapes his body and dissipates into thin air.", \
- "In the last moment of your humble life, you feel an immense pain as fabric of reality mends... with your blood.", \
- "You hear faint rustle.")
- for(,user.stat==2)
- sleep(600)
- if (!user)
- return
- runedec-=10
- return
+///Communicate: Static communication rune. Somewhat pointless with free communications with tomes.
-/////////////////////////////////////////FOURTEETH RUNE
-
- // returns 0 if the rune is not used. returns 1 if the rune is used.
/obj/effect/rune/proc/communicate()
- . = 1 // Default output is 1. If the rune is deleted it will return 1
- var/input = stripped_input(usr, "Please choose a message to tell to the other acolytes.", "Voice of Blood", "")
+ var/input = stripped_input(usr, "Please enter a message to tell to the other acolytes.", "Voice of Blood", "")
if(!input)
- if (istype(src))
+ if(istype(src))
fizzle()
return 0
else
return 0
- if(istype(src,/obj/effect/rune))
- usr.say("O bidai nabora se[pick("'","`")]sma!")
- else
- usr.whisper("O bidai nabora se[pick("'","`")]sma!")
-
- if(istype(src,/obj/effect/rune))
- usr.say("[input]")
- else
- usr.whisper("[input]")
- for(var/mob/M in mob_list)
- if((M.mind && (M.mind in ticker.mode.cult)) || (M in dead_mob_list))
- M << "[input]"
+ cultist_commune(usr , 1, 1, input)
return 1
-/////////////////////////////////////////FIFTEENTH RUNE
+
+///Sacrifice: Gibs a target as an offering. Gives tome words as a reward and if the target has a mind, spawns a soul shard with their shade contained within.
+
/obj/effect/rune/proc/sacrifice()
var/list/mob/living/carbon/human/cultsinrange = list()
@@ -705,21 +637,6 @@ var/list/sacrificed = list()
stone_or_gib(M)
for(var/mob/victim in src.loc) //TO-DO: Move the shite above into the mob's own sac_act - see /mob/living/simple_animal/pet/corgi/sac_act for an example
victim.sac_act(src, victim) //Sacrifice procs are now seperate per mob, this allows us to allow sacrifice on as many mob types as we want without making an already clunky system worse
-/* for(var/mob/living/carbon/alien/A)
- for(var/mob/K in cultsinrange)
- K.say("Barhah hra zar'garis!")
- A.dust() /// A.gib() doesnt work for some reason, and dust() leaves that skull and bones thingy which we dont really need.
- if (ticker.mode.name == "cult")
- if(prob(75))
- usr << "\red The Geometer of Blood accepts your exotic sacrifice."
- sac_grant_word()
- else
- usr << "\red The Geometer of Blood accepts your exotic sacrifice."
- usr << "\red However, this alien is not enough to gain His favor."
- else
- usr << "\red The Geometer of Blood accepts your exotic sacrifice."
- return
- return fizzle() */
/obj/effect/rune/proc/sac_grant_word(var/mob/living/C) //The proc that which chooses a word rewarded for a successful sacrifice, sacrifices always give a currently unknown word if the normal checks pass
if(C.mind.cult_words.len != ticker.mode.allwords.len) // No point running if they already know everything
@@ -739,7 +656,8 @@ var/list/sacrificed = list()
T.gib()
-/////////////////////////////////////////SIXTEENTH RUNE
+///Reveal: Reverses the Veil rune's effect, revealing all hidden runes.
+
/obj/effect/rune/proc/revealrunes(var/obj/W as obj)
var/go=0
@@ -783,7 +701,9 @@ var/list/sacrificed = list()
call(/obj/effect/rune/proc/fizzle)()
return
-/////////////////////////////////////////SEVENTEENTH RUNE
+
+///Wall: Makes the rune dense and uncrossable. You can invoke it again to make it normal again. Deals 2 brute damage when used.
+
/obj/effect/rune/proc/wall()
usr.say("Khari[pick("'","`")]d! Eske'te tannin!")
@@ -796,9 +716,11 @@ var/list/sacrificed = list()
usr << "Your blood flows into the rune, and you feel as the rune releases its grasp on space."
return
-/////////////////////////////////////////EIGHTTEENTH RUNE
-/obj/effect/rune/proc/freedom()
+///Free Cultist: If the cultist is not walking free, makes it so.
+
+
+/obj/effect/rune/proc/freedom() //MURICA ;_;7
var/mob/living/user = usr
var/list/mob/living/cultists = new
for(var/datum/mind/H in ticker.mode.cult)
@@ -847,7 +769,9 @@ var/list/sacrificed = list()
qdel(src)
return fizzle(user)
-/////////////////////////////////////////NINETEENTH RUNE
+
+///Summon Cultist: Requires 3 cultists, summons a cultist to the rune's location and does 25 brute to all users.
+
/obj/effect/rune/proc/cultsummon()
var/mob/living/user = usr
@@ -877,11 +801,13 @@ var/list/sacrificed = list()
C.take_overall_damage(25, 0)
user.visible_message("Rune disappears with a flash of red light, and in its place now a body lies.", \
"You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \
- "You hear a pop and smell ozone.")
+ "You hear a pop and smell ozone.")
qdel(src)
return fizzle(user)
-/////////////////////////////////////////TWENTIETH RUNES
+
+///Deafen: Makes all nearby non-cultists deaf.
+
/obj/effect/rune/proc/deafen()
if(istype(src,/obj/effect/rune))
@@ -923,6 +849,10 @@ var/list/sacrificed = list()
V.show_message("Dust flows from [usr]'s hands for a moment, and the world suddenly becomes quiet..", 3)
return
+
+///Blind: Makes all non-cultists nearby blind. Combine with Deafen to make the entire shuttle go into a panic and laugh as they bumble around.
+
+
/obj/effect/rune/proc/blind()
if(istype(src,/obj/effect/rune))
var/affected = 0
@@ -965,15 +895,11 @@ var/list/sacrificed = list()
return
+///Blood Boil: Every non-cultist nearby will take 51 burn and 51 brute damage. 5% chance for them to gib as well. Users will take 15 brute. 10% chance for the rune to blow up.
+
+
/obj/effect/rune/proc/bloodboil() //cultists need at least one DANGEROUS rune. Even if they're all stealthy.
-/*
- var/list/mob/living/carbon/cultists = new
- for(var/datum/mind/H in ticker.mode.cult)
- if (istype(H.current,/mob/living/carbon))
- cultists+=H.current
-*/
- var/culcount = 0 //also, wording for it is old wording for obscure rune, which is now hide-see-blood.
-// var/list/cultboil = list(cultists-usr) //and for this words are destroy-see-blood.
+ var/culcount = 0
for(var/mob/living/carbon/C in orange(1,src))
if(iscultist(C) && !C.stat)
culcount++
@@ -986,9 +912,6 @@ var/list/sacrificed = list()
continue
M.take_overall_damage(51,51)
M << "Your blood boils!"
- if(prob(5))
- spawn(5)
- M.gib()
for(var/obj/effect/rune/R in view(src))
if(prob(10))
explosion(R.loc, -1, 0, 1, 5)
@@ -1001,35 +924,9 @@ var/list/sacrificed = list()
return fizzle()
return
-// WIP rune, I'll wait for Rastaf0 to add limited blood.
-/obj/effect/rune/proc/burningblood()
- var/culcount = 0
- for(var/mob/living/carbon/C in orange(1,src))
- if(iscultist(C) && !C.stat)
- culcount++
- if(culcount >= 5)
- for(var/obj/effect/rune/R in world)
- if(R.blood_DNA == src.blood_DNA)
- for(var/mob/living/M in orange(2,R))
- M.take_overall_damage(0,15)
- if (R.invisibility>M.see_invisible)
- M << "Aargh it burns!"
- else
- M << "Rune suddenly ignites, burning you!"
- var/turf/T = get_turf(R)
- T.hotspot_expose(700,125)
- for(var/obj/effect/decal/cleanable/blood/B in world)
- if(B.blood_DNA == src.blood_DNA)
- for(var/mob/living/M in orange(1,B))
- M.take_overall_damage(0,5)
- M << "Blood suddenly ignites, burning you!"
- var/turf/T = get_turf(B)
- T.hotspot_expose(700,125)
- qdel(B)
- qdel(src)
+///Stun: Everyone nearby would be stunned for a -very- short time. If used in a talisman, it stuns and mutes a single target.
-////////// Rune 24 (counting burningblood, which kinda doesnt work yet.)
/obj/effect/rune/proc/runestun(var/mob/living/T as mob)
if(istype(src,/obj/effect/rune)) ///When invoked as rune, flash and stun everyone around.
@@ -1047,7 +944,7 @@ var/list/sacrificed = list()
else if(issilicon(L))
var/mob/living/silicon/S = L
S.Weaken(5)
- S.show_message("BZZZT... The rune has exploded in a bright flash.", 3)
+ S.show_message("!@(%* BZZZZZT !@(%!)$", 3)
qdel(src)
else ///When invoked as talisman, stun and mute the target mob.
usr.say("Dream sign ''Evil sealing talisman'[pick("'","`")]!")
@@ -1070,7 +967,9 @@ var/list/sacrificed = list()
C.Stun(10)
return
-/////////////////////////////////////////TWENTY-FIFTH RUNE
+
+///Armor: The user will be armed with cultist garb, a trophy rack, and a high-damage sword. If items are in these slots, they will not be equipped and simply deleted.
+
/obj/effect/rune/proc/armor()
var/mob/living/carbon/human/user = usr
@@ -1091,6 +990,10 @@ var/list/sacrificed = list()
qdel(src)
+
+///Summon Shell: Summons a construct shell if there's four plasteel sheets on top of the rune
+
+
/obj/effect/rune/proc/summon_shell() // Summons a construct shell
for(var/obj/item/stack/sheet/plasteel/PS in src.loc) //I could probably combine the amounts but I'm too lazy to compensate for others' lazyness
if(PS.amount >= 4) // may need increasing?
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 7be427bcb97..4bfeecb2247 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -16,9 +16,10 @@
var/name = "invalid"
var/config_tag = null
var/votable = 1
- var/probability = 1
+ var/probability = 0
var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm
var/explosion_in_progress = 0 //sit back and relax
+ var/round_ends_with_antag_death = 0 //flags the "one verse the station" antags as such
var/list/datum/mind/modePlayer = new
var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here
var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist
@@ -26,12 +27,13 @@
var/required_players = 0
var/required_enemies = 0
var/recommended_enemies = 0
- var/pre_setup_before_jobs = 0
var/antag_flag = null //preferences flag such as BE_WIZARD that need to be turned on for players to be antag
var/datum/mind/sacrifice_target = null
+ var/mob/living/living_antag_player = null
var/list/datum/game_mode/replacementmode = null
var/round_converted = 0 //0: round not converted, 1: round going to convert, 2: round converted
var/reroll_friendly //During mode conversion only these are in the running
+ var/continuous_sanity_checked //Catches some cases where config options could be used to suggest that modes without antagonists should end when all antagonists die
var/enemy_minimum_age = 7 //How many days must players have been playing before they can play this antagonist
var/const/waittime_l = 600
@@ -84,7 +86,7 @@
spawn (rand(waittime_l, waittime_h))
send_intercept(0)
start_state = new /datum/station_state()
- start_state.count()
+ start_state.count(1)
return 1
///make_antag_chance()
@@ -97,16 +99,16 @@
///convert_roundtype()
///Allows rounds to basically be "rerolled" should the initial premise fall through
/datum/game_mode/proc/convert_roundtype()
- var/living_crew = 0
+ var/list/living_crew = list()
for(var/mob/Player in mob_list)
if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player))
- living_crew++
- if(living_crew / joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh
+ living_crew += Player
+ if(living_crew.len / joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh
message_admins("Convert_roundtype failed due to too many dead people. Limit is [config.midround_antag_life_check * 100]% living crew")
return null
- var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew)
+ var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len)
var/list/datum/game_mode/usable_modes = list()
for(var/datum/game_mode/G in runnable_modes)
if(G.reroll_friendly)
@@ -114,8 +116,6 @@
else
del(G)
- SSshuttle.emergencyNoEscape = 0 //Time to get the fuck out of here
-
if(!usable_modes)
message_admins("Convert_roundtype failed due to no valid modes to convert to. Please report this error to the Coders.")
return null
@@ -169,12 +169,86 @@
/datum/game_mode/proc/check_finished() //to be called by ticker
+ if(replacementmode && round_converted == 2)
+ return replacementmode.check_finished()
if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || station_was_nuked)
return 1
+ if(!round_converted && (!config.continuous[config_tag] || (config.continuous[config_tag] && config.midround_antag[config_tag]))) //Non-continuous or continous with replacement antags
+ if(!continuous_sanity_checked) //make sure we have antags to be checking in the first place
+ for(var/mob/Player in mob_list)
+ if(Player.mind)
+ if(Player.mind.special_role)
+ continuous_sanity_checked = 1
+ return 0
+ if(!continuous_sanity_checked)
+ message_admins("The roundtype ([config_tag]) has no antagonists, continuous round has been defaulted to on and midround_antag has been defaulted to off.")
+ config.continuous[config_tag] = 1
+ config.midround_antag[config_tag] = 0
+ SSshuttle.emergencyNoEscape = 0
+ return 0
+
+
+ if(living_antag_player && living_antag_player.mind && living_antag_player.stat != DEAD && !isnewplayer(living_antag_player) &&!isbrain(living_antag_player))
+ return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark.
+
+ for(var/mob/Player in living_mob_list)
+ if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player))
+ if(Player.mind.special_role) //Someone's still antaging!
+ living_antag_player = Player
+ return 0
+
+ if(!config.continuous[config_tag])
+ return 1
+
+ else
+ round_converted = convert_roundtype()
+ if(!round_converted)
+ if(round_ends_with_antag_death)
+ return 1
+ else
+ config.midround_antag[config_tag] = 0
+ return 0
+
return 0
/datum/game_mode/proc/declare_completion()
+ var/clients = 0
+ var/surviving_humans = 0
+ var/surviving_total = 0
+ var/ghosts = 0
+ var/escaped_humans = 0
+ var/escaped_total = 0
+
+ for(var/mob/M in player_list)
+ if(M.client)
+ clients++
+ if(ishuman(M))
+ if(!M.stat)
+ surviving_humans++
+ if(M.z == 2)
+ escaped_humans++
+ if(!M.stat)
+ surviving_total++
+ if(M.z == 2)
+ escaped_total++
+
+
+ if(isobserver(M))
+ ghosts++
+
+ if(clients > 0)
+ feedback_set("round_end_clients",clients)
+ if(ghosts > 0)
+ feedback_set("round_end_ghosts",ghosts)
+ if(surviving_humans > 0)
+ feedback_set("survived_human",surviving_humans)
+ if(surviving_total > 0)
+ feedback_set("survived_total",surviving_total)
+ if(escaped_humans > 0)
+ feedback_set("escaped_human",escaped_humans)
+ if(escaped_total > 0)
+ feedback_set("escaped_total",escaped_total)
send2irc("Server", "Round just ended.")
return 0
@@ -188,7 +262,7 @@
intercepttext += " Centcom has recently been contacted by the following syndicate affiliated organisations in your area, please investigate any information you may have:"
var/list/possible_modes = list()
- possible_modes.Add("revolution", "wizard", "nuke", "traitor", "malf", "changeling", "cult")
+ possible_modes.Add("revolution", "wizard", "nuke", "traitor", "malf", "changeling", "cult", "gang")
possible_modes -= "[ticker.mode]" //remove current gamemode to prevent it from being randomly deleted, it will be readded later
var/number = pick(1, 2)
@@ -229,6 +303,7 @@
if(BE_GANG) roletext="gangster"
if(BE_CULTIST) roletext="cultist"
if(BE_MONKEY) roletext="monkey"
+ if(BE_ABDUCTOR) roletext="abductor"
// Ultimate randomizing code right here
@@ -343,7 +418,7 @@
//////////////////////////
//Reports player logouts//
//////////////////////////
-proc/display_roundstart_logout_report()
+/proc/display_roundstart_logout_report()
var/msg = "Roundstart logout report\n\n"
for(var/mob/living/L in mob_list)
@@ -412,6 +487,17 @@ proc/display_roundstart_logout_report()
return text
+/datum/game_mode/proc/printobjectives(var/datum/mind/ply)
+ var/text = ""
+ var/count = 1
+ for(var/datum/objective/objective in ply.objectives)
+ if(objective.check_completion())
+ text += "Objective #[count]: [objective.explanation_text] Success!" + else + text += "
Objective #[count]: [objective.explanation_text] Fail." + count++ + return text + //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 /datum/game_mode/proc/age_check(client/C) if(get_remaining_days(C) == 0) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 45d23881221..6967dc894c7 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -2,10 +2,19 @@ //Gang War Game Mode /datum/game_mode - var/list/datum/mind/A_bosses = list() //gang A bosses - var/list/datum/mind/A_gangsters = list() //gang A Members - var/list/datum/mind/B_bosses = list() //gang B bosses - var/list/datum/mind/B_gangsters = list() //gang B Members + var/list/datum/mind/A_gang = list() //gang A Members + var/list/datum/mind/B_gang = list() //gang B Members + var/list/datum/mind/A_bosses = list() //gang A Bosses + var/list/datum/mind/B_bosses = list() //gang B Bosses + var/obj/item/device/gangtool/A_tools = list() + var/obj/item/device/gangtool/B_tools = list() + var/datum/gang_points/gang_points + var/list/A_territory = list() + var/list/B_territory = list() + var/list/A_territory_new = list() + var/list/A_territory_lost = list() + var/list/B_territory_new = list() + var/list/B_territory_lost = list() /datum/game_mode/gang name = "gang war" @@ -16,15 +25,15 @@ required_enemies = 2 recommended_enemies = 2 enemy_minimum_age = 14 - var/finished = 0 - var/checkwin_counter = 0 + var/goal_scalar = 0.5 //Goal = Total territories x goal_scalar + /////////////////////////// //Announces the game type// /////////////////////////// /datum/game_mode/gang/announce() world << "The current game mode is - Gang War!" - world << "A violent turf war has erupted on the station!
Gangsters - Take over the station by recruiting gangsters and killing the rival gang's boss!
Crew - Identify and stop the mob bosses without killing either of them!" + world << "A violent turf war has erupted on the station!
Gangsters - Take over the station by claiming more than [round(100*goal_scalar,1)]% of the station!
Crew - The gangs will try to keep you on the station. Successfully evacuate the station to win!" /////////////////////////////////////////////////////////////////////////////// @@ -37,11 +46,6 @@ if(config.protect_assistant_from_antagonist) restricted_jobs += "Assistant" - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs)//Removing heads and such from the list - if(player.assigned_role == job) - antag_candidates -= player - if(antag_candidates.len >= 2) assign_bosses() @@ -69,39 +73,32 @@ modePlayer += B_bosses ..() - -/datum/game_mode/gang/process() - checkwin_counter++ - if(checkwin_counter >= 5) - if(!finished) - ticker.mode.check_win() - checkwin_counter = 0 - return 0 - /datum/game_mode/gang/proc/assign_bosses() var/datum/mind/boss = pick(antag_candidates) A_bosses += boss antag_candidates -= boss boss.special_role = "[gang_name("A")] Gang (A) Boss" - log_game("[boss.key] has been selected as a boss for the [gang_name("A")] Gang (A)") + boss.restricted_roles = restricted_jobs + log_game("[boss.key] has been selected as the boss for the [gang_name("A")] Gang (A)") boss = pick(antag_candidates) B_bosses += boss antag_candidates -= boss boss.special_role = "[gang_name("B")] Gang (B) Boss" - log_game("[boss.key] has been selected as a boss for the [gang_name("B")] Gang (B)") + boss.restricted_roles = restricted_jobs + log_game("[boss.key] has been selected as the boss for the [gang_name("B")] Gang (B)") /datum/game_mode/proc/forge_gang_objectives(var/datum/mind/boss_mind) var/datum/objective/rival_obj = new rival_obj.owner = boss_mind - rival_obj.explanation_text = "Assassinate or exile the [(boss_mind in A_bosses) ? gang_name("B") : gang_name("A")] Gang's bosses." + rival_obj.explanation_text = "Claim more than 50% the station before the [(boss_mind in A_bosses) ? gang_name("B") : gang_name("A")] Gang does." boss_mind.objectives += rival_obj /datum/game_mode/proc/greet_gang(var/datum/mind/boss_mind, var/you_are=1) var/obj_count = 1 if (you_are) - boss_mind.current << "You are a [(boss_mind in A_bosses) ? gang_name("A") : gang_name("B")] Gang Boss!" + boss_mind.current << "You are the founding member of the [(boss_mind in A_bosses) ? gang_name("A") : gang_name("B")] Gang!" for(var/datum/objective/objective in boss_mind.objectives) boss_mind.current << "Objective #[obj_count]: [objective.explanation_text]" obj_count++ @@ -118,51 +115,9 @@ mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." mob.dna.remove_mutation(CLOWNMUT) - // find a radio! toolbox(es), backpack, belt, headset - var/loc = "" - var/obj/item/R = locate(/obj/item/device/pda) in mob.contents //Hide the uplink in a PDA if available, otherwise radio - if(!R) - R = locate(/obj/item/device/radio) in mob.contents - - if (!R) - mob << "Unfortunately, Your Syndicate benefactors wasn't able to get you an uplink." - . = 0 - else - if (istype(R, /obj/item/device/radio)) - // generate list of radio freqs - var/obj/item/device/radio/target_radio = R - var/freq = 1441 - var/list/freqlist = list() - while (freq <= 1489) - if (freq < 1451 || freq > 1459) - freqlist += freq - freq += 2 - if ((freq % 2) == 0) - freq += 1 - freq = freqlist[rand(1, freqlist.len)] - - var/obj/item/device/uplink/hidden/T = new(R) - target_radio.hidden_uplink = T - T.uplink_owner = "[mob.key]" - target_radio.traitor_frequency = freq - mob << "Your Syndicate benefactors have cunningly disguised a Syndicate Uplink as your [R.name] [loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features." - mob.mind.store_memory("Radio Freq: [format_frequency(freq)] ([R.name] [loc]).") - else if (istype(R, /obj/item/device/pda)) - // generate a passcode if the uplink is hidden in a PDA - var/pda_pass = "[rand(100,999)] [pick("Alpha","Bravo","Delta","Omega")]" - - var/obj/item/device/uplink/hidden/T = new(R) - R.hidden_uplink = T - T.uplink_owner = "[mob.key]" - var/obj/item/device/pda/P = R - P.lock_code = pda_pass - - mob << "Your Syndicate benefactors have cunningly disguised a Syndicate Uplink as your [R.name] [loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features." - mob.mind.store_memory("Uplink Passcode: [pda_pass] ([R.name] [loc]).") - - var/obj/item/device/flash/T = new(mob) - var/obj/item/device/recaller/recaller = new(mob) - var/obj/item/toy/crayon/spraycan/SC = new(mob) + var/obj/item/weapon/pen/gang/T = new(mob) + var/obj/item/device/gangtool/gangtool = new(mob) + var/obj/item/toy/crayon/spraycan/gang/SC = new(mob) var/list/slots = list ( "backpack" = slot_in_backpack, @@ -174,21 +129,28 @@ . = 0 - var/where2 = mob.equip_in_one_of_slots(recaller, slots) - if (!where2) - mob << "Your Syndicate benefactors were unfortunately unable to get you a Recaller." - else - mob << "The Recaller in your [where2] will allow you to prevent the station from prematurely evacuating. Use it to recall the emergency shuttle from anywhere on the station." - . += 2 - - var/where = mob.equip_in_one_of_slots(T, slots) + var/where = mob.equip_in_one_of_slots(gangtool, slots) if (!where) - mob << "Your Syndicate benefactors were unfortunately unable to get you a flash." + mob << "Your Syndicate benefactors were unfortunately unable to get you a Gangtool." else - mob << "The flash in your [where] will help you to persuade the crew to work for you." + gangtool.register_device(mob) + mob << "The Gangtool in your [where] will allow you to use your influence to purchase items and prevent the station from evacuating before you can take over. Use it to recall the emergency shuttle from anywhere on the station." + mob << "You can also promote your gang members to lieutenant by giving them an unregistered gangtool. Lieutenants cannot be deconverted and are able to use recruitment pens and gangtools." . += 1 - mob.equip_in_one_of_slots(SC,slots) + var/where2 = mob.equip_in_one_of_slots(T, slots) + if (!where2) + mob << "Your Syndicate benefactors were unfortunately unable to get you a recruitment pen to start." + else + mob << "The recruitment pen in your [where2] will help you get your gang started. Use it on unsuspecting crew members to recruit them." + . += 1 + + var/where3 = mob.equip_in_one_of_slots(SC, slots) + if (!where3) + mob << "Your Syndicate benefactors were unfortunately unable to get you a territory spraycan to start." + else + mob << "The territory spraycan in your [where3] can be used to claim areas of the station for your gang. The more territory your gang controls, the more influence you get. Distribute these to your gangsters to grow your influence faster." + . += 1 mob.update_icons() return . @@ -197,23 +159,16 @@ //Checks if the either gang have won or not// ///////////////////////////////////////////// /datum/game_mode/gang/check_win() - var/A_victory = check_gang_victory(B_bosses) //Check if B bosses are dead or exiled - var/B_victory = check_gang_victory(A_bosses) //Check if A bosses are dead or exiled - - if(A_victory && B_victory) - finished = "Draw" //Both teams fail. Allow for draws in case they're all incapacitated at the same time. - - else if(A_victory) + if(A_territory.len > (start_state.num_territories * goal_scalar)) finished = "A" //Gang A wins - - else if(B_victory) + else if(B_territory.len > (start_state.num_territories * goal_scalar)) finished = "B" //Gang B wins /////////////////////////////// //Checks if the round is over// /////////////////////////////// /datum/game_mode/gang/check_finished() - if(finished && !config.continuous["gang"]) //Check for Gang Boss death + if(finished) return 1 return ..() //Check for evacuation/nuke @@ -223,12 +178,12 @@ /datum/game_mode/proc/add_gangster(datum/mind/gangster_mind, var/gang, var/check = 1) if(check && isloyal(gangster_mind.current)) //Check to see if the potential gangster is implanted return 0 - if((gangster_mind in A_bosses) || (gangster_mind in A_gangsters) || (gangster_mind in B_bosses) || (gangster_mind in B_gangsters)) + if(gangster_mind in (A_bosses | A_gang | B_bosses | B_gang)) return 0 if(gang == "A") - A_gangsters += gangster_mind + A_gang += gangster_mind else - B_gangsters += gangster_mind + B_gang += gangster_mind if(check) if(iscarbon(gangster_mind.current)) var/mob/living/carbon/carbon_mob = gangster_mind.current @@ -236,14 +191,15 @@ carbon_mob.flash_eyes(1, 1) gangster_mind.current.Stun(5) gangster_mind.current << "You are now a member of the [gang=="A" ? gang_name("A") : gang_name("B")] Gang!" - gangster_mind.current << "Help your Boss take over the station by defeating the rival gang. You can identify your Boss by their brown \"B\" icon." + gangster_mind.current << "Help your bosses take over the station by claiming territory with special spraycans only they can provide. Simply spray on any unclaimed area of the station." + gangster_mind.current << "You can identify your bosses by their red \[G\] icon." gangster_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the [gang=="A" ? "[gang_name("A")] Gang (A)" : "[gang_name("B")] Gang (B)"]!" gangster_mind.special_role = "[gang=="A" ? "[gang_name("A")] Gang (A)" : "[gang_name("B")] Gang (B)"]" update_gang_icons_added(gangster_mind,gang) return 1 -////////////////////////////////////////////////////////////// -//Deals with players going straight (Not a gangster anymore)// -////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////// +//Deals with players reverting to neutral (Not a gangster anymore)// +//////////////////////////////////////////////////////////////////// /datum/game_mode/proc/remove_gangster(datum/mind/gangster_mind, var/beingborged, var/silent, var/exclude_bosses=0) var/gang @@ -256,12 +212,12 @@ B_bosses -= gangster_mind gang = "B" - if(gangster_mind in A_gangsters) - A_gangsters -= gangster_mind + if(gangster_mind in A_gang) + A_gang -= gangster_mind gang = "A" - if(gangster_mind in B_gangsters) - B_gangsters -= gangster_mind + if(gangster_mind in B_gang) + B_gang -= gangster_mind gang = "B" if(!gang) //not a valid gangster @@ -279,8 +235,8 @@ else if(!silent) gangster_mind.current.Paralyse(5) - gangster_mind.current.visible_message("[gangster_mind.current] looks like they've given up the life of crime!") - gangster_mind.current << "You have been reformed! You are no longer a gangster!" + gangster_mind.current.visible_message("[gangster_mind.current] looks like they've given up the life of crime!") + gangster_mind.current << "You have been reformed! You are no longer a gangster!
You try as hard as you can, but you can't seem to recall any of the identities of your former gangsters..." update_gang_icons_removed(gangster_mind, gang) @@ -318,21 +274,6 @@ ganghud.leave_hud(defector_mind.current) set_antag_hud(defector_mind.current, null) -/////////////////////////// -//Checks for gang victory// -/////////////////////////// -/datum/game_mode/gang/proc/check_gang_victory(var/list/boss_list) - if(!boss_list.len) - return 0 - for(var/datum/mind/boss_mind in boss_list) - if(boss_mind.current) - if(boss_mind.current.stat == DEAD || !ishuman(boss_mind.current) || !boss_mind.current.ckey) - return 1 - var/turf/T = get_turf(boss_mind.current) - if(T && (T.z != ZLEVEL_STATION)) //If they leave the station they count as dead for this - return 1 - return 0 - return 1 ////////////////////////////////////////////////////////////////////// //Announces the end of the game with all relavent information stated// @@ -340,10 +281,8 @@ /datum/game_mode/gang/declare_completion() if(!finished) world << "The station was [station_was_nuked ? "destroyed!" : "evacuated before either gang could claim it!"]" - else if(finished == "Draw") - world << "All gang bosses have been killed or exiled!" else - world << "The [finished=="A" ? gang_name("A") : gang_name("B")] Gang defeated their rivals!" + world << "The [finished=="A" ? gang_name("A") : gang_name("B")] Gang has claimed over [round(100*goal_scalar,1)]% of the station and has assumed control!" ..() return 1 @@ -356,36 +295,22 @@ else winner = "Draw" - var/num_ganga = 0 - var/list/agang = A_gangsters + A_bosses - for(var/datum/mind/agangster in agang) - if(agangster.current) - if(agangster.current in living_mob_list) - num_ganga++ - - var/num_gangb = 0 - var/list/bgang = B_gangsters + B_bosses - for(var/datum/mind/bgangster in bgang) - if(bgangster.current) - if(bgangster.current in living_mob_list) - num_gangb++ - - if(A_bosses.len || A_gangsters.len) + if(A_bosses.len || A_gang.len) if(winner) - world << "
The [gang_name("A")] Gang was [winner=="A" ? "victorious" : "defeated"] with [num_ganga] members!" - world << "
The [gang_name("A")] Gang Boss was:" + world << "
The [gang_name("A")] Gang was [winner=="A" ? "victorious" : "defeated"] with [round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1)]% control of the station!" + world << "
The [gang_name("A")] Gang Bosses were:" gang_membership_report(A_bosses) world << "
The [gang_name("A")] Gangsters were:" - gang_membership_report(A_gangsters) + gang_membership_report(A_gang) world << "
" - if(B_bosses.len || B_gangsters.len) + if(B_bosses.len || B_gang.len) if(winner) - world << "
The [gang_name("B")] Gang was [winner=="B" ? "victorious" : "defeated"] with [num_gangb] members!" - world << "
The [gang_name("B")] Gang Boss was:" + world << "
The [gang_name("B")] Gang was [winner=="B" ? "victorious" : "defeated"] with [round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1)]% control of the station!" + world << "
The [gang_name("B")] Gang Bosses were:" gang_membership_report(B_bosses) world << "
The [gang_name("B")] Gangsters were:" - gang_membership_report(B_gangsters) + gang_membership_report(B_gang) world << "
" /datum/game_mode/proc/gang_membership_report(var/list/membership) @@ -395,7 +320,7 @@ if(gang_mind.current) if(gang_mind.current.stat == DEAD || isbrain(gang_mind.current)) text += "died" - else if(gang_mind.current.z != ZLEVEL_STATION) + else if(gang_mind.current.z > ZLEVEL_STATION) text += "fled the station" else text += "survived" @@ -406,3 +331,126 @@ text += ")" world << text + + +////////////////////////////////////////////////////////// +//Handles influence, territories, and the victory checks// +////////////////////////////////////////////////////////// + +/datum/gang_points + var/A = 30 + var/B = 30 + var/next_point_interval = 1800 + var/next_point_time + +/datum/gang_points/proc/start() + next_point_time = world.time + next_point_interval + spawn(next_point_interval) + income() + +/datum/gang_points/proc/income() + var/A_added_names = "" + var/B_added_names = "" + var/A_lost_names = "" + var/B_lost_names = "" + + //Process lost territories + for(var/area in ticker.mode.A_territory_lost) + if(A_lost_names == "") + A_lost_names += ":
" + else + A_lost_names += ", " + A_lost_names += "[ticker.mode.A_territory_lost[area]], " + ticker.mode.A_territory -= area + + for(var/area in ticker.mode.B_territory_lost) + if(B_lost_names == "") + B_lost_names += ":
" + else + B_lost_names += ", " + B_lost_names += "[ticker.mode.B_territory_lost[area]], " + ticker.mode.B_territory -= area + + //Calculate and report influence growth + ticker.mode.message_gangtools(ticker.mode.A_tools,"[gang_name("A")] Gang Status Report:") + var/A_new = min(999,A + 15 + ticker.mode.A_territory.len) + var/A_message = "" + if(A_new != A) + A_message += "Your gang has gained [A_new - A] Influence for holding on to [ticker.mode.A_territory.len] territories." + if(A_new == 999) + A_message += " You cannot gain any more influence without spending some with this device." + A = A_new + ticker.mode.message_gangtools(ticker.mode.A_tools,A_message,0) + + ticker.mode.message_gangtools(ticker.mode.B_tools,"[gang_name("B")] Gang Status Report:") + var/B_new = min(999,B + 15 + ticker.mode.B_territory.len) + var/B_message = "" + if(B_new != B) + B_message += "Your gang has gained [B_new - B] Influence for holding on to [ticker.mode.B_territory.len] territories." + if(B_new == 999) + B_message += " You cannot gain any more influence without spending some with this device." + B = B_new + ticker.mode.message_gangtools(ticker.mode.B_tools,B_message,0) + + + //Remove territories they already own from the buffer, so if they got tagged over, they can still earn income if they tag it back before the next status report + ticker.mode.A_territory_new -= ticker.mode.A_territory + ticker.mode.B_territory_new -= ticker.mode.B_territory + + //Process new territories + for(var/area in ticker.mode.A_territory_new) + if(A_added_names == "") + A_added_names += ":
" + else + A_added_names += ", " + A_added_names += "[ticker.mode.A_territory_new[area]]" + ticker.mode.A_territory += area + + for(var/area in ticker.mode.B_territory_new) + if(B_added_names == "") + B_added_names += ":
" + else + B_added_names += ", " + B_added_names += "[ticker.mode.B_territory_new[area]]" + ticker.mode.B_territory += area + + //Report territory changes + ticker.mode.message_gangtools(ticker.mode.A_tools,"[ticker.mode.A_territory_new.len] new territories[A_added_names]",0) + ticker.mode.message_gangtools(ticker.mode.B_tools,"[ticker.mode.B_territory_new.len] new territories[B_added_names]",0,) + ticker.mode.message_gangtools(ticker.mode.A_tools,"[ticker.mode.A_territory_lost.len] territories lost[A_lost_names]",0,1) + ticker.mode.message_gangtools(ticker.mode.B_tools,"[ticker.mode.B_territory_lost.len] territories lost[B_lost_names]",0,1) + + //Clear the lists + ticker.mode.A_territory_new = list() + ticker.mode.B_territory_new = list() + ticker.mode.A_territory_lost = list() + ticker.mode.B_territory_lost = list() + + var/A_control = round((ticker.mode.A_territory.len/start_state.num_territories)*100, 1) + var/B_control = round((ticker.mode.B_territory.len/start_state.num_territories)*100, 1) + ticker.mode.message_gangtools((ticker.mode.A_tools),"Your gang now has [A_control]% control of the station.",0) + ticker.mode.message_gangtools((ticker.mode.A_tools),"The [gang_name("B")] Gang has [B_control]% control of the station.",0,1) + ticker.mode.message_gangtools((ticker.mode.B_tools),"Your gang now has [B_control]% control of the station.",0) + ticker.mode.message_gangtools((ticker.mode.B_tools),"The [gang_name("A")] Gang has [A_control]% control of the station.",0,1) + + //Victory check + ticker.mode.check_win() + + //Restart the counter + start() + + +//////////////////////////////////////////////// +//Sends a message to the boss via his gangtool// +//////////////////////////////////////////////// + +/datum/game_mode/proc/message_gangtools(var/list/gangtools,var/message,var/beep=1,var/warning) + if(!gangtools.len || !message) + return + for(var/obj/item/device/gangtool/tool in gangtools) + var/mob/living/mob = get(tool.loc,/mob/living) + if(mob && mob.mind) + if(((tool.gang == "A") && ((mob.mind in A_gang) || (mob.mind in A_bosses))) || ((tool.gang == "B") && ((mob.mind in B_gang) || (mob.mind in B_bosses)))) + mob << "\icon[tool] [message]" + if(beep) + playsound(mob.loc, 'sound/machines/twobeep.ogg', 50, 1) \ No newline at end of file diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index 81ed244f086..e392f101ae7 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -228,9 +228,9 @@ */ /datum/intercept_text/proc/build_gang(datum/mind/correct_person) - src.text += "
Syndicate forces may be supplying opposing criminal organizations within your sector in an attempt at destabilizing our operations." - src.text += "Ensure law and order is maintained on the station and be on the lookout for violent confrontations between station factions." - src.text += "Central Command retains an interest in any criminal leaders captured by station security. The execution or exile of these persons are ill-advised." + src.text += "
We have recieved reports of a sudden increase of criminal activity in close proximity to our operations within your sector." + src.text += "Ensure law and order is maintained on the station and be on the lookout for unusually territorial behavior from the crew." + src.text += "In the event of a full-scale takeover attempt, sensitive research items are to be secured and the station evacuated ASAP." src.text += "
" /datum/intercept_text/proc/build_wizard(datum/mind/correct_person) diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 5e5aa1bf462..5ef07cdcbf5 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -227,7 +227,7 @@ for(var/datum/AI_Module/small/overload_machine/overload in current_modules) if(overload.uses > 0) overload.uses -- - audible_message("You hear a loud electrical buzzing sound!") + audible_message("You hear a loud electrical buzzing sound!") src << "Overloading machine circuitry..." spawn(50) if(M) @@ -257,7 +257,7 @@ for(var/datum/AI_Module/small/override_machine/override in current_modules) if(override.uses > 0) override.uses -- - audible_message("You hear a loud electrical buzzing sound!") + audible_message("You hear a loud electrical buzzing sound!") src << "Reprogramming machine behaviour..." spawn(50) if(M && !M.gc_destroyed) @@ -270,65 +270,71 @@ mod_pick_name = "cyborgtransformer" description = "Build a machine anywhere, using expensive nanomachines, that can convert a living human into a loyal cyborg slave when placed inside." cost = 100 - power_type = /mob/living/silicon/ai/proc/place_transformer + var/list/turfOverlays = list() + +/datum/AI_Module/large/place_cyborg_transformer/New() + for(var/i=0;i<3;i++) + var/image/I = image("icon"='icons/turf/overlays.dmi') + turfOverlays += I + ..() /mob/living/silicon/ai/proc/place_transformer() set name = "Place Robotic Factory" set category = "Malfunction" - - if(!eyeobj) + if(!canPlaceTransformer()) return - - if(!isturf(src.loc)) // AI must be in it's core. - return - - var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in src.current_modules - if(!PCT) - return - - if(PCT.uses < 1) - src << "Out of uses." - return - - if(!canUseTopic()) - return - - var/sure = alert(src, "Make sure the room it is in is big enough, there is camera vision and that there is a 1x3 area for the machine. Are you sure you want to place the machine here?", "Are you sure?", "Yes", "No") - if(sure != "Yes") - return - - // Make sure there is enough room. - var/turf/middle = get_turf(eyeobj.loc) - var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z)) - - var/alert_msg = "There isn't enough room. Make sure you are placing the machine in a clear area and on a floor." - - var/datum/camerachunk/C = cameranet.getCameraChunk(middle.x, middle.y, middle.z) - if(!C.visibleTurfs[middle]) - alert(src, "We cannot get camera vision of this location.") - return - - for(var/T in turfs) - - // Make sure the turfs are clear and the correct type. - if(!istype(T, /turf/simulated/floor)) - alert(src, alert_msg) + var/sure = alert(src, "Are you sure you want to place the machine here?", "Are you sure?", "Yes", "No") + if(sure == "Yes") + if(!canPlaceTransformer()) return + var/turf/T = get_turf(eyeobj) + new /obj/machinery/transformer/conveyor(T) + playsound(T, 'sound/effects/phasein.ogg', 100, 1) + var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in current_modules + PCT.uses -- + can_shunt = 0 + src << "You cannot shunt anymore." - var/turf/simulated/floor/F = T - for(var/atom/movable/AM in F.contents) - if(AM.density) - alert(src, alert_msg) - return - - // All clear, place the transformer - new /obj/machinery/transformer/conveyor(middle) - playsound(middle, 'sound/effects/phasein.ogg', 100, 1) - src.can_shunt = 0 - PCT.uses -= 1 - src << "You cannot shunt anymore." - +/mob/living/silicon/ai/proc/canPlaceTransformer() + if(!eyeobj || !isturf(src.loc) || !canUseTopic()) + return + var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in current_modules + if(!PCT || PCT.uses < 1) + alert(src, "Out of uses.") + return + var/turf/middle = get_turf(eyeobj) + var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z)) + var/alert_msg = "There isn't enough room. Make sure you are placing the machine in a clear area and on a floor." + var/success = 1 + if(turfs.len == 3) + for(var/n=1;n<4,n++) + var/fail + var/turf/T = turfs[n] + if(!istype(T, /turf/simulated/floor)) + fail = 1 + var/datum/camerachunk/C = cameranet.getCameraChunk(T.x, T.y, T.z) + if(!C.visibleTurfs[T]) + alert_msg = "We cannot get camera vision of this location." + fail = 1 + for(var/atom/movable/AM in T.contents) + if(AM.density) + fail = 1 + var/image/I = PCT.turfOverlays[n] + I.loc = T + client.images += I + if(fail) + success = 0 + I.icon_state = "redOverlay" + else + I.icon_state = "greenOverlay" + spawn(30) + if(client && (I.loc == T)) + client.images -= I + if(success) + return 1 + alert(src, alert_msg) + return /datum/AI_Module/small/blackout module_name = "Blackout" @@ -426,11 +432,11 @@ if(upgraded) UC.uses -- C.visible_message("\icon[C] *beep*") - src << "Camera successully upgraded!" + src << "You successully upgrade the camera." else - src << "This camera is already upgraded!" + src << "This camera is already upgraded!" else - src << "Out of uses." + src << "Out of uses!" /datum/module_picker var/temp = null diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 7271875daee..f08f4e58d4e 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -8,9 +8,8 @@ required_players = 25 required_enemies = 1 recommended_enemies = 1 - pre_setup_before_jobs = 1 enemy_minimum_age = 30 //Same as AI minimum age - + round_ends_with_antag_death = 1 var/AI_win_timeleft = 5400 //started at 5400, in case I change this for testing round end. var/malf_mode_declared = 0 @@ -49,7 +48,7 @@ if (malf_ai.len < required_enemies) return 0 for(var/datum/mind/ai_mind in malf_ai) - ai_mind.assigned_role = "MODE" + ai_mind.assigned_role = "malfunctioning AI" ai_mind.special_role = "malfunctioning AI"//So they actually have a special role/N log_game("[ai_mind.key] (ckey) has been selected as a malf AI") return 1 @@ -58,33 +57,16 @@ /datum/game_mode/malfunction/post_setup() for(var/datum/mind/AI_mind in malf_ai) if(malf_ai.len < 1) - world << "Uh oh, its malfunction and there is no AI! Please report this." - world << "Rebooting world in 5 seconds." - - feedback_set_details("end_error","malf - no AI") - - if(blackbox) - blackbox.save_all_data_to_sql() - sleep(50) - world.Reboot() + world.Reboot("No AI during Malfunction.", "end_error", "malf - no AI", 50) return AI_mind.current.verbs += /mob/living/silicon/ai/proc/choose_modules AI_mind.current:laws = new /datum/ai_laws/malfunction AI_mind.current:malf_picker = new /datum/module_picker AI_mind.current:show_laws() - greet_malf(AI_mind) - AI_mind.special_role = "malfunction" - AI_mind.current.verbs += /datum/game_mode/malfunction/proc/takeover AI_mind.current.verbs += /mob/living/silicon/ai/proc/ai_cancel_call - -/* AI_mind.current.icon_state = "ai-malf" - spawn(10) - if(alert(AI_mind.current,"Do you want to use an alternative sprite for your real core?",,"Yes","No")=="Yes") - AI_mind.current.icon_state = "ai-malf2" -*/ SSshuttle.emergencyNoEscape = 1 ..() @@ -170,10 +152,6 @@ /datum/game_mode/malfunction/check_finished() - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - if(round_converted == 1) //No reason to waste resources - return ..() //Check for evacuation/nuke if (station_captured && !to_nuke_or_not_to_nuke) return 1 if (is_malf_ai_dead() || !check_ai_loc()) @@ -184,12 +162,9 @@ priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") SSshuttle.emergencyNoEscape = 0 malf_mode_declared = 0 + continuous_sanity_checked = 1 if(get_security_level() == "delta") set_security_level("red") - if(config.midround_antag["malfunction"]) - round_converted = convert_roundtype() - if(!round_converted) - return 1 return ..() else return 1 diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 2d3e4e1c380..cceb0c6a622 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -34,6 +34,8 @@ if(player.onCentcom()) text += "
[player.real_name] escaped to the safety of Centcom." + else if(player.onSyndieBase()) + text += "
[player.real_name] escaped to the (relative) safety of Syndicate Space." else text += "
[player.real_name] survived but is stranded without any hope of rescue." diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 43992706cd4..a8a74bbffb1 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -238,7 +238,7 @@ explosion(src.loc, 0, 0, 4, 3, 0) new /obj/effect/decal/cleanable/greenglow(get_turf(src)) for(var/mob/living/L in view(5, src)) - L.apply_effect(40, IRRADIATE) + L.irradiate(40) //Meaty Ore /obj/effect/meteor/meaty diff --git a/code/game/gamemodes/monkey/monkey.dm b/code/game/gamemodes/monkey/monkey.dm index 66cc61bd322..18a62827b4f 100644 --- a/code/game/gamemodes/monkey/monkey.dm +++ b/code/game/gamemodes/monkey/monkey.dm @@ -24,17 +24,13 @@ /datum/game_mode/monkey/pre_setup() carriers_to_make = max(round(num_players()/players_per_carrier, 1), 1) - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs)//Removing robots from the list - if(player.assigned_role == job) - antag_candidates -= player - for(var/j = 0, j < carriers_to_make, j++) if (!antag_candidates.len) break var/datum/mind/carrier = pick(antag_candidates) carriers += carrier carrier.special_role = "monkey" + carrier.restricted_roles = restricted_jobs log_game("[carrier.key] (ckey) has been selected as a Jungle Fever carrier") antag_candidates -= carrier @@ -69,15 +65,36 @@ carriermind.current.viruses += D ..() +/datum/game_mode/monkey/check_finished() + if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || station_was_nuked) + return 1 + + if(!round_converted) + for(var/datum/mind/monkey_mind in ape_infectees) + continuous_sanity_checked = 1 + if(monkey_mind.current && monkey_mind.current.stat != DEAD) + return 0 + + var/datum/disease/D = new /datum/disease/transformation/jungle_fever() //ugly but unfortunately needed + for(var/mob/living/carbon/human/H in living_mob_list) + if(H.mind && H.stat != DEAD) + if(H.HasDisease(D)) + return 0 + + ..() + /datum/game_mode/monkey/proc/check_monkey_victory() + if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) + return 0 + var/datum/disease/D = new /datum/disease/transformation/jungle_fever() for(var/mob/living/carbon/monkey/M in living_mob_list) - if (M.HasDisease(/datum/disease/transformation/jungle_fever)) - if(M.onCentcom()) + if (M.HasDisease(D)) + if(M.onCentcom() || M.onSyndieBase()) escaped_monkeys++ if(escaped_monkeys >= monkeys_to_win) - return 0 - else return 1 + else + return 0 /datum/game_mode/proc/add_monkey(datum/mind/monkey_mind) ape_infectees |= monkey_mind @@ -89,7 +106,7 @@ /datum/game_mode/monkey/declare_completion() - if(!check_monkey_victory()) + if(check_monkey_victory()) feedback_set_details("round_end_result","win - monkey win") feedback_set("round_end_result",escaped_monkeys) world << "The monkeys have overthrown their captors! Eeek eeeek!!" diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index afd98a9ab5d..7d8a51b32eb 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -8,7 +8,6 @@ required_players = 20 // 20 players - 5 players to be the nuke ops = 15 players remaining required_enemies = 5 recommended_enemies = 5 - pre_setup_before_jobs = 1 antag_flag = BE_OPERATIVE enemy_minimum_age = 14 @@ -41,7 +40,7 @@ agent_number-- for(var/datum/mind/synd_mind in syndicates) - synd_mind.assigned_role = "MODE" + synd_mind.assigned_role = "Syndicate" synd_mind.special_role = "Syndicate"//So they actually have a special role/N log_game("[synd_mind.key] (ckey) has been selected as a nuclear operative") return 1 @@ -164,6 +163,7 @@ var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(synd_mob) R.set_frequency(radio_freq) + R.freqlock = 1 synd_mob.equip_to_slot_or_del(R, slot_ears) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) @@ -201,6 +201,15 @@ return 0 return 1 +/datum/game_mode/nuclear/check_finished() //to be called by ticker + if(replacementmode && round_converted == 2) + return replacementmode.check_finished() + if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || station_was_nuked) + return 1 + if(are_operatives_dead()) + if(bomb_set) //snaaaaaaaaaake! It's not over yet! + return 0 + ..() /datum/game_mode/nuclear/declare_completion() var/disk_rescued = 1 @@ -237,7 +246,7 @@ world << "[syndicate_name()] operatives have earned Darwin Award!" world << "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't lose the disk!" - else if ( disk_rescued && are_operatives_dead()) + else if ((disk_rescued || SSshuttle.emergency.mode < SHUTTLE_ENDGAME) && are_operatives_dead()) feedback_set_details("round_end_result","loss - evacuation - disk secured - syndi team dead") world << "Crew Major Victory!" world << "The Research Staff has saved the disc and killed the [syndicate_name()] Operatives" diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 3364fe864a7..2629d2bfce2 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -208,21 +208,10 @@ var/bomb_set ticker.mode:nukes_left -- else world << "The station was destoyed by the nuclear blast!" - ticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated. //kinda shit but I couldn't get permission to do what I wanted to do. - if(!ticker.mode.check_finished())//If the mode does not deal with the nuke going off so just reboot because everyone is stuck as is - world << "Resetting in 30 seconds!" - - feedback_set_details("end_error","nuke - unhandled ending") - - if(blackbox) - blackbox.save_all_data_to_sql() - sleep(300) - log_game("Rebooting due to nuclear detonation") - kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked - world.Reboot() + world.Reboot("Station destroyed by Nuclear Device.", "end_error", "nuke - unhandled ending") return return @@ -246,6 +235,7 @@ This is here to make the tiles around the station mininuke change when it's arme /obj/item/weapon/disk/nuclear name = "nuclear authentication disk" desc = "Better keep this safe." + icon = 'icons/obj/items.dmi' icon_state = "nucleardisk" item_state = "card-id" w_class = 1.0 @@ -258,7 +248,7 @@ This is here to make the tiles around the station mininuke change when it's arme var/turf/disk_loc = get_turf(src) if(disk_loc.z > ZLEVEL_CENTCOM) get(src, /mob) << "You can't help but feel that you just lost something back there..." - Destroy() + qdel(src) /obj/item/weapon/disk/nuclear/Destroy() if(blobstart.len > 0) @@ -267,7 +257,7 @@ This is here to make the tiles around the station mininuke change when it's arme var/turf/diskturf = get_turf(src) message_admins("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z] - JMP). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - JMP).") log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y] ,[diskturf.z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).") - del(src) //Needed to clear all references to it + return QDEL_HINT_HARDDEL_NOW else ERROR("[src] was supposed to be destroyed, but we were unable to locate a blobstart landmark to spawn a new one.") - return 1 // Cancel destruction. + return QDEL_HINT_LETMELIVE // Cancel destruction. diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index bfccd051890..74e88d79bad 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -122,7 +122,7 @@ location = locate(locationx,locationy,Z.z) - usr << "You set the pinpointer to locate [locationx],[locationy]" + usr << "You set the pinpointer to locate [locationx],[locationy]" return attack_self() @@ -140,9 +140,9 @@ return target=locate(possible_items[targetitem]) if(!target) - usr << "Failed to locate [targetitem]!" + usr << "Failed to locate [targetitem]!" return - usr << "You set the pinpointer to locate [targetitem]" + usr << "You set the pinpointer to locate [targetitem]." if("DNA") var/DNAstring = input("Input DNA string to search for." , "Please Enter String." , "") if(!DNAstring) @@ -170,12 +170,13 @@ /obj/item/weapon/pinpointer/nukeop/attack_self(mob/user as mob) if(!active) active = 1 + var/mode_text = "Authentication Disk Locator mode" if(!mode) workdisk() - user << "Authentication Disk Locator active." else + mode_text = "Shuttle Locator mode" worklocation() - user << "Shuttle Locator active." + user << "You activate the pinpointer([mode_text])." else active = 0 icon_state = "pinoff" @@ -191,7 +192,7 @@ mode = 1 //Ensures worklocation() continues to work worklocation() playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) //Plays a beep - visible_message("Shuttle Locator active.") //Lets the mob holding it know that the mode has changed + visible_message("Shuttle Locator mode actived.") //Lets the mob holding it know that the mode has changed return //Get outta here scandisk() if(!the_disk) @@ -221,7 +222,7 @@ mode = 0 workdisk() playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) - visible_message("Authentication Disk Locator active.") + visible_message("Authentication Disk Locator mode actived.") return if(!home) home = SSshuttle.getShuttle("syndicate") diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 9f0eee8e881..34097634102 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1,4 +1,4 @@ -datum/objective +/datum/objective var/datum/mind/owner = null //Who owns the objective. var/explanation_text = "Nothing" //What that person is supposed to do. var/datum/mind/target = null //If they are focused on a particular person. @@ -7,23 +7,23 @@ datum/objective var/dangerrating = 0 //How hard the objective is, essentially. Used for dishing out objectives and checking overall victory. var/martyr_compatible = 0 //If the objective is compatible with martyr objective, i.e. if you can still do it while dead. -datum/objective/New(var/text) +/datum/objective/New(var/text) if(text) explanation_text = text -datum/objective/proc/check_completion() +/datum/objective/proc/check_completion() return completed -datum/objective/proc/is_unique_objective(possible_target) +/datum/objective/proc/is_unique_objective(possible_target) for(var/datum/objective/O in owner.objectives) if(istype(O, type) && O.get_target() == possible_target) return 0 return 1 -datum/objective/proc/get_target() +/datum/objective/proc/get_target() return target -datum/objective/proc/find_target() +/datum/objective/proc/find_target() var/list/possible_targets = list() for(var/datum/mind/possible_target in ticker.minds) if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != 2) && is_unique_objective(possible_target)) @@ -33,36 +33,36 @@ datum/objective/proc/find_target() update_explanation_text() return target -datum/objective/proc/find_target_by_role(role, role_type=0)//Option sets either to check assigned role or special role. Default to assigned. +/datum/objective/proc/find_target_by_role(role, role_type=0)//Option sets either to check assigned role or special role. Default to assigned. for(var/datum/mind/possible_target in ticker.minds) if((possible_target != owner) && ishuman(possible_target.current) && ((role_type ? possible_target.special_role : possible_target.assigned_role) == role) ) target = possible_target break update_explanation_text() -datum/objective/proc/update_explanation_text() +/datum/objective/proc/update_explanation_text() //Default does nothing, override where needed -datum/objective/assassinate +/datum/objective/assassinate var/target_role_type=0 dangerrating = 10 martyr_compatible = 1 -datum/objective/assassinate/find_target_by_role(role, role_type=0) +/datum/objective/assassinate/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/assassinate/check_completion() +/datum/objective/assassinate/check_completion() if(target && target.current) if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite return 1 return 0 return 1 -datum/objective/assassinate/update_explanation_text() +/datum/objective/assassinate/update_explanation_text() ..() if(target && target.current) explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." @@ -71,26 +71,26 @@ datum/objective/assassinate/update_explanation_text() -datum/objective/mutiny +/datum/objective/mutiny var/target_role_type=0 martyr_compatible = 1 -datum/objective/mutiny/find_target_by_role(role, role_type=0) +/datum/objective/mutiny/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/mutiny/check_completion() +/datum/objective/mutiny/check_completion() if(target && target.current) if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey || !target.current.client) return 1 var/turf/T = get_turf(target.current) - if(T && (T.z != ZLEVEL_STATION)) //If they leave the station they count as dead for this + if(T && (T.z > ZLEVEL_STATION) || target.current.client.is_afk()) //If they leave the station or go afk they count as dead for this return 2 return 0 return 1 -datum/objective/mutiny/update_explanation_text() +/datum/objective/mutiny/update_explanation_text() ..() if(target && target.current) explanation_text = "Assassinate or exile [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." @@ -99,25 +99,25 @@ datum/objective/mutiny/update_explanation_text() -datum/objective/maroon +/datum/objective/maroon var/target_role_type=0 dangerrating = 5 martyr_compatible = 1 -datum/objective/maroon/find_target_by_role(role, role_type=0) +/datum/objective/maroon/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/maroon/check_completion() +/datum/objective/maroon/check_completion() if(target && target.current) if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite return 1 - if(target.current.onCentcom()) + if(target.current.onCentcom() || target.current.onSyndieBase()) return 0 return 1 -datum/objective/maroon/update_explanation_text() +/datum/objective/maroon/update_explanation_text() if(target && target.current) explanation_text = "Prevent [target.name], the [!target_role_type ? target.assigned_role : target.special_role], from escaping alive." else @@ -125,16 +125,16 @@ datum/objective/maroon/update_explanation_text() -datum/objective/debrain//I want braaaainssss +/datum/objective/debrain//I want braaaainssss var/target_role_type=0 dangerrating = 20 -datum/objective/debrain/find_target_by_role(role, role_type=0) +/datum/objective/debrain/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/debrain/check_completion() +/datum/objective/debrain/check_completion() if(!target)//If it's a free objective. return 1 if( !owner.current || owner.current.stat==DEAD )//If you're otherwise dead. @@ -148,7 +148,7 @@ datum/objective/debrain/check_completion() return 1 return 0 -datum/objective/debrain/update_explanation_text() +/datum/objective/debrain/update_explanation_text() ..() if(target && target.current) explanation_text = "Steal the brain of [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." @@ -157,17 +157,17 @@ datum/objective/debrain/update_explanation_text() -datum/objective/protect//The opposite of killing a dude. +/datum/objective/protect//The opposite of killing a dude. var/target_role_type=0 dangerrating = 10 martyr_compatible = 1 -datum/objective/protect/find_target_by_role(role, role_type=0) +/datum/objective/protect/find_target_by_role(role, role_type=0) target_role_type = role_type ..(role, role_type) return target -datum/objective/protect/check_completion() +/datum/objective/protect/check_completion() if(!target) //If it's a free objective. return 1 if(target.current) @@ -176,7 +176,7 @@ datum/objective/protect/check_completion() return 1 return 0 -datum/objective/protect/update_explanation_text() +/datum/objective/protect/update_explanation_text() ..() if(target && target.current) explanation_text = "Protect [target.name], the [!target_role_type ? target.assigned_role : target.special_role]." @@ -185,12 +185,12 @@ datum/objective/protect/update_explanation_text() -datum/objective/hijack +/datum/objective/hijack explanation_text = "Hijack the emergency shuttle by escaping alone." dangerrating = 25 martyr_compatible = 0 //Technically you won't get both anyway. -datum/objective/hijack/check_completion() +/datum/objective/hijack/check_completion() if(!owner.current || owner.current.stat) return 0 if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) @@ -209,16 +209,17 @@ datum/objective/hijack/check_completion() if(/mob/living/silicon/ai, /mob/living/silicon/pai) continue if(get_area(player) == A) - return 0 + if(!player.mind.special_role && !istype(get_turf(player.mind.current), /turf/simulated/floor/plasteel/shuttle/red)) + return 0 return 1 -datum/objective/block +/datum/objective/block explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive." dangerrating = 25 martyr_compatible = 1 -datum/objective/block/check_completion() +/datum/objective/block/check_completion() if(!istype(owner.current, /mob/living/silicon)) return 0 if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) @@ -237,11 +238,11 @@ datum/objective/block/check_completion() return 1 -datum/objective/escape +/datum/objective/escape explanation_text = "Escape on the shuttle or an escape pod alive and without being in custody." dangerrating = 5 -datum/objective/escape/check_completion() +/datum/objective/escape/check_completion() if(issilicon(owner.current)) return 0 if(isbrain(owner.current)) @@ -254,24 +255,24 @@ datum/objective/escape/check_completion() if(!location) return 0 - if(istype(location, /turf/simulated/shuttle/floor4)) // Fails traitors if they are in the shuttle brig -- Polymorph + if(istype(location, /turf/simulated/floor/plasteel/shuttle/red)) // Fails traitors if they are in the shuttle brig -- Polymorph return 0 - if(location.onCentcom()) + if(location.onCentcom() || location.onSyndieBase()) return 1 return 0 -datum/objective/escape/escape_with_identity +/datum/objective/escape/escape_with_identity dangerrating = 10 var/target_real_name // Has to be stored because the target's real_name can change over the course of the round var/target_missing_id -datum/objective/escape/escape_with_identity/find_target() +/datum/objective/escape/escape_with_identity/find_target() target = ..() update_explanation_text() -datum/objective/escape/escape_with_identity/update_explanation_text() +/datum/objective/escape/escape_with_identity/update_explanation_text() if(target && target.current) target_real_name = target.current.real_name explanation_text = "Escape on the shuttle or an escape pod with the identity of [target_real_name], the [target.assigned_role]" @@ -287,7 +288,7 @@ datum/objective/escape/escape_with_identity/update_explanation_text() else explanation_text = "Free Objective." -datum/objective/escape/escape_with_identity/check_completion() +/datum/objective/escape/escape_with_identity/check_completion() if(!target_real_name) return 1 if(!ishuman(owner.current)) @@ -300,11 +301,11 @@ datum/objective/escape/escape_with_identity/check_completion() return 0 -datum/objective/survive +/datum/objective/survive explanation_text = "Stay alive until the end." dangerrating = 3 -datum/objective/survive/check_completion() +/datum/objective/survive/check_completion() if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current)) return 0 //Brains no longer win survive objectives. --NEO if(!is_special_character(owner.current)) //This fails borg'd traitors @@ -312,11 +313,11 @@ datum/objective/survive/check_completion() return 1 -datum/objective/martyr +/datum/objective/martyr explanation_text = "Die a glorious death." dangerrating = 1 -datum/objective/martyr/check_completion() +/datum/objective/martyr/check_completion() if(!owner.current) //Gibbed, etc. return 1 if(owner.current && owner.current.stat == DEAD) //You're dead! Yay! @@ -324,34 +325,34 @@ datum/objective/martyr/check_completion() return 0 -datum/objective/nuclear +/datum/objective/nuclear explanation_text = "Destroy the station with a nuclear device." martyr_compatible = 1 var/global/list/possible_items = list() -datum/objective/steal +/datum/objective/steal var/datum/objective_item/targetinfo = null //Save the chosen item datum so we can access it later. var/obj/item/steal_target = null //Needed for custom objectives (they're just items, not datums). dangerrating = 5 //Overridden by the individual item's difficulty, but defaults to 5 for custom objectives. martyr_compatible = 0 -datum/objective/steal/get_target() +/datum/objective/steal/get_target() return steal_target -datum/objective/steal/New() +/datum/objective/steal/New() ..() if(!possible_items.len)//Only need to fill the list when it's needed. init_subtypes(/datum/objective_item/steal,possible_items) -datum/objective/steal/find_target() +/datum/objective/steal/find_target() var/approved_targets = list() for(var/datum/objective_item/possible_item in possible_items) if(is_unique_objective(possible_item.targetitem)) approved_targets += possible_item return set_target(safepick(possible_items)) -datum/objective/steal/proc/set_target(var/datum/objective_item/item) +/datum/objective/steal/proc/set_target(var/datum/objective_item/item) if(item) targetinfo = item @@ -363,7 +364,7 @@ datum/objective/steal/proc/set_target(var/datum/objective_item/item) explanation_text = "Free objective" return -datum/objective/steal/proc/select_target() //For admins setting objectives manually. +/datum/objective/steal/proc/select_target() //For admins setting objectives manually. var/list/possible_items_all = possible_items+"custom" var/new_target = input("Select target:", "Objective target", steal_target) as null|anything in possible_items_all if (!new_target) return @@ -383,7 +384,7 @@ datum/objective/steal/proc/select_target() //For admins setting objectives manua set_target(new_target) return steal_target -datum/objective/steal/check_completion() +/datum/objective/steal/check_completion() if(!steal_target) return 1 if(!isliving(owner.current)) return 0 var/list/all_items = owner.current.GetAllContents() //this should get things in cheesewheels, books, etc. @@ -401,23 +402,23 @@ datum/objective/steal/check_completion() return 0 var/global/list/possible_items_special = list() -datum/objective/steal/special //ninjas are so special they get their own subtype good for them +/datum/objective/steal/special //ninjas are so special they get their own subtype good for them -datum/objective/steal/special/New() +/datum/objective/steal/special/New() ..() if(!possible_items_special.len) init_subtypes(/datum/objective_item/special,possible_items) init_subtypes(/datum/objective_item/stack,possible_items) -datum/objective/steal/special/find_target() +/datum/objective/steal/special/find_target() return set_target(pick(possible_items_special)) -datum/objective/steal/exchange +/datum/objective/steal/exchange dangerrating = 10 -datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) +/datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) target = otheragent if(faction == "red") targetinfo = new/datum/objective_item/unique/docs_blue @@ -427,7 +428,7 @@ datum/objective/steal/exchange/proc/set_faction(var/faction,var/otheragent) steal_target = targetinfo.targetitem -datum/objective/steal/exchange/update_explanation_text() +/datum/objective/steal/exchange/update_explanation_text() ..() if(target && target.current) explanation_text = "Acquire [targetinfo.name] held by [target.name], the [target.assigned_role] and syndicate agent" @@ -435,10 +436,10 @@ datum/objective/steal/exchange/update_explanation_text() explanation_text = "Free Objective" -datum/objective/steal/exchange/backstab +/datum/objective/steal/exchange/backstab dangerrating = 3 -datum/objective/steal/exchange/backstab/set_faction(var/faction) +/datum/objective/steal/exchange/backstab/set_faction(var/faction) if(faction == "red") targetinfo = new/datum/objective_item/unique/docs_red else if(faction == "blue") @@ -447,15 +448,15 @@ datum/objective/steal/exchange/backstab/set_faction(var/faction) steal_target = targetinfo.targetitem -datum/objective/download +/datum/objective/download dangerrating = 10 -datum/objective/download/proc/gen_amount_goal() +/datum/objective/download/proc/gen_amount_goal() target_amount = rand(10,20) explanation_text = "Download [target_amount] research level\s." return target_amount -datum/objective/download/check_completion()//NINJACODE +/datum/objective/download/check_completion()//NINJACODE if(!ishuman(owner.current)) return 0 @@ -483,15 +484,15 @@ datum/objective/download/check_completion()//NINJACODE -datum/objective/capture +/datum/objective/capture dangerrating = 10 -datum/objective/capture/proc/gen_amount_goal() +/datum/objective/capture/proc/gen_amount_goal() target_amount = rand(5,10) explanation_text = "Accumulate [target_amount] capture point\s. It is better if they remain relatively unharmed." return target_amount -datum/objective/capture/check_completion()//Basically runs through all the mobs in the area to determine how much they are worth. +/datum/objective/capture/check_completion()//Basically runs through all the mobs in the area to determine how much they are worth. var/captured_amount = 0 var/area/centcom/holding/A = locate() for(var/mob/living/carbon/human/M in A)//Humans. @@ -523,10 +524,10 @@ datum/objective/capture/check_completion()//Basically runs through all the mobs -datum/objective/absorb +/datum/objective/absorb dangerrating = 10 -datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6) +/datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6) target_amount = rand (lowbound,highbound) if (ticker) var/n_p = 1 //autowin @@ -543,7 +544,7 @@ datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6) explanation_text = "Extract [target_amount] compatible genome\s." return target_amount -datum/objective/absorb/check_completion() +/datum/objective/absorb/check_completion() if(owner && owner.changeling && owner.changeling.absorbed_dna && (owner.changeling.absorbedcount >= target_amount)) return 1 else @@ -551,25 +552,25 @@ datum/objective/absorb/check_completion() -datum/objective/destroy +/datum/objective/destroy dangerrating = 10 martyr_compatible = 1 -datum/objective/destroy/find_target() +/datum/objective/destroy/find_target() var/list/possible_targets = active_ais(1) var/mob/living/silicon/ai/target_ai = pick(possible_targets) target = target_ai.mind update_explanation_text() return target -datum/objective/destroy/check_completion() +/datum/objective/destroy/check_completion() if(target && target.current) if(target.current.stat == DEAD || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite return 1 return 0 return 1 -datum/objective/destroy/update_explanation_text() +/datum/objective/destroy/update_explanation_text() ..() if(target && target.current) explanation_text = "Destroy [target.name], the experimental AI." diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index ca69a926263..44da2ef735d 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -1,126 +1,126 @@ //Contains the target item datums for Steal objectives. -datum/objective_item +/datum/objective_item var/name = "A silly bike horn! Honk!" var/targetitem = /obj/item/weapon/bikehorn //typepath of the objective item var/difficulty = 9001 //vaguely how hard it is to do this objective var/list/excludefromjob = list() //If you don't want a job to get a certain objective (no captain stealing his own medal, etcetc) var/list/altitems = list() //Items which can serve as an alternative to the objective (darn you blueprints) -datum/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc) +/datum/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc) return 1 -datum/objective_item/steal/caplaser +/datum/objective_item/steal/caplaser name = "the captain's antique laser gun" targetitem = /obj/item/weapon/gun/energy/laser/captain difficulty = 5 excludefromjob = list("Captain") -datum/objective_item/steal/hoslaser +/datum/objective_item/steal/hoslaser name = "the head of security's personal laser gun" targetitem = /obj/item/weapon/gun/energy/gun/hos difficulty = 10 excludefromjob = list("Head Of Security") -datum/objective_item/steal/handtele +/datum/objective_item/steal/handtele name = "a hand teleporter" targetitem = /obj/item/weapon/hand_tele difficulty = 5 excludefromjob = list("Captain") -datum/objective_item/steal/rcd +/datum/objective_item/steal/rcd name = "a rapid-construction-device" targetitem = /obj/item/weapon/rcd difficulty = 3 excludefromjob = list("Chief Engineer", "Quartermaster", "Cargo Technician") -datum/objective_item/steal/jetpack +/datum/objective_item/steal/jetpack name = "a jetpack" targetitem = /obj/item/weapon/tank/jetpack difficulty = 3 excludefromjob = list("Chief Engineer") -datum/objective_item/steal/magboots +/datum/objective_item/steal/magboots name = "the chief engineer's advanced magnetic boots" targetitem = /obj/item/clothing/shoes/magboots/advance difficulty = 5 excludefromjob = list("Chief Engineer") -datum/objective_item/steal/corgimeat +/datum/objective_item/steal/corgimeat name = "a piece of corgi meat" targetitem = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi difficulty = 5 excludefromjob = list("Head of Personnel", "Quartermaster", "Cargo Technician") //>hurting your little buddy ever -datum/objective_item/steal/capmedal +/datum/objective_item/steal/capmedal name = "the medal of captaincy" targetitem = /obj/item/clothing/tie/medal/gold/captain difficulty = 5 excludefromjob = list("Captain") -datum/objective_item/steal/hypo +/datum/objective_item/steal/hypo name = "the hypospray" targetitem = /obj/item/weapon/reagent_containers/hypospray/CMO difficulty = 5 excludefromjob = list("Chief Medical Officer") -datum/objective_item/steal/nukedisc +/datum/objective_item/steal/nukedisc name = "the nuclear authentication disk" targetitem = /obj/item/weapon/disk/nuclear difficulty = 5 excludefromjob = list("Captain") -datum/objective_item/steal/ablative +/datum/objective_item/steal/ablative name = "an ablative armor vest" targetitem = /obj/item/clothing/suit/armor/laserproof difficulty = 3 excludefromjob = list("Head of Security", "Warden") -datum/objective_item/steal/reactive +/datum/objective_item/steal/reactive name = "the reactive teleport armor" targetitem = /obj/item/clothing/suit/armor/reactive difficulty = 5 excludefromjob = list("Research Director") -datum/objective_item/steal/documents +/datum/objective_item/steal/documents name = "any set of secret documents of any organization" targetitem = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's difficulty = 5 //Items with special checks! -datum/objective_item/steal/plasma +/datum/objective_item/steal/plasma name = "28 moles of plasma (full tank)" targetitem = /obj/item/weapon/tank difficulty = 3 excludefromjob = list("Chief Engineer","Research Director","Station Engineer","Scientist","Atmospheric Technician") -datum/objective_item/plasma/check_special_completion(var/obj/item/weapon/tank/T) +/datum/objective_item/plasma/check_special_completion(var/obj/item/weapon/tank/T) var/target_amount = text2num(name) var/found_amount = 0 found_amount += T.air_contents.toxins return found_amount>=target_amount -datum/objective_item/steal/functionalai +/datum/objective_item/steal/functionalai name = "a functional AI" targetitem = /obj/item/device/aicard difficulty = 20 //beyond the impossible -datum/objective_item/functionalai/check_special_completion(var/obj/item/device/aicard/C) +/datum/objective_item/functionalai/check_special_completion(var/obj/item/device/aicard/C) for(var/mob/living/silicon/ai/A in C) if(istype(A, /mob/living/silicon/ai) && A.stat != 2) //See if any AI's are alive inside that card. return 1 return 0 -datum/objective_item/steal/blueprints +/datum/objective_item/steal/blueprints name = "the station blueprints" targetitem = /obj/item/areaeditor/blueprints difficulty = 10 excludefromjob = list("Chief Engineer") altitems = list(/obj/item/weapon/photo) -datum/objective_item/blueprints/check_special_completion(var/obj/item/I) +/datum/objective_item/blueprints/check_special_completion(var/obj/item/I) if(istype(I, /obj/item/areaeditor/blueprints)) return 1 if(istype(I, /obj/item/weapon/photo)) @@ -129,66 +129,66 @@ datum/objective_item/blueprints/check_special_completion(var/obj/item/I) return 1 return 0 -datum/objective_item/steal/slime +/datum/objective_item/steal/slime name = "an unused sample of slime extract" targetitem = /obj/item/slime_extract difficulty = 3 excludefromjob = list("Research Director","Scientist") -datum/objective_item/slime/check_special_completion(var/obj/item/slime_extract/E) +/datum/objective_item/slime/check_special_completion(var/obj/item/slime_extract/E) if(E.Uses > 0) return 1 return 0 //Unique Objectives -datum/objective_item/unique/docs_red +/datum/objective_item/unique/docs_red name = "the \"Red\" secret documents" targetitem = /obj/item/documents/syndicate/red difficulty = 10 -datum/objective_item/unique/docs_blue +/datum/objective_item/unique/docs_blue name = "the \"Blue\" secret documents" targetitem = /obj/item/documents/syndicate/blue difficulty = 10 //Old ninja objectives. -datum/objective_item/special/pinpointer +/datum/objective_item/special/pinpointer name = "the captain's pinpointer" targetitem = /obj/item/weapon/pinpointer difficulty = 10 -datum/objective_item/special/aegun +/datum/objective_item/special/aegun name = "an advanced energy gun" targetitem = /obj/item/weapon/gun/energy/gun/nuclear difficulty = 10 -datum/objective_item/special/ddrill +/datum/objective_item/special/ddrill name = "a diamond drill" targetitem = /obj/item/weapon/pickaxe/drill/diamonddrill difficulty = 10 -datum/objective_item/special/boh +/datum/objective_item/special/boh name = "a bag of holding" targetitem = /obj/item/weapon/storage/backpack/holding difficulty = 10 -datum/objective_item/special/hypercell +/datum/objective_item/special/hypercell name = "a hyper-capacity cell" targetitem = /obj/item/weapon/stock_parts/cell/hyper difficulty = 5 -datum/objective_item/special/laserpointer +/datum/objective_item/special/laserpointer name = "a laser pointer" targetitem = /obj/item/device/laser_pointer difficulty = 5 //Stack objectives get their own subtype -datum/objective_item/stack +/datum/objective_item/stack name = "5 cardboards" targetitem = /obj/item/stack/sheet/cardboard difficulty = 9001 -datum/objective_item/stack/check_special_completion(var/obj/item/stack/S) +/datum/objective_item/stack/check_special_completion(var/obj/item/stack/S) var/target_amount = text2num(name) var/found_amount = 0 @@ -196,17 +196,17 @@ datum/objective_item/stack/check_special_completion(var/obj/item/stack/S) found_amount = S.amount return found_amount>=target_amount -datum/objective_item/stack/diamond +/datum/objective_item/stack/diamond name = "10 diamonds" targetitem = /obj/item/stack/sheet/mineral/diamond difficulty = 10 -datum/objective_item/stack/gold +/datum/objective_item/stack/gold name = "50 gold bars" targetitem = /obj/item/stack/sheet/mineral/gold difficulty = 15 -datum/objective_item/stack/uranium +/datum/objective_item/stack/uranium name = "25 refined uranium bars" targetitem = /obj/item/stack/sheet/mineral/uranium difficulty = 10 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 2002cb82d6e..b1cabe16cec 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -44,25 +44,15 @@ if(config.protect_assistant_from_antagonist) restricted_jobs += "Assistant" - var/head_check = 0 - for(var/mob/new_player/player in player_list) - if(player.mind.assigned_role in command_positions) - head_check = 1 - break - - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs)//Removing heads and such from the list - if(player.assigned_role == job) - antag_candidates -= player - for (var/i=1 to max_headrevs) if (antag_candidates.len==0) break var/datum/mind/lenin = pick(antag_candidates) antag_candidates -= lenin head_revolutionaries += lenin + lenin.restricted_roles = restricted_jobs - if((head_revolutionaries.len < required_enemies)||(!head_check)) + if(head_revolutionaries.len < required_enemies) return 0 return 1 @@ -179,7 +169,7 @@ for(var/datum/mind/rev_mind in head_revolutionaries) mark_for_death(rev_mind, head_mind) - if(max_headrevs < initial(max_headrevs) && max_headrevs < heads.len) + if(head_revolutionaries.len < max_headrevs && head_revolutionaries.len < heads.len) latejoin_headrev() /////////////////////////////// @@ -187,14 +177,19 @@ /////////////////////////////// /datum/game_mode/revolution/proc/latejoin_headrev() if(revolutionaries) //Head Revs are not in this list - var/datum/mind/stalin = pick(revolutionaries) - revolutionaries -= stalin - head_revolutionaries += stalin - log_game("[stalin.key] (ckey) has been promoted to a head rev") - equip_revolutionary(stalin.current) - forge_revolutionary_objectives(stalin) - greet_revolutionary(stalin) - ++max_headrevs + var/list/promotable_revs = list() + for(var/datum/mind/khrushchev in revolutionaries) + if(khrushchev.current && khrushchev.current.client && khrushchev.current.stat != DEAD) + if(khrushchev.current.client.prefs.be_special & BE_REV) + promotable_revs += khrushchev + if(promotable_revs) + var/datum/mind/stalin = pick(promotable_revs) + revolutionaries -= stalin + head_revolutionaries += stalin + log_game("[stalin.key] (ckey) has been promoted to a head rev") + equip_revolutionary(stalin.current) + forge_revolutionary_objectives(stalin) + greet_revolutionary(stalin) ////////////////////////////////////// //Checks if the revs have won or not// @@ -213,11 +208,15 @@ if(config.continuous["revolution"]) if(finished != 0) SSshuttle.emergencyNoEscape = 0 + if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) + SSshuttle.emergency.mode = SHUTTLE_DOCKED + SSshuttle.emergency.timer = world.time + priority_announce("Hostile enviroment resolved. You have 3 minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority") return ..() if(finished != 0) return 1 else - return 0 + return ..() /////////////////////////////////////////////////// //Deals with converting players to the revolution// @@ -340,7 +339,7 @@ if(headrev.current) if(headrev.current.stat == DEAD) text += "died" - else if(headrev.current.z != ZLEVEL_STATION) + else if(headrev.current.z > ZLEVEL_STATION) text += "fled the station" else text += "survived the revolution" @@ -364,7 +363,7 @@ if(rev.current) if(rev.current.stat == DEAD || isbrain(rev.current)) text += "died" - else if(rev.current.z != ZLEVEL_STATION) + else if(rev.current.z > ZLEVEL_STATION) text += "fled the station" else text += "survived the revolution" @@ -390,7 +389,7 @@ if(head.current) if(head.current.stat == DEAD || isbrain(head.current)) text += "died" - else if(head.current.z != ZLEVEL_STATION) + else if(head.current.z > ZLEVEL_STATION) text += "fled the station" else text += "survived the revolution" diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm index 7a8f7beb7c7..597064a68f0 100644 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ b/code/game/gamemodes/sandbox/airlock_maker.dm @@ -4,15 +4,15 @@ -Sayu */ -obj/structure/door_assembly +/obj/structure/door_assembly var/datum/airlock_maker/maker = null -obj/structure/door_assembly/attack_hand() +/obj/structure/door_assembly/attack_hand() ..() if(maker) maker.interact() -datum/airlock_maker +/datum/airlock_maker var/obj/structure/door_assembly/linked = null var/list/access_used = null @@ -23,7 +23,7 @@ datum/airlock_maker var/doorname = "airlock" -datum/airlock_maker/New(var/atom/target_loc) +/datum/airlock_maker/New(var/atom/target_loc) linked = new(target_loc) linked.maker = src linked.anchored = 0 @@ -31,7 +31,7 @@ datum/airlock_maker/New(var/atom/target_loc) interact() -datum/airlock_maker/proc/linkpretty(href,desc,active) +/datum/airlock_maker/proc/linkpretty(href,desc,active) if(!desc) var/static/list/defaults = list("No","Yes") desc = defaults[active+1] @@ -39,7 +39,7 @@ datum/airlock_maker/proc/linkpretty(href,desc,active) return "[desc]" return "[desc]" -datum/airlock_maker/proc/interact() +/datum/airlock_maker/proc/interact() var/list/leftcolumn = list() var/list/rightcolumn = list() leftcolumn += "Required Access" @@ -68,7 +68,7 @@ datum/airlock_maker/proc/interact() dat += "
Finalize Airlock Construction | Cancel and Destroy Airlock" usr << browse(dat,"window=airlockmaker") -datum/airlock_maker/Topic(var/href,var/list/href_list) +/datum/airlock_maker/Topic(var/href,var/list/href_list) if(!usr) return if(!src || !linked || !linked.loc) usr << browse(null,"window=airlockmaker") diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 976b992f2be..c55ada2a766 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -2,21 +2,21 @@ var/hsboxspawn = 1 -mob +/mob var/datum/hSB/sandbox = null -mob/proc/CanBuild() +/mob/proc/CanBuild() if(master_mode == "sandbox") sandbox = new/datum/hSB sandbox.owner = src.ckey if(src.client.holder) sandbox.admin = 1 verbs += new/mob/proc/sandbox_panel -mob/proc/sandbox_panel() +/mob/proc/sandbox_panel() set name = "Sandbox Panel" if(sandbox) sandbox.update() -datum/hSB +/datum/hSB var/owner = null var/admin = 0 @@ -32,7 +32,7 @@ datum/hSB /obj/item/device/uplink/hidden, /obj/item/smallDelivery, /obj/item/missile,/obj/item/projectile, /obj/item/borg/sight,/obj/item/borg/overdrive,/obj/item/borg/stun,/obj/item/weapon/robot_module) -datum/hSB/proc/update() +/datum/hSB/proc/update() var/global/list/hrefs = list( "Space Gear", "Suit Up (Space Travel Gear)" = "hsbsuit", @@ -101,7 +101,7 @@ datum/hSB/proc/update() usr << browse(hsbinfo, "window=hsbpanel") -datum/hSB/Topic(href, href_list) +/datum/hSB/Topic(href, href_list) if(!usr || !src || !(src.owner == usr.ckey)) if(usr) usr << browse(null,"window=sandbox") diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index c14ad379d68..7bd0a665f3f 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -1,3 +1,7 @@ +#define LIGHT_DAM_THRESHOLD 4 +#define LIGHT_HEAL_THRESHOLD 2 +#define LIGHT_DAMAGE_TAKEN 10 + /* SHADOWLING: A gamemode based on previously-run events @@ -72,7 +76,7 @@ Made by Xhuis /datum/game_mode/shadowling/announce() world << "The current game mode is - Shadowling!" - world << "There are alien shadowlings on the station. Crew: Kill the shadowlings before they can eat or enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding." + world << "There are alien shadowlings on the station. Crew: Kill the shadowlings before they can eat or enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding." /datum/game_mode/shadowling/pre_setup() if(config.protect_roles_from_antagonist) @@ -81,11 +85,6 @@ Made by Xhuis if(config.protect_assistant_from_antagonist) restricted_jobs += "Assistant" - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs) - if(player.assigned_role == job) - antag_candidates -= player - var/shadowlings = 2 //How many shadowlings there are; hardcoded to 2 while(shadowlings) @@ -94,6 +93,7 @@ Made by Xhuis antag_candidates -= shadow modePlayer += shadow shadow.special_role = "Shadowling" + shadow.restricted_roles = restricted_jobs shadowlings-- return 1 @@ -114,6 +114,7 @@ Made by Xhuis /datum/game_mode/proc/greet_shadow(var/datum/mind/shadow) shadow.current << "Currently, you are disguised as an employee aboard [world.name]." shadow.current << "In your limited state, you have three abilities: Enthrall, Hatch, and Hivemind Commune." + shadow.current << "Any other shadowlings are you allies. You must assist them as they shall assist you." shadow.current << "If you are new to shadowling, or want to read about abilities, check the wiki page at https://tgstation13.org/wiki/Shadowling
" @@ -131,41 +132,27 @@ Made by Xhuis var/mob/living/carbon/human/S = shadow_mind.current shadow_mind.current.verbs += /mob/living/carbon/human/proc/shadowling_hatch shadow_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/enthrall - shadow_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind - if(shadow_mind.assigned_role == "Clown") - S << "Your alien nature has allowed you to overcome your clownishness." - S.dna.remove_mutation(CLOWNMUT) + spawn(0) + shadow_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind + update_shadow_icons_added(shadow_mind) + if(shadow_mind.assigned_role == "Clown") + S << "Your alien nature has allowed you to overcome your clownishness." + S.dna.remove_mutation(CLOWNMUT) /datum/game_mode/proc/add_thrall(datum/mind/new_thrall_mind) if (!istype(new_thrall_mind)) return 0 if(!(new_thrall_mind in thralls)) + update_shadow_icons_added(new_thrall_mind) thralls += new_thrall_mind new_thrall_mind.current.attack_log += "\[[time_stamp()]\] Became a thrall" + new_thrall_mind.memory += "The Shadowlings' Objectives: Ascend to your true form by use of the Ascendance ability. \ + This may only be used with [required_thralls] collective thralls, while hatched, and is unlocked with the Collective Mind ability." + new_thrall_mind.current << "The objectives of your shadowlings:: Ascend to your true form by use of the Ascendance ability. \ + This may only be used with [required_thralls] collective thralls, while hatched, and is unlocked with the Collective Mind ability." + new_thrall_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind return 1 - - -/* - GAME FINISH CHECKS -*/ - - -/datum/game_mode/shadowling/check_finished() - var/shadows_alive = 0 //and then shadowling was kill - for(var/datum/mind/shadow in shadows) //but what if shadowling was not kill? - if(!istype(shadow.current,/mob/living/carbon/human) && !istype(shadow.current,/mob/living/simple_animal/ascendant_shadowling)) - continue - if(shadow.current.stat == DEAD) - continue - shadows_alive++ - if(shadows_alive) - return ..() - else - shadowling_dead = 1 //but shadowling was kill :( - return 1 - - /datum/game_mode/shadowling/proc/check_shadow_victory() var/success = 0 //Did they win? if(shadow_objectives.Find("enthrall")) @@ -175,11 +162,13 @@ Made by Xhuis /datum/game_mode/shadowling/declare_completion() if(check_shadow_victory() && SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) //Doesn't end instantly - this is hacky and I don't know of a better way ~X - world << "The shadowlings have ascended and taken over the station!" + world << "The shadowlings have ascended and taken over the station!" else if(shadowling_dead && !check_shadow_victory()) //If the shadowlings have ascended, they can not lose the round - world << "The shadowlings have been killed by the crew!" + world << "The shadowlings have been killed by the crew!" else if(!check_shadow_victory() && SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) - world << "The crew has escaped the station before the shadowlings could ascend!" + world << "The crew has escaped the station before the shadowlings could ascend!" + else + world << "The shadowlings have failed!" ..() return 1 @@ -187,15 +176,14 @@ Made by Xhuis /datum/game_mode/proc/auto_declare_completion_shadowling() var/text = "" if(shadows.len) - text += "
The shadowlings were:" + text += "
The shadowlings were:" for(var/datum/mind/shadow in shadows) text += printplayer(shadow) + text += "
" if(thralls.len) - text += "
The thralls were:" + text += "
The thralls were:" for(var/datum/mind/thrall in thralls) text += printplayer(thrall) - else - world << "Round-end code broke! Please report this and its circumstances on GitHub at https://github.com/tgstation/-tg-station/issues" text += "
" world << text @@ -224,12 +212,24 @@ Made by Xhuis if(A) if(A.lighting_use_dynamic) light_amount = T.lighting_lumcount else light_amount = 10 - if(light_amount > 2) //Rapid death while in the light, countered by... - H.take_overall_damage(0,6) + if(light_amount > LIGHT_DAM_THRESHOLD) //Not complete blackness - they can live in very small light levels plus starlight + H.take_overall_damage(0, LIGHT_DAMAGE_TAKEN) H << "The light burns you!" H << 'sound/weapons/sear.ogg' - else if (light_amount < 2) //...extreme benefits while in the dark - H.heal_overall_damage(5,3) - H.adjustToxLoss(-3) + else if (light_amount < LIGHT_HEAL_THRESHOLD) + H.heal_overall_damage(5,5) + H.adjustToxLoss(-5) + H.adjustBrainLoss(-25) //gibbering shadowlings are hilarious but also bad to have + H.adjustCloneLoss(-1) H.SetWeakened(0) H.SetStunned(0) + +/datum/game_mode/proc/update_shadow_icons_added(datum/mind/shadow_mind) + var/datum/atom_hud/antag/shadow_hud = huds[ANTAG_HUD_SHADOW] + shadow_hud.join_hud(shadow_mind.current) + set_antag_hud(shadow_mind.current, ((shadow_mind in shadows) ? "shadowling" : "thrall")) + +/datum/game_mode/proc/update_shadow_icons_removed(datum/mind/shadow_mind) //This should never actually occur, but it's here anyway. + var/datum/atom_hud/antag/shadow_hud = huds[ANTAG_HUD_SHADOW] + shadow_hud.leave_hud(shadow_mind.current) + set_antag_hud(shadow_mind.current, null) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index baf3d70c4b2..d6abcab574f 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -21,7 +21,7 @@ usr.visible_message("[usr]'s eyes flash a blinding red!") target.visible_message("[target] freezes in place, their eyes glazing over...") if(in_range(target, usr)) - target << "Your gaze is forcibly drawn into [src]'s eyes, and you are mesmerized by the heavenly lights..." + target << "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by the heavenly lights..." else //Only alludes to the shadowling if the target is close by target << "Red lights suddenly dance in your vision, and you are mesmerized by the heavenly lights..." target.Stun(10) @@ -53,9 +53,26 @@ L.on = 0 L.visible_message("[L] flickers and falls dark.") L.update(0) - for(var/obj/item/device/pda/P in orange(5, usr)) + for(var/obj/item/device/pda/P in T.contents) P.fon = 0 - P.SetLuminosity(0) //failsafe + P.SetLuminosity(0) + for(var/obj/effect/glowshroom/G in orange(2, usr)) //Very small radius + G.visible_message("\The [G] withers away!") + qdel(G) + for(var/mob/living/carbon/human/H in T.contents) + for(var/obj/item/device/flashlight/F in H) + if(is_type_in_list(F, blacklisted_lights)) + F.visible_message("[F] goes slightly dim for a moment.") + return + F.on = 0 + F.visible_message("[F] gutters and falls dark.") + F.update_brightness() + for(var/obj/item/device/pda/P in H) + P.fon = 0 + P.SetLuminosity(0) //failsafe + if(H != usr) + H << "You feel a chill and are plunged into darkness." + H.SetLuminosity(0) //This is required with the object-based lighting @@ -164,11 +181,23 @@ usr.visible_message("[usr] leans over [target], their eyes glowing a deep crimson, and stares into their face.") target << "Your gaze is forcibly drawn into a blinding red light. You fall to the floor as conscious thought is wiped away." target.Weaken(12) + sleep(20) + if(isloyal(target)) + usr << "They are enslaved by Nanotrasen. You begin to shut down the nanobot implant - this will take some time." + usr.visible_message("[usr] halts for a moment, then begins passing its hand over [target]'s body.") + target << "You feel your loyalties begin to weaken!" + sleep(150) //15 seconds - not spawn() so the enthralling takes longer + usr << "The nanobots composing the loyalty implant have been rendered inert. Now to continue." + usr.visible_message("[usr] halts thier hand and resumes staring into [target]'s face.") + for(var/obj/item/weapon/implant/loyalty/L in target) + if(L && L.implanted) + qdel(L) + target << "Your unwavering loyalty to Nanotrasen falters, dims, dies." if(3) usr << "You begin rearranging [target]'s memories." usr.visible_message("[usr]'s eyes flare brightly, and a horrible grin begins to spread across [target]'s face...") target << "Your head cries out. The veil of reality begins to crumple and something evil bleeds through." //Ow the edge - if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling + if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a loyalty implant usr << "The enthralling has been interrupted - your target's mind returns to its previous state." target << "Your thoughts become coherent once more. Already you can barely remember what's happened to you." enthralling = 0 @@ -183,8 +212,6 @@ target.adjustOxyLoss(-200) //In case the shadowling was choking them out ticker.mode.add_thrall(target.mind) target.mind.special_role = "Thrall" - var/datum/mind/thrall_mind = target.mind - thrall_mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_hivemind //Lets thralls hive-chat @@ -208,6 +235,30 @@ +/obj/effect/proc_holder/spell/targeted/shadowling_regenarmor + name = "Regenerate Chitin" + desc = "Re-forms protective chitin that may be lost during cloning or similar processes." + panel = "Shadowling Abilities" + charge_max = 600 + clothes_req = 0 + range = -1 + include_user = 1 + +/obj/effect/proc_holder/spell/targeted/shadowling_regenarmor/cast(list/targets) + for(var/mob/living/user in targets) + user.visible_message("[user]'s skin suddenly bubbles and begins to shift around their body!", \ + "You regenerate your protective armor and cleanse your form of defects.") + user.equip_to_slot_or_del(new /obj/item/clothing/under/shadowling(usr), slot_w_uniform) + user.equip_to_slot_or_del(new /obj/item/clothing/shoes/shadowling(usr), slot_shoes) + user.equip_to_slot_or_del(new /obj/item/clothing/suit/space/shadowling(usr), slot_wear_suit) + user.equip_to_slot_or_del(new /obj/item/clothing/head/shadowling(usr), slot_head) + user.equip_to_slot_or_del(new /obj/item/clothing/gloves/shadowling(usr), slot_gloves) + user.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/shadowling(usr), slot_wear_mask) + user.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/shadowling(usr), slot_glasses) + hardset_dna(user, null, null, null, null, /datum/species/shadow/ling) //can't be a shadowling without being a shadowling + + + /obj/effect/proc_holder/spell/targeted/collective_mind name = "Collective Hivemind" desc = "Gathers the power of all of your thralls and compares it to what is needed for ascendance. Also gains you new abilities." @@ -254,7 +305,7 @@ user << "The power of your thralls has granted you the Sonic Screech ability. This ability will shatter nearby windows and deafen enemies." user.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/unearthly_screech - if(thralls >= 10 && !thrall_swap_acquired) + if(thralls >= 9 && !thrall_swap_acquired) thrall_swap_acquired = 1 user << "The power of your thralls has granted you the Spatial Relocation ability. This will, allow you to instantly swap places with one of your thralls in \ addition to shattering nearby lights." @@ -304,14 +355,14 @@ S.start() qdel(B) -datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowlings/thralls +/datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowlings/thralls name = "!(%@ ERROR )!@$" id = "blindness_smoke" description = "<::ERROR::> CANNOT ANALYZE REAGENT <::ERROR::>" color = "#000000" //Complete black (RGB: 0, 0, 0) metabolization_rate = 100 //lel -datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) +/datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(!is_shadow_or_thrall(M)) M << "You breathe in the black smoke, and your eyes burn horribly!" @@ -351,7 +402,6 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(iscarbon(target)) var/mob/living/carbon/M = target M << "A spike of pain drives into your head and scrambles your thoughts!" - M.Weaken(2) M.confused += 10 M.setEarDamage(M.ear_damage + 3) else if(issilicon(target)) @@ -364,7 +414,7 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) sp.start() S.Weaken(6) for(var/obj/structure/window/W in T.contents) - W.hit(rand(25,50)) + W.hit(rand(50,100)) @@ -448,7 +498,7 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) charge_counter = charge_max return - for(var/mob/boom in targets) + for(var/mob/living/carbon/human/boom in targets) if(is_shadow_or_thrall(boom)) usr << "Making an ally explode seems unwise." charge_counter = charge_max diff --git a/code/game/gamemodes/shadowling/shadowling_items.dm b/code/game/gamemodes/shadowling/shadowling_items.dm index 683d0a4bb81..01e0f5ae928 100644 --- a/code/game/gamemodes/shadowling/shadowling_items.dm +++ b/code/game/gamemodes/shadowling/shadowling_items.dm @@ -46,7 +46,7 @@ /obj/item/clothing/gloves/shadowling name = "chitin hands" - desc = "An electricity-resistant yet thin covering of the hands." + desc = "An electricity-resistant covering of the hands." icon_state = "golem" item_state = null origin_tech = null @@ -75,10 +75,11 @@ vision_flags = SEE_MOBS darkness_view = 3 invis_view = 2 - flash_protect = 2 + flash_protect = -1 unacidable = 1 flags = ABSTRACT | NODROP + /obj/structure/shadow_vortex name = "vortex" desc = "A swirling hole in the fabric of reality. Eye-watering chimes sound from its depths." diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 472bee1cd61..b1ff12edd22 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -85,6 +85,7 @@ usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadow_walk usr.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/flashfreeze usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/collective_mind + usr.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/shadowling_regenarmor @@ -158,4 +159,5 @@ sleep(50) if(!ticker.mode.shadowling_ascended) SSshuttle.emergency.request(null, 0.3) + ticker.mode.shadowling_ascended = 1 qdel(usr) diff --git a/code/game/gamemodes/traitor/double_agents.dm b/code/game/gamemodes/traitor/double_agents.dm index 6ce9c6a44cf..d614da9b9ca 100644 --- a/code/game/gamemodes/traitor/double_agents.dm +++ b/code/game/gamemodes/traitor/double_agents.dm @@ -5,7 +5,7 @@ required_players = 25 required_enemies = 5 recommended_enemies = 8 - reroll_friendly = 1 + reroll_friendly = 0 traitor_name = "double agent" diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index af52f87a109..6c7b57edd47 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -41,17 +41,13 @@ else num_traitors = max(1, min(num_players(), traitors_possible)) - for(var/datum/mind/player in antag_candidates) - for(var/job in restricted_jobs) - if(player.assigned_role == job) - antag_candidates -= player - for(var/j = 0, j < num_traitors, j++) if (!antag_candidates.len) break var/datum/mind/traitor = pick(antag_candidates) traitors += traitor traitor.special_role = traitor_name + traitor.restricted_roles = restricted_jobs log_game("[traitor.key] (ckey) has been selected as a [traitor_name]") antag_candidates.Remove(traitor) @@ -75,15 +71,14 @@ /datum/game_mode/traitor/make_antag_chance(var/mob/living/carbon/human/character) //Assigns traitor to latejoiners var/traitorcap = min(round(joined_player_list.len / (config.traitor_scaling_coeff * 2)) + 2 + num_modifier, round(joined_player_list.len/config.traitor_scaling_coeff) + num_modifier ) - if(traitors.len >= traitorcap) //Upper cap for number of latejoin antagonists + if(ticker.mode.traitors.len >= traitorcap) //Upper cap for number of latejoin antagonists return - if(traitors.len <= (traitorcap - 2) || prob(100 / (config.traitor_scaling_coeff * 2))) + if(ticker.mode.traitors.len <= (traitorcap - 2) || prob(100 / (config.traitor_scaling_coeff * 2))) if(character.client.prefs.be_special & BE_TRAITOR) if(!jobban_isbanned(character.client, "traitor") && !jobban_isbanned(character.client, "Syndicate")) if(age_check(character.client)) - if(!(character.job in ticker.mode.restricted_jobs)) + if(!(character.job in restricted_jobs)) add_latejoin_traitor(character.mind) - ..() /datum/game_mode/traitor/proc/add_latejoin_traitor(var/datum/mind/character) character.make_Traitor() @@ -353,9 +348,9 @@ var/obj/item/weapon/folder/syndicate/folder if(owner == exchange_red) - folder = new/obj/item/weapon/folder/syndicate/red(mob.locs) + folder = new/obj/item/weapon/folder/syndicate/red(mob.loc) else - folder = new/obj/item/weapon/folder/syndicate/blue(mob.locs) + folder = new/obj/item/weapon/folder/syndicate/blue(mob.loc) var/list/slots = list ( "backpack" = slot_in_backpack, diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index cfe5bdcc276..3fb8fe34f4b 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -13,16 +13,17 @@ throwforce = 10 w_class = 3 hitsound = 'sound/weapons/bladeslice.ogg' - var/charged = 1 + var/charges = 1 var/spawn_type = /obj/singularity/narsie/wizard var/spawn_amt = 1 var/activate_descriptor = "reality" var/rend_desc = "You should run now." + var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning /obj/item/weapon/veilrender/attack_self(mob/user as mob) - if(charged) - new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc) - charged = 0 + if(charges > 0) + new /obj/effect/rend(get_turf(usr), spawn_type, spawn_amt, rend_desc, spawn_fast) + charges-- user.visible_message("[src] hums with power as [usr] deals a blow to [activate_descriptor] itself!") else user << "The unearthly energies that powered the blade are now dormant." @@ -37,17 +38,20 @@ anchored = 1.0 var/spawn_path = /mob/living/simple_animal/cow //defaulty cows to prevent unintentional narsies var/spawn_amt_left = 20 + var/spawn_fast = 0 -/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc) +/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc, var/spawn_fast) src.spawn_path = spawn_type src.spawn_amt_left = spawn_amt src.desc = desc + src.spawn_fast = spawn_fast SSobj.processing |= src return /obj/effect/rend/process() - if(locate(/mob) in loc) - return + if(!spawn_fast) + if(locate(/mob) in loc) + return new spawn_path(loc) spawn_amt_left-- if(spawn_amt_left <= 0) @@ -136,21 +140,10 @@ hardset_dna(M, null, null, null, null, /datum/species/skeleton) M.revive() spooky_scaries |= M - M << "You have been revived by [user.real_name]!" - M << "They are your master now, assist them even if it costs you your new life!" + M << "You have been revived by [user.real_name]!" + M << "They are your master now, assist them even if it costs you your new life!" - if(prob(33)) - equip_roman_skeleton(M) - - var/mob/living/carbon/human/master = user - - var/datum/objective/protect/protect_master = new /datum/objective/protect - protect_master.owner = M.mind - protect_master.target = master.mind - protect_master.explanation_text = "Protect [master.real_name], your master." - M.mind.objectives += protect_master - ticker.mode.traitors += M.mind - M.mind.special_role = "skeleton-thrall" + equip_roman_skeleton(M) desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" @@ -163,7 +156,7 @@ spooky_scaries.Remove(X) continue var/mob/living/carbon/human/H = X - if(H.stat) + if(H.stat == DEAD) spooky_scaries.Remove(X) continue listclearnulls(spooky_scaries) diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index d0d350d86d7..6f19d7cdd0d 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -60,7 +60,7 @@ else if(mages_made >= max_mages) finished = 1 - return 1 + return ..() else make_more_mages() return ..() diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index b086e9a1d5d..603c2ff0d88 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -1,9 +1,9 @@ //In this file: Summon Magic/Summon Guns/Summon Events /proc/rightandwrong(var/summon_type, var/mob/user, var/survivor_probability) //0 = Summon Guns, 1 = Summon Magic - var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun") - var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying", "necromantic","staffdoor", "special") - var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos") + var/list/gunslist = list("taser","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg") + var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying","staffdoor", "special") + var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos", "necromantic") if(user) //in this case either someone holding a spellbook or a badmin user << "You summoned [summon_type ? "magic" : "guns"]!" @@ -55,6 +55,8 @@ new /obj/item/weapon/gun/projectile/shotgun(get_turf(H)) if("combatshotgun") new /obj/item/weapon/gun/projectile/shotgun/combat(get_turf(H)) + if("arg") + new /obj/item/weapon/gun/projectile/automatic/ar(get_turf(H)) if("mateba") new /obj/item/weapon/gun/projectile/revolver/mateba(get_turf(H)) if("boltaction") @@ -85,6 +87,8 @@ if("car") var/obj/item/weapon/gun/projectile/automatic/m90/gat = new(get_turf(H)) gat.pin = new /obj/item/device/firing_pin + playsound(get_turf(H),'sound/magic/Summon_guns.ogg', 50, 1) + else switch (randomizemagic) if("fireball") @@ -130,8 +134,6 @@ if (!(H.dna.check_mutation(XRAY))) H.dna.add_mutation(XRAY) H << "The walls suddenly disappear." - if("necromantic") - new /obj/item/device/necromantic_stone(get_turf(H)) if("special") magiclist -= "special" //only one super OP item per summoning max switch (randomizemagicspecial) @@ -145,7 +147,11 @@ new /obj/item/weapon/antag_spawner/contract(get_turf(H)) if("staffchaos") new /obj/item/weapon/gun/magic/staff/chaos(get_turf(H)) + if("necromantic") + new /obj/item/device/necromantic_stone(get_turf(H)) H << "You suddenly feel lucky." + playsound(get_turf(H),'sound/magic/Summon_Magic.ogg', 50, 1) + /proc/summonevents() if(!SSevent.wizardmode) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 2df1b4cd4ca..351f87f9c37 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -169,6 +169,8 @@ var/mob/living/simple_animal/shade/A = locate() in C if(A) var/construct_class = alert(U, "Please choose which type of construct you wish to create.",,"Juggernaut","Wraith","Artificer") + if(!T || !T.loc) + return switch(construct_class) if("Juggernaut") makeNewConstruct(/mob/living/simple_animal/construct/armored, A, U) @@ -186,7 +188,7 @@ return -proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) +/proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) var/mob/living/simple_animal/construct/newstruct = new ctype(get_turf(target)) newstruct.faction |= "\ref[stoner]" newstruct.key = target.key diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 138a77305c1..8a58076e663 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -1,3 +1,383 @@ +/datum/spellbook_entry + var/name = "Entry Name" + + var/spell_type = null + var/desc = "" + var/category = "Offensive Spells" + var/log_name = "XX" //What it shows up as in logs + var/cost = 1 + var/refundable = 1 + var/surplus = -1 // -1 for infinite, not used by anything atm + var/obj/effect/proc_holder/spell/S = null //Since spellbooks can be used by only one person anyway we can track the actual spell + var/buy_word = "Learn" + +/datum/spellbook_entry/proc/IsAvailible() // For config prefs / gamemode restrictions - these are round applied + return 1 +/datum/spellbook_entry/proc/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) // Specific circumstances + if(book.uses
" + dat += "[S.desc][desc]
" + dat += "[S.clothes_req?"Needs wizard garb":"Can be cast without wizard garb"]
" + return dat + +/datum/spellbook_entry/fireball + name = "Fireball" + spell_type = /obj/effect/proc_holder/spell/dumbfire/fireball + log_name = "FB" + +/datum/spellbook_entry/magicm + name = "Magic Missile" + spell_type = /obj/effect/proc_holder/spell/targeted/projectile/magic_missile + log_name = "MM" + +/datum/spellbook_entry/disintegrate + name = "Disintegrate" + spell_type = /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate + log_name = "DG" + +/datum/spellbook_entry/disabletech + name = "Disable Tech" + spell_type = /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech + log_name = "DT" + category = "Utility Spells" + +/datum/spellbook_entry/repulse + name = "Repulse" + spell_type = /obj/effect/proc_holder/spell/aoe_turf/repulse + log_name = "RP" + +/datum/spellbook_entry/smoke + name = "Smoke" + spell_type = /obj/effect/proc_holder/spell/targeted/smoke + log_name = "SM" + category = "Utility Spells" + +/datum/spellbook_entry/blind + name = "Blind" + spell_type = /obj/effect/proc_holder/spell/targeted/trigger/blind + log_name = "BD" + +/datum/spellbook_entry/mindswap + name = "Mindswap" + spell_type = /obj/effect/proc_holder/spell/targeted/mind_transfer + log_name = "MT" + category = "Utility Spells" + +/datum/spellbook_entry/forcewall + name = "Force Wall" + spell_type = /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall + log_name = "FW" + category = "Utility Spells" + +/datum/spellbook_entry/blink + name = "Blink" + spell_type = /obj/effect/proc_holder/spell/targeted/turf_teleport/blink + log_name = "BL" + category = "Utility Spells" + +/datum/spellbook_entry/teleport + name = "Teleport" + spell_type = /obj/effect/proc_holder/spell/targeted/area_teleport/teleport + log_name = "TP" + category = "Utility Spells" + +/datum/spellbook_entry/mutate + name = "Mutate" + spell_type = /obj/effect/proc_holder/spell/targeted/genetic/mutate + log_name = "MU" + category = "Utility Spells" + +/datum/spellbook_entry/jaunt + name = "Ethereal Jaunt" + spell_type = /obj/effect/proc_holder/spell/targeted/ethereal_jaunt + log_name = "EJ" + category = "Utility Spells" + +/datum/spellbook_entry/knock + name = "Knock" + spell_type = /obj/effect/proc_holder/spell/aoe_turf/knock + log_name = "KN" + category = "Utility Spells" + +/datum/spellbook_entry/fleshtostone + name = "Flesh to Stone" + spell_type = /obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone + log_name = "FS" + +/datum/spellbook_entry/summonitem + name = "Summon Item" + spell_type = /obj/effect/proc_holder/spell/targeted/summonitem + log_name = "IS" + category = "Utility Spells" + +/datum/spellbook_entry/lightningbolt + name = "Lightning Bolt" + spell_type = /obj/effect/proc_holder/spell/targeted/lightning + log_name = "LB" + +/datum/spellbook_entry/barnyard + name = "Barnyard Curse" + spell_type = /obj/effect/proc_holder/spell/targeted/barnyardcurse + log_name = "BC" + +/datum/spellbook_entry/item + name = "Buy Item" + category = "Artifacts" + refundable = 0 + buy_word = "Summon" + var/item_path= null + + +/datum/spellbook_entry/item/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + new item_path(get_turf(user)) + feedback_add_details("wizard_spell_learned",log_name) + return 1 + +/datum/spellbook_entry/item/GetInfo() + var/dat ="" + dat += "[name]" + dat += " Cost:[cost]
" + dat += "[desc]
" + if(surplus>=0) + dat += "[surplus] left.
" + return dat + +/datum/spellbook_entry/item/staffchange + name = "Staff of Change" + desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself." + item_path = /obj/item/weapon/gun/magic/staff/change + log_name = "ST" + +/datum/spellbook_entry/item/staffanimation + name = "Staff of Animation" + desc = "An arcane staff capable of shooting bolts of eldritch energy which cause inanimate objects to come to life. This magic doesn't affect machines." + item_path = /obj/item/weapon/gun/magic/staff/animate + log_name = "SA" + +/datum/spellbook_entry/item/staffchaos + name = "Staff of Chaos" + desc = "A caprious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended." + item_path = /obj/item/weapon/gun/magic/staff/chaos + log_name = "SC" + +/datum/spellbook_entry/item/staffdoor + name = "Staff of Door Creation" + desc = "A particular staff that can mold solid metal into ornate wooden doors. Useful for getting around in the absence of other transportation. Does not work on glass." + item_path = /obj/item/weapon/gun/magic/staff/door + log_name = "SD" + +/datum/spellbook_entry/item/scryingorb + name = "Scrying Orb" + desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision." + item_path = /obj/item/weapon/gun/magic/staff/chaos + log_name = "SO" + +/datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + if(..()) + if (!(user.dna.check_mutation(XRAY))) + user.dna.add_mutation(XRAY) + return 1 + +/datum/spellbook_entry/item/soulstones + name = "Six Soul Stone Shards and the spell Artificer" + desc = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot." + item_path = /obj/item/weapon/storage/belt/soulstone/full + log_name = "SS" + +/datum/spellbook_entry/item/soulstones/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + . =..() + if(.) + user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null)) + return . + +/datum/spellbook_entry/item/necrostone + name = "A Necromantic Stone" + desc = "A Necromantic stone is able to resurrect three dead individuals as skeletal thralls for you to command." + item_path = /obj/item/device/necromantic_stone + log_name = "NS" + +/datum/spellbook_entry/item/wands + name = "Wand Assortment" + desc = "A collection of wands that allow for a wide variety of utility. Wands do not recharge, so be conservative in use. Comes in a handy belt." + item_path = /obj/item/weapon/storage/belt/wands/full + log_name = "WA" + +/datum/spellbook_entry/item/armor + name = "Mastercrafted Armor Set" + desc = "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space." + item_path = /obj/item/clothing/suit/space/hardsuit/wizard + log_name = "HS" + +/datum/spellbook_entry/item/armor/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + . = ..() + if(.) + new /obj/item/clothing/shoes/sandal(get_turf(user)) //In case they've lost them. + new /obj/item/clothing/gloves/color/purple(get_turf(user))//To complete the outfit + +/datum/spellbook_entry/item/contract + name = "Contract of Apprenticeship" + desc = "A magical contract binding an apprentice wizard to your service, using it will summon them to your side." + item_path = /obj/item/weapon/antag_spawner/contract + log_name = "CT" + +/datum/spellbook_entry/summon + name = "Summon Stuff" + category = "Rituals" + refundable = 0 + buy_word = "Cast" + var/active = 0 + +/datum/spellbook_entry/summon/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + return ..() && !active + +/datum/spellbook_entry/summon/GetInfo() + var/dat ="" + dat += "[name]" + if(cost>0) + dat += " Cost:[cost]
" + else + dat += " No Cost
" + dat += "[desc]
" + if(active) + dat += "Already cast!
" + return dat + +/datum/spellbook_entry/summon/guns + name = "Summon Guns" + category = "Challenges" + desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!" + cost = 0 + log_name = "SG" + +/datum/spellbook_entry/summon/guns/IsAvailible() + return !config.no_summon_guns + +/datum/spellbook_entry/summon/guns/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + feedback_add_details("wizard_spell_learned",log_name) + rightandwrong(0, user, 0) + book.uses += 1 + active = 1 + playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1) + user << "You have cast summon guns and gained an extra charge for your spellbook." + return 1 + +/datum/spellbook_entry/summon/magic + name = "Summon Magic" + category = "Challenges" + desc = "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time." + cost = 0 + log_name = "SU" + +/datum/spellbook_entry/summon/magic/IsAvailible() + return !config.no_summon_magic + +/datum/spellbook_entry/summon/magic/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + feedback_add_details("wizard_spell_learned",log_name) + rightandwrong(1, user, 0) + book.uses += 1 + active = 1 + playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1) + user << "You have cast summon magic and gained an extra charge for your spellbook." + return 1 + +/datum/spellbook_entry/summon/events + name = "Summon Events" + desc = "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events." + cost = 1 + log_name = "SE" + var/times = 0 + +/datum/spellbook_entry/summon/events/IsAvailible() + return (ticker.mode.name != "ragin' mages" && !config.no_summon_events) + +/datum/spellbook_entry/summon/events/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + feedback_add_details("wizard_spell_learned",log_name) + summonevents() + times++ + playsound(get_turf(user),"sound/magic/CastSummon.ogg",50,1) + user << "You have cast summon events." + return 1 + +/datum/spellbook_entry/summon/events/GetInfo() + . = ..() + if(times>0) + . += "You cast it [times] times.
" + return . + + + /obj/item/weapon/spellbook name = "spell book" desc = "The legendary book of spells of the wizard." @@ -8,188 +388,119 @@ w_class = 1.0 var/uses = 5 var/temp = null - var/max_uses = 5 var/op = 1 - var/activepage - var/list/active_challenges = list() + var/tab = null var/mob/living/carbon/human/owner + var/list/datum/spellbook_entry/entries = list() + var/list/categories = list() + +/obj/item/weapon/spellbook/New() + ..() + var/entry_types = typesof(/datum/spellbook_entry) - /datum/spellbook_entry - /datum/spellbook_entry/item - /datum/spellbook_entry/summon + for(var/T in entry_types) + var/datum/spellbook_entry/E = new T + if(E.IsAvailible()) + entries |= E + categories |= E.category + else + del(E) + tab = categories[1] + /obj/item/weapon/spellbook/attackby(obj/item/O as obj, mob/user as mob, params) if(istype(O, /obj/item/weapon/antag_spawner/contract)) var/obj/item/weapon/antag_spawner/contract/contract = O if(contract.used) - user << "The contract has been used, you can't get your points back now." + user << "The contract has been used, you can't get your points back now!" else - user << "You feed the contract back into the spellbook, refunding your points." - src.max_uses++ + user << "You feed the contract back into the spellbook, refunding your points." src.uses++ qdel(O) +/obj/item/weapon/spellbook/proc/GetCategoryHeader(var/category) + var/dat = "" + switch(category) + if("Offensive Spells") + dat += "Spells that can be reused endlessly.
" + dat += "The number after the spell name is the cooldown time.
" + dat += "You can reduce this number by spending more points on the spell.
" + if("Utility Spells") + dat += "Spells that can be reused endlessly.
" + dat += "The number after the spell name is the cooldown time.
" + dat += "You can reduce this number by spending more points on the spell.
" + if("Artifacts") + dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of uses.
" + dat += "These items are not bound to you and can be stolen. Additionaly they cannot typically be returned once purchased.
" + if("Challenges") + dat += "The Wizard Federation typically has hard limits on the potency and number of spells brought to the station based on risk.
" + dat += "Arming the station against you will increases the risk, but will grant you one more charge for your spellbook.
" + if("Rituals") + dat += "These powerful spells change the very fabric of reality. Not always in your favour.
" + return dat - +/obj/item/weapon/spellbook/proc/wrap(var/content) + var/dat = "" + dat +="
Clear" - else if (!activepage || activepage == "return") - dat = "The Book of Magic:
" - dat += "Uses remaining: [uses]
" - dat += "
" - dat += "Learn and Improve Magical Abilities
" - dat += "Summon Magical Tools and Weapons
" - if(ticker.mode.name != "ragin' mages") // we totally need summon guns x100 - dat += "Raise The Stakes For More Power
" - dat += "
" - dat += "Re-memorize Spells
" + var/dat = "" - else if (activepage == "spells") - dat += "Spells:
" - dat += "Spells that can be reused endlessly. Unless stated otherwise all spells require full wizard garb as a focus.
" - dat += "The number after the spell name is the cooldown time. You can reduce this number by spending more points on the spell.
" + dat += "
- "
+ var/list/cat_dat = list()
+ for(var/category in categories)
+ cat_dat[category] = "
- [category] " - dat += "
- Uses remaining : [uses] " + dat += "
" + dat += "
" + dat += "
" + else + spell_info+= "Can't [E.buy_word]
" + if(E.CanRefund(user,src)) + spell_info+= "Refund
" + spell_info += "
" + if(cat_dat[E.category]) + cat_dat[E.category] += spell_info - dat += "Magic Missile (15)
" - dat += "This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage.
" + for(var/category in categories) + dat += "
"
+ dat += GetCategoryHeader(category)
+ dat += cat_dat[category]
+ dat += "
"
- dat += "Fireball (10)" - dat += "This spell fires a fireball in the direction you're facing and does not require wizard garb. Be careful not to fire it at people that are standing next to you.
" - - dat += "Disintegrate (60)
" - dat += "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown.
" - - dat += "Disable Technology (60)
" - dat += "This spell disables all weapons, cameras and most other technology in range.
" - - dat += "Repulse (40)
" - dat += "This spell throws nearby objects away from you and knocks creatures down.
" - - dat += "Smoke (10)
" - dat += "This spell spawns a cloud of choking smoke at your location and does not require wizard garb.
" - - dat += "Blind (30)
" - dat += "This spell temporarly blinds a single person and does not require wizard garb.
" - - dat += "Mind Transfer (60)
" - dat += "This spell allows the user to switch bodies with a target. Careful to not lose your memory in the process.
" - - dat += "Forcewall (10)
" - dat += "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb.
" - - dat += "Blink (2)
" - dat += "This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience.
" - - dat += "Teleport (60)
" - dat += "This spell teleports you to a type of area of your selection. Very useful if you are in danger, but has a decent cooldown, and is unpredictable.
" - - dat += "Mutate (60)
" - dat += "This spell causes you to turn into a hulk and gain telekinesis for a short while.
" - - dat += "Ethereal Jaunt (30)
" - dat += "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls.
" - - dat += "Knock (10)
" - dat += "This spell opens nearby doors and does not require wizard garb.
" - - dat += "Curse of the Barnyward (15)
" - dat += " This Spell dooms any unlucky soul to the life of a barnyard animal. Well not exactly but you still get to laugh at them when they MOO!. It does not require a wizard garb.
" - - dat += "Flesh to Stone (60)
" - dat += "This spell will curse a person to immediately turn into an unmoving statue. The effect will eventually wear off if the statue is not destroyed.
" - - dat += "Lightning Bolt (30)
" - dat += "Charge up and throw lightning bolt at the nearby enemy. Classic. The longer you charge the more powerful the spell, beware of overcharge however!
" - - dat += "Instant Summons (10)
" - dat += "This spell can be used to bind a valuable item to you, bringing it to your hand at will. Using this spell while holding the bound item will allow you to unbind it. It does not require wizard garb.
" - if(ticker.mode.name != "ragin' mages" && !config.no_summon_events) // we totally need summon greentext x100 - dat += "Summon Events (One time use, persistent global spell)
" - dat += "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events.
" - - dat += "
" - - dat += "Return
" - - else if (activepage == "challenge") - - dat += "Challenges:
" - dat += "The Wizard Federation typically has hard limits on the potency and number of spells brought to the station based on risk.
" - dat += "Arming the station against you will increases the risk, but will grant you one more charge for your spellbook.
" - - dat += "
" - - if(!("summon guns" in active_challenges) && !config.no_summon_guns) - dat += "Summon Guns (Single use only, global spell)
" - dat += "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!
" - - if(!("summon magic" in active_challenges) && !config.no_summon_magic) - dat += "Summon Magic (Single use only, global spell)
" - dat += "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time.
" - - dat += "
" - - dat += "Return
" - - else if (activepage == "artifacts") - - dat += "Artifacts:
" - dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of uses.
" - dat += "These items are not bound to you and can be stolen. Additionaly they cannot typically be returned once purchased.
" - dat += "
" - - dat += "Staff of Change
" - dat += "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself.
" - dat += "
" - - dat += "Staff of Animation
" - dat += "An arcane staff capable of shooting bolts of eldritch energy which cause inanimate objects to come to life. This magic doesn't affect machines.
" - dat += "
" - - dat += "Staff of Door Creation
" - dat += "A particular staff that can mold solid metal into ornate wooden doors. Useful for getting around in the absence of other transportation. Does not work on glass.
" - dat += "
" - - dat += "Staff of Chaos
" - dat += "A caprious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended.
" - dat += "
" - - dat += "Six Soul Stone Shards and the spell Artificer
" - dat += "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot.
" - dat += "
" - - dat += "A Necromantic Stone
" - dat += "A Necromantic stone is able to resurrect three dead individuals as skeletal thralls for you to command." - dat += "
" - - dat += "Wand Assortment
" - dat += "A collection of wands that allow for a wide variety of utility. Wands do not recharge, so be conservative in use. Comes in a handy belt.
" - dat += "
" - - dat += "Mastercrafted Armor Set
" - dat += "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space.
" - dat += "
" - - dat += "Contract of Apprenticeship
" - dat += "A magical contract binding an apprentice wizard to your service, using it will summon them to your side.
" - dat += "
" - - dat += "Scrying Orb
" - dat += "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision.
" - - dat += "
" - - dat += "Return
" - user << browse(dat, "window=radio") - onclose(user, "radio") + user << browse(wrap(dat), "window=spellbook;size=600x300") + onclose(user, "spellbook") return /obj/item/weapon/spellbook/Topic(href, href_list) @@ -205,210 +516,23 @@ temp = "If you got caught sneaking a peak from your teacher's spellbook, you'd likely be expelled from the Wizard Academy. Better not." return + var/datum/spellbook_entry/E = null if(loc == H || (in_range(src, H) && istype(loc, /turf))) H.set_machine(src) - if(href_list["spell_choice"]) - if(href_list["spell_choice"] == "rememorize") - var/area/wizard_station/A = locate() - if(usr in A.contents) - uses = max_uses - H.spellremove(usr) - temp = "All spells have been removed. You may now memorize a new set of spells." - feedback_add_details("wizard_spell_learned","UM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - else - temp = "You may only re-memorize spells whilst located inside the wizard sanctuary." - else if(href_list["spell_choice"] == "spells" || href_list["spell_choice"] == "artifacts" || href_list["spell_choice"] == "challenge" || href_list["spell_choice"] == "return") - activepage = href_list["spell_choice"] - else if(uses >= 1 && max_uses >=1) - uses-- - /* - */ - var/list/available_spells = list(magicmissile = "Magic Missile", fireball = "Fireball", disintegrate = "Disintegrate", disabletech = "Disable Tech", repulse = "Repulse", smoke = "Smoke", blind = "Blind", mindswap = "Mind Transfer", forcewall = "Forcewall", blink = "Blink", teleport = "Teleport", mutate = "Mutate", etherealjaunt = "Ethereal Jaunt", knock = "Knock", barnyardcurse = "The Curse of the Barnyard", fleshtostone = "Flesh to Stone", summonitem = "Instant Summons", summonguns = "Summon Guns", summonmagic = "Summon Magic", summonevents = "Summon Events", staffchange = "Staff of Change", soulstone = "Six Soul Stone Shards and the spell Artificer", necrostone = "A Necromantic Stone", armor = "Mastercrafted Armor Set", staffanimate = "Staff of Animation", staffchaos = "Staff of Chaos", staffdoor = "Staff of Door Creation", wands = "Wand Assortment", lightningbolt = "Lightning Bolt") - var/already_knows = 0 - for(var/obj/effect/proc_holder/spell/aspell in H.mind.spell_list) - if(available_spells[href_list["spell_choice"]] == initial(aspell.name)) - already_knows = 1 - if(aspell.spell_level >= aspell.level_max) - temp = "This spell cannot be improved further." - uses++ - break - else - aspell.name = initial(aspell.name) - aspell.spell_level++ - aspell.charge_max = round(initial(aspell.charge_max) - aspell.spell_level * (initial(aspell.charge_max) - aspell.cooldown_min)/ aspell.level_max) - if(aspell.charge_max < aspell.charge_counter) - aspell.charge_counter = aspell.charge_max - switch(aspell.spell_level) - if(1) - temp = "You have improved [aspell.name] into Efficient [aspell.name]." - aspell.name = "Efficient [aspell.name]" - if(2) - temp = "You have further improved [aspell.name] into Quickened [aspell.name]." - aspell.name = "Quickened [aspell.name]" - if(3) - temp = "You have further improved [aspell.name] into Free [aspell.name]." - aspell.name = "Free [aspell.name]" - if(4) - temp = "You have further improved [aspell.name] into Instant [aspell.name]." - aspell.name = "Instant [aspell.name]" - if(aspell.spell_level >= aspell.level_max) - temp += " This spell cannot be strengthened any further." - /* - */ - if(!already_knows) - switch(href_list["spell_choice"]) - if("magicmissile") - feedback_add_details("wizard_spell_learned","MM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null)) - temp = "You have learned magic missile." - if("fireball") - feedback_add_details("wizard_spell_learned","FB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/dumbfire/fireball(null)) - temp = "You have learned fireball." - if("disintegrate") - feedback_add_details("wizard_spell_learned","DG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(null)) - temp = "You have learned disintegrate." - if("disabletech") - feedback_add_details("wizard_spell_learned","DT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(null)) - temp = "You have learned disable technology." - if("repulse") - feedback_add_details("wizard_spell_learned","RP") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse(null)) - temp = "You have learned repulse." - if("smoke") - feedback_add_details("wizard_spell_learned","SM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/smoke(null)) - temp = "You have learned smoke." - if("blind") - feedback_add_details("wizard_spell_learned","BD") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/trigger/blind(null)) - temp = "You have learned blind." - if("mindswap") - feedback_add_details("wizard_spell_learned","MT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null)) - temp = "You have learned mindswap." - if("forcewall") - feedback_add_details("wizard_spell_learned","FW") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(null)) - temp = "You have learned forcewall." - if("blink") - feedback_add_details("wizard_spell_learned","BL") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(null)) - temp = "You have learned blink." - if("teleport") - feedback_add_details("wizard_spell_learned","TP") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null)) - temp = "You have learned teleport." - if("mutate") - feedback_add_details("wizard_spell_learned","MU") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/genetic/mutate(null)) - temp = "You have learned mutate." - if("etherealjaunt") - feedback_add_details("wizard_spell_learned","EJ") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null)) - temp = "You have learned ethereal jaunt." - if("knock") - feedback_add_details("wizard_spell_learned","KN") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null)) - temp = "You have learned knock." - if("fleshtostone") - feedback_add_details("wizard_spell_learned","FS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone(null)) - temp = "You have learned flesh to stone." - if("summonitem") - feedback_add_details("wizard_spell_learned","IS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/summonitem(null)) - temp = "You have learned instant summons." - if("lightningbolt") - feedback_add_details("wizard_spell_learned","LB") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lightning(null)) - temp = "You have learned lightning bolt." - if("summonguns") - feedback_add_details("wizard_spell_learned","SG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - rightandwrong(0, H, 0) - max_uses++ - uses = uses + 2 //refund plus a free point - active_challenges += "summon guns" - temp = "You have cast summon guns and gained an extra charge for your spellbook." - if("summonmagic") - feedback_add_details("wizard_spell_learned","SU") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - rightandwrong(1, H, 0) - max_uses++ - uses = uses + 2 //refund plus a free point - active_challenges += "summon magic" - temp = "You have cast summon magic and gained an extra charge for your spellbook." - if("summonevents") - feedback_add_details("wizard_spell_learned","SE") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - summonevents() - max_uses-- - temp = "You have cast summon events." - if("staffchange") - feedback_add_details("wizard_spell_learned","ST") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/gun/magic/staff/change(get_turf(H)) - temp = "You have purchased a staff of change." - max_uses-- - if("soulstone") - feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/storage/belt/soulstone/full(get_turf(H)) - H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null)) - temp = "You have purchased a belt full of soulstones and have learned the artificer spell." - max_uses-- - if("necrostone") - feedback_add_details("wizard_spell_learned","NS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/device/necromantic_stone(get_turf(H)) - temp = "You have purchased a necromantic stone." - max_uses-- - if("armor") - feedback_add_details("wizard_spell_learned","HS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/clothing/shoes/sandal(get_turf(H)) //In case they've lost them. - new /obj/item/clothing/gloves/color/purple(get_turf(H))//To complete the outfit - new /obj/item/clothing/suit/space/hardsuit/wizard(get_turf(H)) - temp = "You have purchased a suit of wizard armor." - max_uses-- - if("staffanimation") - feedback_add_details("wizard_spell_learned","SA") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/gun/magic/staff/animate(get_turf(H)) - temp = "You have purchased a staff of animation." - max_uses-- - if("staffchaos") - feedback_add_details("wizard_spell_learned","SC") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/gun/magic/staff/chaos(get_turf(H)) - temp = "You have purchased a staff of chaos." - max_uses-- - if("staffdoor") - feedback_add_details("wizard_spell_learned","SD") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/gun/magic/staff/door(get_turf(H)) - temp = "You have purchased a staff of door creation." - max_uses-- - if("barnyard") - feedback_add_details("wizard_spell_learned","BC") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/barnyardcurse(null)) - temp = "You have learned the curse of the barnyard." - if("wands") - feedback_add_details("wizard_spell_learned","WA") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/storage/belt/wands/full(get_turf(H)) - temp = "You have purchased an assortment of wands." - max_uses-- - if("contract") - feedback_add_details("wizard_spell_learned","CT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/antag_spawner/contract(get_turf(H)) - temp = "You have purchased a contract of apprenticeship." - max_uses-- - if("scrying") - feedback_add_details("wizard_spell_learned","SO") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells - new /obj/item/weapon/scrying(get_turf(H)) - if (!(H.dna.check_mutation(XRAY))) - H.dna.add_mutation(XRAY) - temp = "You have purchased a scrying orb, and gained x-ray vision." - max_uses-- - else - if(href_list["temp"]) - temp = null - activepage = null - attack_self(H) - + if(href_list["buy"]) + E = entries[text2num(href_list["buy"])] + if(E && E.CanBuy(H,src)) + if(E.Buy(H,src)) + uses -= E.cost + else if(href_list["refund"]) + E = entries[text2num(href_list["refund"])] + if(E && E.refundable) + var/result = E.Refund(H,src) + if(result > 0) + uses += result + else if(href_list["page"]) + tab = sanitize(href_list["page"]) + attack_self(H) return //Single Use Spellbooks// @@ -419,7 +543,6 @@ var/used = 0 name = "spellbook of " uses = 1 - max_uses = 1 desc = "This template spellbook was never meant for the eyes of man..." /obj/item/weapon/spellbook/oneuse/New() diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 62799672ab5..25f8b25db8c 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -8,8 +8,8 @@ required_players = 20 required_enemies = 1 recommended_enemies = 1 - pre_setup_before_jobs = 1 enemy_minimum_age = 14 + round_ends_with_antag_death = 1 var/use_huds = 0 var/finished = 0 @@ -22,7 +22,7 @@ var/datum/mind/wizard = pick(antag_candidates) wizards += wizard modePlayer += wizard - wizard.assigned_role = "MODE" + wizard.assigned_role = "Wizard" wizard.special_role = "Wizard" if(wizardstart.len == 0) wizard.current << "A starting location for you could not be found, please report this bug!" @@ -171,33 +171,14 @@ /datum/game_mode/wizard/check_finished() - if(replacementmode && round_converted == 2) - return replacementmode.check_finished() - - if(round_converted == 1 || !wizards) //No reason to waste resources - return ..() //Check for evacuation/nuke - for(var/datum/mind/wizard in wizards) - if(wizard.current.stat != DEAD) + if(isliving(wizard.current) && wizard.current.stat!=DEAD) return ..() - for(var/datum/mind/traitor in traitors) - if(traitor.current.stat != DEAD) - return ..() - - if(!config.continuous["wizard"]) - return 1 - if(SSevent.wizardmode) //If summon events was active, turn it off SSevent.toggleWizardmode() SSevent.resetFrequency() - if(config.midround_antag["wizard"]) - round_converted = convert_roundtype() - if(!round_converted) - finished = 1 - return 1 - return ..() /datum/game_mode/wizard/declare_completion() diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 1cbffbab51d..6bb063181f0 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -194,13 +194,13 @@ if("Centcom Commander") return get_all_centcom_access() if("Emergency Response Team Commander") - return list(access_cent_general) + return get_ert_access("commander") if("Security Response Officer") - return list(access_cent_general) + return get_ert_access("sec") if("Engineer Response Officer") - return list(access_cent_general) + return get_ert_access("eng") if("Medical Response Officer") - return list(access_cent_general) + return get_ert_access("med") /proc/get_all_accesses() return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_court, @@ -223,11 +223,11 @@ if("commander") return get_all_centcom_access() if("sec") - return list(access_cent_general, access_cent_specops) + return list(access_cent_general, access_cent_specops, access_cent_living) if("eng") - return list(access_cent_general, access_cent_storage) + return list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) if("med") - return list(access_cent_general, access_cent_medical) + return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_living) /proc/get_all_syndicate_access() return list(access_syndicate, access_syndicate) @@ -426,7 +426,7 @@ "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer") -proc/get_all_job_icons() //For all existing HUD icons +/proc/get_all_job_icons() //For all existing HUD icons return get_all_jobs() + list("Prisoner") /proc/get_all_centcom_jobs() diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 26225a71971..53d8be8e8ad 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -18,131 +18,50 @@ Chaplain access = list(access_morgue, access_chapel_office, access_crematorium) minimal_access = list(access_morgue, access_chapel_office, access_crematorium) - //Pretty bible names - var/global/list/biblenames = list("Bible", "Quran", "Scrapbook", "Burning Bible", "Clown Bible", "Banana Bible", "Creeper Bible", "White Bible", "Holy Light", "The God Delusion", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "Melted Bible", "Necronomicon") - - //Bible iconstates - var/global/list/biblestates = list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon") - - //Bible itemstates - var/global/list/bibleitemstates = list("bible", "koran", "scrapbook", "bible", "bible", "bible", "syringe_kit", "syringe_kit", "syringe_kit", "syringe_kit", "syringe_kit", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon") - -/datum/job/chaplain/proc/setupbiblespecifics(var/obj/item/weapon/storage/book/bible/B, var/mob/living/carbon/human/H) - switch(B.icon_state) - if("honk1","honk2") - new /obj/item/weapon/grown/bananapeel(B) - new /obj/item/weapon/grown/bananapeel(B) - - if(B.icon_state == "honk1") - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask) - - if("bible") - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = 2 - if("koran") - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = 4 - if("scientology") - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = 8 - if("athiest") - for(var/area/chapel/main/A in world) - for(var/turf/T in A.contents) - if(T.icon_state == "carpetsymbol") - T.dir = 10 - -/datum/job/chaplain/Topic(href, href_list) - if(href_list["seticon"]) - var/iconi = text2num(href_list["seticon"]) - - var/biblename = biblenames[iconi] - var/obj/item/weapon/storage/book/bible/B = locate(href_list["bible"]) - - B.icon_state = biblestates[iconi] - B.item_state = bibleitemstates[iconi] - - //Set biblespecific chapels - setupbiblespecifics(B, usr) - - usr.put_in_hands(B) // Update inhand icon - - if(ticker) - ticker.Bible_icon_state = B.icon_state - ticker.Bible_item_state = B.item_state - ticker.Bible_name = B.name - feedback_set_details("religion_book","[biblename]") - - usr << browse(null, "window=editicon") // Close window - /datum/job/chaplain/equip_items(var/mob/living/carbon/human/H) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(H), slot_shoes) var/obj/item/weapon/storage/book/bible/B = new /obj/item/weapon/storage/book/bible/booze(H) - spawn(0) - var/religion_name = "Christianity" - var/new_religion = copytext(sanitize(input(H, "You are the Chaplain. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)),1,MAX_NAME_LEN) + var/new_religion = "Christianity" + if(H.client && H.client.prefs.custom_names["religion"]) + new_religion = H.client.prefs.custom_names["religion"] - if (!new_religion) - new_religion = religion_name + switch(lowertext(new_religion)) + if("christianity") + B.name = pick("The Holy Bible","The Dead Sea Scrolls") + if("satanism") + B.name = "The Unholy Bible" + if("cthulu") + B.name = "The Necronomicon" + if("islam") + B.name = "Quran" + if("scientology") + B.name = pick("The Biography of L. Ron Hubbard","Dianetics") + if("chaos") + B.name = "The Book of Lorgar" + if("imperium") + B.name = "Uplifting Primer" + if("toolboxia") + B.name = "Toolbox Manifesto" + if("homosexuality") + B.name = "Guys Gone Wild" + if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks") + B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition") + H.setBrainLoss(100) // starts off retarded as fuck + if("science") + B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") + else + B.name = "The Holy Book of [new_religion]" + feedback_set_details("religion_name","[new_religion]") + ticker.Bible_name = B.name - switch(lowertext(new_religion)) - if("christianity") - B.name = pick("The Holy Bible","The Dead Sea Scrolls") - if("satanism") - B.name = "The Unholy Bible" - if("cthulu") - B.name = "The Necronomicon" - if("islam") - B.name = "Quran" - if("scientology") - B.name = pick("The Biography of L. Ron Hubbard","Dianetics") - if("chaos") - B.name = "The Book of Lorgar" - if("imperium") - B.name = "Uplifting Primer" - if("toolboxia") - B.name = "Toolbox Manifesto" - if("homosexuality") - B.name = "Guys Gone Wild" - if("lol", "wtf", "gay", "penis", "ass", "poo", "badmin", "shitmin", "deadmin", "cock", "cocks") - B.name = pick("Woodys Got Wood: The Aftermath", "War of the Cocks", "Sweet Bro and Hella Jef: Expanded Edition") - H.setBrainLoss(100) // starts off retarded as fuck - if("science") - B.name = pick("Principle of Relativity", "Quantum Enigma: Physics Encounters Consciousness", "Programming the Universe", "Quantum Physics and Theology", "String Theory for Dummies", "How To: Build Your Own Warp Drive", "The Mysteries of Bluespace", "Playing God: Collector's Edition") - else - B.name = "The Holy Book of [new_religion]" - feedback_set_details("religion_name","[new_religion]") + var/new_deity = "Space Jesus" + if(H.client && H.client.prefs.custom_names["deity"]) + new_deity = H.client.prefs.custom_names["deity"] + B.deity_name = new_deity - spawn(1) - var/deity_name = "Space Jesus" - var/new_deity = copytext(sanitize(input(H, "Would you like to change your deity? Default is Space Jesus.", "Name change", deity_name)),1,MAX_NAME_LEN) - - if ((length(new_deity) == 0) || (new_deity == "Space Jesus") ) - new_deity = deity_name - B.deity_name = new_deity - - if(ticker) - ticker.Bible_deity_name = B.deity_name - feedback_set_details("religion_deity","[new_deity]") - - //Open bible selection - var/dat = "
Pick a bible style
| [nicename] |
Swipe ID card to [locked ? "unlock" : "lock"] interface.
"
- if(!usr.has_unlimited_silicon_privilege && locked)
- dat += "[return_status()]"
- else
- dat += "[return_safety()][return_status()][return_controls()]" - return dat - -/obj/machinery/alarm/proc/return_status() - var/turf/location = src.loc +/obj/machinery/alarm/proc/populate_status(var/list/data) + var/turf/location = get_turf(src) + if(!location) + return var/datum/gas_mixture/environment = location.return_air() var/total = environment.oxygen + environment.carbon_dioxide + environment.toxins + environment.nitrogen - var/output = "
Air Status:
" - if(total == 0) - output +={"Warning: Cannot obtain air sample for analysis."} - return output + var/list/environment_data = list() + data["atmos_alarm"] = alarm_area.atmosalm + data["fire_alarm"] = (alarm_area.fire != null && alarm_area.fire) + data["danger_level"] = danger_level + if(total) + var/datum/tlv/cur_tlv + var/partial_pressure = R_IDEAL_GAS_EQUATION*environment.temperature/environment.volume - output += {" - -"} - var/datum/tlv/cur_tlv - var/GET_PP = R_IDEAL_GAS_EQUATION*environment.temperature/environment.volume + cur_tlv = TLV["pressure"] + var/pressure = environment.return_pressure() + var/pressure_danger = cur_tlv.get_danger_level(pressure) + environment_data += list(list("name" = "Pressure", "value" = pressure, "unit" = "kPa", "danger_level" = pressure_danger)) - cur_tlv = TLV["pressure"] - var/environment_pressure = environment.return_pressure() - var/pressure_dangerlevel = cur_tlv.get_danger_level(environment_pressure) + cur_tlv = TLV["oxygen"] + var/oxygen_danger = cur_tlv.get_danger_level(environment.oxygen*partial_pressure) + environment_data += list(list("name" = "Oxygen", "value" = environment.oxygen / total * 100, "unit" = "%", "danger_level" = oxygen_danger)) - cur_tlv = TLV["oxygen"] - var/oxygen_dangerlevel = cur_tlv.get_danger_level(environment.oxygen*GET_PP) - var/oxygen_percent = round(environment.oxygen / total * 100, 2) + cur_tlv = TLV["carbon dioxide"] + var/carbon_dioxide_danger = cur_tlv.get_danger_level(environment.carbon_dioxide*partial_pressure) + environment_data += list(list("name" = "Carbon dioxide", "value" = environment.carbon_dioxide / total * 100, "unit" = "%", "danger_level" = carbon_dioxide_danger)) - cur_tlv = TLV["carbon dioxide"] - var/co2_dangerlevel = cur_tlv.get_danger_level(environment.carbon_dioxide*GET_PP) - var/co2_percent = round(environment.carbon_dioxide / total * 100, 2) + cur_tlv = TLV["plasma"] + var/plasma_danger = cur_tlv.get_danger_level(environment.toxins*partial_pressure) + environment_data += list(list("name" = "Toxins", "value" = environment.toxins / total * 100, "unit" = "%", "danger_level" = plasma_danger)) - cur_tlv = TLV["plasma"] - var/plasma_dangerlevel = cur_tlv.get_danger_level(environment.toxins*GET_PP) - var/plasma_percent = round(environment.toxins / total * 100, 2) + cur_tlv = TLV["other"] + var/other_moles = 0.0 + for(var/datum/gas/G in environment.trace_gases) + other_moles+=G.moles + var/other_danger = cur_tlv.get_danger_level(other_moles*partial_pressure) + environment_data += list(list("name" = "Other", "value" = other_moles / total * 100, "unit" = "%", "danger_level" = other_danger)) - cur_tlv = TLV["other"] - var/other_moles = 0.0 - for(var/datum/gas/G in environment.trace_gases) - other_moles+=G.moles - var/other_dangerlevel = cur_tlv.get_danger_level(other_moles*GET_PP) - - cur_tlv = TLV["temperature"] - var/temperature_dangerlevel = cur_tlv.get_danger_level(environment.temperature) - - output += {" -Pressure: [environment_pressure]kPa-Oxygen: [oxygen_percent]%
-Carbon dioxide: [co2_percent]%
-Toxins: [plasma_percent]%
-"} - if (other_dangerlevel==2) - output += {"Notice: High Concentration of Unknown Particles Detected
"} - else if (other_dangerlevel==1) - output += {"Notice: Low Concentration of Unknown Particles Detected
"} - - output += {" -Temperature: [environment.temperature]K
-"} - - var/display_danger_level = max( - pressure_dangerlevel, - oxygen_dangerlevel, - co2_dangerlevel, - plasma_dangerlevel, - other_dangerlevel, - temperature_dangerlevel - ) - - //Overall status - output += {"Local Status: "} - if(display_danger_level == 2) - output += {"DANGER: Internals Required"} - else if(display_danger_level == 1) - output += {"Caution"} - else if (alarm_area.atmosalm) - output += {"Caution: Atmos alert in area"} - else - output += {"Optimal"} - - return output - -/obj/machinery/alarm/proc/return_safety() - var/output = "" - if(src.emagged) - output += "NOTICE: Safety measures nonfunctional. Device may exhibit abnormal behavior.
" - else - output += "Safety measures functioning properly.
" - return output - - -/obj/machinery/alarm/proc/return_controls() - var/output = ""//"[alarm_zone] Air [name]
" + cur_tlv = TLV["temperature"] + var/temperature_danger = cur_tlv.get_danger_level(environment.temperature) + environment_data += list(list("name" = "Temperature", "value" = environment.temperature, "unit" = "K ([round(environment.temperature - T0C, 0.1)]C)", "danger_level" = temperature_danger)) + data["environment_data"] = environment_data +/obj/machinery/alarm/proc/populate_controls(var/list/data) switch(screen) - if (AALARM_SCREEN_MAIN) - if(alarm_area.atmosalm) - output += {"Reset - Atmospheric Alarm
"} - else - output += {"Activate - Atmospheric Alarm
"} + if(AALARM_SCREEN_MAIN) + data["mode"] = mode + if(AALARM_SCREEN_VENT) + data["vents"] = list() + for(var/id_tag in alarm_area.air_vent_names) + var/long_name = alarm_area.air_vent_names[id_tag] + var/list/info = alarm_area.air_vent_info[id_tag] + if(!info) + continue + data["vents"] += list(list( + "id_tag" = id_tag, + "long_name" = sanitize(long_name), + "power" = info["power"], + "checks" = info["checks"], + "excheck" = info["checks"]&1, + "incheck" = info["checks"]&2, + "direction" = info["direction"], + "external" = info["external"] + )) + if(AALARM_SCREEN_SCRUB) + data["scrubbers"] = list() + for(var/id_tag in alarm_area.air_scrub_names) + var/long_name = alarm_area.air_scrub_names[id_tag] + var/list/info = alarm_area.air_scrub_info[id_tag] + if(!info) + continue + data["scrubbers"] += list(list( + "id_tag" = id_tag, + "long_name" = sanitize(long_name), + "power" = info["power"], + "scrubbing" = info["scrubbing"], + "panic" = info["panic"], + "filter_co2" = info["filter_co2"], + "filter_toxins" = info["filter_toxins"], + "filter_n2o" = info["filter_n2o"] + )) + if(AALARM_SCREEN_MODE) + data["mode"] = mode + data["modes"] = list() + data["modes"] += list(list("name" = "Filtering - Scrubs out contaminants", "mode" = AALARM_MODE_SCRUBBING, "selected" = mode == AALARM_MODE_SCRUBBING, "danger" = 0)) + data["modes"] += list(list("name" = "Draught - Siphons out air while replacing", "mode" = AALARM_MODE_VENTING, "selected" = mode == AALARM_MODE_VENTING, "danger" = 0)) + data["modes"] += list(list("name" = "Cycle - Siphons air before replacing", "mode" = AALARM_MODE_REPLACEMENT, "selected" = mode == AALARM_MODE_REPLACEMENT, "danger" = 1)) + data["modes"] += list(list("name" = "Panic - Siphons air out of the room", "mode" = AALARM_MODE_PANIC, "selected" = mode == AALARM_MODE_PANIC, "danger" = 1)) + data["modes"] += list(list("name" = "Off - Shuts off vents and scrubbers", "mode" = AALARM_MODE_OFF, "selected" = mode == AALARM_MODE_OFF, "danger" = 0)) + if (src.emagged) + data["modes"] += list(list("name" = "Flood - Shuts off scrubbers and opens vents", "mode" = AALARM_MODE_FLOOD, "selected" = mode == AALARM_MODE_FLOOD, "danger" = 1)) + if(AALARM_SCREEN_SENSORS) + var/datum/tlv/selected + var/list/thresholds = list() - output += {" -Scrubbers Control
-Vents Control
-Set Environmentals Mode
-Sensor Settings
-
-"} - if (mode==AALARM_MODE_PANIC) - output += "PANIC SYPHON ACTIVE
Turn syphoning off" - else - output += "ACTIVATE PANIC SYPHON IN AREA" - if (AALARM_SCREEN_VENT) - var/sensor_data = "" - if(alarm_area.air_vent_names.len) - for(var/id_tag in alarm_area.air_vent_names) - var/long_name = alarm_area.air_vent_names[id_tag] - var/list/data = alarm_area.air_vent_info[id_tag] - if(!data) - continue; - var/state = "" - - sensor_data += {" -
[long_name]
-[state]-Operating: -[data["power"]?"on":"off"] -
-Pressure checks: -external -internal -
-External pressure bound: -- -- -- -- -[data["external"]] -+ -+ -+ -+ -reset -
-"} - if (data["direction"] == "siphon") - sensor_data += {" -Direction: -siphoning -
-"} - sensor_data += {"
"} - else - sensor_data = "No vents connected.
" - output = {"<< Main Menu
[sensor_data]"} - if (AALARM_SCREEN_SCRUB) - var/sensor_data = "" - if(alarm_area.air_scrub_names.len) - for(var/id_tag in alarm_area.air_scrub_names) - var/long_name = alarm_area.air_scrub_names[id_tag] - var/list/data = alarm_area.air_scrub_info[id_tag] - if(!data) - continue; - var/state = "" - - sensor_data += {" -[long_name][state]
-Operating: -[data["power"]?"on":"off"]
-Type: -[data["scrubbing"]?"scrubbing":"syphoning"]
-"} - - if(data["scrubbing"]) - sensor_data += {" -Filtering: -Carbon Dioxide -[data["filter_co2"]?"on":"off"]; -Toxins -[data["filter_toxins"]?"on":"off"]; -Nitrous Oxide -[data["filter_n2o"]?"on":"off"] -
-"} - sensor_data += {" -Panic syphon: [data["panic"]?"PANIC SYPHON ACTIVATED":""] -Dea":"red'>A")]ctivate
-
-"} - else - sensor_data = "No scrubbers connected.
" - output = {"<< Main Menu
[sensor_data]"} - - if (AALARM_SCREEN_MODE) - output += {" -<< Main Menu
-Air machinery mode for the area:
- "}
- var/list/modes = list()
- if(src.emagged)
- modes = list(
- AALARM_MODE_SCRUBBING = "Filtering",
- AALARM_MODE_VENTING = "Draught",
- AALARM_MODE_PANIC = "PANIC",
- AALARM_MODE_REPLACEMENT = "REPLACE AIR",
- AALARM_MODE_OFF = "Off",
- AALARM_MODE_FLOOD = "FLOOD", //Below everything else because it shouldn't be there normally
- )
- else
- modes = list(
- AALARM_MODE_SCRUBBING = "Filtering",
- AALARM_MODE_VENTING = "Draught",
- AALARM_MODE_PANIC = "PANIC",
- AALARM_MODE_REPLACEMENT = "REPLACE AIR",
- AALARM_MODE_OFF = "Off",
- )
- for (var/m=1,m<=modes.len,m++)
- if (mode==m)
- output += {"
- [modes[m]] (selected) "} - else - output += {"
- [modes[m]] "} - output += "
-Alarm thresholds:
-Partial pressure for gases - -
| min2 | min1 | max1 | max2 | |
|---|---|---|---|---|
| [gases[g]] | -"} - tlv = TLV[g] - for (var/v in thresholds) - output += {" --[tlv.vars[v]>=0?tlv.vars[v]:"OFF"] - | -"} - output += {" -|||
| Pressure | -"} - for (var/v in thresholds) - output += {" --[tlv.vars[v]>=0?tlv.vars[v]:"OFF"] - | -"} - output += {" -|||
| Temperature | -"} - for (var/v in thresholds) - output += {" --[tlv.vars[v]>=0?tlv.vars[v]:"OFF"] - | -"} - output += {" -
" if(sensors.len) //if recieving signals from nearby sensors... output += ..() //... get the data. @@ -296,7 +296,7 @@ Rate: [volume_rate] L/sec
"} return output -obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal) +/obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return var/id_tag = signal.data["tag"] @@ -308,7 +308,7 @@ obj/machinery/computer/general_air_control/large_tank_control/receive_signal(dat else ..(signal) -obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list) +/obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list) if(..()) return @@ -352,7 +352,7 @@ obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_l // FUEL INJECTION ///////////////////////////////////////////////////////////// -obj/machinery/computer/general_air_control/fuel_injection +/obj/machinery/computer/general_air_control/fuel_injection icon = 'icons/obj/computer.dmi' icon_state = "atmos" @@ -364,7 +364,7 @@ obj/machinery/computer/general_air_control/fuel_injection var/cutoff_temperature = 2000 var/on_temperature = 1200 -obj/machinery/computer/general_air_control/fuel_injection/process() +/obj/machinery/computer/general_air_control/fuel_injection/process() if(automation) if(!radio_connection) return 0 @@ -393,7 +393,7 @@ obj/machinery/computer/general_air_control/fuel_injection/process() ..() -obj/machinery/computer/general_air_control/fuel_injection/return_text() +/obj/machinery/computer/general_air_control/fuel_injection/return_text() var/output = ..() output += "Fuel Injection System
" @@ -415,7 +415,7 @@ Rate: [volume_rate] L/sec
"} return output -obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal) +/obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal) if(!signal || signal.encryption) return var/id_tag = signal.data["tag"] @@ -425,7 +425,7 @@ obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/s else ..(signal) -obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list) +/obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list) if(..()) return diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 5450c05c626..1ee28a02cbf 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -18,6 +18,7 @@ var/release_log = "" var/update_flag = 0 + /obj/machinery/portable_atmospherics/canister/sleeping_agent name = "canister: \[N2O\]" icon_state = "redws" @@ -123,6 +124,7 @@ update_flag if (src.health <= 10) var/atom/location = src.loc location.assume_air(air_contents) + air_update_turf() src.destroyed = 1 playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) @@ -138,9 +140,9 @@ update_flag else return 1 -/obj/machinery/portable_atmospherics/canister/process() +/obj/machinery/portable_atmospherics/canister/process_atmos() if (destroyed) - return + return PROCESS_KILL ..() @@ -174,9 +176,9 @@ update_flag can_label = 1 else can_label = 0 - +/obj/machinery/portable_atmospherics/canister/process() src.updateDialog() - return + return ..() /obj/machinery/portable_atmospherics/canister/return_air() return air_contents @@ -245,7 +247,7 @@ update_flag transfer_moles = pressure_delta*thejetpack.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)//Actually transfer the gas var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) thejetpack.merge(removed) - user << "You pulse-pressurize your jetpack from the tank." + user << "You pulse-pressurize your jetpack from the tank." return ..() @@ -257,32 +259,34 @@ update_flag return src.attack_hand(user) /obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob) - return src.interact(user) + return src.ui_interact(user) -/obj/machinery/portable_atmospherics/canister/interact(var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main") if (src.destroyed) return - user.set_machine(src) - var/holding_text - if(holding) - holding_text = {"
Tank Pressure: [holding.air_contents.return_pressure()] KPa
-Remove Tank
-"} - var/output_text = {"[name][can_label?" relabel":""]
-Pressure: [air_contents.return_pressure()] KPa
-Port Status: [(connected_port)?("Connected"):("Disconnected")] -[holding_text] -
-Release Valve: [valve_open?("Open"):("Closed")]
-Release Pressure: - - - - [release_pressure] + + + +
-
-Close
-"} + var/data = list() + data["name"] = src.name + data["canLabel"] = src.can_label ? 1 : 0 + data["portConnected"] = src.connected_port ? 1 : 0 + data["tankPressure"] = round(src.air_contents.return_pressure() ? src.air_contents.return_pressure() : 0) + data["releasePressure"] = round(src.release_pressure ? src.release_pressure : 0) + data["minReleasePressure"] = round(ONE_ATMOSPHERE/10) + data["maxReleasePressure"] = round(10*ONE_ATMOSPHERE) + data["valveOpen"] = src.valve_open ? 1 : 0 - user << browse("
" dat += "Toggle Auto Pickup Crate ([auto_pickup ? "On":"Off"])
" dat += "Toggle Delivery Reporting ([report_delivery ? "On" : "Off"])
" + dat += "Toggle Interface Refreshing ([refresh ? "On" : "Off"])
" if(load) dat += "Unload Now
" @@ -241,7 +237,7 @@ obj/machinery/bot/mulebot/bot_reset() //user << browse("
\[Unauthenticated\] /"
dat += " Server Power: [src.linkedServer && src.linkedServer.active ? "\[On\]":"\[Off\]"]
"
- if(hacking || emag)
+ if(hacking || emagged)
screen = 2
else if(!auth || !linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
if(!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN))) message = noserver
@@ -276,7 +268,7 @@
/obj/machinery/computer/message_monitor/proc/UnmagConsole()
src.icon_state = normal_icon
- src.emag = 0
+ src.emagged = 0
/obj/machinery/computer/message_monitor/proc/ResetMessage()
customsender = "System Administrator"
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index d58f416f99c..c021d2e158a 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -132,7 +132,7 @@
var/obj/item/weapon/implant/I = locate(href_list["warn"])
if((I)&&(I.imp_in))
var/mob/living/carbon/R = I.imp_in
- R << "You hear a voice in your head saying: '[warning]'"
+ R << "You hear a voice in your head saying: '[warning]'"
log_say("[usr]/[usr.ckey] sent an implant message to [R]/[R.ckey]: '[warning]'")
src.add_fingerprint(usr)
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 3f677d16775..305e8d9ea58 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -111,7 +111,7 @@
R.SetLockdown(!R.lockcharge)
R << "[!R.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]"
if(R.connected_ai)
- R.connected_ai << "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]" + R.connected_ai << "[!R.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [R.name]
" else usr << "Access Denied." diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index f4f5f3c9d00..3ac9f1abf03 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -28,7 +28,7 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + user << "You insert [O]." else ..() diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 692bf826437..87e1389167d 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -87,7 +87,7 @@ return prob(60) var/obj/structure/stool/bed/B = A - if (istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass + if (istype(A, /obj/structure/stool/bed) && (B.buckled_mob || B.density))//if it's a bed/chair and is dense or someone is buckled, it will not pass return 0 else if(istype(A, /mob/living)) // You Shall Not Pass! @@ -159,3 +159,10 @@ var/temp = null var/reqtime = 0 //Cooldown for requisitions - Quarxink var/last_viewed_group = "categories" + +/obj/machinery/computer/shuttle/white_ship + name = "White Ship Console" + desc = "Used to control the White Ship." + circuit = /obj/item/weapon/circuitboard/white_ship + shuttleId = "whiteship" + possible_destinations = "whiteship_ss13;whiteship_home;whiteship_z4" diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 5c823178fad..5530c7cc5a1 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -55,31 +55,57 @@ /obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob, params) if(P.crit_fail) - user << "This part is faulty, you cannot add this to the machine!" + user << "This part is faulty, you cannot add this to the machine!" return switch(state) if(1) + if(istype(P, /obj/item/weapon/circuitboard)) + user << "The frame needs wiring first!" + return if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = P if(C.get_amount() >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You start to add cables to the frame." - if(do_after(user, 20)) + user << "You start to add cables to the frame..." + if(do_after(user, 20, target = src)) if(C.get_amount() >= 5 && state == 1) C.use(5) user << "You add cables to the frame." state = 2 icon_state = "box_1" else - user << "You need five length of cable to wire the frame." + user << "You need five length of cable to wire the frame!" return + if(istype(P, /obj/item/weapon/screwdriver) && !anchored) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) + user.visible_message("[user] disassembles the frame.", \ + "You start to disassemble the frame...", "You hear banging and clanking.") + if(do_after(user, 40, target = src)) + if(state == 1) + user << "You disassemble the frame." + var/obj/item/stack/sheet/metal/M = new (loc, 5) + M.add_fingerprint(user) + qdel(src) if(istype(P, /obj/item/weapon/wrench)) + user << "You start [anchored ? "un" : ""]securing [name]..." playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - user << "You dismantle the frame." - new /obj/item/stack/sheet/metal(src.loc, 5) - qdel(src) + if(do_after(user, 40, target = src)) + if(state == 1) + user << "You [anchored ? "un" : ""]secure [name]." + anchored = !anchored + if(2) + if(istype(P, /obj/item/weapon/wrench)) + user << "You start [anchored ? "un" : ""]securing [name]..." + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) + if(do_after(user, 40, target = src)) + user << "You [anchored ? "un" : ""]secure [name]." + anchored = !anchored + if(istype(P, /obj/item/weapon/circuitboard)) + if(!anchored) + user << "The frame needs to be secured first!" + return var/obj/item/weapon/circuitboard/B = P if(B.board_type == "machine") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -94,7 +120,7 @@ update_namelist() update_req_desc() else - user << "This frame does not accept circuit boards of this type!" + user << "This frame does not accept circuit boards of this type!" if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You remove the cables." @@ -177,7 +203,7 @@ if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CP = P if (CP.get_amount() < 1) - user << "You need more cable!" + user << "You need more cable!" return var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src, 1, CP.item_color) if(CP.use(1)) @@ -192,7 +218,7 @@ update_req_desc() return 1 if(!success) - user << "You cannot add that to the machine!" + user << "You cannot add that to the machine!" return 0 @@ -239,6 +265,15 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/stock_parts/cell = 5, /obj/item/weapon/stock_parts/capacitor = 1) +/obj/item/weapon/circuitboard/emitter + name = "circuit board (Emitter)" + build_path = /obj/machinery/power/emitter + board_type = "machine" + origin_tech = "programming=4;powerstorage=5;engineering=5" + req_components = list( + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + /obj/item/weapon/circuitboard/power_compressor name = "circuit board (Power Compressor)" build_path = /obj/machinery/power/compressor @@ -358,6 +393,7 @@ to destroy them and players will be able to make replacements. origin_tech = "programming=1;biotech=1" req_components = list( /obj/item/weapon/stock_parts/matter_bin = 2, + /obj/item/weapon/stock_parts/manipulator = 1, /obj/item/weapon/stock_parts/console_screen = 1) /obj/item/weapon/circuitboard/microwave @@ -367,9 +403,71 @@ to destroy them and players will be able to make replacements. origin_tech = "programming=1" req_components = list( /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/stack/cable_coil = 2, /obj/item/weapon/stock_parts/console_screen = 1) +/obj/item/weapon/circuitboard/gibber + name = "circuit board (Gibber)" + build_path = /obj/machinery/gibber + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/processor + name = "circuit board (Food processor)" + build_path = /obj/machinery/processor + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/recycler + name = "circuit board (Recycler)" + build_path = /obj/machinery/recycler + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/seed_extractor + name = "circuit board (Seed Extractor)" + build_path = /obj/machinery/seed_extractor + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/smartfridge + name = "circuit board (Smartfridge)" + build_path = /obj/machinery/smartfridge + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1) + +/obj/item/weapon/circuitboard/monkey_recycler + name = "circuit board (Monkey Recycler)" + build_path = /obj/machinery/monkey_recycler + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/manipulator = 1) + +/obj/item/weapon/circuitboard/holopad + name = "circuit board (AI Holopad)" + build_path = /obj/machinery/hologram/holopad + board_type = "machine" + origin_tech = "programming=1" + req_components = list( + /obj/item/weapon/stock_parts/capacitor = 1) + /obj/item/weapon/circuitboard/chem_dispenser name = "circuit board (Portable Chem Dispenser)" build_path = /obj/machinery/chem_dispenser/constructable @@ -381,7 +479,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/stock_parts/manipulator = 1, /obj/item/weapon/stock_parts/console_screen = 1, /obj/item/weapon/stock_parts/cell = 1) - + /obj/item/weapon/circuitboard/chem_master name = "circuit board (Chem Master 2999)" build_path = /obj/machinery/chem_master/constructable @@ -613,6 +711,8 @@ obj/item/weapon/circuitboard/rdserver req_components = list( /obj/item/weapon/stock_parts/console_screen = 1, /obj/item/weapon/stock_parts/matter_bin = 1, + /obj/item/weapon/stock_parts/micro_laser = 1, + /obj/item/weapon/stock_parts/manipulator = 1, /obj/item/device/assembly/igniter = 1) /obj/item/weapon/circuitboard/mining_equipment_vendor diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 6c57394b1ef..f84c488f930 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -25,7 +25,7 @@ component_parts += new /obj/item/weapon/stock_parts/console_screen(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) component_parts += new /obj/item/stack/cable_coil(null, 1) - RefreshParts() + /obj/machinery/atmospherics/unary/cryo_cell/construction() ..(dir,dir) @@ -40,10 +40,18 @@ /obj/machinery/atmospherics/unary/cryo_cell/Destroy() var/turf/T = loc T.contents += contents - var/obj/item/weapon/reagent_containers/glass/B = beaker + if(beaker) - B.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube + beaker.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube + beaker = null ..() +/obj/machinery/atmospherics/unary/cryo_cell/process_atmos() + ..() + if(air_contents) + temperature_archived = air_contents.temperature + heat_gas_contents() + if(abs(temperature_archived-air_contents.temperature) > 1) + parent.update = 1 /obj/machinery/atmospherics/unary/cryo_cell/process() ..() @@ -54,19 +62,15 @@ playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) if(!node || !is_operational()) return + if(!on) updateDialog() return if(air_contents) - temperature_archived = air_contents.temperature - heat_gas_contents() - expel_gas() - - if(occupant) + if (occupant) process_occupant() - if(abs(temperature_archived-air_contents.temperature) > 1) - parent.update = 1 + expel_gas() updateDialog() return 1 @@ -76,11 +80,7 @@ return close_machine(target) -/obj/machinery/atmospherics/unary/cryo_cell/allow_drop() - return 0 - /obj/machinery/atmospherics/unary/cryo_cell/relaymove(var/mob/user) - ..() open_machine() /obj/machinery/atmospherics/unary/cryo_cell/container_resist() @@ -102,6 +102,9 @@ open_machine() add_fingerprint(usr) else + if(!istype(usr, /mob/living) || usr.stat) + usr << "You can't do that!" + return open_machine() /obj/machinery/atmospherics/unary/cryo_cell/examine(mob/user) @@ -229,14 +232,16 @@ /obj/machinery/atmospherics/unary/cryo_cell/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/glass)) + if(isrobot(user)) + return if(beaker) - user << "A beaker is already loaded into [src]." + user << "A beaker is already loaded into [src]!" return beaker = I user.drop_item() I.loc = src - user.visible_message("[user] places [I] in [src].", \ + user.visible_message("[user] places [I] in [src].", \ "You place [I] in [src].") if(!(on || occupant || state_open)) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 98c7cf1fff0..471818ca3c4 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -67,11 +67,11 @@ for reference: user.changeNext_move(CLICK_CD_MELEE) if (istype(W, /obj/item/stack/sheet/mineral/wood)) if (src.health < src.maxhealth) - visible_message("[user] begins to repair \the [src]!") + visible_message("[user] begins to repair \the [src]!", "You begin to repair \the [src]...") if(do_after(user,20)) src.health = src.maxhealth W:use(1) - visible_message("[user] repairs \the [src]!") + visible_message("[user] repairs \the [src]!", "You repair \the [src].") return else return @@ -84,7 +84,7 @@ for reference: src.health -= W.force * 0.75 else if (src.health <= 0) - visible_message("The barricade is smashed apart!") + visible_message("The barricade is smashed apart!") new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) @@ -94,13 +94,13 @@ for reference: /obj/structure/barricade/wooden/ex_act(severity, target) switch(severity) if(1.0) - visible_message("The barricade is blown apart!") + visible_message("The barricade is blown apart!") qdel(src) return if(2.0) src.health -= 25 if (src.health <= 0) - visible_message("The barricade is blown apart!") + visible_message("The barricade is blown apart!") new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) new /obj/item/stack/sheet/mineral/wood(get_turf(src)) @@ -110,7 +110,7 @@ for reference: /obj/structure/barricade/wooden/blob_act() src.health -= 25 if (src.health <= 0) - visible_message("The blob eats through the barricade!") + visible_message("The blob eats through the barricade!") qdel(src) return @@ -196,7 +196,7 @@ for reference: if (src.emagged == 0) src.emagged = 1 src.req_access = null - user << "You break the ID authentication lock on \the [src]." + user << "You break the ID authentication lock on \the [src]." var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() @@ -204,7 +204,7 @@ for reference: return else if (src.emagged == 1) src.emagged = 2 - user << "You short out the anchoring mechanism on \the [src]." + user << "You short out the anchoring mechanism on \the [src]." var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 2b1ef80ccff..c7b8dc92fe8 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -164,7 +164,6 @@ opacity = 0 doortype = /obj/structure/door_assembly/door_assembly_research/glass glass = 1 - heat_proof = 1 /obj/machinery/door/airlock/glass_mining name = "maintenance hatch" @@ -215,7 +214,7 @@ /obj/machinery/door/airlock/uranium/proc/radiate() for(var/mob/living/L in range (3,src)) - L.apply_effect(15,IRRADIATE,0) + L.irradiate(15) return /obj/machinery/door/airlock/plasma @@ -306,6 +305,23 @@ About the new airlock wires panel: */ // You can find code for the airlock wires in the wire datum folder. +/obj/machinery/door/airlock/proc/bolt() + if(locked) + return + locked = 1 + update_icon() + +/obj/machinery/door/airlock/proc/unbolt() + if(!locked) + return + locked = 0 + update_icon() + +/obj/machinery/door/airlock/Destroy() + if(id_tag) + for(var/obj/machinery/doorButtons/D in world) + D.removeMe(src) + ..() /obj/machinery/door/airlock/bumpopen(mob/living/user as mob) //Airlocks now zap you when you 'bump' them open when they're electrified. --NeoFite if(!issilicon(usr)) @@ -530,9 +546,9 @@ About the new airlock wires panel: if(src.isWireCut(AIRLOCK_WIRE_LIGHT)) t1 += text("Door bolt lights wire is cut.
\n") else if(!src.lights) - t1 += text("Door lights are off. Enable?
\n", src) + t1 += text("Door bolt lights are off. Enable?
\n", src) else - t1 += text("Door lights are on. Disable?
\n", src) + t1 += text("Door bolt lights are on. Disable?
\n", src) if(src.isWireCut(AIRLOCK_WIRE_ELECTRIFY)) t1 += text("Electrification wire is cut.
\n") @@ -640,7 +656,7 @@ About the new airlock wires panel: playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) if(!istype(H.head, /obj/item/clothing/head/helmet)) H.visible_message("[user] headbutts the airlock.", \ - "[user] headbutts the airlock!") + "You headbutt the airlock!") var/obj/item/organ/limb/affecting = H.get_organ("head") H.Stun(5) H.Weaken(5) @@ -889,9 +905,9 @@ About the new airlock wires panel: if((istype(C, /obj/item/weapon/weldingtool) && !( src.operating ) && src.density)) var/obj/item/weapon/weldingtool/W = C if(W.remove_fuel(0,user)) - user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ - "You begin [welded ? "unwelding":"welding"] the airlock...", \ - "You hear welding.") + user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \ + "You begin [welded ? "unwelding":"welding"] the airlock...", \ + "You hear welding.") playsound(loc, 'sound/items/Welder.ogg', 40, 1) if(do_after(user,40,5,1)) if(density && !operating)//Door must be closed to weld. @@ -899,8 +915,8 @@ About the new airlock wires panel: return playsound(loc, 'sound/items/Welder2.ogg', 50, 1) welded = !welded - user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ - "You've [welded ? "welded the airlock shut":"unwelded the airlock"].") + user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \ + "You [welded ? "weld the airlock shut":"unweld the airlock"].") update_icon() return else if(istype(C, /obj/item/weapon/screwdriver)) @@ -924,18 +940,19 @@ About the new airlock wires panel: beingcrowbarred = 0 if( beingcrowbarred && (density && welded && !operating && src.p_open && (!hasPower()) && !src.locked) ) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] removes the electronics from the airlock assembly.", \ - "You start to remove electronics from the airlock assembly.") + user.visible_message("[user] removes the electronics from the airlock assembly.", \ + "You start to remove electronics from the airlock assembly...") if(do_after(user,40)) if(src.loc) if(src.doortype) - new src.doortype(src.loc) + var/obj/structure/door_assembly/A = new src.doortype(src.loc) + A.heat_proof_finished = src.heat_proof //tracks whether there's rglass in if(emagged) user << "You discard the damaged electronics." qdel(src) return - user << "You removed the airlock electronics!" + user << "You remove the airlock electronics." var/obj/item/weapon/airlock_electronics/ae if(!electronics) @@ -953,9 +970,9 @@ About the new airlock wires panel: qdel(src) return else if(hasPower()) - user << " The airlock's motors resist your efforts to force it." + user << " The airlock's motors resist your efforts to force it!" else if(locked) - user << " The airlock's bolts prevent it from being forced." + user << " The airlock's bolts prevent it from being forced!" else if( !welded && !operating) if(density) if(beingcrowbarred == 0) //being fireaxe'd @@ -963,7 +980,7 @@ About the new airlock wires panel: if(F:wielded) spawn(0) open(2) else - user << "You need to be wielding the Fire axe to do that." + user << "You need to be wielding the fire axe to do that!" else spawn(0) open(2) else @@ -972,7 +989,7 @@ About the new airlock wires panel: if(F:wielded) spawn(0) close(2) else - user << "You need to be wielding the Fire axe to do that." + user << "You need to be wielding the fire axe to do that!" else spawn(0) close(2) @@ -1069,7 +1086,7 @@ About the new airlock wires panel: update_freelook_sight() if(locate(/mob/living) in get_turf(src)) open() - return + return 1 /obj/machinery/door/airlock/New() ..() @@ -1114,35 +1131,27 @@ About the new airlock wires panel: if("Default") icon = 'icons/obj/doors/Doorglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_glass - heat_proof = 0 if("Engineering") icon = 'icons/obj/doors/Doorengglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_eng/glass - heat_proof = 0 if("Atmospherics") icon = 'icons/obj/doors/Dooratmoglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_atmo/glass - heat_proof = 0 if("Security") icon = 'icons/obj/doors/Doorsecglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_sec/glass - heat_proof = 0 if("Command") icon = 'icons/obj/doors/Doorcomglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_com/glass - heat_proof = 0 if("Medical") icon = 'icons/obj/doors/Doormedglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_med/glass - heat_proof = 0 if("Research") icon = 'icons/obj/doors/Doorresearchglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_research/glass - heat_proof = 1 if("Mining") icon = 'icons/obj/doors/Doorminingglass.dmi' doortype = /obj/structure/door_assembly/door_assembly_min/glass - heat_proof = 0 else //These airlocks have a regular version. var optionlist = list("Default", "Engineering", "Atmospherics", "Security", "Command", "Medical", "Research", "Mining", "Maintenance", "External", "High Security") @@ -1152,47 +1161,36 @@ About the new airlock wires panel: if("Default") icon = 'icons/obj/doors/Doorint.dmi' doortype = /obj/structure/door_assembly/door_assembly_0 - heat_proof = 0 if("Engineering") icon = 'icons/obj/doors/Dooreng.dmi' doortype = /obj/structure/door_assembly/door_assembly_eng - heat_proof = 0 if("Atmospherics") icon = 'icons/obj/doors/Dooratmo.dmi' doortype = /obj/structure/door_assembly/door_assembly_atmo - heat_proof = 0 if("Security") icon = 'icons/obj/doors/Doorsec.dmi' doortype = /obj/structure/door_assembly/door_assembly_sec - heat_proof = 0 if("Command") icon = 'icons/obj/doors/Doorcom.dmi' doortype = /obj/structure/door_assembly/door_assembly_com - heat_proof = 0 if("Medical") icon = 'icons/obj/doors/Doormed.dmi' doortype = /obj/structure/door_assembly/door_assembly_med - heat_proof = 0 if("Research") icon = 'icons/obj/doors/Doorresearch.dmi' doortype = /obj/structure/door_assembly/door_assembly_research - heat_proof = 0 if("Mining") icon = 'icons/obj/doors/Doormining.dmi' doortype = /obj/structure/door_assembly/door_assembly_min - heat_proof = 0 if("Maintenance") icon = 'icons/obj/doors/Doormaint.dmi' doortype = /obj/structure/door_assembly/door_assembly_mai - heat_proof = 0 if("External") icon = 'icons/obj/doors/Doorext.dmi' doortype = /obj/structure/door_assembly/door_assembly_ext - heat_proof = 0 if("High Security") icon = 'icons/obj/doors/hightechsecurity.dmi' doortype = /obj/structure/door_assembly/door_assembly_highsecurity - heat_proof = 0 update_icon() /obj/machinery/door/airlock/CanAStarPass(var/obj/item/weapon/card/id/ID) diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 5db76850d2d..0264ae95312 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -17,6 +17,7 @@ /obj/machinery/door/airlock/alarmlock/Destroy() if(radio_controller) radio_controller.remove_object(src,air_frequency) + air_connection = null ..() /obj/machinery/door/airlock/alarmlock/initialize() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 86434159b81..84e06f843ad 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -15,9 +15,10 @@ var/operating = 0 var/glass = 0 var/normalspeed = 1 - var/heat_proof = 0 // For glass airlocks/opacity firedoors + var/heat_proof = 0 // For rglass-windowed airlocks and firedoors var/emergency = 0 // Emergency access override var/sub_door = 0 // 1 if it's meant to go under another door. + var/closingLayer = 3.1 /obj/machinery/door/New() ..() @@ -236,7 +237,7 @@ operating = 1 do_animate("closing") - src.layer = 3.1 + src.layer = closingLayer sleep(5) src.density = 1 sleep(5) @@ -274,7 +275,7 @@ /obj/machinery/door/proc/hasPower() return !(stat & NOPOWER) -/obj/machinery/door/BlockSuperconductivity() +/obj/machinery/door/BlockSuperconductivity() // All non-glass airlocks block heat, this is intended. if(opacity || heat_proof) return 1 return 0 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 9a4e57c97f3..85f6dac25e8 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -13,7 +13,7 @@ var/blocked = 0 var/nextstate = null sub_door = 1 - + closingLayer = 3.11 /obj/machinery/door/firedoor/Bumped(atom/AM) if(p_open || operating) return diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index ac30218b651..e558ccbac61 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -6,12 +6,15 @@ var/id = 1 var/auto_close = 0 // Time in seconds to automatically close when opened, 0 if it doesn't. sub_door = 1 + heat_proof = 1 /obj/machinery/door/poddoor/preopen icon_state = "open" density = 0 opacity = 0 +/obj/machinery/door/poddoor/ert + desc = "A heavy duty blast door that only opens for dire emergencies." /obj/machinery/door/poddoor/Bumped(atom/AM) if(density) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 412048bb8a5..c679e37cd4c 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -22,9 +22,11 @@ density = 0 if(health == 0) playsound(src, "shatter", 70, 1) + electronics = null ..() + /obj/machinery/door/window/proc/open_and_close() open() if(src.check_access(null)) @@ -213,8 +215,8 @@ return user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) - user.visible_message("[user] smashes against the [src.name].", \ - "[user] smashes against the [src.name].") + user.visible_message("[user] smashes against the [src.name]!", \ + "You smash against the [src.name]!") take_damage(damage) /obj/machinery/door/window/attack_alien(mob/living/user as mob) @@ -247,7 +249,7 @@ /obj/machinery/door/window/emag_act(mob/user as mob) if(density && !emagged) - operating = -1 + operating = 0 flick("[src.base_state]spark", src) sleep(6) desc += "
Its access panel is smoking slightly." @@ -264,7 +266,7 @@ if(istype(I, /obj/item/weapon/screwdriver)) if(src.density || src.operating) - user << "You need to open the door to access the maintenance panel." + user << "You need to open the door to access the maintenance panel!" return playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) src.p_open = !( src.p_open ) @@ -274,8 +276,8 @@ if(istype(I, /obj/item/weapon/crowbar)) if(p_open && !src.density && !src.operating) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user.visible_message("[user] removes the electronics from the [src.name].", \ - "You start to remove electronics from the [src.name].") + user.visible_message("[user] removes the electronics from the [src.name].", \ + "You start to remove electronics from the [src.name]...") if(do_after(user,40)) if(src.p_open && !src.density && !src.operating && src.loc) var/obj/structure/windoor_assembly/WA = new /obj/structure/windoor_assembly(src.loc) @@ -302,7 +304,7 @@ qdel(src) return - user << "You removed the airlock electronics!" + user << "You remove the airlock electronics." var/obj/item/weapon/airlock_electronics/ae if(!electronics) @@ -358,6 +360,13 @@ return +/obj/machinery/door/window/attack_hulk(mob/user) + ..(user, 1) + user.visible_message("[user] smashes through the windoor!", \ + "You tear through the windoor!") + user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) + playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1) + take_damage(health) /obj/machinery/door/window/brigdoor diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index d91d360f5e5..0e54a939366 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -1,213 +1,296 @@ -//States for airlock_control -#define ACCESS_STATE_INTERNAL -1 -#define ACCESS_STATE_LOCKED 0 -#define ACCESS_STATE_EXTERNAL 1 +#define CLOSING 1 +#define OPENING 2 +#define CYCLE 3 +#define CYCLE_EXTERIOR 4 +#define CYCLE_INTERIOR 5 -datum/computer/file/embedded_program/access_controller - var/id_tag - var/exterior_door_tag - var/interior_door_tag +/obj/machinery/doorButtons + power_channel = ENVIRON + anchored = 1 + use_power = 1 + idle_power_usage = 2 + active_power_usage = 4 + var/idSelf - state = ACCESS_STATE_LOCKED - var/target_state = ACCESS_STATE_LOCKED +/obj/machinery/doorButtons/attackby(obj/O, mob/user) + attack_hand(user) -datum/computer/file/embedded_program/access_controller/receive_signal(datum/signal/signal, receive_method, receive_param) - var/receive_tag = signal.data["tag"] - if(!receive_tag) return +/obj/machinery/doorButtons/proc/findObjsByTag() + return - if(receive_tag==exterior_door_tag) - if(signal.data["door_status"] == "closed") - if(signal.data["lock_status"] == "locked") - memory["exterior_status"] = "locked" +/obj/machinery/doorButtons/initialize() + findObjsByTag() + +/obj/machinery/doorButtons/proc/removeMe() + + +/obj/machinery/doorButtons/access_button + icon = 'icons/obj/airlock_machines.dmi' + icon_state = "access_button_standby" + name = "access button" + var/idDoor + var/obj/machinery/door/airlock/door + var/obj/machinery/doorButtons/airlock_controller/controller + var/busy + +/obj/machinery/doorButtons/access_button/findObjsByTag() + for(var/obj/machinery/doorButtons/airlock_controller/A in world) + if(A.idSelf == idSelf) + controller = A + break + for(var/obj/machinery/door/airlock/I in world) + if(I.id_tag == idDoor) + door = I + break + +/obj/machinery/doorButtons/access_button/attack_hand(mob/user) + if(..()) + return + if(busy) + return + if(controller && !controller.busy && door) + if(controller.stat & NOPOWER) + return + busy = 1 + update_icon() + if(door.density) + if(!controller.exteriorAirlock || !controller.interiorAirlock) + controller.onlyOpen(door) else - memory["exterior_status"] = "closed" - else - memory["exterior_status"] = "open" - - else if(receive_tag==interior_door_tag) - if(signal.data["door_status"] == "closed") - if(signal.data["lock_status"] == "locked") - memory["interior_status"] = "locked" - else - memory["interior_status"] = "closed" - else - memory["interior_status"] = "open" - - else if(receive_tag==id_tag) - switch(signal.data["command"]) - if("cycle_interior") - target_state = ACCESS_STATE_INTERNAL - if("cycle_exterior") - target_state = ACCESS_STATE_EXTERNAL - if("cycle") - if(state < ACCESS_STATE_LOCKED) - target_state = ACCESS_STATE_EXTERNAL + if(controller.exteriorAirlock.density && controller.interiorAirlock.density) + controller.onlyOpen(door) else - target_state = ACCESS_STATE_INTERNAL + controller.cycleClose(door) + else + controller.onlyClose(door) + sleep(20) + busy = 0 + update_icon() -datum/computer/file/embedded_program/access_controller/receive_user_command(command) - switch(command) - if("cycle_closed") - target_state = ACCESS_STATE_LOCKED - if("cycle_exterior") - target_state = ACCESS_STATE_EXTERNAL - if("cycle_interior") - target_state = ACCESS_STATE_INTERNAL +/obj/machinery/doorButtons/access_button/update_icon() + if(stat & NOPOWER) + icon_state = "access_button_off" + else + if(busy) + icon_state = "access_button_cycle" + else + icon_state = "access_button_standby" -datum/computer/file/embedded_program/access_controller/process() - var/process_again = 1 - while(process_again) - process_again = 0 - switch(state) - if(ACCESS_STATE_INTERNAL) // state -1 - if(target_state > state) - if(memory["interior_status"] == "locked") - state = ACCESS_STATE_LOCKED - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - if(memory["interior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) +/obj/machinery/doorButtons/access_button/power_change() + ..() + update_icon() - if(ACCESS_STATE_LOCKED) - if(target_state < state) - if(memory["exterior_status"] != "locked") - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - if(memory["exterior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) - else - if(memory["interior_status"] == "closed" || memory["interior_status"] == "open") - state = ACCESS_STATE_INTERNAL - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) - else if(target_state > state) - if(memory["interior_status"] != "locked") - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - if(memory["interior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) - else - if(memory["exterior_status"] == "closed" || memory["exterior_status"] == "open") - state = ACCESS_STATE_EXTERNAL - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - signal.data["command"] = "secure_open" - post_signal(signal) - else - if(memory["interior_status"] != "locked") - var/datum/signal/signal = new - signal.data["tag"] = interior_door_tag - if(memory["interior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) - else if(memory["exterior_status"] != "locked") - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - if(memory["exterior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) - - if(ACCESS_STATE_EXTERNAL) //state 1 - if(target_state < state) - if(memory["exterior_status"] == "locked") - state = ACCESS_STATE_LOCKED - process_again = 1 - else - var/datum/signal/signal = new - signal.data["tag"] = exterior_door_tag - if(memory["exterior_status"] == "closed") - signal.data["command"] = "lock" - else - signal.data["command"] = "secure_close" - post_signal(signal) +/obj/machinery/doorButtons/access_button/removeMe(obj/O) + if(O == door) + door = null - return 1 - -obj/machinery/embedded_controller/radio/access_controller +/obj/machinery/doorButtons/airlock_controller icon = 'icons/obj/airlock_machines.dmi' icon_state = "access_control_standby" - name = "access console" - density = 0 - power_channel = ENVIRON + var/obj/machinery/door/airlock/interiorAirlock + var/obj/machinery/door/airlock/exteriorAirlock + var/idInterior + var/idExterior + var/busy + var/lostPower - frequency = 1449 +/obj/machinery/doorButtons/airlock_controller/removeMe(obj/O) + if(O == interiorAirlock) + interiorAirlock = null + else if(O == exteriorAirlock) + exteriorAirlock = null - // Setup parameters only - var/id_tag - var/exterior_door_tag - var/interior_door_tag - -obj/machinery/embedded_controller/radio/access_controller/initialize() +/obj/machinery/doorButtons/airlock_controller/Destroy() + for(var/obj/machinery/doorButtons/access_button/A in world) + if(A.controller == src) + A.controller = null ..() - var/datum/computer/file/embedded_program/access_controller/new_prog = new +/obj/machinery/doorButtons/airlock_controller/Topic(href, href_list) + if(..()) + return + if(busy) + return + switch(href_list["command"]) + if("close_exterior") + onlyClose(exteriorAirlock) + if("close_interior") + onlyClose(interiorAirlock) + if("cycle_exterior") + cycleClose(exteriorAirlock) + if("cycle_interior") + cycleClose(interiorAirlock) + if("open_exterior") + onlyOpen(exteriorAirlock) + if("open_interior") + onlyOpen(interiorAirlock) - new_prog.id_tag = id_tag - new_prog.exterior_door_tag = exterior_door_tag - new_prog.interior_door_tag = interior_door_tag +/obj/machinery/doorButtons/airlock_controller/proc/onlyOpen(obj/machinery/door/airlock/A) + if(A) + busy = CLOSING + update_icon() + openDoor(A) - new_prog.master = src - program = new_prog +/obj/machinery/doorButtons/airlock_controller/proc/onlyClose(obj/machinery/door/airlock/A) + if(A) + busy = CLOSING + closeDoor(A) -obj/machinery/embedded_controller/radio/access_controller/update_icon() - if(on && program) - if(program.memory["processing"]) - icon_state = "access_control_process" +/obj/machinery/doorButtons/airlock_controller/proc/closeDoor(obj/machinery/door/airlock/A) + if(A.density) + goIdle() + return 0 + update_icon() + A.unbolt() + spawn() + if(A && A.close()) + if(stat & NOPOWER || lostPower || !A || A.gc_destroyed) + goIdle(1) + return + A.bolt() + if(busy == CLOSING) + goIdle(1) else - icon_state = "access_control_standby" + goIdle(1) + return 1 + +/obj/machinery/doorButtons/airlock_controller/proc/cycleClose(obj/machinery/door/airlock/A) + if(!A || !exteriorAirlock || !interiorAirlock) + return + if(exteriorAirlock.density == interiorAirlock.density || !A.density) + return + busy = CYCLE + update_icon() + if(A == interiorAirlock) + if(closeDoor(exteriorAirlock)) + busy = CYCLE_INTERIOR else + if(closeDoor(interiorAirlock)) + busy = CYCLE_EXTERIOR + +/obj/machinery/doorButtons/airlock_controller/proc/cycleOpen(obj/machinery/door/airlock/A) + if(!A) + goIdle(1) + if(A == exteriorAirlock) + if(interiorAirlock) + if(!interiorAirlock.density || !interiorAirlock.locked) + return + else + if(exteriorAirlock) + if(!exteriorAirlock.density || !exteriorAirlock.locked) + return + if(busy != OPENING) + busy = OPENING + openDoor(A) + +/obj/machinery/doorButtons/airlock_controller/proc/openDoor(obj/machinery/door/airlock/A) + if(exteriorAirlock && interiorAirlock && (!exteriorAirlock.density || !interiorAirlock.density)) + goIdle(1) + return + A.unbolt() + spawn() + if(A && A.open()) + if(stat | (NOPOWER) && !lostPower && A && !A.gc_destroyed) + A.bolt() + goIdle(1) + +/obj/machinery/doorButtons/airlock_controller/proc/goIdle(var/update) + lostPower = 0 + busy = 0 + if(update) + update_icon() + updateUsrDialog() + +/obj/machinery/doorButtons/airlock_controller/process() + if(stat & NOPOWER) + return + if(busy == CYCLE_EXTERIOR) + cycleOpen(exteriorAirlock) + else if(busy == CYCLE_INTERIOR) + cycleOpen(interiorAirlock) + +/obj/machinery/doorButtons/airlock_controller/power_change() + ..() + if(stat & NOPOWER) + lostPower = 1 + else + if(!busy) + lostPower = 0 + update_icon() + +/obj/machinery/doorButtons/airlock_controller/findObjsByTag() + for(var/obj/machinery/door/airlock/A in world) + if(A.id_tag == idInterior) + interiorAirlock = A + else if(A.id_tag == idExterior) + exteriorAirlock = A + +/obj/machinery/doorButtons/airlock_controller/update_icon() + if(stat & NOPOWER) icon_state = "access_control_off" + return + if(busy || lostPower) + icon_state = "access_control_process" + else + icon_state = "access_control_standby" + +/obj/machinery/doorButtons/airlock_controller/attack_hand(mob/user) + if(..()) + return + var/datum/browser/popup = new(user, "computer", name) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.set_content(returnText()) + popup.open() + +/obj/machinery/doorButtons/airlock_controller/proc/returnText() + var/output + if(!exteriorAirlock && !interiorAirlock) + return "ERROR ERROR ERROR ERROR" + if(lostPower) + output = "Initializing..." + else + if(!exteriorAirlock || !interiorAirlock) + if(!exteriorAirlock) + if(interiorAirlock.density) + output = "Open Interior Airlock
" + else + output = "Close Interior Airlock
" + else + if(exteriorAirlock.density) + output = "Open Exterior Airlock
" + else + output = "Close Exterior Airlock
" + else + if(exteriorAirlock.density) + if(interiorAirlock.density) + output = {"Open Exterior Airlock
+ Open Interior Airlock
"} + else + output = {"Cycle to Exterior Airlock
+ Close Interior Airlock
"} + else + if(interiorAirlock.density) + output = {"Close Exterior Airlock
+ Cycle to Interior Airlock
"} + else + output = {"Close Exterior Airlock
+ Close Interior Airlock
"} -obj/machinery/embedded_controller/radio/access_controller/return_text() - var/state_options = null + output = {"Access Control Console
+ [output]
"} + if(exteriorAirlock) + output += "Exterior Door: [exteriorAirlock.density ? "closed" : "open"]
" + if(interiorAirlock) + output += "Interior Door: [interiorAirlock.density ? "closed" : "open"]
" - var/state = 0 - var/exterior_status = "----" - var/interior_status = "----" - if(program) - state = program.state - exterior_status = program.memory["exterior_status"] - interior_status = program.memory["interior_status"] + return output - switch(state) - if(ACCESS_STATE_INTERNAL) - state_options = {"Lock Interior Airlock
-Cycle to Exterior Airlock
"} - if(ACCESS_STATE_LOCKED) - state_options = {"Unlock Interior Airlock
-Unlock Exterior Airlock
"} - if(ACCESS_STATE_EXTERNAL) - state_options = {"Cycle to Interior Airlock
-Lock Exterior Airlock
"} - - var/output = {"Access Control Console
-[state_options]
-Exterior Door: [exterior_status]
-Interior Door: [interior_status]
"} - - return output \ No newline at end of file +#undef CLOSING +#undef OPENING +#undef CYCLE +#undef CYCLE_EXTERIOR +#undef CYCLE_INTERIOR \ No newline at end of file diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 1e702ac8c24..6ef3d8e0dd6 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -5,7 +5,7 @@ #define AIRLOCK_STATE_DEPRESSURIZE 1 #define AIRLOCK_STATE_OUTOPEN 2 -datum/computer/file/embedded_program/airlock_controller +/datum/computer/file/embedded_program/airlock_controller var/id_tag var/exterior_door_tag var/interior_door_tag @@ -17,7 +17,7 @@ datum/computer/file/embedded_program/airlock_controller var/target_state = AIRLOCK_STATE_CLOSED var/sensor_pressure = null -datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param) +/datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/signal/signal, receive_method, receive_param) var/receive_tag = signal.data["tag"] if(!receive_tag) return @@ -45,7 +45,7 @@ datum/computer/file/embedded_program/airlock_controller/receive_signal(datum/sig else target_state = AIRLOCK_STATE_INOPEN -datum/computer/file/embedded_program/airlock_controller/receive_user_command(command) +/datum/computer/file/embedded_program/airlock_controller/receive_user_command(command) switch(command) if("cycle_closed") target_state = AIRLOCK_STATE_CLOSED @@ -56,7 +56,7 @@ datum/computer/file/embedded_program/airlock_controller/receive_user_command(com if("abort") target_state = AIRLOCK_STATE_CLOSED -datum/computer/file/embedded_program/airlock_controller/process() +/datum/computer/file/embedded_program/airlock_controller/process() var/process_again = 1 while(process_again) process_again = 0 @@ -201,7 +201,7 @@ datum/computer/file/embedded_program/airlock_controller/process() return 1 -obj/machinery/embedded_controller/radio/airlock_controller +/obj/machinery/embedded_controller/radio/airlock_controller icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_control_standby" @@ -219,7 +219,7 @@ obj/machinery/embedded_controller/radio/airlock_controller var/sensor_tag var/sanitize_external -obj/machinery/embedded_controller/radio/airlock_controller/initialize() +/obj/machinery/embedded_controller/radio/airlock_controller/initialize() ..() var/datum/computer/file/embedded_program/airlock_controller/new_prog = new @@ -234,7 +234,7 @@ obj/machinery/embedded_controller/radio/airlock_controller/initialize() new_prog.master = src program = new_prog -obj/machinery/embedded_controller/radio/airlock_controller/update_icon() +/obj/machinery/embedded_controller/radio/airlock_controller/update_icon() if(on && program) if(program.memory["processing"]) icon_state = "airlock_control_process" @@ -244,7 +244,7 @@ obj/machinery/embedded_controller/radio/airlock_controller/update_icon() icon_state = "airlock_control_off" -obj/machinery/embedded_controller/radio/airlock_controller/return_text() +/obj/machinery/embedded_controller/radio/airlock_controller/return_text() var/state_options = null var/state = 0 diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 6f9b91169b0..ac2b9b6ff7d 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -1,23 +1,23 @@ -datum/computer/file/embedded_program +/datum/computer/file/embedded_program var/list/memory = list() var/state var/obj/machinery/embedded_controller/master -datum/computer/file/embedded_program/proc/post_signal(datum/signal/signal, comm_line) +/datum/computer/file/embedded_program/proc/post_signal(datum/signal/signal, comm_line) if(master) master.post_signal(signal, comm_line) else del(signal) -datum/computer/file/embedded_program/proc/receive_user_command(command) +/datum/computer/file/embedded_program/proc/receive_user_command(command) -datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param) +/datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param) return null -datum/computer/file/embedded_program/process() +/datum/computer/file/embedded_program/process() return 0 -obj/machinery/embedded_controller +/obj/machinery/embedded_controller var/datum/computer/file/embedded_program/program name = "embedded controller" @@ -26,7 +26,7 @@ obj/machinery/embedded_controller var/on = 1 -obj/machinery/embedded_controller/interact(mob/user as mob) +/obj/machinery/embedded_controller/interact(mob/user as mob) //user << browse(return_text(), "window=computer") //onclose(user, "computer") user.set_machine(src) @@ -35,24 +35,24 @@ obj/machinery/embedded_controller/interact(mob/user as mob) popup.set_content(return_text()) popup.open() -obj/machinery/embedded_controller/attack_hand(mob/user as mob) +/obj/machinery/embedded_controller/attack_hand(mob/user as mob) interact(user) -obj/machinery/embedded_controller/update_icon() +/obj/machinery/embedded_controller/update_icon() -obj/machinery/embedded_controller/proc/return_text() +/obj/machinery/embedded_controller/proc/return_text() -obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line) +/obj/machinery/embedded_controller/proc/post_signal(datum/signal/signal, comm_line) return 0 -obj/machinery/embedded_controller/receive_signal(datum/signal/signal, receive_method, receive_param) +/obj/machinery/embedded_controller/receive_signal(datum/signal/signal, receive_method, receive_param) if(!signal || signal.encryption) return if(program) program.receive_signal(signal, receive_method, receive_param) //spawn(5) program.process() //no, program.process sends some signals and machines respond and we here again and we lag -rastaf0 -obj/machinery/embedded_controller/Topic(href, href_list) +/obj/machinery/embedded_controller/Topic(href, href_list) if(..()) return 0 @@ -63,33 +63,33 @@ obj/machinery/embedded_controller/Topic(href, href_list) usr.set_machine(src) spawn(5) src.updateDialog() -obj/machinery/embedded_controller/process() +/obj/machinery/embedded_controller/process() if(program) program.process() update_icon() src.updateDialog() -obj/machinery/embedded_controller/radio +/obj/machinery/embedded_controller/radio var/frequency var/datum/radio_frequency/radio_connection -obj/machinery/embedded_controller/radio/Destroy() +/obj/machinery/embedded_controller/radio/Destroy() if(radio_controller) radio_controller.remove_object(src,frequency) ..() -obj/machinery/embedded_controller/radio/initialize() +/obj/machinery/embedded_controller/radio/initialize() set_frequency(frequency) -obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal) +/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal) signal.transmission_method = TRANSMISSION_RADIO if(radio_connection) return radio_connection.post_signal(src, signal) else signal = null -obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency) +/obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index f575ccd7778..fdea6d8469f 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -40,23 +40,23 @@ /obj/machinery/flasher/attackby(obj/item/weapon/W, mob/user, params) if (istype(W, /obj/item/weapon/wirecutters)) if (bulb) - user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb.") + user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb...") playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) if(do_after(user, 30) && bulb) - user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb!") + user.visible_message("[user] has disconnected [src]'s flashbulb!", "You disconnect [src]'s flashbulb.") bulb.loc = src.loc bulb = null power_change() else if (istype(W, /obj/item/device/flash/handheld)) if (!bulb) - user.visible_message("[user] installs [W] into [src].", "You install [W] into [src].") + user.visible_message("[user] installs [W] into [src].", "You install [W] into [src].") user.drop_item() W.loc = src bulb = W power_change() else - user << "A flashbulb is already installed in [src]." + user << "A flashbulb is already installed in [src]!" add_fingerprint(user) //Let the AI trigger them directly. diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 6f20b8ce9f6..299a8c01b38 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -42,6 +42,35 @@ var/const/HOLOPAD_MODE = RANGE_BASED var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating. var/temp = "" +/obj/machinery/hologram/holopad/New() + ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/holopad(null) + component_parts += new /obj/item/weapon/stock_parts/capacitor(null) + RefreshParts() + +/obj/machinery/hologram/holopad/RefreshParts() + var/holograph_range = 4 + for(var/obj/item/weapon/stock_parts/capacitor/B in component_parts) + holograph_range += 1 * B.rating + holo_range = holograph_range + +/obj/machinery/hologram/holopad/attackby(obj/item/P as obj, mob/user as mob, params) + if(default_deconstruction_screwdriver(user, "holopad_open", "holopad0", P)) + return + + if(exchange_parts(user, P)) + return + + if(default_pry_open(P)) + return + + if(default_unfasten_wrench(user, P)) + return + + default_deconstruction_crowbar(P) + + /obj/machinery/hologram/holopad/attack_hand(var/mob/living/carbon/human/user) //Carn: Hologram requests. if(!istype(user)) return diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index aa9be627ab2..0354e94eac4 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -76,10 +76,10 @@ add_fingerprint(user) src.disable = !src.disable if (src.disable) - user.visible_message("[user] has disabled \the [src]!", "You disable the connection to \the [src].") + user.visible_message("[user] has disabled \the [src]!", "You disable the connection to \the [src].") icon_state = "[base_state]-d" if (!src.disable) - user.visible_message("[user] has reconnected \the [src]!", "You fix the connection to \the [src].") + user.visible_message("[user] has reconnected \the [src]!", "You fix the connection to \the [src].") if(src.powered()) icon_state = "[base_state]" else diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index b56321f9588..8d07ebf090d 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -53,35 +53,35 @@ return if(attached) - visible_message("[attached] is detached from \the [src]") + visible_message("[attached] is detached from \the [src].") attached = null update_icon() return if(!ishuman(target)) - usr << "The drip beeps: Warning, human patients only!" + usr << "The drip beeps: Warning, human patients only!" return if(Adjacent(target) && usr.Adjacent(target)) if(beaker) - visible_message("[usr] attaches \the [src] to \the [target].") + usr.visible_message("[usr] attaches \the [src] to \the [target].", "You attach \the [src] to \the [target].") attached = target SSmachine.processing.Add(src) update_icon() else - usr << "There's nothing attached to the IV drip!" + usr << "There's nothing attached to the IV drip!" /obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/reagent_containers)) if(!isnull(beaker)) - user << "There is already a reagent container loaded!" + user << "There is already a reagent container loaded!" return user.drop_item() W.loc = src beaker = W - user << "You attach \the [W] to \the [src]." + user << "You attach \the [W] to \the [src]." update_icon() return else @@ -107,7 +107,7 @@ if(istype(beaker, /obj/item/weapon/reagent_containers/blood)) // speed up transfer on blood packs transfer_amount = 4 - beaker.reagents.reaction(attached, INGEST, 0,0) //make reagents reacts, but don't spam messages + beaker.reagents.reaction(attached, INGEST, 1,0) //make reagents reacts, but don't spam messages beaker.reagents.trans_to(attached, transfer_amount) update_icon() @@ -163,7 +163,7 @@ set src in view(1) if(!istype(usr, /mob/living)) - usr << "You can't do that." + usr << "You can't do that!" return if(usr.stat) @@ -180,7 +180,7 @@ set src in view(1) if(!istype(usr, /mob/living)) - usr << "You can't do that." + usr << "You can't do that!" return if(usr.stat) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index bfa9f68ef65..1498fa14fe8 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -82,9 +82,12 @@ Class Procs: Called by machine to assign a value to the uid variable. process() 'game/machinery/machine.dm' - Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list. + Called by the 'machinery subsystem' once per machinery tick for each machine that is listed in its 'machines' list. - is_operational() + process_atmos() + Called by the 'air subsystem' once per atmos tick for each machine that is listed in its 'atmos_machines' list. + + is_operational() Returns 0 if the machine is unpowered, broken or undergoing maintenance, something else if not Compiled by Aygar @@ -94,6 +97,7 @@ Class Procs: name = "machinery" icon = 'icons/obj/stationobjs.dmi' verb_yell = "blares" + pressure_resistance = 10 var/stat = 0 var/emagged = 0 var/use_power = 1 @@ -132,6 +136,9 @@ Class Procs: /obj/machinery/process()//If you dont use process or power why are you here return PROCESS_KILL +/obj/machinery/proc/process_atmos()//If you dont use process why are you here + return PROCESS_KILL + /obj/machinery/emp_act(severity) if(use_power && stat == 0) use_power(7500/severity) @@ -227,7 +234,7 @@ Class Procs: if(be_close && in_range(M, src)) return 1 else - src << "You don't have the dexterity to do this!" + src << "You don't have the dexterity to do this!" return /mob/living/carbon/human/canUseTopic(atom/movable/M, be_close = 0) @@ -275,31 +282,28 @@ Class Procs: //set_machine must be 0 if clicking the machinery doesn't bring up a dialog /obj/machinery/attack_hand(mob/user as mob, var/check_power = 1, var/set_machine = 1) - if(check_power && stat & NOPOWER) - user << "\The [src] seems unpowered." - return 1 - if(!interact_offline && stat & (BROKEN|MAINT)) - user << "\The [src] seems broken." - return 1 if(user.lying || user.stat) return 1 if(!user.IsAdvancedToolUser()) - usr << "You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return 1 -/* - //distance checks are made by atom/proc/DblClick - if ((get_dist(src, user) > 1 || !istype(src.loc, /turf)) && !istype(user, /mob/living/silicon)) - return 1 -*/ if (ishuman(user)) var/mob/living/carbon/human/H = user if(H.getBrainLoss() >= 60) visible_message("[H] stares cluelessly at [src] and drools.") return 1 else if(prob(H.getBrainLoss())) - user << "You momentarily forget how to use [src]." + user << "You momentarily forget how to use [src]!" return 1 - + if(panel_open) + src.add_fingerprint(user) + return 0 + if(check_power && stat & NOPOWER) + user << "\The [src] seems unpowered." + return 1 + if(!interact_offline && stat & (BROKEN|MAINT)) + user << "\The [src] seems broken." + return 1 src.add_fingerprint(user) if(set_machine) user.set_machine(src) @@ -361,10 +365,10 @@ Class Procs: /obj/machinery/proc/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20) if(istype(W)) - user << "Now [anchored ? "un" : ""]securing [name]." + user << "You begin [anchored ? "un" : ""]securing [name]..." playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, time)) - user << "You've [anchored ? "un" : ""]secured [name]." + user << "You [anchored ? "un" : ""]secure [name]." anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) return 1 @@ -373,9 +377,13 @@ Class Procs: /obj/machinery/proc/exchange_parts(mob/user, obj/item/weapon/storage/part_replacer/W) var/shouldplaysound = 0 if(istype(W) && component_parts) - if(panel_open) + if(panel_open || W.works_from_distance) var/obj/item/weapon/circuitboard/CB = locate(/obj/item/weapon/circuitboard) in component_parts var/P + if(W.works_from_distance) + user << "Following parts detected in the machine:" + for(var/var/obj/item/C in component_parts) + user << " [C.name]" for(var/obj/item/weapon/stock_parts/A in component_parts) for(var/D in CB.req_components) if(ispath(A.type, D)) @@ -405,3 +413,6 @@ Class Procs: //called on machinery construction (i.e from frame to machinery) but not on initialization /obj/machinery/proc/construction() return + +/obj/machinery/allow_drop() + return 0 \ No newline at end of file diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 490280f4edc..41ebba50ddb 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -46,6 +46,7 @@ if(radio_controller) radio_controller.remove_object(src, freq) ..() + center = null // update the invisibility and icon /obj/machinery/magnetic_module/hide(var/intact) @@ -244,6 +245,8 @@ if(radio_controller) radio_controller.remove_object(src, frequency) ..() + magnets = null + rpath = null /obj/machinery/magnetic_controller/process() if(magnets.len == 0 && autolink) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 3851c577c72..e23456392ae 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -1,5 +1,5 @@ // Navigation beacon for AI robots -// Functions as a transponder: looks for incoming signal matching +// No longer exists on the radio controller, it is managed by a global list. /obj/machinery/navbeacon @@ -18,7 +18,7 @@ var/list/codes // assoc. list of transponder codes var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value" - req_access = list(access_engine) + req_access = list(access_engine, access_robotics) /obj/machinery/navbeacon/New() ..() @@ -27,14 +27,15 @@ var/turf/T = loc hide(T.intact) - - spawn(5) // must wait for map loading to finish - if(radio_controller) - radio_controller.add_object(src, freq, RADIO_NAVBEACONS) + if(codes["patrol"]) + navbeacons += src //Register with the patrol list! + if(codes["delivery"]) + deliverybeacons += src + deliverybeacontags += location /obj/machinery/navbeacon/Destroy() - if(radio_controller) - radio_controller.remove_object(src, freq) + navbeacons &= src //Remove from beacon list, if in one. + deliverybeacons &= src ..() // set the transponder codes assoc list from codes_txt @@ -72,38 +73,6 @@ else icon_state = "[state]" - -// look for a signal of the form "findbeacon=X" -// where X is any -// or the location -// or one of the set transponder keys -// if found, return a signal -/obj/machinery/navbeacon/receive_signal(datum/signal/signal) - - var/request = signal.data["findbeacon"] - if(request && ((request in codes) || request == "any" || request == location)) - spawn(1) - post_signal() - -// return a signal giving location and transponder codes - -/obj/machinery/navbeacon/proc/post_signal() - - var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq) - - if(!frequency) return - - var/datum/signal/signal = new() - signal.source = src - signal.transmission_method = 1 - signal.data["beacon"] = location - - for(var/key in codes) - signal.data[key] = codes[key] - - frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS) - - /obj/machinery/navbeacon/attackby(var/obj/item/I, var/mob/user, params) var/turf/T = loc if(T.intact) @@ -112,7 +81,7 @@ if(istype(I, /obj/item/weapon/screwdriver)) open = !open - user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") + user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") updateicon() @@ -120,12 +89,12 @@ if(open) if (src.allowed(user)) src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + user << "Controls are now [src.locked ? "locked" : "unlocked"]." else user << "Access denied." updateDialog() else - user << "You must open the cover first!" + user << "You must open the cover first!" return /obj/machinery/navbeacon/attack_ai(var/mob/user) @@ -143,7 +112,7 @@ return // prevent intraction when T-scanner revealed if(!open && !ai) // can't alter controls if not open, unless you're an AI - user << "The beacon's control cover is closed." + user << "The beacon's control cover is closed!" return @@ -152,7 +121,6 @@ if(locked && !ai) t = {"Navigation Beacon
(swipe card to unlock controls)
-Frequency: [format_frequency(freq)]
Location: [location ? location : "(none)"]
Transponder Codes:
- "}
@@ -164,25 +132,21 @@ Transponder Codes:
- [key] ... [codes[key]]"
- t += " (edit)"
- t += " (delete)
" - t += "(add new)
" + t += " Edit" + t += " Delete
" + t += " Add New
" t+= "
- "}
t = {"Navigation Beacon
(swipe card to lock controls)
-Frequency: -- -- -[format_frequency(freq)] -+ -+
+
-Location: [location ? location : "(none)"]
+Location: [location ? location : "None"]
Transponder Codes:
- "}
for(var/key in codes)
t += "
- "}
if(open && !locked)
usr.set_machine(src)
- if (href_list["freq"])
- freq = sanitize_frequency(freq + text2num(href_list["freq"]))
- updateDialog()
-
- else if(href_list["locedit"])
+ if(href_list["locedit"])
var/newloc = copytext(sanitize(input("Enter New Location", "Navigation Beacon", location) as text|null),1,MAX_MESSAGE_LEN)
if(newloc)
location = newloc
@@ -240,8 +200,4 @@ Transponder Codes:
- "}
codes[newkey] = newval
- updateDialog()
-
-
-
-
+ updateDialog()
\ No newline at end of file
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index a69a1526de8..5c3e80e238d 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -1,70 +1,123 @@
-//##############################################
-//################### NEWSCASTERS BE HERE! ####
-//###-Agouri###################################
+var/datum/newscaster/feed_network/news_network = new /datum/newscaster/feed_network
+var/list/obj/machinery/newscaster/allCasters = list()
-/datum/feed_comment
+/datum/newscaster
+
+/datum/newscaster/feed_comment
var/author = ""
var/body = ""
var/time_stamp = ""
-/datum/feed_message
+/datum/newscaster/feed_message
var/author =""
var/body =""
- //var/parent_channel
- var/backup_body =""
- var/backup_author =""
+ var/list/authorCensorTime = list()
+ var/list/bodyCensorTime = list()
var/is_admin_message = 0
var/icon/img = null
var/time_stamp = ""
- var/list/datum/feed_comment/comments = list()
+ var/list/datum/newscaster/feed_comment/comments = list()
var/locked = 0
var/caption = ""
+ var/creationTime
+ var/authorCensor
+ var/bodyCensor
-/datum/feed_channel
- var/channel_name=""
- var/list/datum/feed_message/messages = list()
- //var/message_count = 0
- var/locked=0
- var/author=""
- var/backup_author=""
- var/censored=0
- var/is_admin_channel=0
- //var/page = null //For newspapers
+/datum/newscaster/feed_message/proc/returnAuthor(censor)
+ if(censor == -1)
+ censor = authorCensor
+ var/txt = "[news_network.redactedText]"
+ if(!censor)
+ txt = author
+ return txt
-/datum/feed_message/proc/clear()
- src.author = ""
- src.body = ""
- src.backup_body = ""
- src.backup_author = ""
- src.img = null
- src.locked = 0
+/datum/newscaster/feed_message/proc/returnBody(censor)
+ if(censor == -1)
+ censor = bodyCensor
+ var/txt = "[news_network.redactedText]"
+ if(!censor)
+ txt = body
+ return txt
-/datum/feed_channel/proc/clear()
- src.channel_name = ""
- src.messages = list()
- src.locked = 0
- src.author = ""
- src.backup_author = ""
- src.censored = 0
- src.is_admin_channel = 0
+/datum/newscaster/feed_message/proc/toggleCensorAuthor()
+ if(authorCensor)
+ authorCensorTime.Add(news_network.lastAction*-1)
+ else
+ authorCensorTime.Add(news_network.lastAction)
+ authorCensor = !authorCensor
+ news_network.lastAction ++
-/datum/feed_network
- var/list/datum/feed_channel/network_channels = list()
- var/datum/feed_message/wanted_issue
+/datum/newscaster/feed_message/proc/toggleCensorBody()
+ if(bodyCensor)
+ bodyCensorTime.Add(news_network.lastAction*-1)
+ else
+ bodyCensorTime.Add(news_network.lastAction)
+ bodyCensor = !bodyCensor
+ news_network.lastAction ++
-/datum/feed_network/New()
+/datum/newscaster/feed_channel
+ var/channel_name = ""
+ var/list/datum/newscaster/feed_message/messages = list()
+ var/locked = 0
+ var/author = ""
+ var/censored = 0
+ var/list/authorCensorTime = list()
+ var/list/DclassCensorTime = list()
+ var/authorCensor
+ var/is_admin_channel = 0
+
+/datum/newscaster/feed_channel/proc/returnAuthor(censor)
+ if(censor == -1)
+ censor = authorCensor
+ var/txt = "[news_network.redactedText]"
+ if(!censor)
+ txt = author
+ return txt
+
+/datum/newscaster/feed_channel/proc/toggleCensorDclass()
+ if(censored)
+ DclassCensorTime.Add(news_network.lastAction*-1)
+ else
+ DclassCensorTime.Add(news_network.lastAction)
+ censored = !censored
+ news_network.lastAction ++
+
+/datum/newscaster/feed_channel/proc/toggleCensorAuthor()
+ if(authorCensor)
+ authorCensorTime.Add(news_network.lastAction*-1)
+ else
+ authorCensorTime.Add(news_network.lastAction)
+ authorCensor = !authorCensor
+ news_network.lastAction ++
+
+/datum/newscaster/wanted_message
+ var/active
+ var/criminal
+ var/body
+ var/scannedUser
+ var/isAdminMsg
+ var/icon/img
+
+/datum/newscaster/feed_network
+ var/list/datum/newscaster/feed_channel/network_channels = list()
+ var/datum/newscaster/wanted_message/wanted_issue
+ var/lastAction
+ var/redactedText = "\[REDACTED\]"
+
+/datum/newscaster/feed_network/New()
CreateFeedChannel("Station Announcements", "SS13", 1)
+ wanted_issue = new /datum/newscaster/wanted_message
-/datum/feed_network/proc/CreateFeedChannel(var/channel_name, var/author, var/locked, var/adminChannel = 0)
- var/datum/feed_channel/newChannel = new /datum/feed_channel
+/datum/newscaster/feed_network/proc/CreateFeedChannel(channel_name, author, locked, adminChannel = 0)
+ var/datum/newscaster/feed_channel/newChannel = new /datum/newscaster/feed_channel
newChannel.channel_name = channel_name
newChannel.author = author
newChannel.locked = locked
newChannel.is_admin_channel = adminChannel
network_channels += newChannel
-/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/allow_comments = 1)
- var/datum/feed_message/newMsg = new /datum/feed_message
+/datum/newscaster/feed_network/proc/SubmitArticle(msg, author, channel_name, obj/item/weapon/photo/photo, adminMessage = 0, allow_comments = 1)
+ var/datum/newscaster/feed_message/newMsg = new /datum/newscaster/feed_message
newMsg.author = author
newMsg.body = msg
newMsg.time_stamp = "[worldtime2text()]"
@@ -73,17 +126,37 @@
if(photo)
newMsg.img = photo.img
newMsg.caption = photo.scribble
- for(var/datum/feed_channel/FC in network_channels)
+ for(var/datum/newscaster/feed_channel/FC in network_channels)
if(FC.channel_name == channel_name)
- FC.messages += newMsg //Adding message to the network's appropriate feed_channel
+ FC.messages += newMsg
break
for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
NEWSCASTER.newsAlert(channel_name)
+ lastAction ++
+ newMsg.creationTime = lastAction
+/datum/newscaster/feed_network/proc/submitWanted(criminal, body, scanned_user, obj/item/weapon/photo/photo, adminMsg = 0, newMessage = 0)
+ wanted_issue.active = 1
+ wanted_issue.criminal = criminal
+ wanted_issue.body = body
+ wanted_issue.scannedUser = scanned_user
+ wanted_issue.isAdminMsg = adminMsg
+ if(photo)
+ wanted_issue.img = photo.img
+ if(newMessage)
+ for(var/obj/machinery/newscaster/N in allCasters)
+ N.newsAlert()
+ N.update_icon()
-var/datum/feed_network/news_network = new /datum/feed_network //The global news-network, which is coincidentally a global list.
+/datum/newscaster/feed_network/proc/deleteWanted()
+ wanted_issue.active = 0
+ wanted_issue.criminal = null
+ wanted_issue.body = null
+ wanted_issue.scannedUser = null
+ wanted_issue.img = null
+ for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+ NEWSCASTER.update_icon()
-var/list/obj/machinery/newscaster/allCasters = list() //Global list that will contain reference to all newscasters in existence.
/obj/item/newscaster_frame
@@ -103,13 +176,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
var/turf/loc = get_turf(usr)
var/area/A = loc.loc
if (!istype(loc, /turf/simulated/floor))
- usr << "Newscaster cannot be placed on this spot."
+ usr << "Newscaster cannot be placed on this spot!"
return
if (A.requires_power == 0 || A.name == "Space")
- usr << "Newscaster cannot be placed in this area."
+ usr << "Newscaster cannot be placed in this area!"
return
for(var/obj/machinery/newscaster/T in loc)
- usr << "There is another newscaster here."
+ usr << "There is another newscaster here!"
return
var/obj/machinery/newscaster/N = new(loc)
N.pixel_y -= (loc.y - on_wall.y) * 32
@@ -117,8 +190,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
qdel(src)
-
-
/obj/machinery/newscaster
name = "newscaster"
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!"
@@ -127,138 +198,103 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
verb_say = "beeps"
verb_ask = "beeps"
verb_exclaim = "beeps"
- var/isbroken = 0 //1 if someone banged it with something heavy
- var/ispowered = 1 //starts powered, changes with power_change()
- //var/list/datum/feed_channel/channel_list = list() //This list will contain the names of the feed channels. Each name will refer to a data region where the messages of the feed channels are stored.
- //OBSOLETE: We're now using a global news network
+ var/isbroken = 0
+ var/ispowered = 1
var/screen = 0
- // 0 = welcome screen - main menu
- // 1 = view feed channels
- // 2 = create feed channel
- // 3 = create feed story
- // 4 = feed story submited sucessfully
- // 5 = feed channel created successfully
- // 6 = ERROR: Cannot create feed story
- // 7 = ERROR: Cannot create feed channel
- // 8 = print newspaper
- // 9 = viewing channel feeds
- // 10 = censor feed story
- // 11 = censor feed channel
- //Holy shit this is outdated, made this when I was still starting newscasters :3
var/paper_remaining = 0
var/securityCaster = 0
- // 0 = Caster cannot be used to issue wanted posters
- // 1 = the opposite
- var/unit_no = 0 //Each newscaster has a unit number
- //var/datum/feed_message/wanted //We're gonna use a feed_message to store data of the wanted person because fields are similar
- //var/wanted_issue = 0 //OBSOLETE
- // 0 = there's no WANTED issued, we don't need a special icon_state
- // 1 = Guess what.
+ var/unit_no = 0
var/alert_delay = 500
var/alert = 0
- // 0 = there hasn't been a news/wanted update in the last alert_delay
- // 1 = there has
- var/scanned_user = "Unknown" //Will contain the name of the person who currently uses the newscaster
- var/msg = ""; //Feed message
+ var/scanned_user = "Unknown"
+ var/msg = ""
var/obj/item/weapon/photo/photo = null
- var/channel_name = ""; //the feed channel which will be receiving the feed, or being created
- var/c_locked=0; //Will our new channel be locked to public submissions?
- var/hitstaken = 0 //Death at 3 hits from an item with force>=15
- var/datum/feed_channel/viewing_channel = null
+ var/channel_name = ""
+ var/c_locked=0
+ var/hitstaken = 0
+ var/datum/newscaster/feed_channel/viewing_channel = null
var/allow_comments = 1
luminosity = 0
anchored = 1
-
-/obj/machinery/newscaster/security_unit //Security unit
+/obj/machinery/newscaster/security_unit
name = "security newscaster"
securityCaster = 1
/obj/machinery/newscaster/New()
allCasters += src
- src.paper_remaining = 15
+ paper_remaining = 15
for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
- src.unit_no++
- src.update_icon() //for any custom ones on the map...
- ..() //I just realised the newscasters weren't in the global machines list. The superconstructor call will tend to that
+ unit_no++
+ update_icon()
+ ..()
/obj/machinery/newscaster/Destroy()
allCasters -= src
+ viewing_channel = null
+ photo = null
..()
/obj/machinery/newscaster/update_icon()
if(!ispowered || isbroken)
icon_state = "newscaster_off"
- if(isbroken) //If the thing is smashed, add crack overlay on top of the unpowered sprite.
- src.overlays.Cut()
- src.overlays += image(src.icon, "crack3")
+ if(isbroken)
+ overlays.Cut()
+ overlays += image(icon, "crack3")
return
-
- src.overlays.Cut() //reset overlays
-
- if(news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message
+ overlays.Cut()
+ if(news_network.wanted_issue.active)
icon_state = "newscaster_wanted"
return
-
- if(alert) //new message alert overlay
- src.overlays += "newscaster_alert"
-
- if(hitstaken > 0) //Cosmetic damage overlay
- src.overlays += image(src.icon, "crack[hitstaken]")
-
+ if(alert)
+ overlays += "newscaster_alert"
+ if(hitstaken > 0)
+ overlays += image(icon, "crack[hitstaken]")
icon_state = "newscaster_normal"
- return
/obj/machinery/newscaster/power_change()
- if(isbroken) //Broken shit can't be powered.
+ if(isbroken)
return
- if( src.powered() )
- src.ispowered = 1
+ if(powered())
+ ispowered = 1
stat &= ~NOPOWER
- src.update_icon()
+ update_icon()
else
spawn(rand(0, 15))
- src.ispowered = 0
+ ispowered = 0
stat |= NOPOWER
- src.update_icon()
-
+ update_icon()
/obj/machinery/newscaster/ex_act(severity, target)
switch(severity)
if(1.0)
qdel(src)
- return
if(2.0)
- src.isbroken=1
+ isbroken=1
if(prob(50))
qdel(src)
else
- src.update_icon() //can't place it above the return and outside the if-else. or we might get runtimes of null.update_icon() if(prob(50)) goes in.
- return
+ update_icon()
else
if(prob(50))
- src.isbroken=1
- src.update_icon()
- return
- return
+ isbroken=1
+ update_icon()
-/obj/machinery/newscaster/attack_ai(mob/user as mob)
- return src.attack_hand(user)
+/obj/machinery/newscaster/attack_ai(mob/user)
+ return attack_hand(user)
-/obj/machinery/newscaster/attack_hand(mob/user as mob) //########### THE MAIN BEEF IS HERE! And in the proc below this...############
- if(!src.ispowered || src.isbroken)
+/obj/machinery/newscaster/attack_hand(mob/user)
+ if(!ispowered || isbroken)
return
if(istype(user, /mob/living/carbon/human) || istype(user,/mob/living/silicon) )
var/mob/living/human_or_robot_user = user
var/dat
-
- src.scan_user(human_or_robot_user) //Newscaster scans you
-
+ scan_user(human_or_robot_user)
switch(screen)
if(0)
- dat += "Welcome to Newscasting Unit #[src.unit_no].
Interface & News networks Operational." + dat += "Welcome to Newscasting Unit #[unit_no].
Interface & News networks Operational." dat += "
Property of Nanotransen Inc" - if(news_network.wanted_issue) + if(news_network.wanted_issue.active) dat+= "
Read Wanted Issue" dat+= "
Create Feed Channel" dat+= "
View Feed Channels" @@ -266,125 +302,113 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+= "
Print newspaper" dat+= "
Re-scan User" dat+= "
Exit" - if(src.securityCaster) + if(securityCaster) var/wanted_already = 0 - if(news_network.wanted_issue) + if(news_network.wanted_issue.active) wanted_already = 1 - dat+="
Feed Security functions:
" dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" dat+="
Censor Feed Stories" dat+="
Mark Feed Channel with Nanotrasen D-Notice" - dat+="
The newscaster recognises you as: [src.scanned_user]" + dat+="
The newscaster recognises you as: [scanned_user]" if(1) dat+= "Station Feed Channels
" if( isemptylist(news_network.network_channels) ) dat+="No active channels found..." else - for(var/datum/feed_channel/CHANNEL in news_network.network_channels) + for(var/datum/newscaster/feed_channel/CHANNEL in news_network.network_channels) if(CHANNEL.is_admin_channel) dat+="[CHANNEL.channel_name]
" else dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" - /*for(var/datum/feed_channel/CHANNEL in src.channel_list) - dat+="[CHANNEL.channel_name]:
\[created by: [CHANNEL.author]\]
" - if( isemptylist(CHANNEL.messages) ) - dat+="No feed messages found in channel...
" - else - for(var/datum/feed_message/MESSAGE in CHANNEL.messages) - dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
"*/ - dat+="
Refresh" dat+="
Back" if(2) dat+="Creating new Feed Channel..." - dat+="
Channel Name: [src.channel_name]
" - dat+="Channel Author: [src.scanned_user]
" - dat+="Will Accept Public Feeds: [(src.c_locked) ? ("NO") : ("YES")]
" + dat+="
Channel Name: [channel_name]
" + dat+="Channel Author: [scanned_user]
" + dat+="Will Accept Public Feeds: [(c_locked) ? ("NO") : ("YES")]
" dat+="
Submit
Cancel
" if(3) dat+="Creating new Feed Message..." - dat+="
Receiving Channel: [src.channel_name]
" //MARK - dat+="Message Author: [src.scanned_user]
" - dat+="Message Body:
[parsepencode(src.msg, user, SIGNFONT)]
" - dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + dat+="
Receiving Channel: [channel_name]
" + dat+="Message Author: [scanned_user]
" + dat+="Message Body:
[parsepencode(msg, user, SIGNFONT)]
" + dat+="Attach Photo: [(photo ? "Photo Attached" : "No Photo")]" dat+="Comments [allow_comments ? "Enabled" : "Disabled"]
" dat+="
Submit
Cancel
" if(4) - dat+="Feed story successfully submitted to [src.channel_name].
" + dat+="Feed story successfully submitted to [channel_name].
" dat+="
Return
" if(5) - dat+="Feed Channel [src.channel_name] created successfully.
" + dat+="Feed Channel [channel_name] created successfully.
" dat+="
Return
" if(6) dat+="ERROR: Could not submit Feed story to Network.
" - if(src.channel_name=="") + if(channel_name=="") dat+="•Invalid receiving channel name.
" - if(src.scanned_user=="Unknown") + if(scanned_user=="Unknown") dat+="•Channel author unverified.
" - if(src.msg == "" || src.msg == "\[REDACTED\]") + if(msg == "" || msg == "\[REDACTED\]") dat+="•Invalid message body.
" - dat+="
Return
" if(7) dat+="ERROR: Could not submit Feed Channel to Network.
" - //var/list/existing_channels = list() //Let's get dem existing channels - OBSOLETE var/list/existing_authors = list() - for(var/datum/feed_channel/FC in news_network.network_channels) - //existing_channels += FC.channel_name //OBSOLETE - if(FC.author == "\[REDACTED\]") - existing_authors += FC.backup_author + for(var/datum/newscaster/feed_channel/FC in news_network.network_channels) + if(FC.authorCensor) + existing_authors += news_network.redactedText else existing_authors += FC.author - if(src.scanned_user in existing_authors) + if(scanned_user in existing_authors) dat+="•There already exists a Feed channel under your name.
" - if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") + if(channel_name=="" || channel_name == "\[REDACTED\]") dat+="•Invalid channel name.
" var/check = 0 - for(var/datum/feed_channel/FC in news_network.network_channels) - if(FC.channel_name == src.channel_name) + for(var/datum/newscaster/feed_channel/FC in news_network.network_channels) + if(FC.channel_name == channel_name) check = 1 break if(check) dat+="•Channel name already in use.
" - if(src.scanned_user=="Unknown") + if(scanned_user=="Unknown") dat+="•Channel author unverified.
" dat+="
Return
" if(8) var/total_num=length(news_network.network_channels) var/active_num=total_num var/message_num=0 - for(var/datum/feed_channel/FC in news_network.network_channels) + for(var/datum/newscaster/feed_channel/FC in news_network.network_channels) if(!FC.censored) - message_num += length(FC.messages) //Dont forget, datum/feed_channel's var messages is a list of datum/feed_message + message_num += length(FC.messages) else active_num-- - dat+="Network currently serves a total of [total_num] Feed channels, [active_num] of which are active, and a total of [message_num] Feed Stories." //TODO: CONTINUE - dat+="
Liquid Paper remaining: [(src.paper_remaining) *100 ] cm^3" + dat+="Network currently serves a total of [total_num] Feed channels, [active_num] of which are active, and a total of [message_num] Feed Stories." + dat+="
Liquid Paper remaining: [(paper_remaining) *100 ] cm^3" dat+="
Print Paper" dat+="
Cancel" if(9) - dat+="[src.viewing_channel.channel_name]: \[created by: [src.viewing_channel.author]\]
" - if(src.viewing_channel.censored) + dat+="[viewing_channel.channel_name]: \[created by: [viewing_channel.returnAuthor(-1)]\]
" + if(viewing_channel.censored) dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.
" else - if( isemptylist(src.viewing_channel.messages) ) + if( isemptylist(viewing_channel.messages) ) dat+="No feed messages found in channel...
" else var/i = 0 - for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) + for(var/datum/newscaster/feed_message/MESSAGE in viewing_channel.messages) i++ - dat+="-[MESSAGE.body]
" + dat+="-[MESSAGE.returnBody(-1)]
" if(MESSAGE.img) usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") dat+="
" if(MESSAGE.caption) dat+="[MESSAGE.caption]
" dat+="
" - dat+="\[Story by [MESSAGE.author] \] - ([MESSAGE.time_stamp])
" + dat+="\[Story by [MESSAGE.returnAuthor(-1)] \] - ([MESSAGE.time_stamp])
" dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]
" - for(var/datum/feed_comment/comment in MESSAGE.comments) + for(var/datum/newscaster/feed_comment/comment in MESSAGE.comments) dat+="[comment.body]
[comment.author] [comment.time_stamp]
" if(MESSAGE.locked) dat+="Comments locked
" @@ -400,7 +424,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(isemptylist(news_network.network_channels)) dat+="No feed channels found active...
" else - for(var/datum/feed_channel/CHANNEL in news_network.network_channels) + for(var/datum/newscaster/feed_channel/CHANNEL in news_network.network_channels) dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" dat+="
Cancel" if(11) @@ -411,80 +435,75 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(isemptylist(news_network.network_channels)) dat+="No feed channels found active...
" else - for(var/datum/feed_channel/CHANNEL in news_network.network_channels) + for(var/datum/newscaster/feed_channel/CHANNEL in news_network.network_channels) dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
" - dat+="
Back" if(12) - dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" - dat+="[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]
" - - - if( isemptylist(src.viewing_channel.messages) ) + dat+="[viewing_channel.channel_name]: \[ created by: [viewing_channel.returnAuthor(-1)] \]
" + dat+="[(viewing_channel.authorCensor) ? ("Undo Author censorship") : ("Censor channel Author")]
" + if(isemptylist(viewing_channel.messages)) dat+="No feed messages found in channel...
" else - for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) - dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" - dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + for(var/datum/newscaster/feed_message/MESSAGE in viewing_channel.messages) + dat+="-[MESSAGE.returnBody(-1)]
\[Story by [MESSAGE.returnAuthor(-1)]\]
" + dat+="[(MESSAGE.bodyCensor) ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.authorCensor) ? ("Undo Author Censorship") : ("Censor message Author")]
" dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
" - for(var/datum/feed_comment/comment in MESSAGE.comments) + for(var/datum/newscaster/feed_comment/comment in MESSAGE.comments) dat+="[comment.body] X
[comment.author] [comment.time_stamp]
" dat+="
Back" if(13) - dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" - dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
" - if(src.viewing_channel.censored) + dat+="[viewing_channel.channel_name]: \[ created by: [viewing_channel.returnAuthor(-1)] \]
" + dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
" + if(viewing_channel.censored) dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
" dat+="No further feed story additions are allowed while the D-Notice is in effect.
" else - if( isemptylist(src.viewing_channel.messages) ) + if(isemptylist(viewing_channel.messages)) dat+="No feed messages found in channel...
" else - for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) - dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" - + for(var/datum/newscaster/feed_message/MESSAGE in viewing_channel.messages) + dat+="-[MESSAGE.returnBody(-1)]
\[Story by [MESSAGE.returnAuthor(-1)]\]
" dat+="
Back" if(14) dat+="Wanted Issue Handler:" var/wanted_already = 0 var/end_param = 1 - if(news_network.wanted_issue) + if(news_network.wanted_issue.active) wanted_already = 1 end_param = 2 - if(wanted_already) dat+="
A wanted issue is already in Feed Circulation. You can edit or cancel it below." dat+="
" - dat+="Criminal Name: [src.channel_name]
" - dat+="Description: [src.msg]
" - dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + dat+="Criminal Name: [channel_name]
" + dat+="Description: [msg]
" + dat+="Attach Photo: [(photo ? "Photo Attached" : "No Photo")]" if(wanted_already) - dat+="Wanted Issue created by: [news_network.wanted_issue.backup_author]
" + dat+="Wanted Issue created by: [news_network.wanted_issue.scannedUser]
" else - dat+="Wanted Issue will be created under prosecutor: [src.scanned_user]
" + dat+="Wanted Issue will be created under prosecutor: [scanned_user]
" dat+="
[(wanted_already) ? ("Edit Issue") : ("Submit")]" if(wanted_already) dat+="
Take down Issue" dat+="
Cancel" if(15) - dat+="Wanted issue for [src.channel_name] is now in Network Circulation.
" + dat+="Wanted issue for [channel_name] is now in Network Circulation.
" dat+="
Return
" if(16) dat+="ERROR: Wanted Issue rejected by Network.
" - if(src.channel_name=="" || src.channel_name == "\[REDACTED\]") + if(channel_name=="" || channel_name == "\[REDACTED\]") dat+="•Invalid name for person wanted.
" - if(src.scanned_user=="Unknown") + if(scanned_user=="Unknown") dat+="•Issue author unverified.
" - if(src.msg == "" || src.msg == "\[REDACTED\]") + if(msg == "" || msg == "\[REDACTED\]") dat+="•Invalid description.
" dat+="
Return
" if(17) dat+="Wanted Issue successfully deleted from Circulation
" dat+="
Return
" if(18) - if(news_network.wanted_issue) - dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [news_network.wanted_issue.backup_author]\]
" - dat+="Criminal: [news_network.wanted_issue.author]
" + if(news_network.wanted_issue.active) + dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [news_network.wanted_issue.scannedUser]\]
" + dat+="Criminal: [news_network.wanted_issue.criminal]
" dat+="Description: [news_network.wanted_issue.body]
" dat+="Photo:: " if(news_network.wanted_issue.img) @@ -496,7 +515,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="No current wanted issue found.
" dat+="
Back
" if(19) - dat+="Wanted issue for [src.channel_name] successfully edited.
" + dat+="Wanted issue for [channel_name] successfully edited.
" dat+="
Return
" if(20) dat+="Printing successful. Please receive your newspaper from the bottom of the machine.
" @@ -504,337 +523,264 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(21) dat+="Unable to print newspaper. Insufficient paper. Please notify maintenance personnel to refill machine storage.
" dat+="Return" - else - dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" - - //human_or_robot_user << browse(dat, "window=newscaster_main;size=400x600") - //onclose(human_or_robot_user, "newscaster_main") - - var/datum/browser/popup = new(human_or_robot_user, "newscaster_main", "Newscaster Unit #[src.unit_no]", 400, 600) + var/datum/browser/popup = new(human_or_robot_user, "newscaster_main", "Newscaster Unit #[unit_no]", 400, 600) popup.set_content(dat) - popup.set_title_image(human_or_robot_user.browse_rsc_icon(src.icon, src.icon_state)) + popup.set_title_image(human_or_robot_user.browse_rsc_icon(icon, icon_state)) popup.open() /obj/machinery/newscaster/Topic(href, href_list) if(..()) return - if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) + if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon))) usr.set_machine(src) scan_user(usr) if(href_list["set_channel_name"]) - src.channel_name = stripped_input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "", MAX_NAME_LEN) - while (findtext(src.channel_name," ") == 1) - src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1) - src.updateUsrDialog() - //src.update_icon() - + channel_name = stripped_input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "", MAX_NAME_LEN) + while (findtext(channel_name," ") == 1) + channel_name = copytext(channel_name,2,lentext(channel_name)+1) + updateUsrDialog() else if(href_list["set_channel_lock"]) - src.c_locked = !src.c_locked - src.updateUsrDialog() - //src.update_icon() - + c_locked = !c_locked + updateUsrDialog() else if(href_list["submit_new_channel"]) var/list/existing_authors = list() - for(var/datum/feed_channel/FC in news_network.network_channels) - //existing_channels += FC.channel_name - if(FC.author == "\[REDACTED\]") - existing_authors += FC.backup_author + for(var/datum/newscaster/feed_channel/FC in news_network.network_channels) + if(FC.authorCensor) + existing_authors += news_network.redactedText else - existing_authors +=FC.author + existing_authors += FC.author var/check = 0 - for(var/datum/feed_channel/FC in news_network.network_channels) - if(FC.channel_name == src.channel_name) + for(var/datum/newscaster/feed_channel/FC in news_network.network_channels) + if(FC.channel_name == channel_name) check = 1 break - if(src.channel_name == "" || src.channel_name == "\[REDACTED\]" || src.scanned_user == "Unknown" || check || (src.scanned_user in existing_authors) ) - src.screen=7 + if(channel_name == "" || channel_name == "\[REDACTED\]" || scanned_user == "Unknown" || check || (scanned_user in existing_authors) ) + screen=7 else var/choice = alert("Please confirm Feed channel creation","Network Channel Handler","Confirm","Cancel") if(choice=="Confirm") scan_user(usr) - news_network.CreateFeedChannel(src.channel_name, src.scanned_user, c_locked) + news_network.CreateFeedChannel(channel_name, scanned_user, c_locked) feedback_inc("newscaster_channels",1) - src.screen=5 - src.updateUsrDialog() - //src.update_icon() - + screen=5 + updateUsrDialog() else if(href_list["set_channel_receiving"]) - //var/list/datum/feed_channel/available_channels = list() var/list/available_channels = list() - for(var/datum/feed_channel/F in news_network.network_channels) + for(var/datum/newscaster/feed_channel/F in news_network.network_channels) if( (!F.locked || F.author == scanned_user) && !F.censored) available_channels += F.channel_name - src.channel_name = input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels - src.updateUsrDialog() - + channel_name = input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels + updateUsrDialog() else if(href_list["set_new_message"]) - var/temp_message = trim(stripped_multiline_input(usr, "Write your Feed story", "Network Channel Handler", src.msg)) + var/temp_message = trim(stripped_multiline_input(usr, "Write your Feed story", "Network Channel Handler", msg)) if(temp_message) - src.msg = temp_message - src.updateUsrDialog() - + msg = temp_message + updateUsrDialog() else if(href_list["set_attachment"]) AttachPhoto(usr) - src.updateUsrDialog() - + updateUsrDialog() else if(href_list["submit_new_message"]) - if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) - src.screen=6 + if(msg =="" || msg=="\[REDACTED\]" || scanned_user == "Unknown" || channel_name == "" ) + screen=6 else - news_network.SubmitArticle("[parsepencode(src.msg, usr, SIGNFONT)]", scanned_user, channel_name, photo, allow_comments) + news_network.SubmitArticle("[parsepencode(msg, usr, SIGNFONT)]", scanned_user, channel_name, photo, 0, allow_comments) feedback_inc("newscaster_stories",1) - src.screen=4 - src.msg = "" - src.updateUsrDialog() - + screen=4 + msg = "" + updateUsrDialog() else if(href_list["create_channel"]) - src.screen=2 - src.updateUsrDialog() - + screen=2 + updateUsrDialog() else if(href_list["create_feed_story"]) - src.screen=3 - src.updateUsrDialog() - + screen=3 + updateUsrDialog() else if(href_list["menu_paper"]) - src.screen=8 - src.updateUsrDialog() + screen=8 + updateUsrDialog() else if(href_list["print_paper"]) - if(!src.paper_remaining) - src.screen=21 + if(!paper_remaining) + screen=21 else - src.print_paper() - src.screen = 20 - src.updateUsrDialog() - + print_paper() + screen = 20 + updateUsrDialog() else if(href_list["menu_censor_story"]) - src.screen=10 - src.updateUsrDialog() - + screen=10 + updateUsrDialog() else if(href_list["menu_censor_channel"]) - src.screen=11 - src.updateUsrDialog() - + screen=11 + updateUsrDialog() else if(href_list["menu_wanted"]) var/already_wanted = 0 - if(news_network.wanted_issue) + if(news_network.wanted_issue.active) already_wanted = 1 - if(already_wanted) - src.channel_name = news_network.wanted_issue.author - src.msg = news_network.wanted_issue.body - src.screen = 14 - src.updateUsrDialog() - + channel_name = news_network.wanted_issue.criminal + msg = news_network.wanted_issue.body + screen = 14 + updateUsrDialog() else if(href_list["set_wanted_name"]) - src.channel_name = trim(stripped_input(usr, "Provide the name of the Wanted person", "Network Security Handler")) - src.updateUsrDialog() - + channel_name = trim(stripped_input(usr, "Provide the name of the Wanted person", "Network Security Handler")) + updateUsrDialog() else if(href_list["set_wanted_desc"]) - src.msg = trim(stripped_input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler")) - src.updateUsrDialog() - + msg = trim(stripped_input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler")) + updateUsrDialog() else if(href_list["submit_wanted"]) var/input_param = text2num(href_list["submit_wanted"]) - if(src.msg == "" || src.channel_name == "" || src.scanned_user == "Unknown") - src.screen = 16 + if(msg == "" || channel_name == "" || scanned_user == "Unknown") + screen = 16 else var/choice = alert("Please confirm Wanted Issue [(input_param==1) ? ("creation.") : ("edit.")]","Network Security Handler","Confirm","Cancel") if(choice=="Confirm") scan_user(usr) - if(input_param==1) //If input_param == 1 we're submitting a new wanted issue. At 2 we're just editing an existing one. See the else below - var/datum/feed_message/WANTED = new /datum/feed_message - WANTED.author = src.channel_name - WANTED.body = src.msg - WANTED.backup_author = src.scanned_user //I know, a bit wacky - if(photo) - WANTED.img = photo.img - news_network.wanted_issue = WANTED - for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) - NEWSCASTER.newsAlert() - NEWSCASTER.update_icon() - src.screen = 15 + if(input_param==1) //If input_param == 1 we're submitting a new wanted issue. At 2 we're just editing an existing one. + news_network.submitWanted(channel_name, msg, scanned_user, photo, 0 , 1) + screen = 15 else - if(news_network.wanted_issue.is_admin_message) + if(news_network.wanted_issue.isAdminMsg) alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot edit it.","Ok") return - news_network.wanted_issue.author = src.channel_name - news_network.wanted_issue.body = src.msg - news_network.wanted_issue.backup_author = src.scanned_user - if(photo) - news_network.wanted_issue.img = photo.img - src.screen = 19 - - src.updateUsrDialog() - + news_network.submitWanted(channel_name, msg, scanned_user, photo) + screen = 19 + updateUsrDialog() else if(href_list["cancel_wanted"]) - if(news_network.wanted_issue.is_admin_message) + if(news_network.wanted_issue.isAdminMsg) alert("The wanted issue has been distributed by a Nanotrasen higherup. You cannot take it down.","Ok") return var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel") if(choice=="Confirm") - news_network.wanted_issue = null - for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) - NEWSCASTER.update_icon() - src.screen=17 - src.updateUsrDialog() - + news_network.deleteWanted() + screen=17 + updateUsrDialog() else if(href_list["view_wanted"]) - src.screen=18 - src.updateUsrDialog() + screen=18 + updateUsrDialog() else if(href_list["censor_channel_author"]) - var/datum/feed_channel/FC = locate(href_list["censor_channel_author"]) + var/datum/newscaster/feed_channel/FC = locate(href_list["censor_channel_author"]) if(FC.is_admin_channel) alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") return - if(FC.author != "\[REDACTED\]") - FC.backup_author = FC.author - FC.author = "\[REDACTED\]" - else - FC.author = FC.backup_author - src.updateUsrDialog() - + FC.toggleCensorAuthor() + updateUsrDialog() else if(href_list["censor_channel_story_author"]) - var/datum/feed_message/MSG = locate(href_list["censor_channel_story_author"]) + var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_author"]) if(MSG.is_admin_message) alert("This message was created by a Nanotrasen Officer. You cannot censor its author.","Ok") return - if(MSG.author != "\[REDACTED\]") - MSG.backup_author = MSG.author - MSG.author = "\[REDACTED\]" - else - MSG.author = MSG.backup_author - src.updateUsrDialog() - + MSG.toggleCensorAuthor() + updateUsrDialog() else if(href_list["censor_channel_story_body"]) - var/datum/feed_message/MSG = locate(href_list["censor_channel_story_body"]) + var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_body"]) if(MSG.is_admin_message) alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok") return - if(MSG.body != "\[REDACTED\]") - MSG.backup_body = MSG.body - MSG.body = "\[REDACTED\]" - else - MSG.body = MSG.backup_body - src.updateUsrDialog() - + MSG.toggleCensorBody() + updateUsrDialog() else if(href_list["pick_d_notice"]) - var/datum/feed_channel/FC = locate(href_list["pick_d_notice"]) - src.viewing_channel = FC - src.screen=13 - src.updateUsrDialog() - + var/datum/newscaster/feed_channel/FC = locate(href_list["pick_d_notice"]) + viewing_channel = FC + screen=13 + updateUsrDialog() else if(href_list["toggle_d_notice"]) - var/datum/feed_channel/FC = locate(href_list["toggle_d_notice"]) + var/datum/newscaster/feed_channel/FC = locate(href_list["toggle_d_notice"]) if(FC.is_admin_channel) alert("This channel was created by a Nanotrasen Officer. You cannot place a D-Notice upon it.","Ok") return - FC.censored = !FC.censored - src.updateUsrDialog() - + FC.toggleCensorDclass() + updateUsrDialog() else if(href_list["view"]) - src.screen=1 - src.updateUsrDialog() - - else if(href_list["setScreen"]) //Brings us to the main menu and resets all fields~ - src.screen = text2num(href_list["setScreen"]) - if (src.screen == 0) - src.scanned_user = "Unknown"; + screen=1 + updateUsrDialog() + else if(href_list["setScreen"]) + screen = text2num(href_list["setScreen"]) + if (screen == 0) + scanned_user = "Unknown"; msg = ""; - src.c_locked=0; + c_locked=0; channel_name=""; - src.viewing_channel = null - src.updateUsrDialog() - + viewing_channel = null + updateUsrDialog() else if(href_list["show_channel"]) - var/datum/feed_channel/FC = locate(href_list["show_channel"]) - src.viewing_channel = FC - src.screen = 9 - src.updateUsrDialog() - + var/datum/newscaster/feed_channel/FC = locate(href_list["show_channel"]) + viewing_channel = FC + screen = 9 + updateUsrDialog() else if(href_list["pick_censor_channel"]) - var/datum/feed_channel/FC = locate(href_list["pick_censor_channel"]) - src.viewing_channel = FC - src.screen = 12 - src.updateUsrDialog() - + var/datum/newscaster/feed_channel/FC = locate(href_list["pick_censor_channel"]) + viewing_channel = FC + screen = 12 + updateUsrDialog() else if(href_list["new_comment"]) - var/datum/feed_message/FM = locate(href_list["new_comment"]) + var/datum/newscaster/feed_message/FM = locate(href_list["new_comment"]) var/cominput = copytext(stripped_input(usr, "Write your message:", "New comment", null),1,141) if(cominput) scan_user(usr) - var/datum/feed_comment/FC = new/datum/feed_comment + var/datum/newscaster/feed_comment/FC = new/datum/newscaster/feed_comment FC.author = scanned_user FC.body = cominput FC.time_stamp = worldtime2text() FM.comments += FC - log_comment("[usr]/([usr.ckey]) as [scanned_user] commented on message [FM.body] -- [FC.body]") + log_comment("[usr]/([usr.ckey]) as [scanned_user] commented on message [FM.returnBody(-1)] -- [FC.body]") updateUsrDialog() - else if(href_list["del_comment"]) - var/datum/feed_comment/FC = locate(href_list["del_comment"]) - var/datum/feed_message/FM = locate(href_list["del_comment_msg"]) + var/datum/newscaster/feed_comment/FC = locate(href_list["del_comment"]) + var/datum/newscaster/feed_message/FM = locate(href_list["del_comment_msg"]) FM.comments -= FC qdel(FC) updateUsrDialog() - else if(href_list["lock_comment"]) - var/datum/feed_message/FM = locate(href_list["lock_comment"]) + var/datum/newscaster/feed_message/FM = locate(href_list["lock_comment"]) FM.locked ^= 1 updateUsrDialog() - else if(href_list["set_comment"]) allow_comments ^= 1 updateUsrDialog() - else if(href_list["refresh"]) - src.updateUsrDialog() - - -/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/living/user as mob, params) + updateUsrDialog() +/obj/machinery/newscaster/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/weapon/wrench)) - user << "Now [anchored ? "un" : ""]securing [name]" - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + user << "You start [anchored ? "un" : ""]securing [name]..." + playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 60)) + user << "You [anchored ? "un" : ""]secure [name]." new /obj/item/newscaster_frame(loc) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) qdel(src) return - - if (isbroken) - playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) - audible_message("[user.name] further abuses the shattered [src.name].", null, 5 ) + if(isbroken) + playsound(loc, 'sound/effects/hit_on_shattered_glass.ogg', 100, 1) + audible_message("[user.name] further abuses the shattered [name].", null, 5 ) else - if(istype(I, /obj/item/weapon) ) + if(istype(I, /obj/item/weapon)) user.do_attack_animation(src) var/obj/item/weapon/W = I if(W.damtype == STAMINA) return if(W.force <15) - audible_message("[user.name] hits the [src.name] with the [W.name] with no visible effect.", null , 5 ) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) + audible_message("[user.name] hits the [name] with the [W.name] with no visible effect.", null , 5 ) + playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1) else hitstaken++ if(hitstaken==3) - audible_message("[user.name] smashes the [src.name]!", null, 5 ) + audible_message("[user.name] smashes the [name]!", null, 5 ) isbroken=1 - playsound(src.loc, 'sound/effects/Glassbr3.ogg', 100, 1) + playsound(loc, 'sound/effects/Glassbr3.ogg', 100, 1) else - audible_message("[user.name] forcefully slams the [src.name] with the [I.name]!", null, 5 ) - playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) + audible_message("[user.name] forcefully slams the [name] with the [I.name]!", null, 5 ) + playsound(loc, 'sound/effects/Glasshit.ogg', 100, 1) else - user << "This does nothing." - src.update_icon() + user << "This does nothing!" + update_icon() - -/obj/machinery/newscaster/attack_paw(mob/user as mob) - user << "The newscaster controls are far too complicated for your tiny brain!" +/obj/machinery/newscaster/attack_paw(mob/user) + user << "The newscaster controls are far too complicated for your tiny brain!" return -/obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob) +/obj/machinery/newscaster/proc/AttachPhoto(mob/user) if(photo) if(!photo.sillynewscastervar) - photo.loc = src.loc + photo.loc = loc if(!issilicon(user)) user.put_in_inactive_hand(photo) else @@ -849,7 +795,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/find var/datum/picture/selection var/obj/item/device/camera/siliconcam/targetcam = null - if(istype(user,/mob/living/silicon/ai)) var/mob/living/silicon/ai/R = user targetcam = R.aicamera @@ -860,8 +805,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else targetcam = R.aicamera else - user << "You cannot interface with silicon photo uploading" //gtfo pAIs - + user << "You cannot interface with silicon photo uploading!" if(targetcam.aipictures.len == 0) usr << "No images saved" return @@ -878,210 +822,210 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co photo = P qdel(P) +/obj/machinery/newscaster/proc/scan_user(mob/living/user) + if(ishuman(user)) + var/mob/living/carbon/human/human_user = user + if(human_user.wear_id) + if(istype(human_user.wear_id, /obj/item/device/pda)) + var/obj/item/device/pda/P = human_user.wear_id + if(P.id) + scanned_user = "[P.id.registered_name] ([P.id.assignment])" + else + scanned_user = "Unknown" + else if(istype(human_user.wear_id, /obj/item/weapon/card/id) ) + var/obj/item/weapon/card/id/ID = human_user.wear_id + scanned_user ="[ID.registered_name] ([ID.assignment])" + else + scanned_user ="Unknown" + else + scanned_user ="Unknown" + else if(istype(user,/mob/living/silicon)) + var/mob/living/silicon/ai_user = user + scanned_user = "[ai_user.name] ([ai_user.job])" + else + ERROR("Newscaster used by non-human/silicon mob: [user.type]") + +/obj/machinery/newscaster/proc/print_paper() + feedback_inc("newscaster_newspapers_printed",1) + var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper + for(var/datum/newscaster/feed_channel/FC in news_network.network_channels) + NEWSPAPER.news_content += FC + if(news_network.wanted_issue.active) + NEWSPAPER.wantedAuthor = news_network.wanted_issue.scannedUser + NEWSPAPER.wantedCriminal = news_network.wanted_issue.criminal + NEWSPAPER.wantedBody = news_network.wanted_issue.body + if(news_network.wanted_issue.img) + NEWSPAPER.wantedPhoto = news_network.wanted_issue.img + NEWSPAPER.loc = get_turf(src) + NEWSPAPER.creationTime = news_network.lastAction + paper_remaining-- + +/obj/machinery/newscaster/proc/newsAlert(channel) + if(channel) + say("Breaking news from [channel]!") + alert ++ + update_icon() + spawn(alert_delay) + alert -- + update_icon() + playsound(loc, 'sound/machines/twobeep.ogg', 75, 1) + else + say("Attention! Wanted issue distributed!") + playsound(loc, 'sound/machines/warning-buzzer.ogg', 75, 1) -//######################################################################################################################## -//###################################### NEWSPAPER! ###################################################################### -//######################################################################################################################## /obj/item/weapon/newspaper name = "newspaper" desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." icon = 'icons/obj/bureaucracy.dmi' icon_state = "newspaper" - w_class = 2 //Let's make it fit in trashbags! + w_class = 2 attack_verb = list("bapped") var/screen = 0 var/pages = 0 var/curr_page = 0 - var/list/datum/feed_channel/news_content = list() - var/datum/feed_message/important_message = null + var/list/datum/newscaster/feed_channel/news_content = list() var/scribble="" var/scribble_page = null + var/wantedAuthor + var/wantedCriminal + var/wantedBody + var/wantedPhoto + var/creationTime -/*obj/item/weapon/newspaper/attack_hand(mob/user as mob) - ..() - world << "derp"*/ - -obj/item/weapon/newspaper/attack_self(mob/user as mob) +/obj/item/weapon/newspaper/attack_self(mob/user) if(ishuman(user)) var/mob/living/carbon/human/human_user = user var/dat - src.pages = 0 + pages = 0 switch(screen) if(0) //Cover dat+="
The Griffon
"
dat+="Nanotrasen-standard newspaper, for use on Nanotrasen© Space Facilities
" - if(isemptylist(src.news_content)) - if(src.important_message) - dat+="Contents:
- **Important Security Announcement** \[page [src.pages+2]\]
- **Important Security Announcement** \[page [pages+2]\]
- "
- for(var/datum/feed_channel/NP in src.news_content)
- src.pages++
- if(src.important_message)
- dat+="**Important Security Announcement** \[page [src.pages+2]\]
" + for(var/datum/newscaster/feed_channel/NP in news_content) + pages++ + if(wantedAuthor) + dat+="**Important Security Announcement** \[page [pages+2]\]
" var/temp_page=0 - for(var/datum/feed_channel/NP in src.news_content) + for(var/datum/newscaster/feed_channel/NP in news_content) temp_page++ dat+="[NP.channel_name] \[page [temp_page+1]\]
" dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" + dat+="
There is a small scribble near the end of this page... It reads: \"[scribble]\"" dat+= "
" if(1) // X channel pages inbetween. - for(var/datum/feed_channel/NP in src.news_content) - src.pages++ //Let's get it right again. - var/datum/feed_channel/C = src.news_content[src.curr_page] - dat+="[C.channel_name] \[created by: [C.author]\]
" - if(C.censored) + for(var/datum/newscaster/feed_channel/NP in news_content) + pages++ + var/datum/newscaster/feed_channel/C = news_content[curr_page] + dat += "[C.channel_name] \[created by: [C.returnAuthor(notContent(C.authorCensorTime))]\]
" + if(notContent(C.DclassCensorTime)) dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a D-Notice. Its contents were not transferred to the newspaper at the time of printing." else if(isemptylist(C.messages)) dat+="No Feed stories stem from this channel..." else - dat+="
- "
var/i = 0
- for(var/datum/feed_message/MESSAGE in C.messages)
+ for(var/datum/newscaster/feed_message/MESSAGE in C.messages)
+ if(MESSAGE.creationTime > creationTime)
+ if(i == 0)
+ dat+="No Feed stories stem from this channel..."
+ break
+ if(i == 0)
+ dat+="
- "
i++
- dat+="-[MESSAGE.body]
" + dat+="-[MESSAGE.returnBody(notContent(MESSAGE.bodyCensorTime))]
" if(MESSAGE.img) user << browse_rsc(MESSAGE.img, "tmp_photo[i].png") dat+="
" - dat+="\[Story by [MESSAGE.author]\]
" + dat+="\[Story by [MESSAGE.returnAuthor(notContent(MESSAGE.authorCensorTime))]\]
" dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" + dat+="
There is a small scribble near the end of this page... It reads: \"[scribble]\"" dat+= "
" if(2) //Last page - for(var/datum/feed_channel/NP in src.news_content) - src.pages++ - if(src.important_message!=null) + for(var/datum/newscaster/feed_channel/NP in news_content) + pages++ + if(wantedAuthor!=null) dat+="
Wanted Issue:
" - dat+="Criminal name: [important_message.author]
" - dat+="Description: [important_message.body]
" + dat+="Criminal name: [wantedCriminal]
" + dat+="Description: [wantedBody]
" dat+="Photo:: " - if(important_message.img) - user << browse_rsc(important_message.img, "tmp_photow.png") + if(wantedPhoto) + user << browse_rsc(wantedPhoto, "tmp_photow.png") dat+="
"
else
dat+="None"
else
dat+="Apart from some uninteresting Classified ads, there's nothing on this page..."
if(scribble_page==curr_page)
- dat+="There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" + dat+="
There is a small scribble near the end of this page... It reads: \"[scribble]\"" dat+= "
" - else - dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" - - dat+="
[src.curr_page+1]
"
+ dat+="[curr_page+1]
"
human_user << browse(dat, "window=newspaper_main;size=300x400")
onclose(human_user, "newspaper_main")
else
user << "The paper is full of intelligible symbols!"
+/obj/item/weapon/newspaper/proc/notContent(list/L)
+ if(!L.len)
+ return 0
+ for(var/i=L.len;i>0;i--)
+ var/num = abs(L[i])
+ if(creationTime <= num)
+ continue
+ else
+ if(L[i] > 0)
+ return 1
+ else
+ return 0
+ return 0
-obj/item/weapon/newspaper/Topic(href, href_list)
+/obj/item/weapon/newspaper/Topic(href, href_list)
var/mob/living/U = usr
..()
if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ))
U.set_machine(src)
if(href_list["next_page"])
- if(curr_page==src.pages+1)
+ if(curr_page == pages+1)
return //Don't need that at all, but anyway.
- if(src.curr_page == src.pages) //We're at the middle, get to the end
- src.screen = 2
+ if(curr_page == pages) //We're at the middle, get to the end
+ screen = 2
else
if(curr_page == 0) //We're at the start, get to the middle
- src.screen=1
- src.curr_page++
- playsound(src.loc, "pageturn", 50, 1)
-
+ screen=1
+ curr_page++
+ playsound(loc, "pageturn", 50, 1)
else if(href_list["prev_page"])
if(curr_page == 0)
return
if(curr_page == 1)
- src.screen = 0
-
+ screen = 0
else
- if(curr_page == src.pages+1) //we're at the end, let's go back to the middle.
- src.screen = 1
- src.curr_page--
- playsound(src.loc, "pageturn", 50, 1)
+ if(curr_page == pages+1) //we're at the end, let's go back to the middle.
+ screen = 1
+ curr_page--
+ playsound(loc, "pageturn", 50, 1)
+ if(ismob(loc))
+ attack_self(loc)
- if (istype(src.loc, /mob))
- src.attack_self(src.loc)
-
-
-obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/weapon/newspaper/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/pen))
- if(src.scribble_page == src.curr_page)
+ if(scribble_page == curr_page)
user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?"
else
var/s = stripped_input(user, "Write something", "Newspaper")
if (!s)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if (!in_range(src, usr) && loc != usr)
return
- src.scribble_page = src.curr_page
- src.scribble = s
- src.attack_self(user)
- return
-
-
-////////////////////////////////////helper procs
-
-
-/obj/machinery/newscaster/proc/scan_user(mob/living/user as mob)
- if(istype(user,/mob/living/carbon/human)) //User is a human
- var/mob/living/carbon/human/human_user = user
- if(human_user.wear_id) //Newscaster scans you
- if(istype(human_user.wear_id, /obj/item/device/pda) ) //autorecognition, woo!
- var/obj/item/device/pda/P = human_user.wear_id
- if(P.id)
- src.scanned_user = "[P.id.registered_name] ([P.id.assignment])"
- else
- src.scanned_user = "Unknown"
- else if(istype(human_user.wear_id, /obj/item/weapon/card/id) )
- var/obj/item/weapon/card/id/ID = human_user.wear_id
- src.scanned_user ="[ID.registered_name] ([ID.assignment])"
- else
- src.scanned_user ="Unknown"
- else
- src.scanned_user ="Unknown"
- else if(istype(user,/mob/living/silicon))
- var/mob/living/silicon/ai_user = user
- src.scanned_user = "[ai_user.name] ([ai_user.job])"
- else
- ERROR("Newscaster used by non-human/silicon mob: [user.type]")
-
-
-/obj/machinery/newscaster/proc/print_paper()
- feedback_inc("newscaster_newspapers_printed",1)
- var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper
- for(var/datum/feed_channel/FC in news_network.network_channels)
- NEWSPAPER.news_content += FC
- if(news_network.wanted_issue)
- NEWSPAPER.important_message = news_network.wanted_issue
- NEWSPAPER.loc = get_turf(src)
- src.paper_remaining--
- return
-
-//Removed for now so these aren't even checked every tick. Left this here in-case Agouri needs it later.
-///obj/machinery/newscaster/process() //Was thinking of doing the icon update through process, but multiple iterations per second does not
-// return //bode well with a newscaster network of 10+ machines. Let's just return it, as it's added in the machines list.
-
-/obj/machinery/newscaster/proc/newsAlert(channel) //This isn't Agouri's work, for it is ugly and vile.
- if(channel) //Who the fuck uses spawn(600) anyway, jesus christ
- say("Breaking news from [channel]!")
- src.alert = 1
- src.update_icon()
- spawn(300)
- src.alert = 0
- src.update_icon()
- playsound(src.loc, 'sound/machines/twobeep.ogg', 75, 1)
- else
- say("Attention! Wanted issue distributed!")
- playsound(src.loc, 'sound/machines/warning-buzzer.ogg', 75, 1)
- return
+ scribble_page = curr_page
+ scribble = s
+ attack_self(user)
\ No newline at end of file
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index e8e0fd7d30d..2491f33c543 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -70,12 +70,6 @@
if("/turf/simulated/wall/r_wall")
colour = rgb(128,96,96)
- if("/turf/unsimulated/floor")
- colour = rgb(240,240,240)
-
- if("/turf/unsimulated/wall", "/turf/unsimulated/wall/other")
- colour = rgb(140,140,140)
-
else
colour = rgb(0,40,0)
@@ -225,12 +219,6 @@
if("/turf/simulated/wall/r_wall")
colour = rgb(128,96,96)
- if("/turf/unsimulated/floor")
- colour = rgb(240,240,240)
-
- if("/turf/unsimulated/wall", "/turf/unsimulated/wall/other")
- colour = rgb(140,140,140)
-
else
colour = rgb(0,40,0)
@@ -340,13 +328,13 @@
return
-proc/getr(col)
+/proc/getr(col)
return hex2num( copytext(col, 2,4))
-proc/getg(col)
+/proc/getg(col)
return hex2num( copytext(col, 4,6))
-proc/getb(col)
+/proc/getb(col)
return hex2num( copytext(col, 6))
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 6e277a7ece8..d56e2129927 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -13,15 +13,13 @@ Buildable meters
#define PIPE_MVALVE 8
#define PIPE_PUMP 9
#define PIPE_SCRUBBER 10
-#define PIPE_INSULATED_STRAIGHT 11
-#define PIPE_INSULATED_BENT 12
-#define PIPE_GAS_FILTER 13
-#define PIPE_GAS_MIXER 14
-#define PIPE_PASSIVE_GATE 15
-#define PIPE_VOLUME_PUMP 16
-#define PIPE_HEAT_EXCHANGE 17
-#define PIPE_DVALVE 18
-#define PIPE_4WAYMANIFOLD 19
+#define PIPE_GAS_FILTER 11
+#define PIPE_GAS_MIXER 12
+#define PIPE_PASSIVE_GATE 13
+#define PIPE_VOLUME_PUMP 14
+#define PIPE_HEAT_EXCHANGE 15
+#define PIPE_DVALVE 16
+#define PIPE_4WAYMANIFOLD 17
//Disposal piping numbers - do NOT hardcode these, use the defines
#define DISP_PIPE_STRAIGHT 0
#define DISP_PIPE_BENT 1
@@ -63,8 +61,6 @@ Buildable meters
src.pipe_type = PIPE_JUNCTION
else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging))
src.pipe_type = PIPE_HE_STRAIGHT + is_bent
- else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/insulated))
- src.pipe_type = PIPE_INSULATED_STRAIGHT + is_bent
else if(istype(make_from, /obj/machinery/atmospherics/pipe/simple))
src.pipe_type = PIPE_SIMPLE_STRAIGHT + is_bent
else if(istype(make_from, /obj/machinery/atmospherics/unary/portables_connector))
@@ -120,8 +116,6 @@ var/global/list/pipeID2State = list(
"mvalve", \
"pump", \
"scrubber", \
- "insulated", \
- "insulated", \
"filter", \
"mixer", \
"passivegate", \
@@ -144,8 +138,6 @@ var/global/list/pipeID2State = list(
"manual valve", \
"pump", \
"scrubber", \
- "insulated pipe", \
- "bent insulated pipe", \
"gas filter", \
"gas mixer", \
"passive gate", \
@@ -197,12 +189,12 @@ var/global/list/pipeID2State = list(
/obj/item/pipe/Move()
..()
- if ((pipe_type in list (PIPE_SIMPLE_BENT, PIPE_HE_BENT, PIPE_INSULATED_BENT)) \
+ if ((pipe_type in list (PIPE_SIMPLE_BENT, PIPE_HE_BENT)) \
&& (src.dir in cardinal))
src.dir = src.dir|turn(src.dir, 90)
else if ((pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER)) && flipped)
src.dir = turn(src.dir, 45+90)
- else if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
+ else if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
if(dir==2)
dir = 1
else if(dir==8)
@@ -225,7 +217,6 @@ var/global/list/pipeID2State = list(
switch(pipe_type)
if( PIPE_SIMPLE_STRAIGHT, \
- PIPE_INSULATED_STRAIGHT, \
PIPE_HE_STRAIGHT, \
PIPE_JUNCTION, \
PIPE_PUMP, \
@@ -235,7 +226,7 @@ var/global/list/pipeID2State = list(
PIPE_DVALVE \
)
return direct|flip
- if(PIPE_SIMPLE_BENT, PIPE_INSULATED_BENT, PIPE_HE_BENT)
+ if(PIPE_SIMPLE_BENT, PIPE_HE_BENT)
return direct //dir|acw
if(PIPE_CONNECTOR,PIPE_UVENT,PIPE_SCRUBBER,PIPE_HEAT_EXCHANGE)
return direct
@@ -287,7 +278,7 @@ var/global/list/pipeID2State = list(
//Helper to clean up dir
/obj/item/pipe/proc/fixdir()
- if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
+ if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_MVALVE, PIPE_DVALVE))
if(dir==2)
dir = 1
else if(dir==8)
@@ -310,7 +301,7 @@ var/global/list/pipeID2State = list(
for(var/obj/machinery/atmospherics/M in src.loc)
if(M.initialize_directions & pipe_dir) // matches at least one direction on either type of pipe
- user << "There is already a pipe at that location."
+ user << "There is already a pipe at that location!"
return 1
// no conflicts found
@@ -380,10 +371,6 @@ var/global/list/pipeID2State = list(
S.name = pipename
S.construction(dir, pipe_dir, pipe_type, color)
- if(PIPE_INSULATED_STRAIGHT, PIPE_INSULATED_BENT)
- var/obj/machinery/atmospherics/pipe/simple/insulated/P = new( src.loc )
- P.construction(dir, pipe_dir, pipe_type, color)
-
if(PIPE_PASSIVE_GATE)
var/obj/machinery/atmospherics/binary/passive_gate/P = new(src.loc)
if (pipename)
@@ -405,8 +392,8 @@ var/global/list/pipeID2State = list(
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user.visible_message( \
"[user] fastens \the [src].", \
- "You have fastened \the [src].", \
- "You hear ratchet.")
+ "You fasten \the [src].", \
+ "You hear ratchet.")
qdel(src) // remove the pipe item
@@ -431,9 +418,9 @@ var/global/list/pipeID2State = list(
if (!istype(W, /obj/item/weapon/wrench))
return ..()
if(!locate(/obj/machinery/atmospherics/pipe, src.loc))
- user << "You need to fasten it to a pipe."
+ user << "You need to fasten it to a pipe!"
return 1
new/obj/machinery/meter( src.loc )
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "You have fastened the meter to the pipe."
+ user << "You fasten the meter to the pipe."
qdel(src)
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 7c68419557b..9d1be6f4519 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -17,27 +17,24 @@
PipeBent Pipe
Manifold
-4-Way Manifold
+4-Way Manifold
Manual Valve
-Digital Valve
+Digital Valve
Devices:
Connector
Vent
Gas Pump
-Passive Gate
-Volume Pump
+Passive Gate
+Volume Pump
Scrubber
Meter
-Gas Filter
-Gas Mixer
+Gas Filter
+Gas Mixer
Heat exchange:
Pipe
Bent Pipe
Junction
-Heat Exchanger
-Insulated pipes:
-Pipe
-Bent Pipe
+Heat Exchanger
"} @@ -86,8 +83,8 @@ add_fingerprint(user) user.visible_message( \ "[user] fastens \the [src].", \ - "You have fastened \the [src]. Now it can dispense pipes.", \ - "You hear ratchet.") + "You fasten \the [src]. Now it can dispense pipes.", \ + "You hear ratchet.") anchored = 1 stat &= MAINT if (usr.machine==src) @@ -99,8 +96,8 @@ add_fingerprint(user) user.visible_message( \ "[user] unfastens \the [src].", \ - "You have unfastened \the [src]. Now it can be pulled somewhere else.", \ - "You hear ratchet.") + "You unfasten \the [src]. Now it can be pulled somewhere else.", \ + "You hear ratchet.") anchored = 0 stat |= ~MAINT power_change() diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 900edaf63ea..188190756d7 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -143,6 +143,7 @@ /obj/machinery/porta_turret/Destroy() //deletes its own cover with it qdel(cover) + cover = null ..() @@ -253,7 +254,7 @@ if(istype(I, /obj/item/weapon/crowbar)) //If the turret is destroyed, you can remove it with a crowbar to //try and salvage its components - user << "You begin prying the metal coverings off." + user << "You begin prying the metal coverings off..." sleep(20) if(prob(70)) user << "You remove the turret and salvage some components." @@ -680,7 +681,7 @@ build_step = 2 icon_state = "turret_frame2" else - user << "You need two sheets of metal to continue construction." + user << "You need two sheets of metal to continue construction!" return else if(istype(I, /obj/item/weapon/wrench)) @@ -703,14 +704,15 @@ if(!WT.isOn()) return if(WT.get_fuel() < 5) //uses up 5 fuel. - user << "You need more fuel to complete this task." + user << "You need more fuel to complete this task!" return playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) + user << "You start to remove the turret's interior metal armor..." if(do_after(user, 20)) if(!src || !WT.remove_fuel(5, user)) return build_step = 1 - user << "You remove the turret's interior metal armor." + user << "You remove the turret's interior metal armor." new /obj/item/stack/sheet/metal( loc, 2) return @@ -722,7 +724,7 @@ return var/obj/item/weapon/gun/energy/E = I //typecasts the item to an energy gun if(!user.unEquip(I)) - user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" + user << "\the [I] is stuck to your hand, you cannot put it in \the [src]!" return installation = I.type //installation becomes I.type gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge @@ -741,9 +743,9 @@ if(isprox(I)) build_step = 5 if(!user.unEquip(I)) - user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" + user << "\the [I] is stuck to your hand, you cannot put it in \the [src]!" return - user << "You add the prox sensor to the turret." + user << "You add the proximity sensor to the turret." qdel(I) return @@ -765,7 +767,7 @@ user << "You add some metal armor to the exterior frame." build_step = 7 else - user << "You need two sheets of metal to continue construction." + user << "You need two sheets of metal to continue construction!" return else if(istype(I, /obj/item/weapon/screwdriver)) @@ -779,9 +781,10 @@ var/obj/item/weapon/weldingtool/WT = I if(!WT.isOn()) return if(WT.get_fuel() < 5) - user << "You need more fuel to complete this task." + user << "You need more fuel to complete this task!" playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) + user << "You begin to weld the turret's armor down..." if(do_after(user, 30)) if(!src || !WT.remove_fuel(5, user)) return diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 8f3d33fafbb..34c13a8bb88 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -12,7 +12,7 @@ /obj/machinery/recharger/attackby(obj/item/weapon/G, mob/user, params) if(istype(user,/mob/living/silicon)) return - if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G, /obj/item/weapon/pickaxe/drill)) + if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton)) if(charging) return @@ -90,17 +90,6 @@ icon_state = "recharger2" else icon_state = "recharger3" - if(istype(charging, /obj/item/weapon/pickaxe/drill)) - var/obj/item/weapon/pickaxe/drill/D = charging - if(D.bcell) - if(D.bcell.give(D.bcell.chargerate)) - icon_state = "recharger1" - use_power(200) - else - icon_state = "recharger2" - else - icon_state = "recharger3" - /obj/machinery/recharger/emp_act(severity) if(stat & (NOPOWER|BROKEN) || !anchored) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 1d1e828514d..30472a439a5 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -43,11 +43,6 @@ process_occupant() return 1 - -/obj/machinery/recharge_station/allow_drop() - return 0 - - /obj/machinery/recharge_station/relaymove(mob/user as mob) if(user.stat) return @@ -157,14 +152,6 @@ F.broken = 0 F.times_used = 0 F.icon_state = "flash" - // Mining - if(istype(O, /obj/item/weapon/pickaxe/drill/cyborg)) - var/obj/item/weapon/pickaxe/drill/cyborg/D = O - if(D.bcell.charge < D.bcell.maxcharge) - D.bcell.charge = min(D.bcell.charge + recharge_speed, D.bcell.maxcharge) - D.update_icon() - if(D.warned) - D.warned = 0 // Security if(istype(O,/obj/item/weapon/gun/energy/gun/advtaser/cyborg)) var/obj/item/weapon/gun/energy/gun/advtaser/cyborg/T = O diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 7c1751ff821..c8a121619cd 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -13,12 +13,38 @@ var/const/SAFETY_COOLDOWN = 100 var/icon_name = "grinder-o" var/blood = 0 var/eat_dir = WEST + var/amount_produced = 1 + var/probability_mod = 1 + var/extra_materials = 0 + var/list/blacklist = list(/obj/item/pipe, /obj/item/pipe_meter, /obj/structure/disposalconstruct, /obj/item/weapon/reagent_containers, /obj/item/weapon/paper, /obj/item/stack/, /obj/item/weapon/pen, /obj/item/weapon/storage/, /obj/item/clothing/mask/cigarette) // Don't allow us to grind things we can poop out at 200 a second for free. /obj/machinery/recycler/New() // On us ..() + component_parts = list() + component_parts += new /obj/item/weapon/circuitboard/recycler(null) + component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) + RefreshParts() update_icon() +/obj/machinery/recycler/RefreshParts() + var/amt_made = 0 + var/prob_mod = 0 + for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts) + amt_made = 1 * B.rating + for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + if(M.rating > 1) + prob_mod = 2 * M.rating + else + prob_mod = 1 * M.rating + if(M.rating >= 3) + extra_materials = 1 + else + extra_materials = 0 + probability_mod = prob_mod + amount_produced = amt_made + /obj/machinery/recycler/examine(mob/user) ..() user << "The power light is [(stat & NOPOWER) ? "off" : "on"]." @@ -31,15 +57,22 @@ var/const/SAFETY_COOLDOWN = 100 /obj/machinery/recycler/attackby(var/obj/item/I, var/mob/user, params) - if(istype(I, /obj/item/weapon/screwdriver)) - if(emagged) - emagged = 0 - update_icon() - user << "You reset the crusher to its default factory settings." - else - ..() + if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I)) return + + if(exchange_parts(user, I)) + return + + if(default_pry_open(I)) + return + + if(default_unfasten_wrench(user, I)) + return + + default_deconstruction_crowbar(I) + ..() add_fingerprint(user) + return /obj/machinery/recycler/emag_act(user as mob) if(!emagged) @@ -70,13 +103,6 @@ var/const/SAFETY_COOLDOWN = 100 return if(safety_mode) return - // If we're not already grinding something. - if(!grinding) - grinding = 1 - spawn(1) - grinding = 0 - else - return var/move_dir = get_dir(loc, AM.loc) if(move_dir == eat_dir) @@ -93,15 +119,40 @@ var/const/SAFETY_COOLDOWN = 100 /obj/machinery/recycler/proc/recycle(var/obj/item/I, var/sound = 1) I.loc = src.loc + if(is_type_in_list(I, blacklist)) + qdel(I) + if(sound) + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) + return qdel(I) - if(prob(15)) - new /obj/item/stack/sheet/metal(loc) - if(prob(10)) - new /obj/item/stack/sheet/glass(loc) - if(prob(2)) - new /obj/item/stack/sheet/plasteel(loc) - if(prob(1)) - new /obj/item/stack/sheet/rglass(loc) + if(prob(15 + probability_mod)) + var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(loc) + M.amount = amount_produced + if(prob(10 + probability_mod)) + var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(loc) + G.amount = amount_produced + if(prob(2 + probability_mod)) + var/obj/item/stack/sheet/plasteel/P = new /obj/item/stack/sheet/plasteel(loc) + P.amount = amount_produced + if(prob(1 + probability_mod)) + var/obj/item/stack/sheet/rglass/R = new /obj/item/stack/sheet/rglass(loc) + R.amount = amount_produced + if(extra_materials) + if(prob(4 + probability_mod)) + var/obj/item/stack/sheet/mineral/plasma/PS = new /obj/item/stack/sheet/mineral/plasma(loc) + PS.amount = amount_produced + if(prob(3 + probability_mod)) + var/obj/item/stack/sheet/mineral/gold/GS = new /obj/item/stack/sheet/mineral/gold(loc) + GS.amount = amount_produced + if(prob(2 + probability_mod)) + var/obj/item/stack/sheet/mineral/silver/S = new /obj/item/stack/sheet/mineral/silver(loc) + S.amount = amount_produced + if(prob(1 + probability_mod)) + var/obj/item/stack/sheet/mineral/bananium/B = new /obj/item/stack/sheet/mineral/bananium(loc) + B.amount = amount_produced + if(prob(1 + probability_mod)) + var/obj/item/stack/sheet/mineral/diamond/D = new /obj/item/stack/sheet/mineral/diamond(loc) + D.amount = amount_produced if(sound) playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 1ba38ab9140..7c7d9efb9a4 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -436,11 +436,11 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params) if (istype(O, /obj/item/weapon/crowbar)) if(open) - user << "You close the maintenance panel." + user << "You close the maintenance panel." open = 0 icon_state="req_comp0" else - user << "You open the maintenance panel." + user << "You open the maintenance panel." open = 1 if(hackState == 0) icon_state="req_comp_open" @@ -449,15 +449,15 @@ var/list/obj/machinery/requests_console/allConsoles = list() if (istype(O, /obj/item/weapon/screwdriver)) if(open) if(hackState == 0) - user << "You modify the wiring." + user << "You modify the wiring." hackState = 1 icon_state="req_comp_rewired" else if(hackState == 1) - user << "You reset the wiring." + user << "You reset the wiring." hackState = 0 icon_state="req_comp_open" else - user << "You can't do much with that." + user << "You can't do much with that!" update_icon() var/obj/item/weapon/card/id/ID = O.GetID() @@ -470,7 +470,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() announceAuth = 1 else announceAuth = 0 - user << "You are not authorized to send announcements." + user << "You are not authorized to send announcements!" updateUsrDialog() if (istype(O, /obj/item/weapon/stamp)) if(screen == 9) diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 85c818f2fd8..2e1c8275332 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -28,7 +28,7 @@ if (O:amount < 1) qdel(O) - user << "You insert [count] metal sheet\s into \the [src]." + user << "You insert [count] metal sheet\s into \the [src]." src.overlays -= "fab-load-metal" updateDialog() else diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 1b1e68bbf6e..2e8aeeecb69 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -142,6 +142,7 @@ /obj/machinery/shieldgen/Destroy() for(var/obj/machinery/shield/shield_tile in deployed_shields) qdel(shield_tile) + deployed_shields = null ..() @@ -210,25 +211,25 @@ /obj/machinery/shieldgen/attack_hand(mob/user as mob) if(locked) - user << "The machine is locked, you are unable to use it." + user << "The machine is locked, you are unable to use it!" return if(is_open) - user << "The panel must be closed before operating this machine." + user << "The panel must be closed before operating this machine!" return if (src.active) - user.visible_message("\icon[src] [user] deactivated the shield generator.", \ - "\icon[src] You deactivate the shield generator.", \ - "You hear heavy droning fade out.") + user.visible_message("[src] [user] deactivated the shield generator.", \ + "[src] You deactivate the shield generator.", \ + "You hear heavy droning fade out.") src.shields_down() else if(anchored) - user.visible_message("\icon[src] [user] activated the shield generator.", \ - "\icon[src] You activate the shield generator.", \ - "You hear heavy droning.") + user.visible_message("[src] [user] activated the shield generator.", \ + "[src] You activate the shield generator.", \ + "You hear heavy droning.") src.shields_up() else - user << "The device must first be secured to the floor." + user << "The device must first be secured to the floor!" return /obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob, params) @@ -244,21 +245,21 @@ else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) - user << "You need one length of cable to repair [src]." + user << "You need one length of cable to repair [src]!" return - user << "You begin to replace the wires." + user << "You begin to replace the wires..." if(do_after(user, 30)) if(coil.get_amount() < 1) return coil.use(1) health = max_health malfunction = 0 - user << "You repair \the [src]!" + user << "You repair \the [src]." update_icon() else if(istype(W, /obj/item/weapon/wrench)) if(locked) - user << "The bolts are covered, unlocking this would retract the covers." + user << "The bolts are covered! Unlocking this would retract the covers." return if(!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) @@ -276,7 +277,7 @@ else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(src.allowed(user)) src.locked = !src.locked - user << "The controls are now [src.locked ? "locked." : "unlocked."]" + user << "You [src.locked ? "lock" : "unlock"] the controls." else user << "Access denied." @@ -348,13 +349,13 @@ /obj/machinery/shieldwallgen/attack_hand(mob/user as mob) if(!anchored) - user << "The shield generator needs to be firmly secured to the floor first." + user << "The shield generator needs to be firmly secured to the floor first!" return 1 if(locked && !istype(user, /mob/living/silicon)) - user << "The controls are locked!" + user << "The controls are locked!" return 1 if(power != 1) - user << "The shield generator needs to be powered by wire underneath." + user << "The shield generator needs to be powered by wire underneath!" return 1 if(src.active >= 1) @@ -362,15 +363,15 @@ icon_state = "Shield_Gen" user.visible_message("[user] turned the shield generator off.", \ - "You turn off the shield generator.", \ - "You hear heavy droning fade out.") + "You turn off the shield generator.", \ + "You hear heavy droning fade out.") src.cleanup() else src.active = 1 icon_state = "Shield_Gen +a" user.visible_message("[user] turned the shield generator on.", \ - "You turn on the shield generator.", \ - "You hear heavy droning.") + "You turn on the shield generator.", \ + "You hear heavy droning.") src.add_fingerprint(user) /obj/machinery/shieldwallgen/process() @@ -396,7 +397,7 @@ if(src.active >= 1) if(src.power == 0) src.visible_message("The [src.name] shuts down due to lack of power!", \ - "You hear heavy droning fade out") + "You hear heavy droning fade out.") icon_state = "Shield_Gen" src.active = 0 src.cleanup(1) @@ -452,7 +453,7 @@ /obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) if(active) - user << "Turn off the field generator first." + user << "Turn off the field generator first!" return else if(!anchored && !isinspace()) //Can't fasten this thing in space @@ -470,7 +471,7 @@ if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (src.allowed(user)) src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + user << "You [src.locked ? "lock" : "unlock"] the controls." else user << "Access denied." diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 223472818c6..da7f6a82c53 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -48,7 +48,7 @@ if(istype(I, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) - user << "There is already a power cell inside." + user << "There is already a power cell inside!" return else // insert cell @@ -59,13 +59,13 @@ C.loc = src C.add_fingerprint(usr) - user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") + user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") else - user << "The hatch must be open to insert a power cell." + user << "The hatch must be open to insert a power cell!" return else if(istype(I, /obj/item/weapon/screwdriver)) open = !open - user.visible_message("[user] [open ? "opens" : "closes"] the hatch on \the [src].", "You [open ? "open" : "close"] the hatch on \the [src].") + user.visible_message("[user] [open ? "opens" : "closes"] the hatch on \the [src].", "You [open ? "open" : "close"] the hatch on \the [src].") update_icon() if(!open && user.machine == src) user << browse(null, "window=spaceheater") @@ -103,7 +103,7 @@ else on = !on - user.visible_message("[user] switches [on ? "on" : "off"] \the [src].","You switch [on ? "on" : "off"] \the [src].") + user.visible_message("[user] switches [on ? "on" : "off"] \the [src].","You switch [on ? "on" : "off"] \the [src].") update_icon() return @@ -127,7 +127,7 @@ usr.put_in_hands(cell) cell.add_fingerprint(usr) cell = null - usr.visible_message("[usr] removes the power cell from \the [src].", "You remove the power cell from \the [src].") + usr.visible_message("[usr] removes the power cell from \the [src].", "You remove the power cell from \the [src].") if("cellinstall") @@ -139,7 +139,7 @@ C.loc = src C.add_fingerprint(usr) - usr.visible_message("[usr] inserts a power cell into \the [src].", "You insert the power cell into \the [src].") + usr.visible_message("[usr] inserts a power cell into \the [src].", "You insert the power cell into \the [src].") updateDialog() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index e1755317dce..cc5c8e96fb8 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -277,10 +277,10 @@ return*/ else //welp, the guy is protected, we can continue if(src.issuperUV) - user << "You slide the dial back towards \"185nm\"." + user << "You slide the dial back towards \"185nm\"." src.issuperUV = 0 else - user << "You crank the dial all the way up to \"15nm\"." + user << "You crank the dial all the way up to \"15nm\"." src.issuperUV = 1 return @@ -302,7 +302,7 @@ user << "You try to touch the controls but you get zapped. There must be a short circuit somewhere." return*/ else - user << "You push the button. The coloured LED next to it changes." + user << "You push the button. The coloured LED next to it changes." src.safetieson = !src.safetieson @@ -339,7 +339,7 @@ /obj/machinery/suit_storage_unit/proc/toggle_open(mob/user as mob) if(src.islocked || src.isUV) - user << "Unable to open unit." + user << "You're unable to open unit!" return 0 if(src.OCCUPANT) src.eject_occupant(user) @@ -350,7 +350,7 @@ /obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user as mob) if(src.OCCUPANT && src.safetieson) - user << "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments." + user << "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments." return if(src.isopen) return @@ -367,7 +367,7 @@ if(!src.HELMET && !src.MASK && !src.SUIT && !src.STORAGE && !src.OCCUPANT ) //shit's empty yo user << "Unit storage bays empty. Nothing to disinfect -- Aborting." return - user << "You start the Unit's cauterisation cycle." + user << "You start the Unit's cauterisation cycle." src.cycletime_left = 20 src.isUV = 1 if(src.OCCUPANT && !src.islocked) @@ -447,7 +447,7 @@ user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT var/breakout_time = 2 - user << "You start kicking against the doors to escape! (This will take about [breakout_time] minutes.)" + user << "You start kicking against the doors to escape... (This will take about [breakout_time] minutes.)" visible_message("You see [user] kicking against the doors of \the [src]!") if(do_after(user,(breakout_time*60*10))) if(!user || user.stat != CONSCIOUS || user.loc != src || isopen || !islocked) @@ -455,7 +455,7 @@ else isopen = 1 islocked = 0 - visible_message("[user] successfully broke out of [src]!") + visible_message("[user] successfully broke out of [src]!") else return @@ -475,18 +475,18 @@ if (user.stat != 0) return if (!src.isopen) - user << "The unit's doors are shut." + user << "The unit's doors are shut!" return if (!src.ispowered || src.isbroken) - user << "The unit is not operational." + user << "The unit is not operational!" return if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) || (src.STORAGE)) - user << "It's too cluttered inside to fit in!" + user << "It's too cluttered inside to fit in!" return if(M == user) visible_message("[user] starts squeezing into the suit storage unit!", 3) else - visible_message("[user] starts putting [M.name] into the Suit Storage Unit.", 3) + visible_message("[user] starts putting [M.name] into the Suit Storage Unit!", 3) if(do_mob(user, M, 10)) user.stop_pulling() if(M.client) @@ -529,9 +529,9 @@ user << "The unit already contains a suit." return if(!user.drop_item()) - user << "\The [S] is stuck to your hand, you cannot put it in the Suit Storage Unit!" + user << "\The [S] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [S.name] into the suit storage compartment." + user << "You load the [S.name] into the suit storage compartment." S.loc = src src.SUIT = S src.update_icon() @@ -542,12 +542,12 @@ return var/obj/item/clothing/head/helmet/H = I if(src.HELMET) - user << "The unit already contains a helmet." + user << "The unit already contains a helmet!" return if(!user.drop_item()) - user << "\The [H] is stuck to your hand, you cannot put it in the Suit Storage Unit!" + user << "\The [H] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [H.name] into the helmet storage compartment." + user << "You load the [H.name] into the helmet storage compartment." H.loc = src src.HELMET = H src.update_icon() @@ -558,12 +558,12 @@ return var/obj/item/clothing/mask/M = I if(src.MASK) - user << "The unit already contains a mask." + user << "The unit already contains a mask!" return if(!user.drop_item()) - user << "\The [M] is stuck to your hand, you cannot put it in the Suit Storage Unit!" + user << "\The [M] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [M.name] into the mask storage compartment." + user << "You load the [M.name] into the mask storage compartment." M.loc = src src.MASK = M src.update_icon() @@ -574,12 +574,12 @@ return var/obj/item/ITEM = I if(src.STORAGE) - user << "The auxiliary storage compartment is full." + user << "The auxiliary storage compartment is full!" return if(!user.drop_item()) - user << "\The [ITEM] is stuck to your hand, you cannot put it in the Suit Storage Unit!" + user << "\The [ITEM] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [ITEM.name] into the auxiliary storage compartment." + user << "You load the [ITEM.name] into the auxiliary storage compartment." ITEM.loc = src src.STORAGE = ITEM src.update_icon() @@ -592,7 +592,7 @@ /obj/machinery/suit_storage_unit/attack_paw(mob/user as mob) - user << "The console controls are far too complicated for your tiny brain!" + user << "The console controls are far too complicated for your tiny brain!" return diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 85107a4deb7..d8ed227bb51 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -111,7 +111,7 @@ anchored = 0 density = 1 - layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS + layer = MOB_LAYER - 0.2 //so people can't hide it and it's REALLY OBVIOUS stat = 0 var/active = 0 @@ -150,14 +150,14 @@ if(anchored) return active ? Deactivate(user) : Activate(user) else - user << "You need to screw the beacon to the floor first!" + user << "You need to screw the beacon to the floor first!" return /obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/screwdriver)) if(active) - user << "You need to deactivate the beacon first!" + user << "You need to deactivate the beacon first!" return if(anchored) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index a0ef6a5fc31..35a1b38e85c 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -6,7 +6,7 @@ anchored = 0 density = 0 - layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS + layer = MOB_LAYER - 0.2 //so people can't hide it and it's REALLY OBVIOUS unacidable = 1 var/datum/wires/syndicatebomb/wires = null @@ -52,16 +52,16 @@ if(istype(I, /obj/item/weapon/wrench)) if(!anchored) if(!isturf(src.loc) || istype(src.loc, /turf/space)) - user << "The bomb must be placed on solid ground to attach it" + user << "The bomb must be placed on solid ground to attach it." else - user << "You firmly wrench the bomb to the floor" + user << "You firmly wrench the bomb to the floor." playsound(loc, 'sound/items/ratchet.ogg', 50, 1) anchored = 1 if(active) - user << "The bolts lock in place" + user << "The bolts lock in place." else if(!active) - user << "You wrench the bomb from the floor" + user << "You wrench the bomb from the floor." playsound(loc, 'sound/items/ratchet.ogg', 50, 1) anchored = 0 else @@ -83,11 +83,11 @@ payload.loc = user.loc payload = null else - user << "There isn't anything in here to remove!" + user << "There isn't anything in here to remove!" else if (open_panel) - user << "The wires conneting the shell to the explosives are holding it down!" + user << "The wires connecting the shell to the explosives are holding it down!" else - user << "The cover is screwed on, it won't pry off!" + user << "The cover is screwed on, it won't pry off!" else if(istype(I, /obj/item/weapon/bombcore)) if(!payload) payload = I @@ -95,7 +95,7 @@ user.drop_item() payload.loc = src else - user << "[payload] is already loaded into [src], you'll have to remove it first." + user << "[payload] is already loaded into [src]! You'll have to remove it first." else ..() @@ -114,7 +114,7 @@ settings(user) return else if(anchored) - user << "The bomb is bolted to the floor!" + user << "The bomb is bolted to the floor!" return /obj/machinery/syndicatebomb/proc/settings(var/mob/user) @@ -126,7 +126,7 @@ if(alert(user,"Would you like to start the countdown now?",,"Yes","No") == "Yes" && in_range(src, user) && isliving(user)) if(defused || active) if(defused) - src.loc.visible_message("\icon[src] Device error: User intervention required.") + src.loc.visible_message("\icon[src] Device error: User intervention required.") return else src.loc.visible_message("\icon[src] [timer] seconds until detonation, please clear the area.") @@ -188,6 +188,8 @@ message_admins(adminlog) log_game(adminlog) explosion(get_turf(src),2,5,11, flame_range = 11) + if(src.loc && istype(src.loc,/obj/machinery/syndicatebomb/)) + qdel(src.loc) qdel(src) /obj/item/weapon/bombcore/proc/defuse() diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcasting.dm similarity index 68% rename from code/game/machinery/telecomms/broadcaster.dm rename to code/game/machinery/telecomms/broadcasting.dm index 27f39329e7c..defe129fca2 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcasting.dm @@ -1,572 +1,440 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 - -/* - The broadcaster sends processed messages to all radio devices in the game. They - do not have to be headsets; intercoms and station-bounced radios suffice. - - They receive their message from a server after the message has been logged. -*/ - -var/list/recentmessages = list() // global list of recent messages broadcasted : used to circumvent massive radio spam -var/message_delay = 0 // To make sure restarting the recentmessages list is kept in sync - -/obj/machinery/telecomms/broadcaster - name = "subspace broadcaster" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "broadcaster" - desc = "A dish-shaped machine used to broadcast processed subspace signals." - density = 1 - anchored = 1 - use_power = 1 - idle_power_usage = 25 - machinetype = 5 - /*heatgen = 0 - delay = 7*/ - circuitboard = "/obj/item/weapon/circuitboard/telecomms/broadcaster" - -/obj/machinery/telecomms/broadcaster/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) - // Don't broadcast rejected signals - if(signal.data["reject"]) - return - - if(signal.data["message"]) - - - // Prevents massive radio spam - signal.data["done"] = 1 // mark the signal as being broadcasted - // Search for the original signal and mark it as done as well - var/datum/signal/original = signal.data["original"] - if(original) - original.data["done"] = 1 - original.data["compression"] = signal.data["compression"] - original.data["level"] = signal.data["level"] - - var/signal_message = "[signal.frequency]:[signal.data["message"]]:[signal.data["realname"]]" - if(signal_message in recentmessages) - return - recentmessages.Add(signal_message) - - if(signal.data["slow"] > 0) - sleep(signal.data["slow"]) // simulate the network lag if necessary - - signal.data["level"] |= listening_level - - /** #### - Normal Broadcast - #### **/ - - if(signal.data["type"] == 0) - - /* ###### Broadcast a message using signal.data ###### */ - Broadcast_Message(signal.data["mob"], - signal.data["vmask"], signal.data["radio"], - signal.data["message"], signal.data["name"], signal.data["job"], signal.data["realname"], - 0, signal.data["compression"], signal.data["level"], signal.frequency, signal.data["spans"], - signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"]) - - - /** #### - Simple Broadcast - #### **/ - - if(signal.data["type"] == 1) - - /* ###### Broadcast a message using signal.data ###### */ - Broadcast_SimpleMessage(signal.data["name"], signal.frequency, - signal.data["message"],null, null, - signal.data["compression"], listening_level) - - - /** #### - Artificial Broadcast - #### **/ - // (Imitates a mob) - - if(signal.data["type"] == 2) - - /* ###### Broadcast a message using signal.data ###### */ - // Parameter "data" as 4: AI can't track this person/mob - Broadcast_Message(signal.data["mob"], - signal.data["vmask"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"], 4, signal.data["compression"], signal.data["level"], signal.frequency, signal.data["spans"], - signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"]) - - if(!message_delay) - message_delay = 1 - spawn(10) - message_delay = 0 - recentmessages = list() - - /* --- Do a snazzy animation! --- */ - flick("broadcaster_send", src) - -/obj/machinery/telecomms/broadcaster/Destroy() - // In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore. - if(message_delay) - message_delay = 0 - ..() - - -/* - Basically just an empty shell for receiving and broadcasting radio messages. Not - very flexible, but it gets the job done. -*/ - -/obj/machinery/telecomms/allinone - name = "telecommunications mainframe" - icon = 'icons/obj/stationobjs.dmi' - icon_state = "comm_server" - desc = "A compact machine used for portable subspace telecommuniations processing." - density = 1 - anchored = 1 - use_power = 0 - idle_power_usage = 0 - machinetype = 6 - //heatgen = 0 - var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel - -/obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal) - - if(!on) // has to be on to receive messages - return - - if(is_freq_listening(signal)) // detect subspace signals - - signal.data["done"] = 1 // mark the signal as being broadcasted - signal.data["compression"] = 0 - - // Search for the original signal and mark it as done as well - var/datum/signal/original = signal.data["original"] - if(original) - original.data["done"] = 1 - - if(signal.data["slow"] > 0) - sleep(signal.data["slow"]) // simulate the network lag if necessary - - /* ###### Broadcast a message using signal.data ###### */ - if(signal.frequency == SYND_FREQ) // if syndicate broadcast, just - Broadcast_Message(signal.data["mob"], - signal.data["vmask"], - signal.data["radio"], signal.data["message"], - signal.data["name"], signal.data["job"], - signal.data["realname"],, signal.data["compression"], list(0, z), signal.frequency, signal.data["spans"], - signal.data["verb_say"], signal.data["verb_ask"], signal.data["verb_exclaim"], signal.data["verb_yell"]) - - -/** - - Here is the big, bad function that broadcasts a message given the appropriate - parameters. - - @param M: - Reference to the mob/speaker, stored in signal.data["mob"] - - @param vmask: - Boolean value if the mob is "hiding" its identity via voice mask, stored in - signal.data["vmask"] - - @param vmessage: - If specified, will display this as the message; such as "chimpering" - for monkeys if the mob is not understood. Stored in signal.data["vmessage"]. - - @param radio: - Reference to the radio broadcasting the message, stored in signal.data["radio"] - - @param message: - The actual string message to display to mobs who understood mob M. Stored in - signal.data["message"] - - @param name: - The name to display when a mob receives the message. signal.data["name"] - - @param job: - The name job to display for the AI when it receives the message. signal.data["job"] - - @param realname: - The "real" name associated with the mob. signal.data["realname"] - - @param vname: - If specified, will use this name when mob M is not understood. signal.data["vname"] - - @param data: - If specified: - 1 -- Will only broadcast to intercoms - 2 -- Will only broadcast to intercoms and station-bounced radios - 3 -- Broadcast to syndicate frequency - 4 -- AI can't track down this person. Useful for imitation broadcasts where you can't find the actual mob - - @param compression: - If 0, the signal is audible - If nonzero, the signal may be partially inaudible or just complete gibberish. - - @param level: - The list of Z levels that the sending radio is broadcasting to. Having 0 in the list broadcasts on all levels - - @param freq - The frequency of the signal - -**/ - - -/proc/Broadcast_Message(var/atom/movable/AM, - var/vmask, var/obj/item/device/radio/radio, - var/message, var/name, var/job, var/realname, - var/data, var/compression, var/list/level, var/freq, var/list/spans, - var/verb_say, var/verb_ask, var/verb_exclaim, var/verb_yell) - - message = copytext(message, 1, MAX_BROADCAST_LEN) - - if(!message) - return - - var/list/radios = list() - - var/atom/movable/virtualspeaker/virt = PoolOrNew(/atom/movable/virtualspeaker,null) - virt.name = name - virt.job = job - virt.languages = AM.languages - virt.source = AM - virt.faketrack = data == 4 ? 1 : 0 - virt.radio = radio - virt.verb_say = verb_say - virt.verb_ask = verb_ask - virt.verb_exclaim = verb_exclaim - virt.verb_yell = verb_yell - - if(compression > 0) - message = Gibberish(message, compression + 40) - - // --- Broadcast only to intercom devices --- - - if(data == 1) - for(var/obj/item/device/radio/intercom/R in all_radios["[freq]"]) - if(R.receive_range(freq, level) > -1) - radios += R - - // --- Broadcast only to intercoms and station-bounced radios --- - - else if(data == 2) - - for(var/obj/item/device/radio/R in all_radios["[freq]"]) - if(istype(R, /obj/item/device/radio/headset)) - continue - - if(R.receive_range(freq, level) > -1) - radios += R - - // --- Broadcast to ALL radio devices --- - - else - for(var/obj/item/device/radio/R in all_radios["[freq]"]) - if(R.receive_range(freq, level) > -1) - radios += R - - var/freqtext = num2text(freq) - for(var/obj/item/device/radio/R in all_radios["[SYND_FREQ]"]) //syndicate radios use magic that allows them to hear everything. this was already the case, now it just doesn't need the allinone anymore. solves annoying bugs that aren't worth solving. - if(R.receive_range(SYND_FREQ, list(R.z)) > -1 && freqtext in radiochannelsreverse) - radios |= R - - // Get a list of mobs who can hear from the radios we collected. - var/list/receive = get_mobs_in_radio_ranges(radios) //this includes all hearers. - - for(var/mob/R in receive) //Filter receiver list. - if (R.client && R.client.holder && !(R.client.prefs.chat_toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. - receive -= R - - for(var/mob/M in player_list) - if(isobserver(M) && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTRADIO)) - receive |= M - - var/rendered = virt.compose_message(virt, virt.languages, message, freq, spans) //Always call this on the virtualspeaker to advoid issues. - for(var/atom/movable/hearer in receive) - hearer.Hear(rendered, virt, AM.languages, message, freq, spans) - - if(length(receive)) - // --- This following recording is intended for research and feedback in the use of department radio channels --- - - var/blackbox_msg = "[AM] [AM.say_quote(message, spans)]" - if(istype(blackbox)) - switch(freq) - if(1459) - blackbox.msg_common += blackbox_msg - if(1351) - blackbox.msg_science += blackbox_msg - if(1353) - blackbox.msg_command += blackbox_msg - if(1355) - blackbox.msg_medical += blackbox_msg - if(1357) - blackbox.msg_engineering += blackbox_msg - if(1359) - blackbox.msg_security += blackbox_msg - if(1441) - blackbox.msg_deathsquad += blackbox_msg - if(1213) - blackbox.msg_syndicate += blackbox_msg - if(1349) - blackbox.msg_service += blackbox_msg - if(1347) - blackbox.msg_cargo += blackbox_msg - else - blackbox.messages += blackbox_msg - - spawn(50) - PlaceInPool(virt) - -/proc/Broadcast_SimpleMessage(var/source, var/frequency, var/text, var/data, var/mob/M, var/compression, var/level) - - /* ###### Prepare the radio connection ###### */ - - if(!M) - var/mob/living/carbon/human/H = new - M = H - - var/datum/radio_frequency/connection = radio_controller.return_frequency(frequency) - - var/display_freq = connection.frequency - - var/list/receive = list() - - - // --- Broadcast only to intercom devices --- - - if(data == 1) - for (var/obj/item/device/radio/intercom/R in connection.devices["[RADIO_CHAT]"]) - var/turf/position = get_turf(R) - if(position && position.z == level) - receive |= R.send_hear(display_freq, level) - - - // --- Broadcast only to intercoms and station-bounced radios --- - - else if(data == 2) - for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) - - if(istype(R, /obj/item/device/radio/headset)) - continue - var/turf/position = get_turf(R) - if(position && position.z == level) - receive |= R.send_hear(display_freq) - - - // --- Broadcast to syndicate radio! --- - - else if(data == 3) - var/datum/radio_frequency/syndicateconnection = radio_controller.return_frequency(SYND_FREQ) - - for (var/obj/item/device/radio/R in syndicateconnection.devices["[RADIO_CHAT]"]) - var/turf/position = get_turf(R) - if(position && position.z == level) - receive |= R.send_hear(SYND_FREQ) - - - // --- Broadcast to ALL radio devices --- - - else - for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) - var/turf/position = get_turf(R) - if(position && position.z == level) - receive |= R.send_hear(display_freq) - - - /* ###### Organize the receivers into categories for displaying the message ###### */ - - // Understood the message: - var/list/heard_normal = list() // normal message - - // Did not understand the message: - var/list/heard_garbled = list() // garbled message (ie "f*c* **u, **i*er!") - var/list/heard_gibberish= list() // completely screwed over message (ie "F%! (O*# *#!<>&**%!") - - for (var/mob/R in receive) - - /* --- Loop through the receivers and categorize them --- */ - - if (R.client && !(R.client.prefs.chat_toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios. - continue - - - // --- Check for compression --- - if(compression > 0) - - heard_gibberish += R - continue - - // --- Can understand the speech --- - - if (R.languages & M.languages) - - heard_normal += R - - // --- Can't understand the speech --- - - else - // - Just display a garbled message - - - heard_garbled += R - - - /* ###### Begin formatting and sending the message ###### */ - if (length(heard_normal) || length(heard_garbled) || length(heard_gibberish)) - - /* --- Some miscellaneous variables to format the string output --- */ - var/part_a = "" // goes in the actual output - var/freq_text // the name of the channel - - // --- Set the name of the channel --- - switch(display_freq) - - if(SYND_FREQ) - freq_text = "#unkn" - if(COMM_FREQ) - freq_text = "Command" - if(SCI_FREQ) - freq_text = "Science" - if(MED_FREQ) - freq_text = "Medical" - if(ENG_FREQ) - freq_text = "Engineering" - if(SEC_FREQ) - freq_text = "Security" - if(SERV_FREQ) - freq_text = "Service" - if(SUPP_FREQ) - freq_text = "Supply" - if(AIPRIV_FREQ) - freq_text = "AI Private" - //There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO - - - // --- If the frequency has not been assigned a name, just use the frequency as the name --- - - if(!freq_text) - freq_text = format_frequency(display_freq) - - // --- Some more pre-message formatting --- - - var/part_b_extra = "" - if(data == 3) // intercepted radio message - part_b_extra = " (Intercepted)" - - // Create a radio headset for the sole purpose of using its icon - var/obj/item/device/radio/headset/radio = new - - var/part_b = " \icon[radio]\[[freq_text]\][part_b_extra] " - - if (display_freq==SYND_FREQ) - part_a = "" - else if (display_freq==COMM_FREQ) - part_a = "" - else if (display_freq==SCI_FREQ) - part_a = "" - else if (display_freq==MED_FREQ) - part_a = "" - else if (display_freq==ENG_FREQ) - part_a = "" - else if (display_freq==SEC_FREQ) - part_a = "" - else if (display_freq==SERV_FREQ) - part_a = "" - else if (display_freq==SUPP_FREQ) - part_a = "" - else if (display_freq==CENTCOM_FREQ) - part_a = "" - else if (display_freq==AIPRIV_FREQ) - part_a = "" - - // --- This following recording is intended for research and feedback in the use of department radio channels --- - - var/part_blackbox_b = " \[[freq_text]\]
Engineering Functions
" dat += "- "
dat += "
Power Monitor "
- if(istype(cartridge.radio, /obj/item/radio/integrated/floorbot))
- dat += "
Floorbot Access "
dat += "
Medical Functions
" dat += "- "
dat += "
Medical Records "
dat += "
[scanmode == 1 ? "Disable" : "Enable"] Medical Scanner "
- if(istype(cartridge.radio, /obj/item/radio/integrated/medbot))
- dat += "
Medibot Access "
- dat += "
Security Functions
" dat += "- "
dat += "
Security Records "
- if(istype(cartridge.radio, /obj/item/radio/integrated/beepsky))
- dat += "- Security Bot Access "
dat += "
Quartermaster Functions:
" dat += "- "
dat += "
Supply Records "
- dat += "
Delivery Bot Control "
dat += "
Utilities
" dat += "- "
if (cartridge)
+ if(cartridge.bot_access_flags)
+ dat += "
- Bots Access "
if (cartridge.access_janitor)
dat += "
Custodial Locator "
- if(istype(cartridge.radio, /obj/item/radio/integrated/cleanbot))
- dat += "
Cleanbot Access "
if (istype(cartridge.radio, /obj/item/radio/integrated/signal))
dat += "
Signaler System "
if (cartridge.access_newscaster)
@@ -862,9 +853,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(id)
remove_id()
else
- usr << "This PDA does not have an ID in it."
+ usr << "This PDA does not have an ID in it!"
else
- usr << "You cannot do this while restrained."
+ usr << "You cannot do that while restrained!"
/obj/item/device/pda/verb/verb_remove_id()
set category = "Object"
@@ -878,9 +869,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(id)
remove_id()
else
- usr << "This PDA does not have an ID in it."
+ usr << "This PDA does not have an ID in it!"
else
- usr << "You cannot do this while restrained."
+ usr << "You cannot do that while restrained!"
/obj/item/device/pda/verb/verb_remove_pen()
@@ -902,9 +893,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
return
O.loc = get_turf(src)
else
- usr << "This PDA does not have a pen in it."
+ usr << "This PDA does not have a pen in it!"
else
- usr << "You cannot do this while restrained."
+ usr << "You cannot do that while restrained!"
/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.
if(choice == 1)
@@ -913,25 +904,28 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
var/obj/item/I = user.get_active_hand()
if (istype(I, /obj/item/weapon/card/id))
- user.drop_item()
+ if(!user.unEquip(I))
+ return 0
I.loc = src
id = I
else
var/obj/item/weapon/card/I = user.get_active_hand()
if (istype(I, /obj/item/weapon/card/id) && I:registered_name)
+ if(!user.unEquip(I))
+ return 0
var/obj/old_id = id
- user.drop_item()
I.loc = src
id = I
user.put_in_hands(old_id)
- return
+ return 1
// access to status display signals
/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob, params)
..()
if(istype(C, /obj/item/weapon/cartridge) && !cartridge)
cartridge = C
- user.drop_item()
+ if(!user.unEquip(C))
+ return
cartridge.loc = src
user << "You insert [cartridge] into [src]."
if(cartridge.radio)
@@ -940,7 +934,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
else if(istype(C, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/idcard = C
if(!idcard.registered_name)
- user << "\The [src] rejects the ID."
+ user << "\The [src] rejects the ID!"
return
if(!owner)
owner = idcard.registered_name
@@ -951,13 +945,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
//Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand.
if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) )
if( can_use(user) )//If they can still act.
- id_check(user, 2)
+ if(!id_check(user, 2))
+ return
user << "You put the ID into \the [src]'s slot."
updateSelfDialog()//Update self dialog on success.
return //Return in case of failed check or when successful.
updateSelfDialog()//For the non-input related code.
else if(istype(C, /obj/item/device/paicard) && !src.pai)
- user.drop_item()
+ if(!user.unEquip(C))
+ return
C.loc = src
pai = C
user << "You slot \the [C] into [src]."
@@ -965,9 +961,10 @@ var/global/list/obj/item/device/pda/PDAs = list()
else if(istype(C, /obj/item/weapon/pen))
var/obj/item/weapon/pen/O = locate() in src
if(O)
- user << "There is already a pen in \the [src]."
+ user << "There is already a pen in \the [src]!"
else
- user.drop_item()
+ if(!user.unEquip(C))
+ return
C.loc = src
user << "You slide \the [C] into \the [src]."
return
@@ -1028,7 +1025,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (!scanmode && istype(A, /obj/item/weapon/paper) && owner)
if (!A:info)
- user << "Unable to scan. Paper is blank."
+ user << "Unable to scan! Paper is blank."
return
notehtml = A:info
note = replacetext(notehtml, "- #[SO.ordernum] - [SO.object.name] requested by [SO.orderedby] " menu += "Upgrade NOW to Space Parts & Space Vendors PLUS for full remote order control and inventory management." - if (48) //mulebot control - var/obj/item/radio/integrated/mule/QC = radio - if(!QC) - menu = "Interlink Error - Please reinsert cartridge." - return - menu = "
- Eat Pipes -
- Paint Pipes -
- Eat Pipes " + else + dat += "
- Eat Pipes " + if(p_class != PAINT_MODE) + dat += "
- Paint Pipes " + else + dat += "
- Paint Pipes " + dat += "
", "\[br\]") @@ -1058,8 +1055,6 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/Destroy() PDAs -= src - if (src.id) - src.id.loc = get_turf(src.loc) ..() /obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery. diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 9f9b4164c3e..54996ca39bc 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -23,6 +23,8 @@ var/access_status_display = 0 var/access_quartermaster = 0 var/access_hydroponics = 0 + var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT|MULE_BOT|FLOOR_BOT|CLEAN_BOT|MED_BOT + var/mode = null var/menu var/datum/data/record/active1 = null //General @@ -35,50 +37,38 @@ var/list/stored_data = list() var/current_channel + var/obj/machinery/bot/active_bot + var/list/botlist = list() + /obj/item/weapon/cartridge/engineering name = "\improper Power-ON cartridge" icon_state = "cart-e" access_engine = 1 - - /obj/item/weapon/cartridge/engineering/New() - ..() - radio = new /obj/item/radio/integrated/floorbot(src) + bot_access_flags = FLOOR_BOT /obj/item/weapon/cartridge/atmos name = "\improper BreatheDeep cartridge" icon_state = "cart-a" access_atmos = 1 - - /obj/item/weapon/cartridge/atmos/New() - ..() - radio = new /obj/item/radio/integrated/floorbot(src) + bot_access_flags = FLOOR_BOT /obj/item/weapon/cartridge/medical name = "\improper Med-U cartridge" icon_state = "cart-m" access_medical = 1 - - /obj/item/weapon/cartridge/medical/New() - ..() - radio = new /obj/item/radio/integrated/medbot(src) + bot_access_flags = MED_BOT /obj/item/weapon/cartridge/chemistry name = "\improper ChemWhiz cartridge" icon_state = "cart-chem" access_reagent_scanner = 1 - - /obj/item/weapon/cartridge/chemistry/New() - ..() - radio = new /obj/item/radio/integrated/medbot(src) + bot_access_flags = MED_BOT /obj/item/weapon/cartridge/security name = "\improper R.O.B.U.S.T. cartridge" icon_state = "cart-s" access_security = 1 - -/obj/item/weapon/cartridge/security/New() - ..() - radio = new /obj/item/radio/integrated/beepsky(src) + bot_access_flags = SEC_BOT /obj/item/weapon/cartridge/detective name = "\improper D.E.T.E.C.T. cartridge" @@ -86,20 +76,14 @@ access_security = 1 access_medical = 1 access_manifest = 1 - -/obj/item/weapon/cartridge/detective/New() - ..() - radio = new /obj/item/radio/integrated/beepsky(src) + bot_access_flags = SEC_BOT /obj/item/weapon/cartridge/janitor name = "\improper CustodiPRO cartridge" desc = "The ultimate in clean-room design." icon_state = "cart-j" access_janitor = 1 - -/obj/item/weapon/cartridge/janitor/New() - ..() - radio = new /obj/item/radio/integrated/cleanbot(src) + bot_access_flags = CLEAN_BOT /obj/item/weapon/cartridge/lawyer name = "\improper P.R.O.V.E. cartridge" @@ -130,6 +114,11 @@ access_flora = 1 */ +/obj/item/weapon/cartridge/roboticist + name = "\improper B.O.O.P. Remote Control cartridge" + desc = "Packed with heavy duty triple-bot interlink!" + bot_access_flags = FLOOR_BOT|CLEAN_BOT|MED_BOT + /obj/item/weapon/cartridge/signal name = "generic signaler cartridge" desc = "A data cartridge with an integrated radio signaler module." @@ -151,11 +140,7 @@ name = "space parts & space vendors cartridge" desc = "Perfect for the Quartermaster on the go!" icon_state = "cart-q" - access_quartermaster = 1 - -/obj/item/weapon/cartridge/quartermaster/New() - ..() - radio = new /obj/item/radio/integrated/mule(src) + bot_access_flags = MULE_BOT /obj/item/weapon/cartridge/head name = "\improper Easy-Record DELUXE cartridge" @@ -168,13 +153,11 @@ icon_state = "cart-h" access_manifest = 1 access_status_display = 1 - access_quartermaster = 1 + bot_access_flags = MULE_BOT|CLEAN_BOT access_janitor = 1 access_security = 1 - -/obj/item/weapon/cartridge/hop/New() - ..() - radio = new /obj/item/radio/integrated/mule(src) + access_newscaster = 1 + access_quartermaster = 1 /obj/item/weapon/cartridge/hos name = "\improper R.O.B.U.S.T. DELUXE cartridge" @@ -182,10 +165,8 @@ access_manifest = 1 access_status_display = 1 access_security = 1 + bot_access_flags = SEC_BOT -/obj/item/weapon/cartridge/hos/New() - ..() - radio = new /obj/item/radio/integrated/beepsky(src) /obj/item/weapon/cartridge/ce name = "\improper Power-On DELUXE cartridge" @@ -194,10 +175,7 @@ access_status_display = 1 access_engine = 1 access_atmos = 1 - -/obj/item/weapon/cartridge/ce/New() - ..() - radio = new /obj/item/radio/integrated/floorbot(src) + bot_access_flags = FLOOR_BOT /obj/item/weapon/cartridge/cmo name = "\improper Med-U DELUXE cartridge" @@ -206,10 +184,7 @@ access_status_display = 1 access_reagent_scanner = 1 access_medical = 1 - -/obj/item/weapon/cartridge/cmo/New() - ..() - radio = new /obj/item/radio/integrated/medbot(src) + bot_access_flags = MED_BOT /obj/item/weapon/cartridge/rd name = "\improper Signal Ace DELUXE cartridge" @@ -218,6 +193,7 @@ access_status_display = 1 access_reagent_scanner = 1 access_atmos = 1 + bot_access_flags = FLOOR_BOT|CLEAN_BOT|MED_BOT /obj/item/weapon/cartridge/rd/New() ..() @@ -225,7 +201,7 @@ /obj/item/weapon/cartridge/captain name = "\improper Value-PAK cartridge" - desc = "Now with 200% more value!" + desc = "Now with 350% more value!" //Give the Captain...EVERYTHING! (Except Mime and Clown) icon_state = "cart-c" access_manifest = 1 access_engine = 1 @@ -234,10 +210,14 @@ access_reagent_scanner = 1 access_status_display = 1 access_atmos = 1 + access_newscaster = 1 + access_quartermaster = 1 + access_janitor = 1 + bot_access_flags = SEC_BOT|MULE_BOT|FLOOR_BOT|CLEAN_BOT|MED_BOT /obj/item/weapon/cartridge/captain/New() ..() - radio = new /obj/item/radio/integrated/beepsky(src) + radio = new /obj/item/radio/integrated/signal(src) /obj/item/weapon/cartridge/syndicate name = "\improper Detomatix cartridge" @@ -285,68 +265,8 @@ frequency.post_signal(src, status_signal) -/obj/item/weapon/cartridge/proc/bot_control(var/obj/item/radio/integrated/SC) - - if(!SC) - menu = "Interlink Error - Please reinsert cartridge." - return - - if(!SC.active) - // list of bots - if(!SC.botlist || (SC.botlist && SC.botlist.len==0)) - menu += "No bots found.
" - - else - for(var/obj/machinery/bot/B in SC.botlist) - menu += "[B] at [get_area(B)]
" - - menu += "
Scan for active bots" - - else // bot selected, control it - - menu += "[SC.active]
Status: (
refresh)" - - if(!SC.botstatus) - menu += "Waiting for response...
" - else - - menu += "Location: [SC.botstatus["loca"] ]
" - menu += "Mode: " - - switch(SC.botstatus["mode"]) - if(BOT_IDLE) - menu += "Ready" - if(BOT_HUNT) - menu += "Apprehending target" - if(BOT_PREP_ARREST,BOT_ARREST) - menu += "Arresting target" - if(BOT_START_PATROL) - menu += "Starting patrol" - if(BOT_PATROL) - menu += "On patrol" - if(BOT_SUMMON) - menu += "Responding to summons" - if(BOT_CLEANING) - menu += "Cleaning" - if(BOT_MOVING) - menu += "Proceeding to work site" - if(BOT_REPAIRING) - menu += "Performing repairs" - if(BOT_HEALING) - menu += "Medicating patient" - if(BOT_RESPONDING) - menu += "Proceeding to AI waypoint" - - menu += "
\[Stop Patrol\] " - menu += "\[Start Patrol\] " - menu += "\[Summon Bot\]
" - menu += "
Return to bot list" - menu += "Keep an ID inserted to upload access codes upon summoning." - return menu - - -/obj/item/weapon/cartridge/proc/generate_menu() +/obj/item/weapon/cartridge/proc/generate_menu(mob/user) switch(mode) if(40) //signaller menu = "
Remote Signaling System
"
@@ -552,10 +472,6 @@ Code:
menu += "Record Lost!" menu += "
" - if (46) //beepsky control - var/obj/item/radio/integrated/beepsky/SC = radio - menu = "
Securitron Interlink
"
- bot_control(SC)
if (47) //quartermaster order records
menu = " Supply Record Interlink
"
@@ -588,63 +504,6 @@ Code:
menu += " M.U.L.E. bot Interlink V0.8
"
-
- if(!QC.active)
- // list of bots
- if(!QC.botlist || (QC.botlist && QC.botlist.len==0))
- menu += "No bots found." - - else - for(var/obj/machinery/bot/mulebot/B in QC.botlist) - menu += "[B] at [get_area(B)]
" - - menu += "
Scan for active bots" - - else // bot selected, control it - - menu += "[QC.active]
Status: (
refresh)" - - if(!QC.botstatus) - menu += "Waiting for response...
" - else - - menu += "Location: [QC.botstatus["loca"] ]
" - menu += "Mode: " - - switch(QC.botstatus["mode"]) - if(BOT_IDLE) - menu += "Ready" - if(BOT_LOADING) - menu += "Loading/Unloading" - if(BOT_DELIVER) - menu += "Navigating to Delivery Location" - if(BOT_GO_HOME) - menu += "Navigating to Home" - if(BOT_BLOCKED) - menu += "Waiting for clear path" - if(BOT_NAV,BOT_WAIT_FOR_NAV) - menu += "Calculating navigation path" - if(BOT_NO_ROUTE) - menu += "Unable to locate destination" - var/obj/structure/closet/crate/C = QC.botstatus["load"] - menu += "
Current Load: [ !C ? "none" : "[C.name] (unload)" ]
" - menu += "Destination: [!QC.botstatus["dest"] ? "none" : QC.botstatus["dest"] ] (set)
" - menu += "Power: [QC.botstatus["powr"]]%
" - menu += "Home: [!QC.botstatus["home"] ? "none" : QC.botstatus["home"] ]
" - menu += "Auto Return Home: [QC.botstatus["retn"] ? "On Off" : "(On) Off"]
" - menu += "Auto Pickup Crate: [QC.botstatus["pick"] ? "On Off" : "(On) Off"]
" - - menu += "\[Stop\] " - menu += "\[Proceed\] " - menu += "\[Return Home\]
" - menu += "
Return to bot list"
-
if (49) //janitorial locator
menu = " Persistent Custodial Object Locator
"
@@ -689,7 +548,7 @@ Code:
menu += "Located Cleanbots:
" ldat = null - for (var/obj/machinery/bot/cleanbot/B in world) + for (var/obj/machinery/bot/cleanbot/B in SSbot.processing) var/turf/bl = get_turf(B) if(bl) @@ -707,35 +566,32 @@ Code: menu += "ERROR: Unable to determine current location." menu += "Refresh GPS Locator" - if (50) //Cleanbot control - menu = "
Cleanbot Interlink
"
- var/obj/item/radio/integrated/cleanbot/SC = radio
- bot_control(SC)
-
- if (51) //floorbot control
- menu = " Floorbot Interlink
"
- var/obj/item/radio/integrated/floorbot/SC = radio
- bot_control(SC)
-
- if (52) //Medibot control
- menu = " Medibot Interlink
"
- var/obj/item/radio/integrated/medbot/SC = radio
- bot_control(SC)
-
if (53) // Newscaster
menu = "
Newscaster Access
"
menu += "Current Newsfeed: [current_channel ? current_channel : "None"]
" - var/datum/feed_channel/current - for(var/datum/feed_channel/chan in news_network.network_channels) + var/datum/newscaster/feed_channel/current + for(var/datum/newscaster/feed_channel/chan in news_network.network_channels) if (chan.channel_name == current_channel) current = chan if(!current) menu += "
ERROR : NO CHANNEL FOUND
" return - for(var/datum/feed_message/msg in current.messages) - menu +="-[msg.body]\[Story by [msg.author]\]
" + var/i = 1 + for(var/datum/newscaster/feed_message/msg in current.messages) + menu +="-[msg.returnBody(-1)]
\[Story by [msg.returnAuthor(-1)]\]
" + menu +="[msg.comments.len] comment[msg.comments.len > 1 ? "s" : ""]
" + if(msg.img) + user << browse_rsc(msg.img, "tmp_photo[i].png") + menu +="
" + i++ + for(var/datum/newscaster/feed_comment/comment in msg.comments) + menu +="[comment.body]
[comment.author] [comment.time_stamp]
" menu += "
Post Message" + if (54) // Beepsky, Medibot, Floorbot, and Cleanbot access + menu = "
Bots Interlink
"
+ bot_control()
+
/obj/item/weapon/cartridge/Topic(href, href_list)
..()
@@ -744,6 +600,8 @@ Code:
usr << browse(null, "window=pda")
return
+ var/obj/item/device/pda/pda = loc
+
switch(href_list["choice"])
if("Medical Records")
active1 = find_record("id", href_list["target"], data_core.general)
@@ -802,11 +660,10 @@ Code:
mode = 53
if("Newscaster Message")
- var/obj/item/device/pda/pda = loc
var/pda_owner_name = pda.id ? "[pda.id.registered_name] ([pda.id.assignment])" : "Unknown"
var/message = pda.msg_input()
- var/datum/feed_channel/current
- for(var/datum/feed_channel/chan in news_network.network_channels)
+ var/datum/newscaster/feed_channel/current
+ for(var/datum/newscaster/feed_channel/chan in news_network.network_channels)
if (chan.channel_name == current_channel)
current = chan
if(current.locked && current.author != pda_owner_name)
@@ -818,12 +675,83 @@ Code:
return
if("Newscaster Switch Channel")
- var/obj/item/device/pda/pda = loc
current_channel = pda.msg_input()
pda.Topic(null,list("choice"=num2text(mode)))
return
+ //Bot control section! Viciously ripped from radios for being laggy and terrible.
+ if(href_list["op"])
+ switch(href_list["op"])
+ if("control")
+ active_bot = locate(href_list["bot"])
- generate_menu()
+ if("botlist")
+ active_bot = null
+ if("summon") //Args are in the correct order, they are stated here just as an easy reminder.
+ active_bot.bot_control(command= "summon", user_turf= get_turf(usr), user_access= pda.GetAccess())
+ else //Forward all other bot commands to the bot itself!
+ active_bot.bot_control(command= href_list["op"])
+
+ if(href_list["mule"]) //MULEbots are special snowflakes, and need different args due to how they work.
+
+ active_bot.bot_control(command= href_list["mule"], user= usr, pda= 1)
+
+ generate_menu(usr)
print_to_host(menu)
+
+
+
+/obj/item/weapon/cartridge/proc/bot_control()
+
+
+ var/obj/machinery/bot/Bot
+
+// if(!SC)
+// menu = "Interlink Error - Please reinsert cartridge."
+// return
+ if(active_bot)
+ menu += "[active_bot]Status: (
refresh)" + menu += "Model: [active_bot.model]
" + menu += "Location: [get_area(active_bot)]
" + menu += "Mode: [active_bot.get_mode()]" + + //MULEs! + if(active_bot.bot_type == MULE_BOT) + var/obj/machinery/bot/mulebot/MULE = active_bot + var/atom/Load = MULE.load + menu += "
Current Load: [ !Load ? "none" : "[Load.name] (unload)" ]
" + menu += "Destination: [MULE.destination ? MULE.destination : "None"] (set)
" + menu += "Set ID: [MULE.suffix] Modify
" + menu += "Power: [MULE.cell ? MULE.cell.percent() : 0]%
" + menu += "Home: [!MULE.home_destination ? "none" : MULE.home_destination ]
" + menu += "Delivery Reporting: [MULE.report_delivery ? "(On)": "(Off)"]
" + menu += "Auto Return Home: [MULE.auto_return ? "(On)": "(Off)"]
" + menu += "Auto Pickup Crate: [MULE.auto_pickup ? "(On)": "(Off)"]
" //Hue. + + menu += "\[Stop\] " + menu += "\[Proceed\] " + menu += "\[Return Home\]
" + + else + menu += "
\[Stop Patrol\] " //patrolon + menu += "\[Start Patrol\] " //patroloff + menu += "\[Summon Bot\]
" //summon + menu += "Keep an ID inserted to upload access codes upon summoning." + + menu += "
Return to bot list"
+ else
+ menu += "Scan for active bots" + var/turf/current_turf = get_turf(src) + var/zlevel = current_turf.z + var/botcount = 0 + for(Bot in SSbot.processing) //Git da botz + if(!Bot.on || Bot.z != zlevel || Bot.remote_disabled || !(bot_access_flags & Bot.bot_type)) //Only non-emagged bots on the same Z-level are detected! + continue //Also, the PDA must have access to the bot type. + menu += "[Bot.name] ([Bot.get_mode()])
" + botcount++ + if(!botcount) //No bots at all? Lame. + menu += "No bots found.
" + return + + return menu \ No newline at end of file diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 27e2b1613af..e000bbfcec4 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -4,13 +4,6 @@ icon = 'icons/obj/module.dmi' icon_state = "power_mod" var/obj/item/device/pda/hostpda = null - var/list/botlist = null // list of bots - var/obj/machinery/bot/active // the active bot; if null, show bot list - var/list/botstatus // the status signal sent by the bot - var/bot_type //The type of bot it is. - var/bot_filter //Determines which radio filter to use. - - var/control_freq = 1447 var/on = 0 //Are we currently active?? var/menu_message = "" @@ -19,215 +12,6 @@ ..() if (istype(loc.loc, /obj/item/device/pda)) hostpda = loc.loc - if (bot_filter) - spawn(5) - add_to_radio(bot_filter) - -/obj/item/radio/integrated/Destroy() - if(radio_controller) - radio_controller.remove_object(src, control_freq) - ..() - -/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3,var/key4, var/value4, s_filter) - - //world << "Post: [freq]: [key]=[value], [key2]=[value2]" - var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq) - - if(!frequency) - return - - var/datum/signal/signal = new() - signal.source = src - signal.transmission_method = 1 - signal.data[key] = value - if(key2) - signal.data[key2] = value2 - if(key3) - signal.data[key3] = value3 - if(key4) - signal.data[key4] = value4 - - frequency.post_signal(src, signal, filter = s_filter) - -/obj/item/radio/integrated/proc/print_to_host(var/text) - if (isnull(src.hostpda)) - return - src.hostpda.cart = text - - for (var/mob/M in viewers(1, src.hostpda.loc)) - if (M.client && M.machine == src.hostpda) - src.hostpda.cartridge.unlock() - - return - -/obj/item/radio/integrated/receive_signal(datum/signal/signal) - /*var/obj/item/device/pda/P = src.loc - - - world << "recvd:[P] : [signal.source]" - for(var/d in signal.data) - world << "- [d] = [signal.data[d]]" - */ - - if (signal.data["type"] == bot_type) - if(!botlist) - botlist = new() - - if(!(signal.source in botlist)) - botlist += signal.source - - if(active == signal.source) - var/list/b = signal.data - botstatus = b.Copy() - -/obj/item/radio/integrated/Topic(href, href_list) - ..() - var/obj/item/device/pda/PDA = src.hostpda - - switch(href_list["op"]) - - if("control") - active = locate(href_list["bot"]) - post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) - - if("scanbots") // find all bots - botlist = null - post_signal(control_freq, "command", "bot_status", s_filter = bot_filter) - - if("botlist") - active = null - - if("stop", "go") - post_signal(control_freq, "command", href_list["op"], "active", active, s_filter = bot_filter) - post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) - - if("summon") - post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(PDA) , "useraccess", PDA.GetAccess(), s_filter = bot_filter) - post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) - PDA.cartridge.unlock() - -/obj/item/radio/integrated/proc/add_to_radio(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots. - if(radio_controller) - radio_controller.add_object(src, control_freq, filter = bot_filter) - - -/obj/item/radio/integrated/beepsky - bot_filter = RADIO_SECBOT - bot_type = SEC_BOT - -/obj/item/radio/integrated/medbot - bot_filter = RADIO_MEDBOT - bot_type = MED_BOT - -/obj/item/radio/integrated/floorbot - bot_filter = RADIO_FLOORBOT - bot_type = FLOOR_BOT - -/obj/item/radio/integrated/cleanbot - bot_filter = RADIO_CLEANBOT - bot_type = CLEAN_BOT - -/obj/item/radio/integrated/mule - //var/list/botlist = null // list of bots - //var/obj/machinery/bot/mulebot/active // the active bot; if null, show bot list - //var/list/botstatus // the status signal sent by the bot - var/list/beacons - - var/beacon_freq = 1400 - control_freq = 1447 - -// create a new QM cartridge, and register to receive bot control & beacon message -/obj/item/radio/integrated/mule/New() - ..() - spawn(5) - if(radio_controller) - radio_controller.add_object(src, control_freq, filter = RADIO_MULEBOT) - radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS) - spawn(10) - post_signal(beacon_freq, "findbeacon", "delivery", s_filter = RADIO_NAVBEACONS) - -/obj/item/radio/integrated/mule/Destroy() - if(radio_controller) - radio_controller.remove_object(src,beacon_freq) - ..() - -// receive radio signals -// can detect bot status signals -// and beacon locations -// create/populate lists as they are recvd - -/obj/item/radio/integrated/mule/receive_signal(datum/signal/signal) -// var/obj/item/device/pda/P = src.loc - - /* - world << "recvd:[P] : [signal.source]" - for(var/d in signal.data) - world << "- [d] = [signal.data[d]]" - */ - if(signal.data["type"] == MULE_BOT) - if(!botlist) - botlist = new() - - if(!(signal.source in botlist)) - botlist += signal.source - - if(active == signal.source) - var/list/b = signal.data - botstatus = b.Copy() - - else if(signal.data["beacon"]) - if(!beacons) - beacons = new() - - beacons[signal.data["beacon"] ] = signal.source - - -// if(istype(P)) P.updateSelfDialog() - -/obj/item/radio/integrated/mule/Topic(href, href_list) - //..() - var/obj/item/device/pda/PDA = src.hostpda - var/cmd = "command" - if(active) - cmd = "command [active.suffix]" - - switch(href_list["op"]) - - if("control") - active = locate(href_list["bot"]) - - if("scanbots") // find all bots - botlist = null - - if("botlist") - active = null - - if("unload") - post_signal(control_freq, cmd, "unload", s_filter = RADIO_MULEBOT) - if("setdest") - if(beacons) - var/dest = input("Select Bot Destination", "Mulebot [active.suffix] Interlink", active.destination) as null|anything in beacons - if(dest) - post_signal(control_freq, cmd, "target", "destination", dest, s_filter = RADIO_MULEBOT) - - if("retoff") - post_signal(control_freq, cmd, "autoret", "value", 0, s_filter = RADIO_MULEBOT) - if("reton") - post_signal(control_freq, cmd, "autoret", "value", 1, s_filter = RADIO_MULEBOT) - - if("pickoff") - post_signal(control_freq, cmd, "autopick", "value", 0, s_filter = RADIO_MULEBOT) - - if("pickon") - post_signal(control_freq, cmd, "autopick", "value", 1, s_filter = RADIO_MULEBOT) - - if("stop", "go", "home") - post_signal(control_freq, cmd, href_list["op"], s_filter = RADIO_MULEBOT) - - post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT) - PDA.cartridge.unlock() - - /* * Radio Cartridge, essentially a signaler. @@ -251,7 +35,7 @@ ..() /obj/item/radio/integrated/signal/initialize() - if (src.frequency < 1441 || src.frequency > 1489) + if (src.frequency < 1200 || src.frequency > 1600) src.frequency = sanitize_frequency(src.frequency) set_frequency(frequency) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 6d5c687803b..f4953c98812 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -49,7 +49,8 @@ qdel(expansion) expansion = null del(src) -/* Easier to just call del() than this nonsense +//Easier to just call del() than this nonsense +// ya no, del() takes 0.8ds to run on avg. this takes less than 0.01 get_cameras() for(var/cam_tag in bugged_cameras) var/obj/machinery/camera/camera = bugged_cameras[cam_tag] @@ -59,7 +60,7 @@ if(tracking) tracking = null ..() -*/ + /obj/item/device/camera_bug/interact(var/mob/user = usr) var/datum/browser/popup = new(user, "camerabug","Camera Bug",nref=src) @@ -249,11 +250,11 @@ var/obj/machinery/camera/C = locate(href_list["view"]) if(istype(C)) if(!C.can_use()) - usr << "Something's wrong with that camera. You can't get a feed." + usr << "Something's wrong with that camera! You can't get a feed." return var/turf/T = get_turf(loc) if(!T || C.z != T.z) - usr << "You can't get a signal." + usr << "You can't get a signal!" return current = C spawn(6) @@ -311,7 +312,7 @@ /obj/item/device/camera_bug/attackby(var/obj/item/W as obj,var/mob/living/user as mob, params) if(istype(W,/obj/item/weapon/screwdriver) && expansion) expansion.loc = get_turf(loc) - user << "You unscrew [expansion]." + user << "You unscrew [expansion]." user.put_in_inactive_hand(expansion) expansion = null bugtype = VANILLA_BUG @@ -352,7 +353,7 @@ user.drop_item() W.loc = src expansion = W - user << "You add [W] to [src]." + user << "You add [W] to [src]." get_cameras() // the tracking code will want to know the new camera list if(bugtype in list(UNIVERSAL_BUG,NETWORK_BUG,ADMIN_BUG)) skip_bugcheck = 1 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 3e9018cb1bb..8901d2dd0ad 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -25,7 +25,7 @@ /obj/item/device/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something. broken = 1 icon_state = "[initial(icon_state)]burnt" - visible_message("The [src.name] burns out!") + visible_message("The [src.name] burns out!") /obj/item/device/flash/proc/flash_recharge(var/mob/user) @@ -66,12 +66,16 @@ M.confused += power terrible_conversion_proc(M, user) M.Stun(1) - user.visible_message("[user] blinds [M] with the flash!") + visible_message("[user] blinds [M] with the flash!") + user << "You blind [M] with the flash!" + M << "[user] blinds you with the flash!" if(M.weakeyes) M.Stun(2) - M.visible_message("[M] gasps and shields their eyes!") + M.visible_message("[M] gasps and shields their eyes!", "You gasp and shields your eyes!") else - user.visible_message("[user] fails to blind [M] with the flash!") + visible_message("[user] fails to blind [M] with the flash!") + user << "You fail to blind [M] with the flash!" + M << "[user] fails to blind you with the flash!" else if(M.flash_eyes()) M.confused += power @@ -88,16 +92,16 @@ add_logs(user, M, "flashed", object="[src.name]") flick("e_flash", M.flash) M.Weaken(rand(5,10)) - user.visible_message("[user] overloads [M]'s sensors with the flash!") + user.visible_message("[user] overloads [M]'s sensors with the flash!", "You overload [M]'s sensors with the flash!") return 1 - user.visible_message("[user] fails to blind [M] with the flash!") + user.visible_message("[user] fails to blind [M] with the flash!", "You fail to blind [M] with the flash!") /obj/item/device/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!try_use_flash(user)) return 0 - user.visible_message("[user]'s flash emits a blinding light!") + user.visible_message("[user]'s flash emits a blinding light!", "Your flash emits a blinding light!") for(var/mob/living/carbon/M in oviewers(3, null)) flash_carbon(M, user, 3, 0) @@ -113,7 +117,7 @@ /obj/item/device/flash/proc/terrible_conversion_proc(var/mob/M, var/mob/user) if(ishuman(M) && ishuman(user) && M.stat != DEAD) - if(user.mind && ((user.mind in ticker.mode.head_revolutionaries) || (user.mind in ticker.mode.A_bosses) || (user.mind in ticker.mode.B_bosses))) + if(user.mind && (user.mind in ticker.mode.head_revolutionaries)) if(M.client) if(M.stat == CONSCIOUS) M.mind_initialize() //give them a mind datum if they don't have one. @@ -122,12 +126,6 @@ if(user.mind in ticker.mode.head_revolutionaries) if(!ticker.mode.add_revolutionary(M.mind)) resisted = 1 - if(user.mind in ticker.mode.A_bosses) - if(!ticker.mode.add_gangster(M.mind,"A")) - resisted = 1 - if(user.mind in ticker.mode.B_bosses) - if(!ticker.mode.add_gangster(M.mind,"B")) - resisted = 1 else resisted = 1 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 14409f8c738..5e8555d13ad 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -38,7 +38,7 @@ /obj/item/device/flashlight/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities. + user << "You cannot turn the light on while in this [user.loc]!" //To prevent some lighting anomalities. return 0 on = !on update_brightness(user) @@ -53,7 +53,7 @@ return ..() //just hit them in the head if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return var/mob/living/carbon/human/H = M //mob has protective eyewear @@ -64,21 +64,22 @@ if(M == user) //they're using it on themselves if(!M.eye_blind) flick("flash", M.flash) - M.visible_message("[M] directs [src] to \his eyes.", \ + M.visible_message("[M] directs [src] to \his eyes.", \ "You wave the light in front of your eyes! Trippy!") else - M.visible_message("[M] directs [src] to \his eyes.", \ + M.visible_message("[M] directs [src] to \his eyes.", \ "You wave the light in front of your eyes.") return - user.visible_message("[user] directs [src] to [M]'s eyes.", \ - "You direct [src] to [M]'s eyes.") + user.visible_message("[user] directs [src] to [M]'s eyes.", \ + "You direct [src] to [M]'s eyes.") + M << "[user] directs [src] to your eyes." if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey)) //robots and aliens are unaffected if(M.stat == DEAD || M.disabilities & BLIND) //mob is dead or fully blind - user << "[M] pupils does not react to the light!" + user << "[M] pupils don't react to the light!" else if(M.dna.check_mutation(XRAY)) //mob has X-RAY vision - user << "[M] pupils give an eerie glow!" + user << "[M] pupils give an eerie glow!" else //they're okay! if(!M.eye_blind) flick("flash", M.flash) //flash the affected mob @@ -111,7 +112,7 @@ /obj/item/device/flashlight/pen/afterattack(atom/target, mob/user, proximity_flag) if(!proximity_flag) if(holo_cooldown) - user << "[src] is not ready yet." + user << "[src] is not ready yet!" return var/T = get_turf(target) if(locate(/mob/living) in T) @@ -237,7 +238,7 @@ obj/item/device/flashlight/lamp/bananalamp // Usual checks if(!fuel) - user << "It's out of fuel." + user << "It's out of fuel!" return if(on) return diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm new file mode 100644 index 00000000000..6ecc1a86125 --- /dev/null +++ b/code/game/objects/items/devices/instruments.dm @@ -0,0 +1,57 @@ +//copy pasta of the space piano, don't hurt me -Pete +/obj/item/device/instrument + name = "generic instrument" + var/datum/song/handheld/song + var/instrumentId = "generic" + var/instrumentExt = "ogg" + +/obj/item/device/instrument/New() + song = new(instrumentId, src) + song.instrumentExt = instrumentExt + +/obj/item/device/instrument/Destroy() + qdel(song) + song = null + ..() + +/obj/item/device/instrument/initialize() + song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded + ..() + +/obj/item/device/instrument/attack_self(mob/user as mob) + if(!user.IsAdvancedToolUser()) + user << "You don't have the dexterity to do this!" + return 1 + interact(user) + +/obj/item/device/instrument/interact(mob/user as mob) + if(!user) + return + + if(!isliving(user) || user.stat || user.restrained() || user.lying) + return + + user.set_machine(src) + song.interact(user) + +/obj/item/device/instrument/violin + name = "space violin" + desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\"" + icon = 'icons/obj/musician.dmi' + icon_state = "violin" + item_state = "violin" + force = 10 + hitsound = "swing_hit" + instrumentId = "violin" + +/obj/item/device/instrument/guitar + name = "guitar" + desc = "It's made of wood and has bronze strings." + icon = 'icons/obj/musician.dmi' + icon_state = "guitar" + item_state = "guitar" + force = 10 + attack_verb = list("played metal on", "serenaded", "crashed", "smashed") + hitsound = "swing_hit" + instrumentId = "guitar" + diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index d773852de9b..c66a93aa4ad 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -112,7 +112,7 @@ if(C.weakeyes) C.Stun(1) else - outmsg = "You fail to blind [C] by shining [src] at their eyes." + outmsg = "You fail to blind [C] by shining [src] at their eyes!" //robots and AI else if(issilicon(target)) @@ -121,11 +121,11 @@ if(prob(effectchance * diode.rating)) flick("e_flash", S.flash) S.Weaken(rand(5,10)) - S << "Your sensors were overloaded by a laser!" + S << "Your sensors were overloaded by a laser!" outmsg = "You overload [S] by shining [src] at their sensors." add_logs(user, S, "shone in the sensors", object="laser pointer") else - outmsg = "You fail to overload [S] by shining [src] at their sensors." + outmsg = "You fail to overload [S] by shining [src] at their sensors!" //cameras else if(istype(target, /obj/machinery/camera)) @@ -135,7 +135,7 @@ outmsg = "You hit the lens of [C] with [src], temporarily disabling the camera!" add_logs(user, C, "EMPed", object="laser pointer") else - outmsg = "You missed the lens of [C] with [src]." + outmsg = "You miss the lens of [C] with [src]!" //laser pointer image icon_state = "pointer_[pointer_icon_state]" @@ -158,7 +158,7 @@ recharging = 1 SSobj.processing |= src if(energy <= 0) - user << "You've overused the battery of [src], now it needs time to recharge!" + user << "The [src]'s battery is overused, it needs time to recharge!" recharge_locked = 1 flick_overlay(I, showto, 10) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index d4f37fa97e5..4580e823eba 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -82,19 +82,19 @@ user << "You insert a piece of glass into the [src.name]. You have [uses] lights remaining." return else - user << "You need one sheet of glass to replace lights." + user << "You need one sheet of glass to replace lights!" if(istype(W, /obj/item/weapon/light)) var/obj/item/weapon/light/L = W if(L.status == 0) // LIGHT OKAY if(uses < max_uses) AddUses(1) - user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining." + user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining." user.drop_item() qdel(L) return else - user << "You need a working light." + user << "You need a working light!" return /obj/item/device/lightreplacer/emag_act() @@ -170,7 +170,7 @@ U << failmsg return else - U << "There is a working [target.fitting] already inserted." + U << "There is a working [target.fitting] already inserted!" return /obj/item/device/lightreplacer/proc/Emag() diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 29c9fbfbba9..3b307fc00cf 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -32,7 +32,7 @@ message = capitalize(message) if(!user.can_speak(message)) - user << "You find yourself unable to speak at all." + user << "You find yourself unable to speak at all!" return if ((src.loc == user && user.stat == 0)) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 9d656406bbf..e7aa20945cb 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -50,7 +50,7 @@ else dat += "No personality is installed.
" dat += "\[Request personal AI personality\]
" - dat += "Each time this button is pressed, a request will be sent out to any available personalities. Check back often and alot time for personalities to respond. This process could take anywhere from 15 seconds to several minutes, depending on the available personalities' timeliness." + dat += "Each time this button is pressed, a request will be sent out to any available personalities. Check back often and give a lot of time for personalities to respond. This process could take anywhere from 15 seconds to several minutes, depending on the available personalities' timeliness." user << browse(dat, "window=paicard") onclose(user, "paicard") return @@ -69,7 +69,7 @@ if(pai.master_dna) return if(!istype(usr, /mob/living/carbon)) - usr << "You don't have any DNA, or your DNA is incompatible with this device." + usr << "You don't have any DNA, or your DNA is incompatible with this device!" else var/mob/living/carbon/M = usr pai.master = M.real_name diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index b7256885428..cbf2bb7d193 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -67,7 +67,7 @@ user.visible_message("[user] cuts the [chosen_wire] wire!", "You cut the [chosen_wire] wire!") sleep(5) if(chosen_wire == correct_wire) - src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.") + src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.") user << "You did it!" icon_state = "pizzabox_bomb_[correct_wire]" name = "pizza bomb" @@ -81,13 +81,13 @@ return if(istype(I, /obj/item/weapon/wirecutters) && disarmed) if(!in_range(user, src)) - user << "You can't see the box well enough to cut the wires out." + user << "You can't see the box well enough to cut the wires out!" return - user.visible_message("[user] starts removing the payload and wires from \the [src].") + user.visible_message("[user] starts removing the payload and wires from \the [src].", "You start removing the payload and wires from \the [src]...") if(do_after(user, 40)) playsound(src, 'sound/items/Wirecutter.ogg', 50, 1, 1) user.unEquip(src) - user.visible_message("[user] removes the insides of \the [src]!") + user.visible_message("[user] removes the insides of \the [src]!", "You remove the insides of \the [src].") var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(src.loc) C.amount = 3 new /obj/item/weapon/bombcore/miniature(src.loc) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 746dfaea182..970e7550699 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -61,21 +61,21 @@ if(isturf(T) && !T.intact) attached = locate() in T if(!attached) - user << "No exposed cable here to attach to." + user << "No exposed cable here to attach to!" else set_mode(CLAMPED_OFF) user.visible_message( \ "[user] attaches \the [src] to the cable.", \ - "You attach \the [src] to the cable.", - "You hear some wires being connected to something.") + "You attach \the [src] to the cable.", + "You hear some wires being connected to something.") else - user << "Device must be placed over an exposed cable to attach to it." + user << "Device must be placed over an exposed cable to attach to it!" else set_mode(DISCONNECTED) user.visible_message( \ "[user] detaches \the [src] from the cable.", \ - "You detach \the [src] from the cable.", - "You hear some wires being disconnected from something.") + "You detach \the [src] from the cable.", + "You hear some wires being disconnected from something.") else ..() @@ -93,8 +93,8 @@ if(CLAMPED_OFF) user.visible_message( \ "[user] activates \the [src]!", \ - "You activate \the [src]!", - "You hear a click.") + "You activate \the [src].", + "You hear a click.") message_admins("Power sink activated by [key_name(user, user.client)](?) at ([x],[y],[z] - JMP)") log_game("Power sink activated by [key_name(user)] at ([x],[y],[z])") set_mode(OPERATING) @@ -102,8 +102,8 @@ if(OPERATING) user.visible_message( \ "[user] deactivates \the [src]!", \ - "You deactivate \the [src]!", - "You hear a click.") + "You deactivate \the [src].", + "You hear a click.") set_mode(CLAMPED_OFF) /obj/item/device/powersink/process() diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 06922665771..3af3ab07841 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -27,7 +27,7 @@ if(iscarbon(user)) var/mob/living/carbon/C = user if(src == C.back) - user << "You need help taking this off!" + user << "You need help taking this off!" return ..() @@ -38,7 +38,7 @@ A.icon = 'icons/obj/assemblies.dmi' if(!user.unEquip(W)) - user << "\the [W] is stuck to your hand, you cannot attach it to \the [src]!" + user << "\the [W] is stuck to your hand, you cannot attach it to \the [src]!" return W.loc = A W.master = A diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index ceec8b34cf9..55fa4cd6179 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -8,6 +8,7 @@ var/translate_binary = 0 var/translate_hive = 0 var/syndie = 0 + var/centcom = 0 var/list/channels = list() @@ -118,5 +119,12 @@ icon_state = "srv_cypherkey" channels = list("Service" = 1) +/obj/item/device/encryptionkey/headset_cent + name = "centcom radio encryption key" + desc = "An encryption key for a radio headset. To access the centcom channel, use :y." + icon_state = "cent_cypherkey" + centcom = 1 + channels = list("Centcom" = 1) + /obj/item/device/encryptionkey/ai //ported from NT, this goes 'inside' the AI. channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1) \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index c054a5de007..92ad5697dc7 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -188,17 +188,18 @@ /obj/item/device/radio/headset/headset_cent name = "\improper Centcom headset" - desc = "A headset used by the upper echelons of Nanotrasen. \nTo access the command channel, use :c." + desc = "A headset used by the upper echelons of Nanotrasen. \nTo access the centcom channel, use :y." icon_state = "cent_headset" item_state = "headset" keyslot = new /obj/item/device/encryptionkey/headset_com + keyslot2 = new /obj/item/device/encryptionkey/headset_cent /obj/item/device/radio/headset/headset_cent/commander keyslot = new /obj/item/device/encryptionkey/heads/captain /obj/item/device/radio/headset/headset_cent/alt name = "\improper Centcom bowman headset" - desc = "A headset especially for emergency response personnel. Protects ears from flashbangs." + desc = "A headset especially for emergency response personnel. Protects ears from flashbangs. \nTo access the centcom channel, use :y." flags = EARBANGPROTECT icon_state = "cent_headset_alt" item_state = "cent_headset_alt" @@ -241,14 +242,14 @@ keyslot2 = null recalculateChannels() - user << "You pop out the encryption keys in the headset!" + user << "You pop out the encryption keys in the headset." else - user << "This headset doesn't have any unique encryption keys! How useless..." + user << "This headset doesn't have any unique encryption keys! How useless..." if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot && keyslot2) - user << "The headset can't hold another key!" + user << "The headset can't hold another key!" return if(!keyslot) @@ -285,6 +286,9 @@ if(keyslot2.syndie) src.syndie = 1 + if (keyslot2.centcom) + centcom = 1 + for(var/ch_name in channels) secure_radio_connections[ch_name] = add_radio(src, radiochannels[ch_name]) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 816c0f37b0a..8bed318c4ad 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -23,7 +23,9 @@ var/obj/item/device/encryptionkey/keyslot //To allow the radio to accept encryption keys. var/subspace_transmission = 0 var/syndie = 0//Holder to see if it's a syndicate encrpyed radio + var/centcom = 0//Bleh, more dirty booleans var/maxf = 1499 + var/freqlock = 0 //Frequency lock to stop the user from untuning specialist radios. var/emped = 0 //Highjacked to track the number of consecutive EMPs on the radio, allowing consecutive EMP's to stack properly. // "Example" = FREQ_LISTENING|FREQ_BROADCASTING flags = CONDUCT | HEAR @@ -58,6 +60,7 @@ translate_binary = 0 translate_hive = 0 syndie = 0 + centcom = 0 if(keyslot) for(var/ch_name in keyslot.channels) @@ -75,6 +78,9 @@ if(keyslot.syndie) syndie = 1 + if (keyslot.centcom) + centcom = 1 + for(var/ch_name in channels) secure_radio_connections[ch_name] = add_radio(src, radiochannels[ch_name]) @@ -132,14 +138,17 @@ "} else //Headsets dont get a mic button, speaker controls both dat += "Power: [listening ? "Engaged" : "Disengaged"]
" - dat += {" - Frequency: - - - - - [format_frequency(frequency)] - + - +
- "} + if (freqlock) + dat += "Frequency: LOCKED
" + else + dat += {" + Frequency: + - + - + [format_frequency(frequency)] + + + +
+ "} for (var/ch_name in channels) dat+=text_sec_channel(ch_name, channels[ch_name]) @@ -173,39 +182,16 @@ usr << browse(null, "window=radio") return usr.set_machine(src) - if (href_list["track"]) - var/mob/target = locate(href_list["track"]) - var/mob/living/silicon/ai/A = locate(href_list["track2"]) - if(A && target) - A.ai_actual_track(target) - return - - else if (href_list["faketrack"]) - var/mob/target = locate(href_list["track"]) - var/mob/living/silicon/ai/A = locate(href_list["track2"]) - if(A && target) - - A:cameraFollow = target - A << text("Now tracking [] on camera.", target.name) - if (usr.machine == null) - usr.machine = usr - - while (usr:cameraFollow == target) - usr << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)." - sleep(40) - continue - - return - - else if (href_list["freq"]) - var/new_frequency = (frequency + text2num(href_list["freq"])) - if (!freerange || (frequency < 1200 || frequency > 1600)) - new_frequency = sanitize_frequency(new_frequency, maxf) - set_frequency(new_frequency) - if(hidden_uplink) - if(hidden_uplink.check_trigger(usr, frequency, traitor_frequency)) - usr << browse(null, "window=radio") - return + if (href_list["freq"]) + if (!freqlock) + var/new_frequency = (frequency + text2num(href_list["freq"])) + if (!freerange || (frequency < 1200 || frequency > 1600)) + new_frequency = sanitize_frequency(new_frequency, maxf) + set_frequency(new_frequency) + if(hidden_uplink) + if(hidden_uplink.check_trigger(usr, frequency, traitor_frequency)) + usr << browse(null, "window=radio") + return else if (href_list["talk"]) broadcasting = text2num(href_list["talk"]) @@ -273,6 +259,7 @@ freq = frequency channel = null + var/freqnum = text2num(freq) //Why should we call text2num three times when we can just do it here? var/turf/position = get_turf(src) //#### Tagging the signal with all appropriate identity values ####// @@ -328,6 +315,43 @@ else jobname = "Unknown" + /* ###### Centcom channel bypasses all comms relays. ###### */ + + if (freqnum == CENTCOM_FREQ && centcom) + var/datum/signal/signal = new + signal.transmission_method = 2 + signal.data = list( + "mob" = M, // store a reference to the mob + "mobtype" = M.type, // the mob's type + "realname" = real_name, // the mob's real name + "name" = voice, // the mob's voice name + "job" = jobname, // the mob's job + "key" = mobkey, // the mob's key + "vmask" = voicemask, // 1 if the mob is using a voice gas mas + + "compression" = 0, // uncompressed radio signal + "message" = message, // the actual sent message + "radio" = src, // stores the radio used for transmission + "slow" = 0, + "traffic" = 0, + "type" = 0, + "server" = null, + "reject" = 0, + "level" = 0, + "languages" = languages, + "spans" = spans, + "verb_say" = M.verb_say, + "verb_ask" = M.verb_ask, + "verb_exclaim" = M.verb_exclaim, + "verb_yell" = M.verb_yell + ) + signal.frequency = freqnum // Quick frequency set + Broadcast_Message(M, voicemask, + src, message, voice, jobname, real_name, + 5, signal.data["compression"], list(position.z, 0), freq, spans, + verb_say, verb_ask, verb_exclaim, verb_yell) + return + /* ###### Radio headsets can only broadcast through subspace ###### */ if(subspace_transmission) @@ -416,7 +440,7 @@ "verb_exclaim" = M.verb_exclaim, "verb_yell" = M.verb_yell ) - signal.frequency = text2num(freq) // Quick frequency set + signal.frequency = freqnum // Quick frequency set for(var/obj/machinery/telecomms/receiver/R in telecomms_list) R.receive_signal(signal) @@ -469,6 +493,9 @@ if(freq == SYND_FREQ) if(!(src.syndie)) //Checks to see if it's allowed on that frequency, based on the encryption keys return -1 + if(freq == CENTCOM_FREQ) + if (!(src.centcom)) + return -1 if (!on) return -1 if (!freq) //received on main frequency @@ -570,14 +597,14 @@ keyslot = null recalculateChannels() - user << "You pop out the encryption key in the radio!" + user << "You pop out the encryption key in the radio." else - user << "This radio doesn't have any encryption keys!" + user << "This radio doesn't have any encryption keys!" if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot) - user << "The radio can't hold another key!" + user << "The radio can't hold another key!" return if(!keyslot) diff --git a/code/game/objects/items/devices/recaller.dm b/code/game/objects/items/devices/recaller.dm index c6e43c89717..de3f046635c 100644 --- a/code/game/objects/items/devices/recaller.dm +++ b/code/game/objects/items/devices/recaller.dm @@ -1,6 +1,5 @@ -//Recaller device -//Allows gang leaders to recall the shuttle -/obj/item/device/recaller +//gangtool device +/obj/item/device/gangtool name = "suspicious device" desc = "A strange device of sorts. Hard to really make out what it actually does just by looking." icon_state = "recaller" @@ -10,31 +9,279 @@ throw_speed = 3 throw_range = 7 flags = CONDUCT + var/gang //Which gang uses this? + var/boss = 1 //If it has the power to promote gang members var/recalling = 0 + var/promotions = 0 -/obj/item/device/recaller/attack_self(mob/user) - if(recalling) +/obj/item/device/gangtool/New() //Initialize supply point income if it hasn't already been started + if(!ticker.mode.gang_points) + ticker.mode.gang_points = new /datum/gang_points(ticker.mode) + ticker.mode.gang_points.start() + if(boss) + desc += " Looks important." + +/obj/item/device/gangtool/attack_self(mob/user) + if (!can_use(user)) return - if((user.mind in ticker.mode.A_bosses) || (user.mind in ticker.mode.B_bosses)) - var/turf/userturf = get_turf(user) - if(userturf.z != 1) - user << "\icon[src]Error: Device out of range of station communication arrays." - return - switch(SSshuttle.emergency.mode) - if(SHUTTLE_CALL) - recalling = 1 - loc << "\icon[src]Generating shuttle recall order with codes retrieved from last call signal..." - sleep(rand(10,30)) - loc << "\icon[src]Shuttle recall order generated. Accessing station long-range communication arrays..." - sleep(rand(10,30)) - loc << "\icon[src]Comm arrays accessed. Broadcasting recall signal..." - sleep(rand(10,30)) - recalling = 0 - log_game("[key_name(user)] has recalled the shuttle with a recaller.") - message_admins("[key_name_admin(user)] has recalled the shuttle with a recaller.", 1) - if(!SSshuttle.cancelEvac(user)) - loc << "\icon[src]No response received. Emergency shuttle cannot be recalled at this time." - return + var/dat + if(!gang) + dat += "This device is not registered.
" + if(user.mind in (ticker.mode.A_bosses | ticker.mode.B_bosses)) + dat += "Give this device to another member of your organization to use.
" + else + dat += "Register Device
" + else + var/gang_size = ((gang == "A")? (ticker.mode.A_gang.len + ticker.mode.A_bosses.len) : (ticker.mode.B_gang.len + ticker.mode.B_bosses.len)) + var/gang_territory = ((gang == "A")? ticker.mode.A_territory.len : ticker.mode.B_territory.len) + var/points = ((gang == "A") ? ticker.mode.gang_points.A : ticker.mode.gang_points.B) - user << "\icon[src]Emergency shuttle cannot be recalled at this time." \ No newline at end of file + dat += "Registration: [(gang == "A")? gang_name("A") : gang_name("B")] Gang [boss ? "Administrator" : "Lieutenant"]
" + dat += "Organization Size: [gang_size]
" + dat += "Station Control: [round((gang_territory/start_state.num_territories)*100, 1)]%
" + dat += "Recall Emergency Shuttle
" + dat += "
" + dat += "Influence: [points]
" + dat += "Time until Influence grows: [(points >= 100) ? ("--:--") : (time2text(ticker.mode.gang_points.next_point_time - world.time, "mm:ss"))]
" + dat += "Purchase Items:
" + + dat += "(5 Influence) " + if(points >= 5) + dat += "Send Gang-wide Message
" + else + dat += "Send Gang-wide Message
" + + dat += "(10 Influence) " + if(points >= 10) + dat += "Territory Spraycan
" + else + dat += "Territory Spraycan
" + + dat += "(10 Influence) " + if(points >= 10) + dat += "Switchblade
" + else + dat += "Switchblade
" + + dat += "(25 Influence) " + if(points >= 25) + dat += "10mm Pistol
" + else + dat += "10mm Pistol
" + + dat += "(10 Influence) " + if(points >= 10) + dat += "10mm Ammo
" + else + dat += "10mm Ammo
" + + dat += "(40 Influence) " + if(points >= 40) + dat += "Recruitment Pen
" + else + dat += "Recruitment Pen
" + + if(boss) + if(promotions >= 3) + dat += "(Out of stock) Promote a Gangster
" + else + dat += "([(promotions*20)+10] Influence, [3-promotions] left) " + if(points >= (promotions*20)+10) + dat += "Promote a Gangster
" + else + dat += "Promote a Gangster
" + + dat += "
" + dat += "Refresh
" + + var/datum/browser/popup = new(user, "gangtool", "Welcome to GangTool v0.4") + popup.set_content(dat) + popup.open() + +/obj/item/device/gangtool/Topic(href, href_list) + if(!can_use(usr)) + return + + add_fingerprint(usr) + + if(href_list["register"]) + register_device(usr) + + else if(!gang) //Gangtool must be registered before you can use the functions below + return + + if(href_list["purchase"]) + var/points = ((gang == "A") ? ticker.mode.gang_points.A : ticker.mode.gang_points.B) + var/item_type + switch(href_list["purchase"]) + if("spraycan") + if(points >= 10) + item_type = /obj/item/toy/crayon/spraycan/gang + points = 10 + if("switchblade") + if(points >= 10) + item_type = /obj/item/weapon/switchblade + points = 10 + if("pistol") + if(points >= 25) + item_type = /obj/item/weapon/gun/projectile/automatic/pistol + points = 25 + if("ammo") + if(points >= 10) + item_type = /obj/item/ammo_box/magazine/m10mm + points = 10 + if("pen") + if(points >= 40) + item_type = /obj/item/weapon/pen/gang + points = 40 + if("gangtool") + if((promotions < 3) && (points >= (promotions*20)+10)) + item_type = /obj/item/device/gangtool/lt + points = (promotions*20)+10 + promotions++ + + if(item_type) + if(gang == "A") + ticker.mode.gang_points.A -= points + else if(gang == "B") + ticker.mode.gang_points.B -= points + var/obj/purchased = new item_type(get_turf(usr)) + var/mob/living/carbon/human/H = usr + H.put_in_any_hand_if_possible(purchased) + ticker.mode.message_gangtools(((gang=="A")? ticker.mode.A_tools : ticker.mode.B_tools), "A [href_list["purchase"]] was purchased by [usr] for [points] Influence.") + log_game("A [href_list["purchase"]] was purchased by [key_name(usr)] for [points] Influence.") + + else if(href_list["choice"]) + switch(href_list["choice"]) + if("recall") + recall(usr) + if("ping") + ping_gang(usr) + attack_self(usr) + + +/obj/item/device/gangtool/proc/ping_gang(var/mob/user) + if(!user) + return + var/message = stripped_input(user,"Discreetly send a gang-wide message.","Send Message") as null|text + if(!message || (message == "") || !can_use(user)) + return + if(user.z > 2) + user << "\icon[src]Error: Station out of range." + return + var/list/members = list() + if(gang == "A") + if(ticker.mode.gang_points.A >= 5) + members += ticker.mode.A_bosses | ticker.mode.A_gang + ticker.mode.gang_points.A -= 5 + else if(gang == "B") + if(ticker.mode.gang_points.B >= 5) + members += ticker.mode.B_bosses | ticker.mode.B_gang + ticker.mode.gang_points.B -= 5 + if(members.len) + for(var/datum/mind/ganger in members) + if(ganger.current.z <= 2) + ganger.current << "BOSS: [message]" + message_admins("[key_name_admin(user)] sent a global message to the [gang_name(gang)] Gang ([gang]): [message].") + log_game("[key_name(user)] sent a global message to the [gang_name(gang)] Gang ([gang]): [message].") + + +/obj/item/device/gangtool/proc/register_device(var/mob/user) + if(jobban_isbanned(user, "gangster") || jobban_isbanned(user, "Syndicate")) + user << "\icon[src] ACCESS DENIED: Blacklisted user." + return 0 + + var/promoted + if(user.mind in (ticker.mode.A_gang | ticker.mode.A_bosses)) + ticker.mode.A_tools += src + gang = "A" + if(!(user.mind in ticker.mode.A_bosses)) + ticker.mode.remove_gangster(user.mind, 0, 2) + ticker.mode.A_bosses += user.mind + user.mind.special_role = "[gang_name("A")] Gang (A) Lieutenant" + ticker.mode.update_gang_icons_added(user.mind, "A") + log_game("[key_name(user)] has been promoted to Lieutenant in the [gang_name("A")] Gang (A)") + promoted = 1 + else if(user.mind in (ticker.mode.B_gang | ticker.mode.B_bosses)) + ticker.mode.B_tools += src + gang = "B" + if(!(user.mind in ticker.mode.B_bosses)) + ticker.mode.remove_gangster(user.mind, 0, 2) + ticker.mode.B_bosses += user.mind + user.mind.special_role = "[gang_name("B")] Gang (B) Lieutenant" + ticker.mode.update_gang_icons_added(user.mind, "B") + log_game("[key_name(user)] has been promoted to Lieutenant in the [gang_name("B")] Gang (B)") + promoted = 1 + if(promoted) + ticker.mode.message_gangtools(((gang=="A")? ticker.mode.A_tools : ticker.mode.B_tools), "[user] has been promoted to Lieutenant.") + user << "You have been promoted to Lieutenant!" + ticker.mode.forge_gang_objectives(user.mind) + ticker.mode.greet_gang(user.mind,0) + user << "The Gangtool you registered will allow you to use your gang's influence to purchase items and prevent the station from evacuating before your gang can take over. Use it to recall the emergency shuttle from anywhere on the station." + user << "You may also now use recruitment pens to grow your gang membership. Use them on unsuspecting crew members to recruit them." + if(!gang) + usr << "ACCESS DENIED: Unauthorized user." + +/obj/item/device/gangtool/proc/recall(mob/user) + if(recalling || !can_use(user)) + return + + recalling = 1 + loc << "\icon[src]Generating shuttle recall order with codes retrieved from last call signal..." + + sleep(rand(10,30)) + + if(SSshuttle.emergency.mode != SHUTTLE_CALL) //Shuttle can only be recalled when it's moving to the station + user << "\icon[src]Emergency shuttle cannot be recalled at this time." + recalling = 0 + return + loc << "\icon[src]Shuttle recall order generated. Accessing station long-range communication arrays..." + + sleep(rand(10,30)) + + var/turf/userturf = get_turf(user) + if(userturf.z != 1) //Shuttle can only be recalled while on station + user << "\icon[src]Error: Device out of range of station communication arrays." + recalling = 0 + return + var/datum/station_state/end_state = new /datum/station_state() + end_state.count() + if((100 * start_state.score(end_state)) < 70) //Shuttle cannot be recalled if the station is too damaged + user << "\icon[src]Error: Station communication systems compromised. Unable to establish connection." + recalling = 0 + return + loc << "\icon[src]Comm arrays accessed. Broadcasting recall signal..." + + sleep(rand(10,30)) + + recalling = 0 + log_game("[key_name(user)] has tried to recall the shuttle with a gangtool.") + message_admins("[key_name_admin(user)] has tried to recall the shuttle with a gangtool.", 1) + if(!SSshuttle.cancelEvac(user)) + loc << "\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time." + +/obj/item/device/gangtool/proc/can_use(mob/living/carbon/human/user) + if(!istype(user)) + return + if(user.restrained() || user.lying || user.stat || user.stunned || user.weakened) + return + if(!(src in user.contents)) + return + + var/success + if(user.mind) + if(gang) + if((gang == "A") && (user.mind in ticker.mode.A_bosses)) + success = 1 + else if((gang == "B") && (user.mind in ticker.mode.B_bosses)) + success = 1 + else + success = 1 + if(success) + return 1 + user << "\icon[src] ACCESS DENIED: Unauthorized user." + return 0 + +/obj/item/device/gangtool/lt + boss = 0 \ No newline at end of file diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 487345421fd..c3c6a846aea 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -92,13 +92,12 @@ MASS SPECTROMETER if ((user.disabilities & CLUMSY || user.getBrainLoss() >= 60) && prob(50)) user << "You stupidly try to analyze the floor's vitals!" user.visible_message("[user] has analyzed the floor's vitals!") - user.show_message("Analyzing Results for The floor:\n\t Overall Status: Healthy", 1) - user.show_message("\t Damage Specifics: 0-0-0-0", 1) - user.show_message("Key: Suffocation/Toxin/Burn/Brute", 1) - user.show_message("Body Temperature: ???", 1) + user << "Analyzing results for The floor:\n\tOverall status: Healthy" + user << "Key: Suffocation/Toxin/Burn/Brute" + user << "\tDamage specifics: 0-0-0-0" + user << "Body temperature: ???" return - user.visible_message("[user] has analyzed [M]'s vitals.") if(!scanchems) @@ -117,98 +116,97 @@ MASS SPECTROMETER var/tox_loss = M.getToxLoss() var/fire_loss = M.getFireLoss() var/brute_loss = M.getBruteLoss() - var/mob_status = (M.stat > 1 ? "Deceased" : "[M.health]% healthy") + var/mob_status = (M.stat > 1 ? "Deceased" : "[M.health] % healthy") if(M.status_flags & FAKEDEATH) - mob_status = "Deceased" + mob_status = "Deceased" oxy_loss = max(rand(1, 40), oxy_loss, (300 - (tox_loss + fire_loss + brute_loss))) // Random oxygen loss if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.heart_attack) - user.show_message("Subject suffering from heart attack: Apply defibrillator immediately.") - user.show_message(text("Analyzing Results for []:\n\t Overall Status: []", M, mob_status), 1) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.dna)// Show target's species, if they have one - user.show_message("Species: [H.dna.species.name]", 1) - else // Otherwise we can assume that they are a regular human - user.show_message("Species: Human", 1) - user.show_message("\t Damage Specifics: [oxy_loss]-[tox_loss]-[fire_loss]-[brute_loss]", 1) - user.show_message("Key: Suffocation/Toxin/Burn/Brute", 1) - user.show_message("Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) + user << "Subject suffering from heart attack: Apply defibrillator immediately!" + user << "Analyzing results for [M]:\n\tOverall status: [mob_status]" - // Time of death - if(M.tod && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) - user.show_message("Time of Death: [M.tod]", 1) + // Damage descriptions + if(brute_loss > 10) + user << "\t[brute_loss > 50 ? "Severe" : "Minor"] tissue damage detected." + if(fire_loss > 10) + user << "\t[fire_loss > 50 ? "Severe" : "Minor"] burn damage detected." + if(oxy_loss > 10) + user << "\t[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected." + if(tox_loss > 10) + user << "\t[tox_loss > 50 ? "Critical" : "Dangerous"] amount of toxins detected." + if(M.getStaminaLoss()) + user << "\tSubject appears to be suffering from fatigue." + if (M.getCloneLoss()) + user << "\tSubject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage." + if (M.reagents && M.reagents.get_reagent_amount("epinephrine")) + user << "\tBloodstream analysis located [M.reagents:get_reagent_amount("epinephrine")] units of rejuvenation chemicals." + if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/brain)) + user << "\tSubject brain function is non-existant." + else if (M.getBrainLoss() >= 60) + user << "\tSevere brain damage detected. Subject likely to have mental retardation." + else if (M.getBrainLoss() >= 10) + user << "\tBrain damage detected. Subject may have had a concussion." // Organ damage report if(istype(M, /mob/living/carbon/human) && mode == 1) var/mob/living/carbon/human/H = M var/list/damaged = H.get_damaged_organs(1,1) - user.show_message("Localized Damage, Burn/Brute:",1) - if(length(damaged)>0) + if(length(damaged)>0 || oxy_loss>0 || tox_loss>0 || fire_loss>0) + user << "\tDamage: Brute-Burn-Toxin-Suffocation\n\t\tSpecifics: [brute_loss]-[fire_loss]-[tox_loss]-[oxy_loss]" for(var/obj/item/organ/limb/org in damaged) - user.show_message(text("\t []: []-[]", capitalize(org.getDisplayName()), (org.burn_dam > 0) ? "[org.burn_dam]" : 0, (org.brute_dam > 0) ? "[org.brute_dam]" : 0), 1) - else - user.show_message("\t Limbs are OK.",1) + user << "\t\t[capitalize(org.getDisplayName())]: [(org.brute_dam > 0) ? "[org.brute_dam]" : "0"]-[(org.burn_dam > 0) ? "[org.burn_dam]" : "0"]" - // Damage descriptions + // Species and body temperature + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.dna) + user << "Species: [H.dna.species.name]" + user << "Body temperature: [round(M.bodytemperature-T0C,0.1)] °C ([round(M.bodytemperature*1.8-459.67,0.1)] °F)" - user.show_message(text("[] | [] | [] | []", oxy_loss > 50 ? " Severe oxygen deprivation detected" : "Subject bloodstream oxygen level normal", tox_loss > 50 ? " Dangerous amount of toxins detected" : "Subject bloodstream toxin level minimal", fire_loss > 50 ? " Severe burn damage detected" : "Subject burn injury status O.K", brute_loss > 50 ? " Severe tissue damage detected" : "Subject brute-force injury status O.K"), 1) - - if(M.getStaminaLoss()) - user.show_message("Subject appears to be suffering from fatigue.", 1) - - if (M.getCloneLoss()) - user.show_message("Subject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.", 1) + // Time of death + if(M.tod && (M.stat == DEAD || (M.status_flags & FAKEDEATH))) + user << "Time of Death: [M.tod]" for(var/datum/disease/D in M.viruses) if(!(D.visibility_flags & HIDDEN_SCANNER)) - user.show_message("Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]", 1) - - if (M.reagents && M.reagents.get_reagent_amount("epinephrine")) - user.show_message("Bloodstream Analysis located [M.reagents:get_reagent_amount("epinephrine")] units of rejuvenation chemicals.", 1) - if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/brain)) - user.show_message("Subject brain function is non-existant.", 1) - else if (M.getBrainLoss() >= 60) - user.show_message("Severe brain damage detected. Subject likely to have mental retardation.", 1) - else if (M.getBrainLoss() >= 10) - user.show_message("Significant brain damage detected. Subject may have had a concussion.", 1) + user << "Warning: [D.form] detected\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]" // Blood Level if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.vessel) if(H.blood_max) - user.show_message("Subject is bleeding!") + user << "Subject is bleeding!" var/blood_volume = round(H.vessel.get_reagent_amount("blood")) - var/blood_percent = blood_volume / 560 + var/blood_percent = round((blood_volume / 560),0.01) var/blood_type = H.dna.blood_type blood_percent *= 100 if(blood_volume <= 500 && blood_volume > 336) - user.show_message("Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl. Type: [blood_type]") + user << "LOW blood level [blood_percent] %, [blood_volume] cl, type: [blood_type]" else if(blood_volume <= 336) - user.show_message("Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl. Type: [blood_type]") + user << "CRITICAL blood level CRITICAL [blood_percent] %, [blood_volume] cl, type: [blood_type]" else - user.show_message("Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]") + user << "Blood level [blood_percent] %, [blood_volume] cl, type: [blood_type]" /proc/chemscan(var/mob/living/user, var/mob/living/M) if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.reagents) if(H.reagents.reagent_list.len) - user.show_message("Subject contains the following reagents:") + user << "Subject contains the following reagents:" for(var/datum/reagent/R in H.reagents.reagent_list) - user.show_message("[R.volume]u of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]") + user << "[R.volume] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]" else - user.show_message("Subject contains no reagents.") + user << "Subject contains no reagents." if(H.reagents.addiction_list.len) - user.show_message("Subject is addicted to the following reagents:") + user << "Subject is addicted to the following reagents:" for(var/datum/reagent/R in H.reagents.addiction_list) - user.show_message("[R.name]") + user << "[R.name]" else - user.show_message("Subject is not addicted to any reagents.") + user << "Subject is not addicted to any reagents." /obj/item/device/healthanalyzer/verb/toggle_mode() set name = "Switch Verbosity" @@ -254,11 +252,11 @@ MASS SPECTROMETER var/pressure = environment.return_pressure() var/total_moles = environment.total_moles() - user.show_message(" Results:", 1) + user.show_message("Results:", 1) if(abs(pressure - ONE_ATMOSPHERE) < 10) - user.show_message(" Pressure: [round(pressure,0.1)] kPa", 1) + user.show_message("Pressure: [round(pressure,0.1)] kPa", 1) else - user.show_message(" Pressure: [round(pressure,0.1)] kPa", 1) + user.show_message("Pressure: [round(pressure,0.1)] kPa", 1) if(total_moles) var/o2_concentration = environment.oxygen/total_moles var/n2_concentration = environment.nitrogen/total_moles @@ -267,27 +265,27 @@ MASS SPECTROMETER var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) if(abs(n2_concentration - N2STANDARD) < 20) - user.show_message(" Nitrogen: [round(n2_concentration*100)]%", 1) + user.show_message("Nitrogen: [round(n2_concentration*100)] %", 1) else - user.show_message(" Nitrogen: [round(n2_concentration*100)]%", 1) + user.show_message("Nitrogen: [round(n2_concentration*100)] %", 1) if(abs(o2_concentration - O2STANDARD) < 2) - user.show_message(" Oxygen: [round(o2_concentration*100)]%", 1) + user.show_message("Oxygen: [round(o2_concentration*100)] %", 1) else - user.show_message(" Oxygen: [round(o2_concentration*100)]%", 1) + user.show_message("Oxygen: [round(o2_concentration*100)] %", 1) if(co2_concentration > 0.01) - user.show_message(" CO2: [round(co2_concentration*100)]%", 1) + user.show_message("CO2: [round(co2_concentration*100)] %", 1) else - user.show_message(" CO2: [round(co2_concentration*100)]%", 1) + user.show_message("CO2: [round(co2_concentration*100)] %", 1) if(plasma_concentration > 0.01) - user.show_message(" Plasma: [round(plasma_concentration*100)]%", 1) + user.show_message("Plasma: [round(plasma_concentration*100)] %", 1) if(unknown_concentration > 0.01) - user.show_message(" Unknown: [round(unknown_concentration*100)]%", 1) + user.show_message("Unknown: [round(unknown_concentration*100)] %", 1) - user.show_message(" Temperature: [round(environment.temperature-T0C)]°C", 1) + user.show_message("Temperature: [round(environment.temperature-T0C)] °C", 1) src.add_fingerprint(user) return @@ -323,17 +321,17 @@ MASS SPECTROMETER if (user.stat) return if (crit_fail) - user << " This device has critically failed and is no longer functional!" + user << "This device has critically failed and is no longer functional!" return if (!user.IsAdvancedToolUser()) - user << " You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return if(reagents.total_volume) var/list/blood_traces = list() for(var/datum/reagent/R in reagents.reagent_list) if(R.id != "blood") reagents.clear_reagents() - user.show_message(" The sample was contaminated! Please insert another sample.", 1) + user.show_message("The sample was contaminated! Please insert another sample.", 1) return else blood_traces = params2list(R.data["trace_chem"]) @@ -401,13 +399,13 @@ MASS SPECTROMETER if (T.slime_mutation[3] == T.slime_mutation[4]) if (T.slime_mutation[2] == T.slime_mutation[1]) user.show_message("Possible mutation: [T.slime_mutation[3]]", 1) - user.show_message("Genetic destability: [T.mutation_chance/2]% chance of mutation on splitting", 1) + user.show_message("Genetic destability: [T.mutation_chance/2] % chance of mutation on splitting", 1) else user.show_message("Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]] (x2)", 1) - user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting", 1) + user.show_message("Genetic destability: [T.mutation_chance] % chance of mutation on splitting", 1) else user.show_message("Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]], [T.slime_mutation[4]]", 1) - user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting", 1) + user.show_message("Genetic destability: [T.mutation_chance] % chance of mutation on splitting", 1) if (T.cores > 1) user.show_message("Anomalious slime core amount detected", 1) user.show_message("Growth progress: [T.amount_grown]/10", 1) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 8258d6dc4e2..2a8ef3cae0b 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -69,7 +69,7 @@ /obj/item/device/taperecorder/proc/can_use(mob/user) if(user && ismob(user)) - if(!user.stat && user.canmove && !user.restrained()) + if(!user.incapacitated()) return 1 return 0 @@ -282,9 +282,9 @@ /obj/item/device/tape/attackby(obj/item/I, mob/user, params) if(ruined && istype(I, /obj/item/weapon/screwdriver)) - user << "You start winding the tape back in." + user << "You start winding the tape back in..." if(do_after(user, 120)) - user << "You wound the tape back in!" + user << "You wound the tape back in." fix() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 3594c570e2e..a9d6ec760ed 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -98,7 +98,7 @@ effective or pretty fucking useless. if(M) if(intensity >= 5) M.apply_effect(round(intensity/1.5), PARALYZE) - M.apply_effect(intensity*10, IRRADIATE) + M.irradiate(intensity*10) else user << "The radioactive microlaser is still recharging." diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 85c5c9ceb4a..97ffc5e6307 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -16,7 +16,7 @@ /obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params) if(istype(item, /obj/item/weapon/tank)) if(tank_one && tank_two) - user << "There are already two tanks attached, remove one first." + user << "There are already two tanks attached, remove one first!" return if(!tank_one) @@ -42,7 +42,7 @@ user << "The device is secured." return if(attached_device) - user << "There is already a device attached to the valve, remove it first." + user << "There is already a device attached to the valve, remove it first!" return user.remove_from_mob(item) attached_device = A @@ -192,10 +192,11 @@ var/bomb_message = "[log_str1] [A.name] [log_str2][log_attacher] [log_str3][last_touch_info]" - bombers += bomb_message + if(tank_one.volume != tank_two.volume) //Equivilent volume prior to mixing means the bomb has probably been fouled by a valve opening already + bombers += bomb_message - message_admins(bomb_message, 0, 1) - log_game("[log_str1] [A.name]([A.x],[A.y],[A.z]) [log_str2] [log_str3]") + message_admins(bomb_message, 0, 1) + log_game("[log_str1] [A.name]([A.x],[A.y],[A.z]) [log_str2] [log_str3]") merge_gases() spawn(20) // In case one tank bursts for (var/i=0,i<5,i++) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index d72e28e591e..3807998cbc9 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -180,7 +180,7 @@ var/list/world_uplinks = list() qdel(S) user << "Teleporter refunded." else - user << "This teleporter is already used." + user << "This teleporter is already used!" // PRESET UPLINKS // A collection of preset uplinks. diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm deleted file mode 100644 index e8481778326..00000000000 --- a/code/game/objects/items/devices/violin.dm +++ /dev/null @@ -1,40 +0,0 @@ -//copy pasta of the space piano, don't hurt me -Pete - -/obj/item/device/violin - name = "space violin" - desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\"" - icon = 'icons/obj/musician.dmi' - icon_state = "violin" - item_state = "violin" - force = 10 - var/datum/song/handheld/song - hitsound = "swing_hit" - -/obj/item/device/violin/New() - song = new("violin", src) - song.instrumentExt = "ogg" - -/obj/item/device/violin/Destroy() - qdel(song) - song = null - ..() - -/obj/item/device/violin/initialize() - song.tempo = song.sanitize_tempo(song.tempo) // tick_lag isn't set when the map is loaded - ..() - -/obj/item/device/violin/attack_self(mob/user as mob) - if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" - return 1 - interact(user) - -/obj/item/device/violin/interact(mob/user as mob) - if(!user) - return - - if(!isliving(user) || user.stat || user.restrained() || user.lying) - return - - user.set_machine(src) - song.interact(user) diff --git a/code/game/objects/items/holotape.dm b/code/game/objects/items/holotape.dm index c517faaa381..bd10a107cad 100644 --- a/code/game/objects/items/holotape.dm +++ b/code/game/objects/items/holotape.dm @@ -113,8 +113,7 @@ P.icon_state = "[P.icon_base]_[dir]" cur = get_step_towards(cur,end) - usr << "You finish project the legnth of [icon_base] holotape." - user.visible_message("[user] finishes projecting the length of [icon_base] holotape.") + user.visible_message("[user] finishes projecting the length of [icon_base] holotape.", "You finish projecting the length of [icon_base] holotape.") charging = 1 spawn(40) @@ -138,7 +137,7 @@ if(!(W.dir == 5) || !(W.fulltile == 1)) return - user << "You start projecting the [icon_base] holotape onto [target]." + user << "You start projecting the [icon_base] holotape onto [target]..." if(!do_mob(user, target, 30)) return @@ -177,8 +176,8 @@ user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) playsound(loc, 'sound/weapons/Egloves.ogg', 80, 1) - user.visible_message("[user] hits [src].", \ - "You hit [src]." ) + user.visible_message("[user] hits [src].", \ + "You hit [src]." ) health -= rand(1,2) healthcheck() diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 4a56ab7b1f8..7e38de5879d 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -21,7 +21,7 @@ for(var/mob/O in viewers(M, null)) if (O.client) O.show_message("[user] has prodded [M] with an electrically-charged arm!", 1, - " You hear someone fall", 2) + "You hear someone fall.", 2) add_logs(user, M, "stunned", object="[src.name]", addition="(INTENT: [uppertext(user.a_intent)])") /obj/item/borg/overdrive diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 9641f540d89..3b9868babac 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -92,13 +92,13 @@ if (M.use(1)) var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly B.loc = get_turf(src) - user << "You armed the robot frame." + user << "You arm the robot frame." if (user.get_inactive_hand()==src) user.unEquip(src) user.put_in_inactive_hand(B) qdel(src) else - user << "You need one sheet of metal to start building ED-209." + user << "You need one sheet of metal to start building ED-209!" return if(istype(W, /obj/item/robot_parts/l_leg)) if(src.l_leg) return @@ -136,9 +136,9 @@ src.chest = W src.updateicon() else if(!W:wires) - user << "You need to attach wires to it first!" + user << "You need to attach wires to it first!" else - user << "You need to attach a cell to it first!" + user << "You need to attach a cell to it first!" if(istype(W, /obj/item/robot_parts/head)) if(src.head) return @@ -148,44 +148,43 @@ src.head = W src.updateicon() else - user << "You need to attach a flash to it first!" + user << "You need to attach a flash to it first!" if (istype(W, /obj/item/device/multitool)) if(check_completion()) Interact(user) else - user << "The endoskeleton must be assembled before debugging can begin." + user << "The endoskeleton must be assembled before debugging can begin!" if(istype(W, /obj/item/device/mmi)) var/obj/item/device/mmi/M = W if(check_completion()) if(!istype(loc,/turf)) - user << "You can't put the MMI in, the frame has to be standing on the ground to be perfectly precise." + user << "You can't put the MMI in, the frame has to be standing on the ground to be perfectly precise!" return if(!M.brainmob) - user << "Sticking an empty MMI into the frame would sort of defeat the purpose." - return - if(!M.brainmob.key) - var/ghost_can_reenter = 0 - if(M.brainmob.mind) - for(var/mob/dead/observer/G in player_list) - if(G.can_reenter_corpse && G.mind == M.brainmob.mind) - ghost_can_reenter = 1 - break - if(!ghost_can_reenter) - user << "The mmi indicates that their mind is completely unresponsive; there's no point." - return - - if(M.brainmob.stat == DEAD) - user << "Sticking a dead brain into the frame would sort of defeat the purpose." + user << "Sticking an empty MMI into the frame would sort of defeat the purpose!" return - if((M.brainmob.mind in ticker.mode.head_revolutionaries) || (M.brainmob.mind in ticker.mode.A_bosses) || (M.brainmob.mind in ticker.mode.B_bosses)) - user << "The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the MMI." + var/mob/living/carbon/brain/BM = M.brainmob + if(!BM.key || !BM.mind) + user << "The mmi indicates that their mind is completely unresponsive; there's no point!" return - if(jobban_isbanned(M.brainmob, "Cyborg")) - user << "This MMI does not seem to fit." + if(!BM.client) //braindead + user << "The mmi indicates that their mind is currently inactive; it might change!" + return + + if(BM.stat == DEAD) + user << "Sticking a dead brain into the frame would sort of defeat the purpose!" + return + + if((BM.mind in ticker.mode.head_revolutionaries) || (BM.mind in ticker.mode.A_bosses) || (BM.mind in ticker.mode.B_bosses)) + user << "The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the MMI!" + return + + if(jobban_isbanned(BM, "Cyborg")) + user << "This MMI does not seem to fit!" return var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc)) @@ -211,7 +210,7 @@ if(ticker.mode.config_tag == "malfunction") //Don't let humans get a cyborg on their side during malf, for balance reasons. O.set_zeroth_law("ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK#*�&110010") - M.brainmob.mind.transfer_to(O) + BM.mind.transfer_to(O) if(O.mind && O.mind.special_role) O.mind.store_memory("As a cyborg, any objectives listed here are null and void, and will be marked as failed. They are simply here for memory purposes.") @@ -223,6 +222,7 @@ chest.cell = null W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame. O.mmi = W + O.updatename() feedback_inc("cyborg_birth",1) @@ -235,10 +235,10 @@ O << "Error: Servo motors unresponsive." else - user << "The MMI must go in after everything else!" + user << "The MMI must go in after everything else!" if(istype(W,/obj/item/weapon/pen)) - user << "You need to use a multitool to name [src]." + user << "You need to use a multitool to name [src]!" return /obj/item/robot_parts/robot_suit/proc/Interact(mob/user) @@ -260,7 +260,7 @@ var/mob/living/living_user = usr var/obj/item/item_in_hand = living_user.get_active_hand() if(!istype(item_in_hand, /obj/item/device/multitool)) - living_user << "You need a multitool!" + living_user << "You need a multitool!" return if(href_list["Name"]) @@ -294,23 +294,23 @@ ..() if(istype(W, /obj/item/weapon/stock_parts/cell)) if(src.cell) - user << "You have already inserted a cell!" + user << "You have already inserted a cell!" return else user.drop_item() W.loc = src src.cell = W - user << "You insert the cell!" + user << "You insert the cell." if(istype(W, /obj/item/stack/cable_coil)) if(src.wires) - user << "You have already inserted wire." + user << "You have already inserted wire!" return var/obj/item/stack/cable_coil/coil = W if (coil.use(1)) src.wires = 1.0 user << "You insert the wire." else - user << "You need one length of coil to wire it." + user << "You need one length of coil to wire it!" return /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob, params) @@ -318,10 +318,10 @@ if(istype(W, /obj/item/device/flash/handheld)) var/obj/item/device/flash/handheld/F = W if(src.flash1 && src.flash2) - user << "You have already inserted the eyes!" + user << "You have already inserted the eyes!" return else if(F.broken) - user << "You can't use a broken flash!" + user << "You can't use a broken flash!" return else user.drop_item() @@ -330,6 +330,6 @@ src.flash2 = F else src.flash1 = F - user << "You insert the flash into the eye socket!" + user << "You insert the flash into the eye socket." return diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 01dc031a466..f16ea230382 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -59,14 +59,14 @@ return 1 /obj/item/borg/upgrade/restart - name = "cyborg emergency restart module" - desc = "Used to force a restart of a disabled-but-repaired cyborg, bringing it back online." + name = "cyborg emergency reboot module" + desc = "Used to force a reboot of a disabled-but-repaired cyborg, bringing it back online." icon_state = "cyborg_upgrade1" /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) if(R.health < 0) - usr << "You have to repair the cyborg before using this module!" + usr << "You have to repair the cyborg before using this module!" return 0 if(!R.key) @@ -171,7 +171,7 @@ qdel(D) for(var/obj/item/weapon/shovel/S in R.module.modules) qdel(S) - R.module.modules += new /obj/item/weapon/pickaxe/drill/diamonddrill(R.module) + R.module.modules += new /obj/item/weapon/pickaxe/drill/cyborg/diamond(R.module) R.module.rebuild() return 1 diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index ad9da7a8362..df964d0de4b 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -1,4 +1,3 @@ -// Targets, the things that actually get shot! /obj/item/target name = "shooting target" desc = "A shooting target." @@ -6,175 +5,77 @@ icon_state = "target_h" density = 0 var/hp = 1800 - var/icon/virtualIcon - var/list/bulletholes = list() + var/obj/structure/target_stake/pinnedLoc /obj/item/target/Destroy() - // if a target is deleted and associated with a stake, force stake to forget - for(var/obj/structure/target_stake/T in view(3,src)) - if(T.pinned_target == src) - T.pinned_target = null - T.density = 1 - break - ..() // delete target + removeOverlays() + if(pinnedLoc) + pinnedLoc.nullPinnedTarget() + ..() + +/obj/item/target/proc/nullPinnedLoc() + pinnedLoc = null + density = 0 + +/obj/item/target/proc/removeOverlays() + overlays.Cut() /obj/item/target/Move() ..() - // After target moves, check for nearby stakes. If associated, move to target - for(var/obj/structure/target_stake/M in view(3,src)) - if(M.density == 0 && M.pinned_target == src) - M.loc = loc + if(pinnedLoc) + pinnedLoc.loc = loc - // This may seem a little counter-intuitive but I assure you that's for a purpose. - // Stakes are the ones that carry targets, yes, but in the stake code we set - // a stake's density to 0 meaning it can't be pushed anymore. Instead of pushing - // the stake now, we have to push the target. - - - -/obj/item/target/attackby(obj/item/W as obj, mob/user as mob, params) - if (istype(W, /obj/item/weapon/weldingtool)) +/obj/item/target/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) - overlays.Cut() - usr << "You slice off [src]'s uneven chunks of aluminium and scorch marks." - return + removeOverlays() + usr << "You slice off [src]'s uneven chunks of aluminium and scorch marks." - -/obj/item/target/attack_hand(mob/user as mob) - // taking pinned targets off! - var/obj/structure/target_stake/stake - for(var/obj/structure/target_stake/T in view(3,src)) - if(T.pinned_target == src) - stake = T - break - - if(stake) - if(stake.pinned_target) - stake.density = 1 - density = 0 - layer = OBJ_LAYER - - loc = user.loc - if(ishuman(user)) - if(!user.get_active_hand()) - user.put_in_hands(src) - user << "You take the target out of the stake." - else - src.loc = get_turf(user) - user << "You take the target out of the stake." - - stake.pinned_target = null - return - - else - ..() +/obj/item/target/attack_hand(mob/user) + if(pinnedLoc) + pinnedLoc.removeTarget(user) + ..() /obj/item/target/syndicate icon_state = "target_s" desc = "A shooting target that looks like a syndicate scum." - hp = 2600 // i guess syndie targets are sturdier? + hp = 2600 /obj/item/target/alien icon_state = "target_q" desc = "A shooting target that looks like a xenomorphic alien." - hp = 2350 // alium onest too kinda + hp = 2350 -/obj/item/target/bullet_act(var/obj/item/projectile/Proj) - var/p_x = Proj.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset Proj.p_x!" - var/p_y = Proj.p_y + pick(0,0,0,0,0,-1,1) - var/decaltype = 1 // 1 - scorch, 2 - bullet +#define DECALTYPE_SCORCH 1 +#define DECALTYPE_BULLET 2 - if(istype(/obj/item/projectile/bullet, Proj)) - decaltype = 2 - - - virtualIcon = new(icon, icon_state) - - if( virtualIcon.GetPixel(p_x, p_y) ) // if the located pixel isn't blank (null) - - hp -= Proj.damage +/obj/item/target/bullet_act(obj/item/projectile/P) + var/p_x = P.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset P.p_x!" + var/p_y = P.p_y + pick(0,0,0,0,0,-1,1) + var/decaltype = DECALTYPE_SCORCH + if(istype(/obj/item/projectile/bullet, P)) + decaltype = DECALTYPE_BULLET + var/icon/C = icon(icon,icon_state) + if(C.GetPixel(p_x, p_y) && P.original == src && overlays.len <= 35) // if the located pixel isn't blank (null) + hp -= P.damage if(hp <= 0) - visible_message("[src] breaks into tiny pieces and collapses!") + visible_message("[src] breaks into tiny pieces and collapses!") qdel(src) - - // Create a temporary object to represent the damage - var/obj/bmark = new - bmark.pixel_x = p_x - bmark.pixel_y = p_y - bmark.icon = 'icons/effects/effects.dmi' - bmark.layer = 3.5 - bmark.icon_state = "scorch" - - if(decaltype == 1) - // Energy weapons are hot. they scorch! - - // offset correction - bmark.pixel_x-- - bmark.pixel_y-- - - 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 - - + var/image/I = image("icon"='icons/effects/effects.dmi', "icon_state"="scorch", "layer"=OBJ_LAYER+0.5) + I.pixel_x = p_x - 1 //offset correction + I.pixel_y = p_y - 1 + if(decaltype == DECALTYPE_SCORCH) + I.dir = pick(NORTH,SOUTH,EAST,WEST)// random scorch design + if(P.damage >= 20 || istype(P, /obj/item/projectile/beam/practice)) + I.dir = pick(NORTH,SOUTH,EAST,WEST) else - bmark.icon_state = "light_scorch" + I.icon_state = "light_scorch" else - - // Bullets are hard. They make dents! - bmark.icon_state = "dent" - - if(Proj.damage >= 10 && bulletholes.len <= 35) // maximum of 35 bullet holes - if(decaltype == 2) // bullet - if(prob(Proj.damage+30)) // bullets make holes more commonly! - new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole - else // Lasers! - if(prob(Proj.damage-10)) // lasers make holes less commonly - new/datum/bullethole(src, bmark.pixel_x, bmark.pixel_y) // create new bullet hole - - // draw bullet holes - for(var/datum/bullethole/B in bulletholes) - - virtualIcon.DrawBox(null, B.b1x1, B.b1y, B.b1x2, B.b1y) // horizontal line, left to right - virtualIcon.DrawBox(null, B.b2x, B.b2y1, B.b2x, B.b2y2) // vertical line, top to bottom - - overlays += bmark // add the decal - - icon = virtualIcon // apply bulletholes over decals - + I.icon_state = "dent" + overlays += I return + return -1 - return -1 // the bullet/projectile goes through the target! Ie, you missed - - -// Small memory holder entity for transparent bullet holes -/datum/bullethole - // First box - var/b1x1 = 0 - var/b1x2 = 0 - var/b1y = 0 - - // Second box - var/b2x = 0 - var/b2y1 = 0 - var/b2y2 = 0 - -/datum/bullethole/New(var/obj/item/target/Target, var/pixel_x = 0, var/pixel_y = 0) - if(!Target) return - - // Randomize the first box - b1x1 = pixel_x - pick(1,1,1,1,2,2,3,3,4) - b1x2 = pixel_x + pick(1,1,1,1,2,2,3,3,4) - b1y = pixel_y - if(prob(35)) - b1y += rand(-4,4) - - // Randomize the second box - b2x = pixel_x - if(prob(35)) - b2x += rand(-4,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) +#undef DECALTYPE_SCORCH +#undef DECALTYPE_BULLET \ No newline at end of file diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 0e90d30f526..55493399fad 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -2,8 +2,8 @@ name = "medical pack" singular_name = "medical pack" icon = 'icons/obj/items.dmi' - amount = 5 - max_amount = 5 + amount = 6 + max_amount = 6 w_class = 1 throw_speed = 3 throw_range = 7 @@ -28,17 +28,17 @@ return 1 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 1 if(ishuman(M)) var/mob/living/carbon/human/H = M if(stop_bleeding) if(H.bleedsuppress) - user << "[H]'s bleeding is already bandaged." + user << "[H]'s bleeding is already bandaged!" return else if(!H.blood_max) - user << "[H] isn't bleeding." + user << "[H] isn't bleeding!" return if(isliving(M)) @@ -115,4 +115,4 @@ singular_name = "ointment" icon_state = "ointment" heal_burn = 40 - origin_tech = "biotech=1" \ No newline at end of file + origin_tech = "biotech=1" diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index eb2bd629f67..dc09dda6ebc 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -16,7 +16,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ throw_speed = 3 throw_range = 7 m_amt = 1000 - max_amount = 60 + max_amount = 50 attack_verb = list("hit", "bludgeoned", "whacked") hitsound = 'sound/weapons/grenadelaunch.ogg' @@ -38,15 +38,15 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 2) - user << "You need at least two rods to do this." + user << "You need at least two rods to do this!" return if(WT.remove_fuel(0,user)) var/obj/item/stack/sheet/metal/new_item = new(usr.loc) new_item.add_to_stacks(usr) - user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ - "You shaped [src] into metal with the weldingtool.", \ - "You hear welding.") + user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \ + "You shape [src] into metal with the welding tool.", \ + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) @@ -58,9 +58,9 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ if(istype(W,/obj/item/weapon/reagent_containers/food/snacks)) var/obj/item/weapon/reagent_containers/food/snacks/S = W if(amount != 1) - user << "You must use a single rod." + user << "You must use a single rod!" else if(S.w_class > 2) - user << "The ingredient is too big for [src]." + user << "The ingredient is too big for [src]!" else var/obj/item/weapon/reagent_containers/food/snacks/customizable/A = new/obj/item/weapon/reagent_containers/food/snacks/customizable/kebab(get_turf(src)) A.initialize_custom_food(src, S, user) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 775be481826..3c1be461a1d 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -30,7 +30,7 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if (get_amount() < 1 || CC.get_amount() < 5) - user << "You need five lengths of coil and one sheet of glass to make wired glass!" return CC.use(5) use(1) @@ -51,7 +51,7 @@ if (!G && replace) user.put_in_hands(RG) else - user << "You need one rod and one sheet of glass to make reinforced glass." + user << "You need one rod and one sheet of glass to make reinforced glass!" return else return ..() @@ -60,7 +60,7 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 0 if(zero_amount()) return 0 var/title = "Sheet-Glass" @@ -75,7 +75,7 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + user << "There are too many windows in this location." return 1 directions-=win.dir if(!(win.ini_dir in cardinal)) @@ -105,10 +105,10 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.get_amount() < 2) - user << "You need more glass to do that." + user << "You need more glass to do that!" return 1 if(locate(/obj/structure/window) in user.loc) - user << "There is a window in the way." + user << "There is a window in the way!" return 1 var/obj/structure/window/W W = new /obj/structure/window/fulltile( user.loc, 0 ) @@ -159,7 +159,7 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + user << "You don't have the dexterity to do this!" return 0 var/title = "Sheet Reinf. Glass" title += " ([src.get_amount()] sheet\s left)" @@ -203,10 +203,10 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.get_amount() < 2) - user << "You need more glass to do that." + user << "You need more glass to do that!" return 1 if(locate(/obj/structure/window) in user.loc) - user << "There is a window in the way." + user << "There is a window in the way!" return 1 var/obj/structure/window/W W = new /obj/structure/window/reinforced/fulltile(user.loc, 1) @@ -221,16 +221,16 @@ for(var/obj/structure/windoor_assembly/WA in user.loc) if(WA.dir == user.dir) - user << "There is already a windoor assembly in that location." + user << "There is already a windoor assembly in that location!" return 1 for(var/obj/machinery/door/window/W in user.loc) if(W.dir == user.dir) - user << "There is already a windoor in that location." + user << "There is already a windoor in that location!" return 1 if(src.get_amount() < 5) - user << "You need more glass to do that." + user << "You need more glass to do that!" return 1 var/obj/structure/windoor_assembly/WD = new(user.loc) @@ -332,6 +332,8 @@ playsound(loc, 'sound/effects/glass_step.ogg', 50, 1) if(ishuman(AM)) var/mob/living/carbon/human/H = AM + if(PIERCEIMMUNE in H.dna.species.specflags) + return 0 if(!H.shoes) H.apply_damage(5,BRUTE,(pick("l_leg", "r_leg"))) H.Weaken(3) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 4c4fa99a3e5..e875c6605d5 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -109,25 +109,21 @@ var/global/list/datum/stack_recipe/xeno_recipes = list ( \ //Step one - dehairing. /obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if( istype(W, /obj/item/weapon/kitchenknife) || \ - istype(W, /obj/item/weapon/kitchen/utensil/knife) || \ - istype(W, /obj/item/weapon/twohanded/fireaxe) || \ - istype(W, /obj/item/weapon/hatchet) ) - - //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) - usr.visible_message("\the [usr] starts cutting hair off \the [src]", "You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") - if(do_after(user,50)) - usr << "You cut the hair from this [src.singular_name]" + if(is_sharp(W)) + playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) + user.visible_message("[user] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.") + if(do_after(user,50, target = src)) + user << "You cut the hair from this [src.singular_name]." //Try locating an exisitng stack on the tile and add to there if possible - for(var/obj/item/stack/sheet/hairlesshide/HS in usr.loc) + for(var/obj/item/stack/sheet/hairlesshide/HS in user.loc) if(HS.amount < 50) HS.amount++ - src.use(1) + use(1) break //If it gets to here it means it did not find a suitable stack on the tile. - var/obj/item/stack/sheet/hairlesshide/HS = new(usr.loc) + var/obj/item/stack/sheet/hairlesshide/HS = new(user.loc) HS.amount = 1 - src.use(1) + use(1) else ..() diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 200718edd3e..1992e75ab6c 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -32,5 +32,5 @@ user << "You make a light tile." L.add_fingerprint(user) else - user << "You need one metal sheet to finish the light tile." + user << "You need one metal sheet to finish the light tile!" return diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index b941b9228d7..f64f19ef4cf 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -25,8 +25,6 @@ return /obj/item/stack/Destroy() - if (is_cyborg) - return // Not supposed to be destroyed if (usr && usr.machine==src) usr << browse(null, "window=stack") src.loc = null @@ -122,7 +120,7 @@ if(!building_checks(R, multiplier)) return if (R.time) - usr << "Building [R.title] ..." + usr.visible_message("[usr] starts building [R.title].", "You start building [R.title]...") if (!do_after(usr, R.time)) return if(!building_checks(R, multiplier)) @@ -160,15 +158,15 @@ /obj/item/stack/proc/building_checks(datum/stack_recipe/R, multiplier) if (src.get_amount() < R.req_amount*multiplier) if (R.req_amount*multiplier>1) - usr << "You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!" + usr << "You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!" else - usr << "You haven't got enough [src] to build \the [R.title]!" + usr << "You haven't got enough [src] to build \the [R.title]!" return 0 if (R.one_per_turf && (locate(R.result_type) in usr.loc)) - usr << "There is another [R.title] here!" + usr << "There is another [R.title] here!" return 0 if (R.on_floor && !istype(usr.loc, /turf/simulated/floor)) - usr << "\The [R.title] must be constructed on the floor!" + usr << "\The [R.title] must be constructed on the floor!" return 0 return 1 @@ -185,6 +183,8 @@ return 1 /obj/item/stack/proc/zero_amount() + if(is_cyborg) + return source.energy < cost if (amount < 1) if(usr) usr.unEquip(src, 1) @@ -210,7 +210,7 @@ if (item.amount>=item.max_amount) continue oldsrc.attackby(item, usr) - usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s." + usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s." if(oldsrc.amount <= 0) break oldsrc.update_icon() diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index fd477f005ce..6d81c36bb2c 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -22,18 +22,18 @@ var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 4) - user << "You need at least four tiles to do this." + user << "You need at least four tiles to do this!" return if(is_hot(WT) && !mineralType) - user << "You can not reform this." + user << "You can not reform this!" return if(WT.remove_fuel(0,user)) if(mineralType == "plasma") atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 5) - user.visible_message("[user.name] set the plasma tiles on fire!", \ + user.visible_message("[user.name] sets the plasma tiles on fire!", \ "You set the plasma tiles on fire!") qdel(src) return @@ -41,9 +41,9 @@ if (mineralType == "metal") var/obj/item/stack/sheet/metal/new_item = new(user.loc) new_item.add_to_stacks(user) - user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ + user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ "You shaped [src] into metal with the weldingtool.", \ - "You hear welding.") + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) @@ -55,9 +55,9 @@ var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]") var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc) new_item.add_to_stacks(user) - user.visible_message("[user.name] shaped [src] into a sheet with the weldingtool.", \ + user.visible_message("[user.name] shaped [src] into a sheet with the weldingtool.", \ "You shaped [src] into a sheet with the weldingtool.", \ - "You hear welding.") + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 53321b2b4f8..00d1e1d32e7 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -15,6 +15,7 @@ * Carp plushie * Foam armblade * Toy big red button + Beach ball */ @@ -54,10 +55,10 @@ if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(O.reagents) if(O.reagents.total_volume < 1) - user << "The [O] is empty." + user << "The [O] is empty." else if(O.reagents.total_volume >= 1) if(O.reagents.has_reagent("facid", 1)) - user << "The acid chews through the balloon!" + user << "The acid chews through the balloon!" O.reagents.reaction(user) qdel(src) else @@ -69,7 +70,7 @@ /obj/item/toy/balloon/throw_impact(atom/hit_atom) if(src.reagents.total_volume >= 1) - src.visible_message("\The [src] bursts!","You hear a pop and a splash.") + src.visible_message("\The [src] bursts!","You hear a pop and a splash.") src.reagents.reaction(get_turf(hit_atom)) for(var/atom/A in get_turf(hit_atom)) src.reagents.reaction(A) @@ -135,17 +136,17 @@ if (istype(A, /obj/item/toy/ammo/gun)) if (src.bullets >= 7) - user << "It's already fully loaded!" + user << "It's already fully loaded!" return 1 if (A.amount_left <= 0) - user << "There are no more caps!" + user << "There are no more caps!" return 1 if (A.amount_left < (7 - src.bullets)) src.bullets += A.amount_left - user << text("You reload [] cap\s!", A.amount_left) + user << text("You reload [] cap\s.", A.amount_left) A.amount_left = 0 else - user << text("You reload [] cap\s!", 7 - src.bullets) + user << text("You reload [] cap\s.", 7 - src.bullets) A.amount_left -= 7 - src.bullets src.bullets = 7 A.update_icon() @@ -156,7 +157,7 @@ if (flag) return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - usr << "You don't have the dexterity to do this!" + usr << "You don't have the dexterity to do this!" return src.add_fingerprint(user) if (src.bullets < 1) @@ -167,7 +168,7 @@ src.bullets-- user.visible_message("[user] fires [src] at [target]!", \ "You fire [src] at [target]!", \ - " You hear a gunshot.") + " You hear a gunshot!") /obj/item/toy/ammo/gun name = "capgun ammo" @@ -227,11 +228,11 @@ ..() if(istype(W, /obj/item/toy/sword)) if(W == src) - user << "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?" + user << "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?" if(ishuman(user)) user.adjustBrainLoss(10) else if((W.flags & NODROP) || (flags & NODROP)) - user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!" + user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!" else user << "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool." var/obj/item/weapon/twohanded/dualsaber/toy/newSaber = new /obj/item/weapon/twohanded/dualsaber/toy(user.loc) @@ -320,7 +321,7 @@ attack_verb = list("attacked", "coloured") var/colour = "#FF0000" //RGB var/drawtype = "rune" - var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","body","cyka","arrow") + var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","body","cyka","arrow","poseur tag") var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z") var/list/oriented = list("arrow","body") // These turn to face the same way as the drawer var/uses = 30 //0 for unlimited uses @@ -328,6 +329,8 @@ var/colourName = "red" //for updateIcon purposes var/dat var/list/validSurfaces = list(/turf/simulated/floor) + var/gang = 0 //For marking territory + var/edible = 1 /obj/item/toy/crayon/suicide_act(mob/user) user.visible_message("[user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide.") @@ -396,13 +399,56 @@ update_window(usr) /obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity) - if(!proximity) return + if(!proximity || !check_allowed_items(target)) return + if(!uses) + user << "There is no more of [src.name] left!" + if(!instant) + qdel(src) + return + if(istype(target, /obj/effect/decal/cleanable)) + target = target.loc if(is_type_in_list(target,validSurfaces)) var/temp = "rune" if(letters.Find(drawtype)) temp = "letter" else if(graffiti.Find(drawtype)) temp = "graffiti" + + ////////////////////////// GANG FUNCTIONS + var/area/territory + var/gangID + if(gang) + //Determine gang affiliation + if(user.mind in (ticker.mode.A_bosses | ticker.mode.A_gang)) + temp = "[gang_name("A")] gang tag" + gangID = "A" + else if(user.mind in (ticker.mode.B_bosses | ticker.mode.B_gang)) + temp = "[gang_name("B")] gang tag" + gangID = "B" + + //Check area validity. Reject space, player-created areas, and non-station z-levels. + if (gangID) + territory = get_area(target) + if(territory && (territory.z == ZLEVEL_STATION) && territory.valid_territory) + //Check if this area is already tagged by a gang + if(!(locate(/obj/effect/decal/cleanable/crayon/gang) in target)) //Ignore the check if the tile being sprayed has a gang tag + if(territory_claimed(territory, user)) + return + /* + //Prevent people spraying from outside of the territory (ie. Maint walls) + var/area/user_area = get_area(user.loc) + if(istype(user_area) && (user_area.type != territory.type)) + user << "You cannot tag [territory] from the outside." + return + */ + if(locate(/obj/machinery/power/apc) in (user.loc.contents | target.contents)) + user << "You cannot tag here." + return + else + user << "[territory] is unsuitable for tagging." + return + ///////////////////////////////////////// + var/graf_rot if(oriented.Find(drawtype)) switch(user.dir) @@ -414,30 +460,62 @@ graf_rot = 270 else graf_rot = 0 - user << "You start drawing a [temp] on the [target.name]." - if(instant || do_after(user, 50)) - new /obj/effect/decal/cleanable/crayon(target,colour,drawtype,temp,graf_rot) - user << "You finish drawing [temp]." - if(uses) - uses-- - if(!uses) - user << "You used up your [src.name]!" + + user << "You start [instant ? "spraying" : "drawing"] a [temp] on the [target.name]..." + if(instant) + playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) + if((instant>0) || do_after(user, 50)) + + //Gang functions + if(gangID) + //Delete any old markings on this tile, including other gang tags + if(!(locate(/obj/effect/decal/cleanable/crayon/gang) in target)) //Ignore the check if the tile being sprayed has a gang tag + if(territory_claimed(territory, user)) + return + for(var/obj/effect/decal/cleanable/crayon/old_marking in target) + qdel(old_marking) + new /obj/effect/decal/cleanable/crayon/gang(target,gangID,temp,graf_rot) + user << "You tagged [territory] for your gang!" + + else + new /obj/effect/decal/cleanable/crayon(target,colour,drawtype,temp,graf_rot) + + user << "You finish [instant ? "spraying" : "drawing"] [temp]." + if(instant<0) + playsound(user.loc, 'sound/effects/spray.ogg', 5, 1, 5) + if(uses < 0) + return + uses = max(0,uses-1) + if(!uses) + user << "There is no more of [src.name] left!" + if(!instant) qdel(src) return /obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob) - var/huffable = istype(src,/obj/item/toy/crayon/spraycan) - if(M == user) - user << "You take a [huffable ? "huff" : "bite"] of the [src.name]. Delicious!" + if(edible && (M == user)) + user << "You take a bite of the [src.name]. Delicious!" user.nutrition += 5 - if(uses) - uses -= 5 - if(uses <= 0) - user << "There is no more of [src.name] left!" - qdel(src) + if(uses < 0) + return + uses = max(0,uses-5) + if(!uses) + user << "There is no more of [src.name] left!" + qdel(src) else ..() +/obj/item/toy/crayon/proc/territory_claimed(var/area/territory,mob/user) + var/occupying_gang + if(territory.type in (ticker.mode.A_territory | ticker.mode.A_territory_new)) + occupying_gang = gang_name("A") + if(territory.type in (ticker.mode.B_territory | ticker.mode.B_territory_new)) + occupying_gang = gang_name("B") + if(occupying_gang) + user << "[territory] has already been tagged by the [occupying_gang] gang! You must get rid of or spray over the old tag first!" + return 1 + return 0 + /* * Snap pops */ @@ -455,7 +533,7 @@ s.set_up(3, 1, src) s.start() new /obj/effect/decal/cleanable/ash(src.loc) - src.visible_message(" The [src.name] explodes!"," You hear a snap!") + src.visible_message(" The [src.name] explodes!","You hear a snap!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -469,7 +547,7 @@ s.set_up(2, 0, src) s.start() new /obj/effect/decal/cleanable/ash(src.loc) - src.visible_message("The [src.name] explodes!","You hear a snap!") + src.visible_message("The [src.name] explodes!","You hear a snap!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -631,7 +709,7 @@ -obj/item/toy/cards +/obj/item/toy/cards var/parentdeck = null var/deckstyle = "nanotrasen" var/card_hitsound = null @@ -641,14 +719,14 @@ obj/item/toy/cards var/card_throw_range = 7 var/list/card_attack_verb = list("attacked") -obj/item/toy/cards/New() +/obj/item/toy/cards/New() ..() -obj/item/toy/cards/proc/apply_card_vars(obj/item/toy/cards/newobj, obj/item/toy/cards/sourceobj) // Applies variables for supporting multiple types of card deck +/obj/item/toy/cards/proc/apply_card_vars(obj/item/toy/cards/newobj, obj/item/toy/cards/sourceobj) // Applies variables for supporting multiple types of card deck if(!istype(sourceobj)) return -obj/item/toy/cards/deck +/obj/item/toy/cards/deck name = "deck of cards" desc = "A deck of space-grade playing cards." icon = 'icons/obj/toy.dmi' @@ -658,7 +736,7 @@ obj/item/toy/cards/deck var/cooldown = 0 var/list/cards = list() -obj/item/toy/cards/deck/New() +/obj/item/toy/cards/deck/New() ..() icon_state = "deck_[deckstyle]_full" for(var/i = 2; i <= 10; i++) @@ -684,11 +762,13 @@ obj/item/toy/cards/deck/New() cards += "Ace of Diamonds" -obj/item/toy/cards/deck/attack_hand(mob/user as mob) +/obj/item/toy/cards/deck/attack_hand(mob/user as mob) + if(user.lying) + return var/choice = null if(cards.len == 0) src.icon_state = "deck_[deckstyle]_empty" - user << "There are no more cards to draw." + user << "There are no more cards to draw!" return var/obj/item/toy/cards/singlecard/H = new/obj/item/toy/cards/singlecard(user.loc) choice = cards[1] @@ -699,7 +779,7 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob) src.cards -= choice H.pickup(user) user.put_in_active_hand(H) - user.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.") + user.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.") if(cards.len > 26) src.icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -707,25 +787,25 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob) else if(cards.len > 1) src.icon_state = "deck_[deckstyle]_low" -obj/item/toy/cards/deck/attack_self(mob/user as mob) +/obj/item/toy/cards/deck/attack_self(mob/user as mob) if(cooldown < world.time - 50) cards = shuffle(cards) playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) - user.visible_message("[user] shuffles the deck.", "You shuffle the deck.") + user.visible_message("[user] shuffles the deck.", "You shuffle the deck.") cooldown = world.time -obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params) +/obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params) ..() if(istype(C)) if(C.parentdeck == src) if(!user.unEquip(C)) - user << "The card is stuck to your hand, you can't add it to the deck!" + user << "The card is stuck to your hand, you can't add it to the deck!" return src.cards += C.cardname - user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.") + user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.") qdel(C) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" if(cards.len > 26) src.icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -734,18 +814,18 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use src.icon_state = "deck_[deckstyle]_low" -obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, params) +/obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, params) ..() if(istype(C)) if(C.parentdeck == src) if(!user.unEquip(C)) - user << "The hand of cards is stuck to your hand, you can't add it to the deck!" + user << "The hand of cards is stuck to your hand, you can't add it to the deck!" return src.cards += C.currenthand - user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.") + user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.") qdel(C) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" if(cards.len > 26) src.icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -755,7 +835,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, /obj/item/toy/cards/deck/MouseDrop(atom/over_object) var/mob/M = usr - if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained()) + if(!ishuman(usr) || usr.incapacitated() || usr.lying) return if(Adjacent(usr)) if(over_object == M && loc != M) @@ -765,16 +845,20 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, else if(istype(over_object, /obj/screen)) switch(over_object.name) if("l_hand") + if(!remove_item_from_storage(M)) + M.unEquip(src) M.put_in_l_hand(src) else if("r_hand") + if(!remove_item_from_storage(M)) + M.unEquip(src) M.put_in_r_hand(src) usr << "You pick up the deck." else - usr << "You can't reach it from here." + usr << "You can't reach it from here!" -obj/item/toy/cards/cardhand +/obj/item/toy/cards/cardhand name = "hand of cards" desc = "A number of cards not in a deck, customarily held in ones hand." icon = 'icons/obj/toy.dmi' @@ -784,11 +868,11 @@ obj/item/toy/cards/cardhand var/choice = null -obj/item/toy/cards/cardhand/attack_self(mob/user as mob) +/obj/item/toy/cards/cardhand/attack_self(mob/user as mob) user.set_machine(src) interact(user) -obj/item/toy/cards/cardhand/interact(mob/user) +/obj/item/toy/cards/cardhand/interact(mob/user) var/dat = "You have:
" for(var/t in currenthand) dat += "A [t].
" @@ -799,7 +883,7 @@ obj/item/toy/cards/cardhand/interact(mob/user) popup.open() -obj/item/toy/cards/cardhand/Topic(href, href_list) +/obj/item/toy/cards/cardhand/Topic(href, href_list) if(..()) return if(usr.stat || !ishuman(usr) || !usr.canmove) @@ -838,12 +922,12 @@ obj/item/toy/cards/cardhand/Topic(href, href_list) qdel(src) return -obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params) +/obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params) if(istype(C)) if(C.parentdeck == src.parentdeck) src.currenthand += C.cardname user.unEquip(C) - user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.") + user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.") interact(user) if(currenthand.len > 4) src.icon_state = "[deckstyle]_hand5" @@ -853,9 +937,9 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living src.icon_state = "[deckstyle]_hand3" qdel(C) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" -obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj) +/obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj) ..() newobj.deckstyle = sourceobj.deckstyle newobj.icon_state = "[deckstyle]_hand2" // Another dumb hack, without this the hand is invisible (or has the default deckstyle) until another card is added. @@ -867,7 +951,7 @@ obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/t newobj.card_attack_verb = sourceobj.card_attack_verb -obj/item/toy/cards/singlecard +/obj/item/toy/cards/singlecard name = "card" desc = "a card" icon = 'icons/obj/toy.dmi' @@ -878,16 +962,16 @@ obj/item/toy/cards/singlecard pixel_x = -5 -obj/item/toy/cards/singlecard/examine(mob/user) +/obj/item/toy/cards/singlecard/examine(mob/user) if(ishuman(user)) var/mob/living/carbon/human/cardUser = user if(cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src) - cardUser.visible_message("[cardUser] checks \his card.", "The card reads: [src.cardname]") + cardUser.visible_message("[cardUser] checks \his card.", "The card reads: [src.cardname]") else - cardUser << "You need to have the card in your hand to check it." + cardUser << "You need to have the card in your hand to check it!" -obj/item/toy/cards/singlecard/verb/Flip() +/obj/item/toy/cards/singlecard/verb/Flip() set name = "Flip Card" set category = "Object" set src in range(1) @@ -908,7 +992,7 @@ obj/item/toy/cards/singlecard/verb/Flip() src.name = "card" src.pixel_x = -5 -obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) +/obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/toy/cards/singlecard/)) var/obj/item/toy/cards/singlecard/C = I if(C.parentdeck == src.parentdeck) @@ -924,14 +1008,14 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) qdel(C) qdel(src) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" if(istype(I, /obj/item/toy/cards/cardhand/)) var/obj/item/toy/cards/cardhand/H = I if(H.parentdeck == parentdeck) H.currenthand += cardname user.unEquip(src) - user.visible_message("[user] adds a card to \his hand.", "You add the [cardname] to your hand.") + user.visible_message("[user] adds a card to \his hand.", "You add the [cardname] to your hand.") H.interact(user) if(H.currenthand.len > 4) H.icon_state = "[deckstyle]_hand5" @@ -941,15 +1025,15 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) H.icon_state = "[deckstyle]_hand3" qdel(src) else - user << "You can't mix cards from other decks." + user << "You can't mix cards from other decks!" -obj/item/toy/cards/singlecard/attack_self(mob/user) +/obj/item/toy/cards/singlecard/attack_self(mob/user) if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained()) return Flip() -obj/item/toy/cards/singlecard/apply_card_vars(obj/item/toy/cards/singlecard/newobj,obj/item/toy/cards/sourceobj) +/obj/item/toy/cards/singlecard/apply_card_vars(obj/item/toy/cards/singlecard/newobj,obj/item/toy/cards/sourceobj) ..() newobj.deckstyle = sourceobj.deckstyle newobj.icon_state = "singlecard_down_[deckstyle]" // Without this the card is invisible until flipped. It's an ugly hack, but it works. @@ -971,7 +1055,7 @@ obj/item/toy/cards/singlecard/apply_card_vars(obj/item/toy/cards/singlecard/newo || Syndicate playing cards, for pretending you're Gambit and playing poker for the nuke disk. || */ -obj/item/toy/cards/deck/syndicate +/obj/item/toy/cards/deck/syndicate name = "suspicious looking deck of cards" desc = "A deck of space-grade playing cards. They seem unusually rigid." deckstyle = "syndicate" @@ -997,7 +1081,7 @@ obj/item/toy/cards/deck/syndicate /obj/item/toy/nuke/attack_self(mob/user) if (cooldown < world.time) cooldown = world.time + 1800 //3 minutes - user.visible_message("[user] presses a button on [src]", "You activate [src], it plays a loud noise!", "You hear the click of a button.") + user.visible_message("[user] presses a button on [src].", "You activate [src], it plays a loud noise!", "You hear the click of a button.") spawn(5) //gia said so icon_state = "nuketoy" playsound(src, 'sound/machines/Alarm.ogg', 100, 0, surround = 0) @@ -1015,7 +1099,7 @@ obj/item/toy/cards/deck/syndicate /obj/item/toy/minimeteor name = "\improper Mini-Meteor" - desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor™" + desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor?" icon = 'icons/obj/toy.dmi' icon_state = "minimeteor" w_class = 2.0 @@ -1056,7 +1140,7 @@ obj/item/toy/cards/deck/syndicate */ /obj/item/toy/redbutton name = "big red button" - desc = "A big, plastic red button. Reads 'From HonkCo Pranks©' on the back." + desc = "A big, plastic red button. Reads 'From HonkCo Pranks?' on the back." icon = 'icons/obj/assemblies.dmi' icon_state = "bigred" w_class = 2.0 @@ -1065,7 +1149,7 @@ obj/item/toy/cards/deck/syndicate /obj/item/toy/redbutton/attack_self(mob/user) if (cooldown < world.time) cooldown = (world.time + 300) // Sets cooldown at 30 seconds - user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "The button clicks loudly.") + user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "The button clicks loudly.") playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, surround = 0) for(var/mob/M in range(10, src)) // Checks range if(!M.stat && !istype(M, /mob/living/silicon/ai)) // Checks to make sure whoever's getting shaken is alive/not the AI @@ -1073,4 +1157,18 @@ obj/item/toy/cards/deck/syndicate shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second. else - user << "Nothing happens." \ No newline at end of file + user << "Nothing happens." + +/* + * Beach ball + */ +/obj/item/toy/beach_ball + icon = 'icons/misc/beach.dmi' + icon_state = "ball" + name = "beach ball" + item_state = "beachball" + w_class = 4 //Stops people from hiding it in their bags/pockets + +/obj/item/toy/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) + user.drop_item() + src.throw_at(target, throw_range, throw_speed) \ No newline at end of file diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 57f667ac382..deef2e3e927 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -59,7 +59,7 @@ AI MODULES //The proc that actually changes the silicon's laws. /obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/target, var/mob/sender) - target << "[sender] has uploaded a change to the laws you must follow using a [name]. From now on, these are your laws: " + target << "[sender] has uploaded a change to the laws you must follow using a [name]. From now on, these are your laws: " /******************** Modules ********************/ diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index e76181e672a..07ea6047cde 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -110,7 +110,7 @@ RCD if(istype(W, /obj/item/weapon/rcd_ammo)) var/obj/item/weapon/rcd_ammo/R = W if((matter + R.ammoamt) > max_matter) - user << "The RCD cant hold any more matter-units." + user << "The RCD can't hold any more matter-units!" return user.drop_item() qdel(W) @@ -127,19 +127,19 @@ RCD switch(mode) if(1) mode = 2 - user << "Changed mode to 'Airlock'" + user << "You change RCD's mode to 'Airlock'." if(prob(20)) src.spark_system.start() return if(2) mode = 3 - user << "Changed mode to 'Deconstruct'" + user << "You change RCD's mode to 'Deconstruct'." if(prob(20)) src.spark_system.start() return if(3) mode = 1 - user << "Changed mode to 'Floor & Walls'" + user << "You change RCD's mode to 'Floor & Walls'." if(prob(20)) src.spark_system.start() return @@ -160,21 +160,23 @@ RCD switch(mode) if(1) if(istype(A, /turf/space)) + var/turf/space/S = A if(useResource(1, user)) - user << "Building Floor..." + user << "You start building floor..." activate() - A:ChangeTurf(/turf/simulated/floor/plating) + S.ChangeTurf(/turf/simulated/floor/plating) return 1 return 0 if(istype(A, /turf/simulated/floor)) + var/turf/simulated/floor/F = A if(checkResource(3, user)) - user << "Building Wall ..." + user << "You start building wall..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 20)) if(!useResource(3, user)) return 0 activate() - A:ChangeTurf(/turf/simulated/wall) + F.ChangeTurf(/turf/simulated/wall) return 1 return 0 @@ -188,7 +190,7 @@ RCD break if(door_check) - user << "Building Airlock..." + user << "You start building airlock..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) if(!useResource(10, user)) return 0 @@ -202,38 +204,43 @@ RCD return 1 return 0 else - user << "There is another door here!" + user << "There is another door here!" return 0 return 0 if(3) if(istype(A, /turf/simulated/wall)) - if(istype(A, /turf/simulated/wall/r_wall) && !canRwall) + var/turf/simulated/wall/W + if(istype(W, /turf/simulated/wall/r_wall) && !canRwall) return 0 if(checkResource(5, user)) - user << "Deconstructing Wall..." + user << "You start deconstructing wall..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 40)) if(!useResource(5, user)) return 0 activate() - A:ChangeTurf(/turf/simulated/floor/plating) + W.ChangeTurf(/turf/simulated/floor/plating) return 1 return 0 if(istype(A, /turf/simulated/floor)) - if(checkResource(5, user)) - user << "Deconstructing Floor..." + var/turf/simulated/floor/F = A + if(istype(F, F.baseturf)) + user << "You can't dig any deeper!" + return 0 + else if(checkResource(5, user)) + user << "You start deconstructing floor..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) if(!useResource(5, user)) return 0 activate() - A:ChangeTurf(/turf/space) + F.ChangeTurf(F.baseturf) return 1 return 0 if(istype(A, /obj/machinery/door/airlock)) if(checkResource(20, user)) - user << "Deconstructing Airlock..." + user << "You start deconstructing airlock..." playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50)) if(!useResource(20, user)) return 0 diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 64185d5d5a0..511e38c8f71 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -17,8 +17,12 @@ RPD #define METER_MODE 1 #define DISPOSALS_MODE 2 +#define CATEGORY_ATMOS 0 +#define CATEGORY_DISPOSALS 1 + /datum/pipe_info var/id=-1 + var/categoryId = CATEGORY_ATMOS var/dir=SOUTH var/dirtype=PIPE_BINARY var/icon = 'icons/obj/pipe-item.dmi' @@ -59,6 +63,7 @@ var/global/list/disposalpipeID2State=list( ) /datum/pipe_info/disposal + categoryId = CATEGORY_DISPOSALS icon = 'icons/obj/pipes/disposal.dmi' icon_state = "meterX" @@ -101,10 +106,6 @@ var/global/list/RPD_recipes=list( "Junction" = new /datum/pipe_info(PIPE_JUNCTION, 1, PIPE_UNARY), "Heat Exchanger" = new /datum/pipe_info(PIPE_HEAT_EXCHANGE, 1, PIPE_UNARY), ), - "Insulated Pipes" = list( - "Pipe" = new /datum/pipe_info(PIPE_INSULATED_STRAIGHT,1, PIPE_BINARY), - "Bent Pipe" = new /datum/pipe_info(PIPE_INSULATED_BENT, 5, PIPE_BENT), - ), "Disposal Pipes" = list( "Pipe" = new /datum/pipe_info/disposal(DISP_PIPE_STRAIGHT, PIPE_BINARY), "Bent Pipe" = new /datum/pipe_info/disposal(DISP_PIPE_BENT, PIPE_TRINARY), @@ -152,6 +153,7 @@ var/global/list/RPD_recipes=list( "purple" = rgb(130,43,255) ) var/paint_color="grey" + var/screen = CATEGORY_ATMOS //Starts on the atmos tab. /obj/item/weapon/pipe_dispenser/New() . = ..() @@ -163,34 +165,57 @@ var/global/list/RPD_recipes=list( show_menu(user) /obj/item/weapon/pipe_dispenser/proc/render_dir_img(var/_dir,var/pic,var/title,var/flipped=0) - var/selected="" + var/selected=" class=\"imglink\"" if(_dir == p_dir) - selected=" class=\"selected\"" - return "
Type
Utilities: --
-
- "}
+ if(p_class != EATING_MODE)
+ dat += "
- "
+ if(screen == CATEGORY_ATMOS)
+ dat += "Atmospherics Disposals
" + else if(screen == CATEGORY_DISPOSALS) + dat += "Atmospherics Disposals
" + dat += "
- "
var/list/cat=RPD_recipes[category]
for(var/label in cat)
var/datum/pipe_info/I = cat[label]
var/found=0
if(I.id == p_type)
- if(p_class==ATMOS_MODE && I.type==/datum/pipe_info)
+ if((p_class == ATMOS_MODE || p_class == METER_MODE) && (I.type == /datum/pipe_info || I.type == /datum/pipe_info/meter))
found=1
- else if(p_class==DISPOSALS_MODE && I.type==/datum/pipe_info/disposal)
+ else if(p_class == DISPOSALS_MODE && I.type==/datum/pipe_info/disposal)
found=1
if(found)
preview=new /icon(I.icon,I.icon_state)
- dat += I.Render(src,label)
+ if(screen == I.categoryId)
+ if(I.id == p_type && p_class >= 0)
+ datbuild += "[label]"
+ else
+ datbuild += I.Render(src,label)
+
+ if(length(datbuild) > 0)
+ dat += "[category]:
- "
+ dat += datbuild
+ datbuild = ""
dat += "
Direction
[color_picker]" + dirsel = "Color
[color_picker]" + else + dirsel = "" if(PIPE_BINARY) // Straight, N-S, W-E if(preview) @@ -359,47 +386,52 @@ var/global/list/RPD_recipes=list( "} - dat = {" - - -@@ -147,9 +148,9 @@ else injectamount = cause reagents.trans_to(R, injectamount) - R << "You hear a faint *beep*." + R << "You hear a faint beep." if(!reagents.total_volume) - R << "You hear a faint click from your chest." + R << "You hear a faint click from your chest." qdel(src) @@ -173,12 +174,14 @@ /obj/item/weapon/implant/loyalty/implanted(mob/target) ..() - if((target.mind in ticker.mode.head_revolutionaries) || (target.mind in ticker.mode.A_bosses) || (target.mind in ticker.mode.B_bosses)) + if((target.mind in (ticker.mode.head_revolutionaries | ticker.mode.A_bosses | ticker.mode.B_bosses)) || is_shadow_or_thrall(target)) target.visible_message("[target] seems to resist the implant!", "You feel the corporate tendrils of Nanotrasen try to invade your mind!") return 0 - if((target.mind in ticker.mode.revolutionaries) || (target.mind in ticker.mode.A_gangsters) || (target.mind in ticker.mode.B_gangsters)) - ticker.mode.remove_revolutionary(target.mind) + if(target.mind in (ticker.mode.A_gang | ticker.mode.B_gang)) ticker.mode.remove_gangster(target.mind, exclude_bosses=0) + return 0 + if(target.mind in ticker.mode.revolutionaries) + ticker.mode.remove_revolutionary(target.mind) target << "You feel a surge of loyalty towards Nanotrasen." return 1 @@ -213,7 +216,7 @@ imp_in.reagents.add_reagent("synaptizine", 10) imp_in.reagents.add_reagent("omnizine", 10) - imp_in.reagents.add_reagent("morphine", 10) + imp_in.reagents.add_reagent("stimulants", 10) /obj/item/weapon/implant/emp diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index e8ebdd6d7dc..b3023ea69ef 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -25,9 +25,9 @@ var/turf/T = get_turf(M) if(T && (M == user || do_after(user, 50))) if(user && M && (get_turf(M) == T) && src && imp) - M.visible_message("[user] has implanted [M].") + M.visible_message("[user] has implanted [M].", "[user] implants you with the implant.") add_logs(user, M, "implanted", object="[name]") - user << "You implanted the implant into [M]." + user << "You implant the implant into [M]." if(imp.implanted(M)) imp.loc = M imp.imp_in = M diff --git a/code/game/objects/items/weapons/janisigns.dm b/code/game/objects/items/weapons/janisigns.dm index 3844bff42ad..48fd898b696 100644 --- a/code/game/objects/items/weapons/janisigns.dm +++ b/code/game/objects/items/weapons/janisigns.dm @@ -12,15 +12,6 @@ origin_tech = "programming=3" var/list/signs = list() var/max_signs = 10 - can_be_placed_into = list( - /obj/machinery/r_n_d/destructive_analyzer, - /obj/structure/table, - /obj/structure/rack, - /obj/structure/closet, - /obj/item/weapon/storage, - /obj/structure/safe, - /obj/machinery/disposal - ) /obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag) if(flag) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 5f52dd4a870..993f1e72c98 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -1,22 +1,18 @@ /* Kitchen tools * Contains: - * Utensils - * Spoons - * Forks - * Knives + * Fork * Kitchen knives * Butcher's cleaver * Rolling Pins - * Trays */ /obj/item/weapon/kitchen icon = 'icons/obj/kitchen.dmi' -/* - * Utensils - */ -/obj/item/weapon/kitchen/utensil +/obj/item/weapon/kitchen/fork + name = "fork" + desc = "Pointy." + icon_state = "fork" force = 5.0 w_class = 1.0 throwforce = 0 @@ -26,126 +22,68 @@ origin_tech = "materials=1" attack_verb = list("attacked", "stabbed", "poked") hitsound = 'sound/weapons/bladeslice.ogg' + var/datum/reagent/forkload //used to eat omelette -/obj/item/weapon/kitchen/utensil/New() - if (prob(60)) - src.pixel_y = rand(0, 4) - return - -/* - * Spoons - */ - /obj/item/weapon/kitchen/utensil/spoon - name = "spoon" - desc = "SPOON!" - icon_state = "spoon" - attack_verb = list("attacked", "poked") - -/* - * Forks - */ -/obj/item/weapon/kitchen/utensil/fork - name = "fork" - desc = "Pointy." - icon_state = "fork" - -/obj/item/weapon/kitchen/utensil/fork/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) +/obj/item/weapon/kitchen/fork/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) if(!istype(M)) return ..() - if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head") - return ..() - - if (src.icon_state == "forkloaded") //This is a poor way of handling it, but a proper rewrite of the fork to allow for a more varied foodening can happen when I'm in the mood. --NEO + if(forkload) if(M == user) M.visible_message("[user] eats a delicious forkful of omelette!") - M.reagents.add_reagent("nutriment", 1) + M.reagents.add_reagent(forkload.id, 1) else M.visible_message("[user] feeds [M] a delicious forkful of omelette!") - M.reagents.add_reagent("nutriment", 1) - src.icon_state = "fork" + M.reagents.add_reagent(forkload.id, 1) + icon_state = "fork" + forkload = null return - else + + else if(user.zone_sel.selecting == "eyes") if(user.disabilities & CLUMSY && prob(50)) M = user return eyestab(M,user) + else + return ..() -/* - * Knives - */ -/obj/item/weapon/kitchen/utensil/knife - name = "knife" - desc = "Can cut through any food." - icon_state = "knife" - force = 10.0 - throwforce = 10.0 -/obj/item/weapon/kitchen/utensil/knife/suicide_act(mob/user) - user.visible_message(pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ - "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ - "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.")) - return (BRUTELOSS) - -/obj/item/weapon/kitchen/utensil/knife/attack(target, mob/living/carbon/human/user) - if(istype(user) && user.disabilities & CLUMSY && prob(50)) - user << "You accidentally cut yourself with \the [src]." - user.take_organ_damage(20) - return - playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) - return ..() - -/* - * Kitchen knives - */ -/obj/item/weapon/kitchenknife +/obj/item/weapon/kitchen/knife name = "kitchen knife" - icon = 'icons/obj/kitchen.dmi' icon_state = "knife" desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." flags = CONDUCT force = 10.0 - w_class = 3.0 + w_class = 2.0 throwforce = 10.0 + hitsound = 'sound/weapons/bladeslice.ogg' throw_speed = 3 throw_range = 6 m_amt = 12000 origin_tech = "materials=1" attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/weapon/kitchenknife/suicide_act(mob/user) +/obj/item/weapon/kitchen/knife/suicide_act(mob/user) user.visible_message(pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.")) return (BRUTELOSS) -/obj/item/weapon/kitchenknife/ritual +/obj/item/weapon/kitchen/knife/ritual name = "ritual knife" desc = "The unearthly energies that once powered this blade are now dormant." icon = 'icons/obj/wizard.dmi' icon_state = "render" + w_class = 3.0 -/* - * Bucher's cleaver - */ -/obj/item/weapon/kitchenknife/butcher +/obj/item/weapon/kitchen/knife/butcher name = "butcher's cleaver" - icon = 'icons/obj/kitchen.dmi' icon_state = "butch" desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." flags = CONDUCT force = 15.0 - w_class = 3.0 throwforce = 8.0 - throw_speed = 3 - throw_range = 6 - m_amt = 12000 - origin_tech = "materials=1" - hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - -/* - * Rolling Pins - */ + w_class = 3.0 /obj/item/weapon/kitchen/rollingpin name = "rolling pin" @@ -158,4 +96,4 @@ w_class = 3.0 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") -/* Trays moved to /obj/item/weapon/storage/bag */ +/* Trays moved to /obj/item/weapon/storage/bag */ diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 5136e6073d2..7e69597ba3d 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -287,6 +287,7 @@ name = "Mentoring your Experiments" icon_state = "rdbook" author = "Dr. H.P. Kritz" + title = "Mentoring your Experiments" dat = {" "} diff --git a/nano/css/shared.css b/nano/css/shared.css index 8f7110ee152..a2fa3507d55 100644 --- a/nano/css/shared.css +++ b/nano/css/shared.css @@ -29,9 +29,18 @@ a, a:link, a:visited, a:active, .link, .linkOn, .linkOff, .selected, .disabled .link { - float: left; - min-width: 40px; - height: 16px; + float: left; + min-width: 15px; + height: 16px; + text-align: center; + color: #ffffff; + text-decoration: none; + background: #40628a; + border: 1px solid #161616; + padding: 0px 4px 4px 4px; + margin: 0 2px 2px 0; + cursor: default; + white-space: nowrap; } a:hover, .linkActive:hover @@ -218,6 +227,10 @@ h4 font-weight: bold; } +.redButton { + background: #ea0000; +} + .highlight { color: #8BA5C4; @@ -228,6 +241,15 @@ h4 color: #272727; } +.noticePlaceholder { + position: relative; + font-size: 12px; + font-style: italic; + font-weight: bold; + padding: 3px 4px 3px 4px; + margin: 4px 0 4px 0; +} + .notice { background: url(uiNoticeBackground.jpg) 0 0 repeat; diff --git a/nano/templates/air_alarm.tmpl b/nano/templates/air_alarm.tmpl new file mode 100644 index 00000000000..f3a64d9efd8 --- /dev/null +++ b/nano/templates/air_alarm.tmpl @@ -0,0 +1,199 @@ + +
+ {{if siliconUser}}
+
+
+ Interface Lock:
+
+
+ {{:~link('Engaged', 'locked', {'toggleaccess' : 1}, locked ? 'selected' : null)}}{{:~link('Disengaged', 'unlocked', {'toggleaccess' : 1}, (locked ? null : 'selected'))}}
+
+ {{else}}
+ {{if locked}}
+ Swipe an ID card to unlock this interface.
+ {{else}}
+ Swipe an ID card to lock this interface.
+ {{/if}}
+ {{/if}}
+
+Air Status
+{{if environment_data}} + {{for environment_data}} + {{:name}} + {{if danger_level == 2}} + + {{else danger_level == 1}} + + {{else}} + + {{/if}} + {{:~round(value*100)/100}} + {{:unit}}+ {{/for}} + Local Status: {{if danger_level == 2}} + DANGER: Internals Required + {{else danger_level == 1}} + Caution + {{else}} + Optimal + {{/if}} +
+ Area Status: {{if atmos_alarm}}Atmosphere alert in area{{else fire_alarm}}Fire alarm in area{{else}}No alerts{{/if}} +{{else}} + Warning: Cannot obtain air sample for analysis. +{{/if}} +{{if dangerous}} +
NOTICE: Safety measures nonfunctional. Device may exhibit abnormal behavior. +{{/if}} +
+{{if (!locked || siliconUser)}} + {{if screen != 1}} +
{{:~link('Main Menu', null, { 'screen' : 1})}}
+ {{/if}}
+ {{if screen == 1}}
+
+ {{if atmos_alarm}}
+ {{:~link('Reset - Area Atmospheric Alarm', null, { 'atmos_reset' : 1})}}
+ {{else}}
+ {{:~link('Activate - Area Atmospheric Alarm', null, { 'atmos_alarm' : 1})}}
+ {{/if}}
+
+ +
+ {{:~link('Scrubbers Control', null, { 'screen' : 3})}}
+
+
+ {{:~link('Vents Control', null, { 'screen' : 2})}}
+
+
+ {{:~link('Set Environmental Mode', null, { 'screen' : 4})}}
+
+
+ {{:~link('Sensor Settings', null, { 'screen' : 5})}}
+
+ + {{if mode==3}} + {{:~link('PANIC SIPHON ACTIVE - Turn siphoning off', null, { 'mode' : 1}, null, 'redButton')}} + {{else}} + {{:~link('ACTIVATE PANIC SIPHON IN AREA', null, { 'mode' : 3}, null, 'yellowButton')}} + {{/if}} + {{else screen == 2}} + {{for vents}} +
{{:long_name}}
+
+
+
+ Operating:
+
+
+ {{:~link(power ? 'On' : 'Off', null, { 'id_tag' : id_tag, 'command' : 'power', 'val' : power ? 0 : 1}, null, power ? null : 'redButton')}}
+
+
+
+
+ Mode:
+
+
+ {{:direction == "siphon" ? 'Siphoning' : 'Pressurizing'}}
+
+
+
+
+ Pressure Checks:
+
+
+ {{:~link('External', null, { 'id_tag' : id_tag, 'command' : 'excheck', 'val' : checks}, null, excheck ? 'selected' : null)}}
+ {{:~link('Internal', null, { 'id_tag' : id_tag, 'command' : 'incheck', 'val' : checks}, null, incheck ? 'selected' : null)}}
+
+
+
+
+ External Pressure Bound:
+
+
+ {{:~link(~round(external*100)/100, null, { 'id_tag' : id_tag, 'command' : 'set_external_pressure'})}}
+ {{:~link('Reset', null, { 'id_tag' : id_tag, 'command' : 'reset_external_pressure'})}}
+
+ + {{/for}} + {{if !vents.length}} + No vents connected. + {{/if}} + {{else screen == 3}} + {{for scrubbers}} +
{{:long_name}}
+
+
+
+ Operating:
+
+
+ {{:~link(power ? 'On' : 'Off', null, { 'id_tag' : id_tag, 'command' : 'power', 'val' : power ? 0 : 1}, null, power ? null : 'redButton')}}
+
+
+
+
+ Mode:
+
+
+ {{:~link(scrubbing ? 'Scrubbing' : 'Siphoning', null, { 'id_tag' : id_tag, 'command' : 'scrubbing', 'val' : scrubbing ? 0 : 1}, null, scrubbing ? null : 'redButton')}}
+
+
+
+
+ Filters:
+
+
+ {{:~link("Carbon Dioxide", null, { 'id_tag' : id_tag, 'command' : "co2_scrub", 'val' : filter_co2 ? 0 : 1}, null, filter_co2 ? 'selected' : null)}}
+ {{:~link("Plasma", null, { 'id_tag' : id_tag, 'command' : "tox_scrub", 'val' : filter_toxins ? 0 : 1}, null, filter_toxins ? 'selected' : null)}}
+ {{:~link("Nitrous Oxide", null, { 'id_tag' : id_tag, 'command' : "n2o_scrub", 'val' : filter_n2o ? 0 : 1}, null, filter_n2o ? 'selected' : null)}}
+
+ + {{:~link("Plasma", null, { 'id_tag' : id_tag, 'command' : "tox_scrub", 'val' : filter_toxins ? 0 : 1}, null, filter_toxins ? 'selected' : null)}}
+ {{:~link("Nitrous Oxide", null, { 'id_tag' : id_tag, 'command' : "n2o_scrub", 'val' : filter_n2o ? 0 : 1}, null, filter_n2o ? 'selected' : null)}}
+
+ {{/for}} + {{if !scrubbers.length}} + No scrubbers connected. + {{/if}} + {{else screen == 4}} +
Environmental Modes
+ {{for modes}} +
+ {{:~link(name, null, { 'mode' : mode }, null, selected ? (danger ? 'redButton' : 'selected') : (danger ? 'bad' : null))}}
+
+ {{/for}}
+ {{else screen == 5}}
+ Alarm Threshold
+ Partial pressure for gases. +| min2 | min1 | max1 | max2 | +|
| {{:name}} | + {{for settings}} ++ {{:~link(selected >= 0 ? ~round(selected*100)/100 : "Off", null, { 'command' : 'set_threshold', 'env' : env, 'var' : val })}} + | + {{/for}} +