NanoTrasen Automatic Teller Machine
" - dat += "For all your monetary needs!
" - dat += "Welcome, [user_id.registered_name].
" - dat += "You have $[user_id.money] in your account.
" - dat += "Withdraw
" - user << browse(dat,"window=atm") + //js replicated from obj/machinery/computer/card + var/dat = "
NanoTrasen Automatic Teller Machine
" + dat += "For all your monetary needs!" + dat += "This terminal is [machine_id]. Report this code when contacting NanoTrasen IT Support
" + dat += "Card: [held_card ? held_card.name : "------"]
" + + if(ticks_left_locked_down > 0) + dat += "Maximum number of pin attempts exceeded! Access to this ATM has been temporarily disabled." + else if(authenticated_account) + switch(view_screen) + if(CHANGE_SECURITY_LEVEL) + dat += "Select a new security level for this account:
" + var/text = "Zero - Only account number or card is required to access this account. EFTPOS transactions will require a card and ask for a pin, but not verify the pin is correct." + if(authenticated_account.security_level != 0) + text = "[text]" + dat += "[text]
" + text = "One - Both an account number and pin is required to access this account and process transactions." + if(authenticated_account.security_level != 1) + text = "[text]" + dat += "[text]
" + text = "Two - In addition to account number and pin, a card is required to access this account and process transactions." + if(authenticated_account.security_level != 2) + text = "[text]" + dat += "[text]
" + dat += "Back" + if(VIEW_TRANSACTION_LOGS) + dat += "Transaction logs
" + dat += "Back" + dat += "
| Date | " + dat += "Time | " + dat += "Target | " + dat += "Purpose | " + dat += "Value | " + dat += "Source terminal ID | " + dat += "
| [T.date] | " + dat += "[T.time] | " + dat += "[T.target_name] | " + dat += "[T.purpose] | " + dat += "$[T.amount] | " + dat += "[T.source_terminal] | " + dat += "
" + dat += "Back
" + dat += "" + else + dat += "Welcome, [authenticated_account.owner_name].
" + dat += "Account balance: $[authenticated_account.money]" + dat += "" + dat += "Change account security level
" + dat += "Make transfer
" + dat += "View transaction log
" + dat += "Print balance statement
" + dat += "Logout
" + else if(linked_db) + dat += "" + else + dat += "Unable to connect to accounts database, please retry and if the issue persists contact NanoTrasen IT support." + reconnect_database() + + user << browse(dat,"window=atm;size=500x650") + else + user << browse(null,"window=atm") /obj/machinery/atm/Topic(var/href, var/href_list) - if(href_list["withdraw"] && href_list["id"]) - var/amount = input("How much would you like to withdraw?", "Amount", 0) in list(1,10,20,50,100,200,500,1000, 0) - var/obj/item/weapon/card/id/user_id = locate(href_list["id"]) - if(amount != 0 && user_id) - if(amount <= user_id.money) - user_id.money -= amount - //hueg switch for giving moneh out - switch(amount) - if(1) - new /obj/item/weapon/spacecash(loc) - if(10) - new /obj/item/weapon/spacecash/c10(loc) - if(20) - new /obj/item/weapon/spacecash/c20(loc) - if(50) - new /obj/item/weapon/spacecash/c50(loc) - if(100) - new /obj/item/weapon/spacecash/c100(loc) - if(200) - new /obj/item/weapon/spacecash/c200(loc) - if(500) - new /obj/item/weapon/spacecash/c500(loc) - if(1000) - new /obj/item/weapon/spacecash/c1000(loc) - else - usr << browse("You don't have that much money!
Back","window=atm") + if(href_list["choice"]) + switch(href_list["choice"]) + if("transfer") + if(authenticated_account && linked_db) + var/target_account_number = text2num(href_list["target_acc_number"]) + var/transfer_amount = text2num(href_list["funds_amount"]) + var/transfer_purpose = href_list["purpose"] + if(transfer_amount <= authenticated_account.money) + if(linked_db.charge_to_account(target_account_number, authenticated_account.owner_name, transfer_purpose, machine_id, transfer_amount)) + usr << "\icon[src]Funds transfer successful." + authenticated_account.money -= transfer_amount + + //create an entry in the account transaction log + var/datum/transaction/T = new() + T.target_name = "Account #[target_account_number]" + T.purpose = transfer_purpose + T.source_terminal = machine_id + T.date = current_date_string + T.time = worldtime2text() + T.amount = "([transfer_amount])" + authenticated_account.transaction_log.Add(T) + else + usr << "\icon[src]Funds transfer failed." + + else + usr << "\icon[src]You don't have enough funds to do that!" + if("view_screen") + view_screen = text2num(href_list["view_screen"]) + if("change_security_level") + if(authenticated_account) + var/new_sec_level = max( min(text2num(href_list["new_security_level"]), 2), 0) + authenticated_account.security_level = new_sec_level + if("attempt_auth") + if(linked_db) + var/tried_account_num = text2num(href_list["account_num"]) + if(!tried_account_num) + tried_account_num = held_card.associated_account_number + var/tried_pin = text2num(href_list["account_pin"]) + + authenticated_account = linked_db.attempt_account_access(tried_account_num, tried_pin, held_card && held_card.associated_account_number == tried_account_num ? 2 : 1) + if(!authenticated_account) + if(previous_account_number == tried_account_num) + if(++number_incorrect_tries > max_pin_attempts) + //lock down the atm + number_incorrect_tries = 0 + ticks_left_locked_down = 10 + playsound(src, 'buzz-two.ogg', 50, 1) + + //create an entry in the account transaction log + var/datum/transaction/T = new() + T.target_name = authenticated_account.owner_name + T.purpose = "Unauthorised login attempt" + T.source_terminal = machine_id + T.date = current_date_string + T.time = worldtime2text() + authenticated_account.transaction_log.Add(T) + else + previous_account_number = tried_account_num + number_incorrect_tries = 1 + playsound(src, 'buzz-sigh.ogg', 50, 1) + else + playsound(src, 'twobeep.ogg', 50, 1) + ticks_left_timeout = 120 + view_screen = NO_SCREEN + + //create a transaction log entry + var/datum/transaction/T = new() + T.target_name = authenticated_account.owner_name + T.purpose = "Remote terminal access" + T.source_terminal = machine_id + T.date = current_date_string + T.time = worldtime2text() + authenticated_account.transaction_log.Add(T) + if("withdrawal") + var/amount = max(text2num(href_list["funds_amount"]),0) + if(authenticated_account && amount > 0) + if(amount <= authenticated_account.money) + playsound(src, 'chime.ogg', 50, 1) + + //remove the money + authenticated_account.money -= amount + withdraw_arbitrary_sum(amount) + + //create an entry in the account transaction log + var/datum/transaction/T = new() + T.target_name = authenticated_account.owner_name + T.purpose = "Credit withdrawal" + T.amount = "([amount])" + T.source_terminal = machine_id + T.date = current_date_string + T.time = worldtime2text() + authenticated_account.transaction_log.Add(T) + else + usr << "\icon[src]You don't have enough funds to do that!" + if("balance_statement") + if(authenticated_account) + var/obj/item/weapon/paper/R = new(src.loc) + R.name = "Account balance: [authenticated_account.owner_name]" + R.info = "NT Automated Teller Account Statement
" + R.info += "Account holder: [authenticated_account.owner_name]
" + R.info += "Account number: [authenticated_account.account_number]
" + R.info += "Balance: $[authenticated_account.money]
" + R.info += "Date and time: [worldtime2text()], [current_date_string]
" + R.info += "Service terminal ID: [machine_id]
" + + //stamp the paper + var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') + stampoverlay.icon_state = "paper_stamp-cent" + if(!R.stamped) + R.stamped = new + R.stamped += /obj/item/weapon/stamp + R.overlays += stampoverlay + R.stamps += "
This paper has been stamped by the Automatic Teller Machine." + + if(prob(50)) + playsound(loc, 'sound/items/polaroid1.ogg', 50, 1) + else + playsound(loc, 'sound/items/polaroid2.ogg', 50, 1) + if("insert_card") + if(held_card) + held_card.loc = src.loc + authenticated_account = null + + if(ishuman(usr) && !usr.get_active_hand()) + usr.put_in_hands(held_card) + held_card = null + + else + var/obj/item/I = usr.get_active_hand() + if (istype(I, /obj/item/weapon/card/id)) + usr.drop_item() + I.loc = src + held_card = I + if("logout") + authenticated_account = null + usr << browse(null,"window=atm") return src.attack_hand(usr) +//create the most effective combination of notes to make up the requested amount +/obj/machinery/atm/proc/withdraw_arbitrary_sum(var/arbitrary_sum) + while(arbitrary_sum >= 1000) + arbitrary_sum -= 1000 + new /obj/item/weapon/spacecash/c1000(src) + while(arbitrary_sum >= 500) + arbitrary_sum -= 500 + new /obj/item/weapon/spacecash/c500(src) + while(arbitrary_sum >= 200) + arbitrary_sum -= 200 + new /obj/item/weapon/spacecash/c200(src) + while(arbitrary_sum >= 100) + arbitrary_sum -= 100 + new /obj/item/weapon/spacecash/c100(src) + while(arbitrary_sum >= 50) + arbitrary_sum -= 50 + new /obj/item/weapon/spacecash/c50(src) + while(arbitrary_sum >= 20) + arbitrary_sum -= 20 + new /obj/item/weapon/spacecash/c20(src) + while(arbitrary_sum >= 10) + arbitrary_sum -= 10 + new /obj/item/weapon/spacecash/c10(src) + while(arbitrary_sum >= 1) + arbitrary_sum -= 1 + new /obj/item/weapon/spacecash(src) + //stolen wholesale and then edited a bit from newscasters, which are awesome and by Agouri /obj/machinery/atm/proc/scan_user(mob/living/carbon/human/human_user as mob) - 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) - return P.id - else - return null - else if(istype(human_user.wear_id, /obj/item/weapon/card/id) ) - return human_user.wear_id - else - return null - else - return null + if(!authenticated_account && linked_db) + if(human_user.wear_id) + var/obj/item/weapon/card/id/I + if(istype(human_user.wear_id, /obj/item/weapon/card/id) ) + I = human_user.wear_id + else if(istype(human_user.wear_id, /obj/item/device/pda) ) + var/obj/item/device/pda/P = human_user.wear_id + I = P.id + if(I) + authenticated_account = linked_db.attempt_account_access(I.associated_account_number) diff --git a/code/WorkInProgress/Sigyn/Department Sec/__README.dm b/code/WorkInProgress/Sigyn/Department Sec/__README.dm new file mode 100644 index 00000000000..e6b3f7967fd --- /dev/null +++ b/code/WorkInProgress/Sigyn/Department Sec/__README.dm @@ -0,0 +1,8 @@ +/* + +Hey you! +You only need to untick maps/tgstation.2.0.9.dmm for this if you download the modified map from: +http://tgstation13.googlecode.com/files/tgstation.2.1.0_deptsec.zip + +Everything else can just be ticked on top of the original stuff. +*/ \ No newline at end of file diff --git a/code/WorkInProgress/Sigyn/Department Sec/jobs.dm b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm new file mode 100644 index 00000000000..66e14b040c3 --- /dev/null +++ b/code/WorkInProgress/Sigyn/Department Sec/jobs.dm @@ -0,0 +1,126 @@ +var/list/sec_departments = list("engineering", "supply", "medical", "science") + +proc/assign_sec_to_department(var/mob/living/carbon/human/H) + if(sec_departments.len) + var/department = pick(sec_departments) + sec_departments -= department + var/access = null + var/destination = null + switch(department) + if("supply") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/cargo(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/supply(H), slot_ears) + access = list(access_mailsorting, access_mining) + destination = /area/security/checkpoint/supply + if("engineering") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/engine(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/engi(H), slot_ears) + access = list(access_construction, access_engine) + destination = /area/security/checkpoint/engineering + if("medical") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/med(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/med(H), slot_ears) + access = list(access_medical) + destination = /area/security/checkpoint/medical + if("science") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/science(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec/department/sci(H), slot_ears) + access = list(access_research) + destination = /area/security/checkpoint/science + else + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + + + if(destination) + var/teleport = 0 + if(!ticker || ticker.current_state <= GAME_STATE_SETTING_UP) + teleport = 1 + spawn(15) + if(H) + if(teleport) + var/turf/T + var/safety = 0 + while(safety < 25) + T = pick(get_area_turfs(destination)) + if(!H.Move(T)) + safety += 1 + continue + else + break + H << "You have been assigned to [department]!" + if(locate(/obj/item/weapon/card/id, H)) + var/obj/item/weapon/card/id/I = locate(/obj/item/weapon/card/id, H) + if(I) + I.access |= access + + +/datum/job/officer + title = "Security Officer" + flag = OFFICER + department_flag = ENGSEC + faction = "Station" + total_positions = 5 + spawn_positions = 5 + supervisors = "the head of security, and the head of your assigned department (if applicable)" + selection_color = "#ffeeee" + + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) + assign_sec_to_department(H) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_l_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) + L.imp_in = H + L.implanted = 1 + return 1 + +/obj/item/device/radio/headset/headset_sec/department/New() + if(radio_controller) + initialize() + recalculateChannels() + +/obj/item/device/radio/headset/headset_sec/department/engi + keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot2 = new /obj/item/device/encryptionkey/headset_eng + +/obj/item/device/radio/headset/headset_sec/department/supply + keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot2 = new /obj/item/device/encryptionkey/headset_cargo + +/obj/item/device/radio/headset/headset_sec/department/med + keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot2 = new /obj/item/device/encryptionkey/headset_med + +/obj/item/device/radio/headset/headset_sec/department/sci + keyslot1 = new /obj/item/device/encryptionkey/headset_sec + keyslot2 = new /obj/item/device/encryptionkey/headset_sci + +/obj/item/clothing/under/rank/security/cargo/New() + var/obj/item/clothing/tie/armband/cargo/A = new /obj/item/clothing/tie/armband/cargo + hastie = A + +/obj/item/clothing/under/rank/security/engine/New() + var/obj/item/clothing/tie/armband/engine/A = new /obj/item/clothing/tie/armband/engine + hastie = A + +/obj/item/clothing/under/rank/security/science/New() + var/obj/item/clothing/tie/armband/science/A = new /obj/item/clothing/tie/armband/science + hastie = A + +/obj/item/clothing/under/rank/security/med/New() + var/obj/item/clothing/tie/armband/medgreen/A = new /obj/item/clothing/tie/armband/medgreen + hastie = A \ No newline at end of file diff --git a/code/WorkInProgress/Sigyn/Softcurity/__README.dm b/code/WorkInProgress/Sigyn/Softcurity/__README.dm new file mode 100644 index 00000000000..75c62c277d5 --- /dev/null +++ b/code/WorkInProgress/Sigyn/Softcurity/__README.dm @@ -0,0 +1,10 @@ +/* + +Hey you! +You'll need to untick code/game/jobs/access.dm for this to all work correctly! + +Everything else can just be ticked on top of the original stuff. + +You'll also need to download a modified map from http://tgstation13.googlecode.com/files/tgstation.2.0.9_Softcurity.zip. +Make sure to untick the original map! +*/ \ No newline at end of file diff --git a/code/WorkInProgress/Sigyn/Softcurity/access.dm b/code/WorkInProgress/Sigyn/Softcurity/access.dm new file mode 100644 index 00000000000..d0dace17bf7 --- /dev/null +++ b/code/WorkInProgress/Sigyn/Softcurity/access.dm @@ -0,0 +1,522 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + +/var/const/access_security = 1 // Security equipment +/var/const/access_brig = 2 // Brig timers and permabrig +/var/const/access_armory = 3 +/var/const/access_forensics_lockers= 4 +/var/const/access_medical = 5 +/var/const/access_morgue = 6 +/var/const/access_tox = 7 +/var/const/access_tox_storage = 8 +/var/const/access_genetics = 9 +/var/const/access_engine = 10 +/var/const/access_engine_equip= 11 +/var/const/access_maint_tunnels = 12 +/var/const/access_external_airlocks = 13 +/var/const/access_emergency_storage = 14 +/var/const/access_change_ids = 15 +/var/const/access_ai_upload = 16 +/var/const/access_teleporter = 17 +/var/const/access_eva = 18 +/var/const/access_heads = 19 +/var/const/access_captain = 20 +/var/const/access_all_personal_lockers = 21 +/var/const/access_chapel_office = 22 +/var/const/access_tech_storage = 23 +/var/const/access_atmospherics = 24 +/var/const/access_bar = 25 +/var/const/access_janitor = 26 +/var/const/access_crematorium = 27 +/var/const/access_kitchen = 28 +/var/const/access_robotics = 29 +/var/const/access_rd = 30 +/var/const/access_cargo = 31 +/var/const/access_construction = 32 +/var/const/access_chemistry = 33 +/var/const/access_cargo_bot = 34 +/var/const/access_hydroponics = 35 +/var/const/access_manufacturing = 36 +/var/const/access_library = 37 +/var/const/access_lawyer = 38 +/var/const/access_virology = 39 +/var/const/access_cmo = 40 +/var/const/access_qm = 41 +/var/const/access_court = 42 +/var/const/access_clown = 43 +/var/const/access_mime = 44 +/var/const/access_surgery = 45 +/var/const/access_theatre = 46 +/var/const/access_research = 47 +/var/const/access_mining = 48 +/var/const/access_mining_office = 49 //not in use +/var/const/access_mailsorting = 50 +/var/const/access_mint = 51 +/var/const/access_mint_vault = 52 +/var/const/access_heads_vault = 53 +/var/const/access_mining_station = 54 +/var/const/access_xenobiology = 55 +/var/const/access_ce = 56 +/var/const/access_hop = 57 +/var/const/access_hos = 58 +/var/const/access_RC_announce = 59 //Request console announcements +/var/const/access_keycard_auth = 60 //Used for events which require at least two people to confirm them +/var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery +/var/const/access_gateway = 62 +/var/const/access_sec_doors = 63 // Security front doors + + //BEGIN CENTCOM ACCESS + /*Should leave plenty of room if we need to add more access levels. +/var/const/Mostly for admin fun times.*/ +/var/const/access_cent_general = 101//General facilities. +/var/const/access_cent_thunder = 102//Thunderdome. +/var/const/access_cent_specops = 103//Special Ops. +/var/const/access_cent_medical = 104//Medical/Research +/var/const/access_cent_living = 105//Living quarters. +/var/const/access_cent_storage = 106//Generic storage areas. +/var/const/access_cent_teleporter = 107//Teleporter. +/var/const/access_cent_creed = 108//Creed's office. +/var/const/access_cent_captain = 109//Captain's office/ID comp/AI. + + //The Syndicate +/var/const/access_syndicate = 150//General Syndicate Access + + //MONEY +/var/const/access_crate_cash = 200 + +/obj/var/list/req_access = null +/obj/var/req_access_txt = "0" +/obj/var/list/req_one_access = null +/obj/var/req_one_access_txt = "0" + +/obj/New() + ..() + //NOTE: If a room requires more than one access (IE: Morgue + medbay) set the req_acesss_txt to "5;6" if it requires 5 and 6 + if(src.req_access_txt) + var/list/req_access_str = text2list(req_access_txt,";") + if(!req_access) + req_access = list() + for(var/x in req_access_str) + var/n = text2num(x) + if(n) + req_access += n + + if(src.req_one_access_txt) + var/list/req_one_access_str = text2list(req_one_access_txt,";") + if(!req_one_access) + req_one_access = list() + for(var/x in req_one_access_str) + var/n = text2num(x) + if(n) + req_one_access += n + + + +//returns 1 if this mob has sufficient access to use this object +/obj/proc/allowed(mob/M) + //check if it doesn't require any access at all + if(src.check_access(null)) + return 1 + if(istype(M, /mob/living/silicon)) + //AI can do whatever he wants + return 1 + else if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + //if they are holding or wearing a card that has access, that works + if(src.check_access(H.get_active_hand()) || src.check_access(H.wear_id)) + return 1 + else if(istype(M, /mob/living/carbon/monkey) || istype(M, /mob/living/carbon/alien/humanoid)) + var/mob/living/carbon/george = M + //they can only hold things :( + if(george.get_active_hand() && (istype(george.get_active_hand(), /obj/item/weapon/card/id) || istype(george.get_active_hand(), /obj/item/device/pda)) && src.check_access(george.get_active_hand())) + return 1 + return 0 + +/obj/item/proc/GetAccess() + return list() + +/obj/item/proc/GetID() + return null + +/obj/proc/check_access(obj/item/weapon/card/id/I) + + if (istype(I, /obj/item/device/pda)) + var/obj/item/device/pda/pda = I + I = pda.id + + if(!src.req_access && !src.req_one_access) //no requirements + return 1 + if(!istype(src.req_access, /list)) //something's very wrong + return 1 + + var/list/L = src.req_access + if(!L.len && (!src.req_one_access || !src.req_one_access.len)) //no requirements + return 1 + if(!I || !istype(I, /obj/item/weapon/card/id) || !I.access) //not ID or no access + return 0 + for(var/req in src.req_access) + if(!(req in I.access)) //doesn't have this access + return 0 + if(src.req_one_access && src.req_one_access.len) + for(var/req in src.req_one_access) + if(req in I.access) //has an access from the single access list + return 1 + return 0 + return 1 + + +/obj/proc/check_access_list(var/list/L) + if(!src.req_access && !src.req_one_access) return 1 + if(!istype(src.req_access, /list)) return 1 + if(!src.req_access.len && (!src.req_one_access || !src.req_one_access.len)) return 1 + if(!L) return 0 + if(!istype(L, /list)) return 0 + for(var/req in src.req_access) + if(!(req in L)) //doesn't have this access + return 0 + if(src.req_one_access && src.req_one_access.len) + for(var/req in src.req_one_access) + if(req in L) //has an access from the single access list + return 1 + return 0 + return 1 + + +/proc/get_access(job) + switch(job) + if("Geneticist") + return list(access_medical, access_morgue, access_genetics) + if("Station Engineer") + return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction) + if("Assistant") + if(config.assistant_maint) + return list(access_maint_tunnels) + else + return list() + if("Chaplain") + return list(access_morgue, access_chapel_office, access_crematorium) + if("Detective") + return list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) + if("Medical Doctor") + return list(access_medical, access_morgue, access_surgery) + if("Botanist") // -- TLE + return list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. + if("Librarian") // -- TLE + return list(access_library) + if("Lawyer") //Muskets 160910 + return list(access_lawyer, access_court, access_sec_doors) + if("Captain") + return get_all_accesses() + if("Crew Supervisor") + return list(access_security, access_sec_doors, access_brig, access_court) + if("Correctional Advisor") + return list(access_security, access_sec_doors, access_brig, access_armory, access_court) + if("Scientist") + return list(access_tox, access_tox_storage, access_research, access_xenobiology) + if("Safety Administrator") + return list(access_medical, access_morgue, access_tox, access_tox_storage, access_chemistry, access_genetics, access_court, + access_teleporter, access_heads, access_tech_storage, access_security, access_sec_doors, access_brig, access_atmospherics, + access_maint_tunnels, access_bar, access_janitor, access_kitchen, access_robotics, access_armory, access_hydroponics, + access_theatre, access_research, access_hos, access_RC_announce, access_forensics_lockers, access_keycard_auth, access_gateway) + if("Head of Personnel") + return list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, + access_tox, access_tox_storage, access_chemistry, access_medical, access_genetics, access_engine, + access_emergency_storage, access_change_ids, access_ai_upload, access_eva, access_heads, + access_all_personal_lockers, access_tech_storage, access_maint_tunnels, access_bar, access_janitor, + access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, + access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, + access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway) + if("Atmospheric Technician") + return list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction) + if("Bartender") + return list(access_bar) + if("Chemist") + return list(access_medical, access_chemistry) + if("Janitor") + return list(access_janitor, access_maint_tunnels) + if("Clown") + return list(access_clown, access_theatre) + if("Mime") + return list(access_mime, access_theatre) + if("Chef") + return list(access_kitchen, access_morgue) + if("Roboticist") + return list(access_robotics, access_tech_storage, access_morgue) //As a job that handles so many corpses, it makes sense for them to have morgue access. + if("Cargo Technician") + return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting) + if("Shaft Miner") + return list(access_mining, access_mint, access_mining_station) + if("Quartermaster") + return list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) + if("Chief Engineer") + return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, + access_heads, access_ai_upload, access_construction, access_robotics, + access_mint, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_sec_doors) + if("Research Director") + return list(access_rd, access_heads, access_tox, access_genetics, + access_tox_storage, access_teleporter, + access_research, access_robotics, access_xenobiology, + access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_sec_doors) + if("Virologist") + return list(access_medical, access_virology) + if("Chief Medical Officer") + return list(access_medical, access_morgue, access_genetics, access_heads, + access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, + access_keycard_auth, access_sec_doors) + else + return list() + +/proc/get_centcom_access(job) + switch(job) + if("VIP Guest") + return list(access_cent_general) + if("Custodian") + return list(access_cent_general, access_cent_living, access_cent_storage) + if("Thunderdome Overseer") + return list(access_cent_general, access_cent_thunder) + if("Intel Officer") + return list(access_cent_general, access_cent_living) + if("Medical Officer") + return list(access_cent_general, access_cent_living, access_cent_medical) + if("Death Commando") + return list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) + if("Research Officer") + return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage) + if("BlackOps Commander") + return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed) + if("Supreme Commander") + return get_all_centcom_access() + +/proc/get_all_accesses() + return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_court, + access_medical, access_genetics, access_morgue, access_rd, + access_tox, access_tox_storage, access_chemistry, access_engine, access_engine_equip, access_maint_tunnels, + access_external_airlocks, access_emergency_storage, access_change_ids, access_ai_upload, + access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers, + access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen, + access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction, + access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery, + access_theatre, access_research, access_mining, access_mailsorting, access_mint_vault, access_mint, + access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce, + access_keycard_auth, access_tcomsat, access_gateway) + +/proc/get_all_centcom_access() + return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_creed, access_cent_captain) + +/proc/get_all_syndicate_access() + return list(access_syndicate) + +/proc/get_region_accesses(var/code) + switch(code) + if(0) + return get_all_accesses() + if(1) //security + return list(access_sec_doors, access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_hos) + if(2) //medbay + return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo) + if(3) //research + return list(access_research, access_tox, access_tox_storage, access_xenobiology, access_rd) + if(4) //engineering and maintenance + return list(access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_construction, access_robotics, access_ce) + if(5) //command + return list(access_heads, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_all_personal_lockers, access_heads_vault, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_hop, access_captain) + if(6) //station general + return list(access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime) + if(7) //supply + return list(access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_mining, access_mining_station) + +/proc/get_region_accesses_name(var/code) + switch(code) + if(0) + return "All" + if(1) //security + return "Security" + if(2) //medbay + return "Medbay" + if(3) //research + return "Research" + if(4) //engineering and maintenance + return "Engineering" + if(5) //command + return "Command" + if(6) //station general + return "Station General" + if(7) //supply + return "Supply" + + +/proc/get_access_desc(A) + switch(A) + if(access_cargo) + return "Cargo Bay" + if(access_cargo_bot) + return "Cargo Bot Delivery" + if(access_security) + return "Security" + if(access_brig) + return "Holding Cells" + if(access_court) + return "Courtroom" + if(access_forensics_lockers) + return "Detective's Office" + if(access_medical) + return "Medical" + if(access_genetics) + return "Genetics Lab" + if(access_morgue) + return "Morgue" + if(access_tox) + return "Research Lab" + if(access_tox_storage) + return "Toxins Storage" + if(access_chemistry) + return "Chemistry Lab" + if(access_rd) + return "RD Private" + if(access_bar) + return "Bar" + if(access_janitor) + return "Custodial Closet" + if(access_engine) + return "Engineering" + if(access_engine_equip) + return "APCs" + if(access_maint_tunnels) + return "Maintenance" + if(access_external_airlocks) + return "External Airlocks" + if(access_emergency_storage) + return "Emergency Storage" + if(access_change_ids) + return "ID Computer" + if(access_ai_upload) + return "AI Upload" + if(access_teleporter) + return "Teleporter" + if(access_eva) + return "EVA" + if(access_heads) + return "Bridge" + if(access_captain) + return "Captain Private" + if(access_all_personal_lockers) + return "Personal Lockers" + if(access_chapel_office) + return "Chapel Office" + if(access_tech_storage) + return "Technical Storage" + if(access_atmospherics) + return "Atmospherics" + if(access_crematorium) + return "Crematorium" + if(access_armory) + return "Armory" + if(access_construction) + return "Construction Areas" + if(access_kitchen) + return "Kitchen" + if(access_hydroponics) + return "Hydroponics" + if(access_library) + return "Library" + if(access_lawyer) + return "Law Office" + if(access_robotics) + return "Robotics" + if(access_virology) + return "Virology" + if(access_cmo) + return "CMO Private" + if(access_qm) + return "Quartermaster's Office" + if(access_clown) + return "HONK! Access" + if(access_mime) + return "Silent Access" + if(access_surgery) + return "Surgery" + if(access_theatre) + return "Theatre" + if(access_manufacturing) + return "Manufacturing" + if(access_research) + return "Science" + if(access_mining) + return "Mining" + if(access_mining_office) + return "Mining Office" + if(access_mailsorting) + return "Delivery Office" + if(access_mint) + return "Mint" + if(access_mint_vault) + return "Mint Vault" + if(access_heads_vault) + return "Main Vault" + if(access_mining_station) + return "Mining Station EVA" + if(access_xenobiology) + return "Xenobiology Lab" + if(access_hop) + return "HoP Private" + if(access_hos) + return "HoS Private" + if(access_ce) + return "CE Private" + if(access_RC_announce) + return "RC Announcements" + if(access_keycard_auth) + return "Keycode Auth. Device" + if(access_tcomsat) + return "Telecommunications" + if(access_gateway) + return "Gateway" + if(access_sec_doors) + return "Brig" + +/proc/get_centcom_access_desc(A) + switch(A) + if(access_cent_general) + return "Code Grey" + if(access_cent_thunder) + return "Code Yellow" + if(access_cent_storage) + return "Code Orange" + if(access_cent_living) + return "Code Green" + if(access_cent_medical) + return "Code White" + if(access_cent_teleporter) + return "Code Blue" + if(access_cent_specops) + return "Code Black" + if(access_cent_creed) + return "Code Silver" + if(access_cent_captain) + return "Code Gold" + +/proc/get_all_jobs() + return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician", + "Shaft Miner", "Clown", "Mime", "Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", + "Atmospheric Technician", "Roboticist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", + "Research Director", "Scientist", "Head of Security", "Warden", "Detective", "Security Officer") + +/proc/get_all_centcom_jobs() + return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander") + +/obj/proc/GetJobName() + if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id)) + return + + var/jobName + + if(istype(src, /obj/item/device/pda)) + if(src:id) + jobName = src:id:assignment + if(istype(src, /obj/item/weapon/card/id)) + jobName = src:assignment + + if(jobName in get_all_jobs()) + return jobName + else + return "Unknown" diff --git a/code/WorkInProgress/Sigyn/Softcurity/clothing.dm b/code/WorkInProgress/Sigyn/Softcurity/clothing.dm new file mode 100644 index 00000000000..057c10cb575 --- /dev/null +++ b/code/WorkInProgress/Sigyn/Softcurity/clothing.dm @@ -0,0 +1,33 @@ +/obj/item/clothing/under/rank/administrator + name = "safety administrator's jumpsuit" + desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Safety Administrator\"." + icon_state = "hosblueclothes" + item_state = "ba_suit" + color = "hosblueclothes" + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + +/obj/item/clothing/under/rank/advisor + name = "correctional advisor's jumpsuit" + desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the words \"Correctional Advisor\" written on the shoulders." + icon_state = "wardenblueclothes" + item_state = "ba_suit" + color = "wardenblueclothes" + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + +/obj/item/clothing/under/rank/supervisor + name = "crew supervisor's jumpsuit" + desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection." + icon_state = "officerblueclothes" + item_state = "ba_suit" + color = "officerblueclothes" + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + +/obj/item/clothing/shoes/boots + name = "boots" + desc = "Nanotrasen-issue hard-toe safety boots." + icon_state = "secshoes" + item_state = "secshoes" + color = "hosred" \ No newline at end of file diff --git a/code/WorkInProgress/Sigyn/Softcurity/jobs.dm b/code/WorkInProgress/Sigyn/Softcurity/jobs.dm new file mode 100644 index 00000000000..a214626d1c6 --- /dev/null +++ b/code/WorkInProgress/Sigyn/Softcurity/jobs.dm @@ -0,0 +1,152 @@ +/datum/job/hos + title = "Safety Administrator" + flag = HOS + department_flag = ENGSEC + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the captain" + selection_color = "#ffdddd" + idtype = /obj/item/weapon/card/id/silver + req_admin_notify = 1 + + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hos(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/administrator(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hos(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/taser(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) + L.imp_in = H + L.implanted = 1 + return 1 + + + +/datum/job/warden + title = "Correctional Advisor" + flag = WARDEN + department_flag = ENGSEC + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the safety administrator" + selection_color = "#ffeeee" + + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/advisor(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/warden(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) + H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) + L.imp_in = H + L.implanted = 1 + return 1 + + + +/datum/job/detective + title = "Detective" + flag = DETECTIVE + department_flag = ENGSEC + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the safety administrator" + selection_color = "#ffeeee" + + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/det(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/detective(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/head/det_hat(H), slot_head) + var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H) + CIG.light("") + H.equip_to_slot_or_del(CIG, slot_wear_mask) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/det_suit(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(H), slot_l_store) + + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/device/detective_scanner(H), slot_in_backpack) + + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) + L.imp_in = H + L.implanted = 1 + return 1 + + + +/datum/job/officer + title = "Crew Supervisor" + flag = OFFICER + department_flag = ENGSEC + faction = "Station" + total_positions = 5 + spawn_positions = 5 + supervisors = "the safety administrator" + selection_color = "#ffeeee" + + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/supervisor(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_r_store) + H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack) + var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) + L.imp_in = H + L.implanted = 1 + return 1 + +/datum/job/hop + title = "Head of Personnel" + flag = HOP + department_flag = CIVILIAN + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the captain" + selection_color = "#ddddff" + idtype = /obj/item/weapon/card/id/silver + req_admin_notify = 1 + + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H.back), slot_in_backpack) + return 1 diff --git a/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm b/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm new file mode 100644 index 00000000000..88f06f98e7c --- /dev/null +++ b/code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm @@ -0,0 +1,235 @@ +/obj/structure/closet/secure_closet/captains + name = "Captain's Locker" + req_access = list(access_captain) + icon_state = "capsecure1" + icon_closed = "capsecure" + icon_locked = "capsecure1" + icon_opened = "capsecureopen" + icon_broken = "capsecurebroken" + icon_off = "capsecureoff" + + New() + sleep(2) + if(prob(50)) + new /obj/item/weapon/storage/backpack/captain(src) + else + new /obj/item/weapon/storage/backpack/satchel_cap(src) + new /obj/item/clothing/suit/captunic(src) + new /obj/item/clothing/head/helmet/cap(src) + new /obj/item/clothing/under/rank/captain(src) + new /obj/item/clothing/suit/armor/vest(src) + new /obj/item/weapon/cartridge/captain(src) + new /obj/item/clothing/head/helmet/swat(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/device/radio/headset/heads/captain(src) + new /obj/item/weapon/reagent_containers/food/drinks/flask(src) + new /obj/item/clothing/gloves/captain(src) + new /obj/item/weapon/gun/energy/gun(src) + return + + + +/obj/structure/closet/secure_closet/hop + name = "Head of Personnel's Locker" + req_access = list(access_hop) + icon_state = "hopsecure1" + icon_closed = "hopsecure" + icon_locked = "hopsecure1" + icon_opened = "hopsecureopen" + icon_broken = "hopsecurebroken" + icon_off = "hopsecureoff" + + New() + sleep(2) + new /obj/item/clothing/under/rank/head_of_personnel(src) + new /obj/item/clothing/suit/armor/vest(src) + new /obj/item/clothing/head/helmet(src) + new /obj/item/weapon/cartridge/hop(src) + new /obj/item/device/radio/headset/heads/hop(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/weapon/storage/id_kit(src) + new /obj/item/weapon/storage/id_kit( src ) + new /obj/item/device/flash(src) + new /obj/item/clothing/glasses/sunglasses(src) + return + + + +/obj/structure/closet/secure_closet/hos + name = "Safety Administrator's Locker" + req_access = list(access_hos) + icon_state = "hossecure1" + icon_closed = "hossecure" + icon_locked = "hossecure1" + icon_opened = "hossecureopen" + icon_broken = "hossecurebroken" + icon_off = "hossecureoff" + + New() + sleep(2) + new /obj/item/weapon/storage/backpack/satchel_sec(src) + new /obj/item/weapon/cartridge/hos(src) + new /obj/item/device/radio/headset/heads/hos(src) + new /obj/item/weapon/storage/lockbox/loyalty(src) + new /obj/item/weapon/storage/flashbang_kit(src) + new /obj/item/weapon/storage/belt/security(src) + new /obj/item/device/flash(src) + new /obj/item/weapon/melee/baton(src) + new /obj/item/weapon/gun/energy/taser(src) + new /obj/item/weapon/reagent_containers/spray/pepper(src) + return + + + +/obj/structure/closet/secure_closet/warden + name = "Correctional Advisor's Locker" + req_access = list(access_armory) + icon_state = "wardensecure1" + icon_closed = "wardensecure" + icon_locked = "wardensecure1" + icon_opened = "wardensecureopen" + icon_broken = "wardensecurebroken" + icon_off = "wardensecureoff" + + + New() + sleep(2) + new /obj/item/weapon/storage/backpack/satchel_sec(src) + new /obj/item/clothing/under/rank/advisor(src) + new /obj/item/device/radio/headset/headset_sec(src) + new /obj/item/clothing/glasses/sunglasses(src) + new /obj/item/weapon/storage/flashbang_kit(src) + new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/reagent_containers/spray/pepper(src) + new /obj/item/weapon/reagent_containers/spray/pepper(src) + new /obj/item/weapon/melee/baton(src) + return + + + +/obj/structure/closet/secure_closet/security + name = "Crew Supervisor's Locker" + req_access = list(access_security) + icon_state = "sec1" + icon_closed = "sec" + icon_locked = "sec1" + icon_opened = "secopen" + icon_broken = "secbroken" + icon_off = "secoff" + + New() + sleep(2) + new /obj/item/weapon/storage/backpack/satchel_sec(src) + new /obj/item/device/radio/headset/headset_sec(src) + new /obj/item/weapon/storage/belt/security(src) + new /obj/item/device/flash(src) + new /obj/item/weapon/reagent_containers/spray/pepper(src) + new /obj/item/weapon/reagent_containers/spray/pepper(src) + new /obj/item/clothing/glasses/sunglasses(src) + return + + + +/obj/structure/closet/secure_closet/detective + name = "Detective's Cabinet" + req_access = list(access_forensics_lockers) + icon_state = "cabinetdetective_locked" + icon_closed = "cabinetdetective" + icon_locked = "cabinetdetective_locked" + icon_opened = "cabinetdetective_open" + icon_broken = "cabinetdetective_broken" + icon_off = "cabinetdetective_broken" + + New() + sleep(2) + new /obj/item/clothing/under/det(src) + new /obj/item/clothing/suit/armor/det_suit(src) + new /obj/item/clothing/suit/det_suit(src) + new /obj/item/clothing/gloves/black(src) + new /obj/item/clothing/head/det_hat(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/device/radio/headset/headset_sec(src) + new /obj/item/weapon/cartridge/detective(src) + new /obj/item/weapon/clipboard(src) + new /obj/item/device/detective_scanner(src) + new /obj/item/weapon/storage/box/evidence(src) + return + +/obj/structure/closet/secure_closet/detective/update_icon() + if(broken) + icon_state = icon_broken + else + if(!opened) + if(locked) + icon_state = icon_locked + else + icon_state = icon_closed + else + icon_state = icon_opened + +/obj/structure/closet/secure_closet/injection + name = "Lethal Injections" + req_access = list(access_hos) + + + New() + sleep(2) + new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src) + new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src) + return + + + +/obj/structure/closet/secure_closet/brig + name = "Brig Locker" + req_access = list(access_brig) + anchored = 1 + + New() + new /obj/item/clothing/under/color/orange( src ) + new /obj/item/clothing/shoes/orange( src ) + return + + + +/obj/structure/closet/secure_closet/courtroom + name = "Courtroom Locker" + req_access = list(access_court) + + New() + sleep(2) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/weapon/paper/Court (src) + new /obj/item/weapon/paper/Court (src) + new /obj/item/weapon/paper/Court (src) + new /obj/item/weapon/pen (src) + new /obj/item/clothing/suit/judgerobe (src) + new /obj/item/clothing/head/powdered_wig (src) + new /obj/item/weapon/storage/briefcase(src) + return + +/obj/structure/closet/secure_closet/wall + name = "wall locker" + req_access = list(access_security) + icon_state = "wall-locker1" + density = 1 + icon_closed = "wall-locker" + icon_locked = "wall-locker1" + icon_opened = "wall-lockeropen" + icon_broken = "wall-lockerbroken" + icon_off = "wall-lockeroff" + + //too small to put a man in + large = 0 + +/obj/structure/closet/secure_closet/wall/update_icon() + if(broken) + icon_state = icon_broken + else + if(!opened) + if(locked) + icon_state = icon_locked + else + icon_state = icon_closed + else + icon_state = icon_opened diff --git a/code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm b/code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm new file mode 100644 index 00000000000..452670091f5 --- /dev/null +++ b/code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm @@ -0,0 +1,311 @@ +/obj/structure/closet/wardrobe + name = "wardrobe" + desc = "It's a storage unit for standard-issue Nanotrasen attire." + icon_state = "blue" + icon_closed = "blue" + +/obj/structure/closet/wardrobe/New() + new /obj/item/clothing/under/color/blue(src) + new /obj/item/clothing/under/color/blue(src) + new /obj/item/clothing/under/color/blue(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/brown(src) + return + + +/obj/structure/closet/wardrobe/red + name = "security wardrobe" + icon_state = "red" + icon_closed = "red" + +/obj/structure/closet/wardrobe/red/New() + new /obj/item/clothing/under/rank/supervisor(src) + new /obj/item/clothing/under/rank/supervisor(src) + new /obj/item/clothing/under/rank/supervisor(src) + new /obj/item/clothing/shoes/boots(src) + new /obj/item/clothing/shoes/boots(src) + new /obj/item/clothing/shoes/boots(src) + new /obj/item/clothing/head/soft/grey(src) + new /obj/item/clothing/head/soft/grey(src) + new /obj/item/clothing/head/soft/grey(src) + return + + +/obj/structure/closet/wardrobe/pink + name = "pink wardrobe" + icon_state = "pink" + icon_closed = "pink" + +/obj/structure/closet/wardrobe/pink/New() + new /obj/item/clothing/under/color/pink(src) + new /obj/item/clothing/under/color/pink(src) + new /obj/item/clothing/under/color/pink(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/brown(src) + return + +/obj/structure/closet/wardrobe/black + name = "black wardrobe" + icon_state = "black" + icon_closed = "black" + +/obj/structure/closet/wardrobe/black/New() + new /obj/item/clothing/under/color/black(src) + new /obj/item/clothing/under/color/black(src) + new /obj/item/clothing/under/color/black(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/head/that(src) + new /obj/item/clothing/head/that(src) + new /obj/item/clothing/head/that(src) + return + + +/obj/structure/closet/wardrobe/chaplain_black + name = "chapel wardrobe" + desc = "It's a storage unit for Nanotrasen-approved religious attire." + icon_state = "black" + icon_closed = "black" + +/obj/structure/closet/wardrobe/chaplain_black/New() + new /obj/item/clothing/under/rank/chaplain(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/suit/nun(src) + new /obj/item/clothing/head/nun_hood(src) + new /obj/item/clothing/suit/chaplain_hoodie(src) + new /obj/item/clothing/head/chaplain_hood(src) + new /obj/item/clothing/suit/holidaypriest(src) + new /obj/item/weapon/storage/backpack/cultpack (src) + new /obj/item/weapon/storage/fancy/candle_box(src) + new /obj/item/weapon/storage/fancy/candle_box(src) + return + + +/obj/structure/closet/wardrobe/green + name = "green wardrobe" + icon_state = "green" + icon_closed = "green" + +/obj/structure/closet/wardrobe/green/New() + new /obj/item/clothing/under/color/green(src) + new /obj/item/clothing/under/color/green(src) + new /obj/item/clothing/under/color/green(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + return + + +/obj/structure/closet/wardrobe/orange + name = "prison wardrobe" + desc = "It's a storage unit for Nanotrasen-regulation prisoner attire." + icon_state = "orange" + icon_closed = "orange" + +/obj/structure/closet/wardrobe/orange/New() + new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + return + + +/obj/structure/closet/wardrobe/yellow + name = "yellow wardrobe" + icon_state = "wardrobe-y" + icon_closed = "wardrobe-y" + +/obj/structure/closet/wardrobe/yellow/New() + new /obj/item/clothing/under/color/yellow(src) + new /obj/item/clothing/under/color/yellow(src) + new /obj/item/clothing/under/color/yellow(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + return + + +/obj/structure/closet/wardrobe/atmospherics_yellow + name = "atmospherics wardrobe" + icon_state = "yellow" + icon_closed = "yellow" + +/obj/structure/closet/wardrobe/atmospherics_yellow/New() + new /obj/item/clothing/under/rank/atmospheric_technician(src) + new /obj/item/clothing/under/rank/atmospheric_technician(src) + new /obj/item/clothing/under/rank/atmospheric_technician(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + return + + + +/obj/structure/closet/wardrobe/engineering_yellow + name = "engineering wardrobe" + icon_state = "yellow" + icon_closed = "yellow" + +/obj/structure/closet/wardrobe/engineering_yellow/New() + new /obj/item/clothing/under/rank/engineer(src) + new /obj/item/clothing/under/rank/engineer(src) + new /obj/item/clothing/under/rank/engineer(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/shoes/orange(src) + return + + +/obj/structure/closet/wardrobe/white + name = "white wardrobe" + icon_state = "white" + icon_closed = "white" + +/obj/structure/closet/wardrobe/white/New() + new /obj/item/clothing/under/color/white(src) + new /obj/item/clothing/under/color/white(src) + new /obj/item/clothing/under/color/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + return + + +/obj/structure/closet/wardrobe/pjs + name = "Pajama wardrobe" + icon_state = "white" + icon_closed = "white" + +/obj/structure/closet/wardrobe/pjs/New() + new /obj/item/clothing/under/pj/red(src) + new /obj/item/clothing/under/pj/red(src) + new /obj/item/clothing/under/pj/blue(src) + new /obj/item/clothing/under/pj/blue(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + return + + +/obj/structure/closet/wardrobe/toxins_white + name = "toxins wardrobe" + icon_state = "white" + icon_closed = "white" + +/obj/structure/closet/wardrobe/toxins_white/New() + new /obj/item/clothing/under/rank/scientist(src) + new /obj/item/clothing/under/rank/scientist(src) + new /obj/item/clothing/under/rank/scientist(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + return + + +/obj/structure/closet/wardrobe/robotics_black + name = "robotics wardrobe" + icon_state = "black" + icon_closed = "black" + +/obj/structure/closet/wardrobe/robotics_black/New() + new /obj/item/clothing/under/rank/roboticist(src) + new /obj/item/clothing/under/rank/roboticist(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/suit/labcoat(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/gloves/black(src) + new /obj/item/clothing/gloves/black(src) + return + + +/obj/structure/closet/wardrobe/chemistry_white + name = "chemistry wardrobe" + icon_state = "white" + icon_closed = "white" + +/obj/structure/closet/wardrobe/chemistry_white/New() + new /obj/item/clothing/under/rank/chemist(src) + new /obj/item/clothing/under/rank/chemist(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/suit/labcoat/chemist(src) + new /obj/item/clothing/suit/labcoat/chemist(src) + return + + +/obj/structure/closet/wardrobe/genetics_white + name = "genetics wardrobe" + icon_state = "white" + icon_closed = "white" + +/obj/structure/closet/wardrobe/genetics_white/New() + new /obj/item/clothing/under/rank/geneticist(src) + new /obj/item/clothing/under/rank/geneticist(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/suit/labcoat/genetics(src) + new /obj/item/clothing/suit/labcoat/genetics(src) + return + + +/obj/structure/closet/wardrobe/virology_white + name = "virology wardrobe" + icon_state = "white" + icon_closed = "white" + +/obj/structure/closet/wardrobe/virology_white/New() + new /obj/item/clothing/under/rank/virologist(src) + new /obj/item/clothing/under/rank/virologist(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/shoes/white(src) + new /obj/item/clothing/suit/labcoat/virologist(src) + new /obj/item/clothing/suit/labcoat/virologist(src) + new /obj/item/clothing/mask/surgical(src) + new /obj/item/clothing/mask/surgical(src) + return + + +/obj/structure/closet/wardrobe/grey + name = "grey wardrobe" + icon_state = "grey" + icon_closed = "grey" + +/obj/structure/closet/wardrobe/grey/New() + new /obj/item/clothing/under/color/grey(src) + new /obj/item/clothing/under/color/grey(src) + new /obj/item/clothing/under/color/grey(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/head/soft/grey(src) + new /obj/item/clothing/head/soft/grey(src) + new /obj/item/clothing/head/soft/grey(src) + return + + +/obj/structure/closet/wardrobe/mixed + name = "mixed wardrobe" + icon_state = "mixed" + icon_closed = "mixed" + +/obj/structure/closet/wardrobe/mixed/New() + new /obj/item/clothing/under/color/white(src) + new /obj/item/clothing/under/color/blue(src) + new /obj/item/clothing/under/color/yellow(src) + new /obj/item/clothing/under/color/green(src) + new /obj/item/clothing/under/color/orange(src) + new /obj/item/clothing/under/color/pink(src) + new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/white(src) + return diff --git a/code/WorkInProgress/Susan/susan_desert_turfs.dm b/code/WorkInProgress/Susan/susan_desert_turfs.dm index 788e665a815..74c48b4c7b3 100644 --- a/code/WorkInProgress/Susan/susan_desert_turfs.dm +++ b/code/WorkInProgress/Susan/susan_desert_turfs.dm @@ -6,12 +6,19 @@ turf/unsimulated/desert icon_state = "desert" temperature = 393.15 luminosity = 5 - brightness_on = 1 lighting_lumcount = 8 turf/unsimulated/desert/New() icon_state = "desert[rand(0,4)]" +turf/simulated/wall/impassable_rock + name = "Mountain Wall" + + //so that you can see the impassable sections in the map editor + icon_state = "riveted" + New() + icon_state = "rock" + /area/awaymission/labs/researchdivision name = "Research" icon_state = "away3" @@ -54,47 +61,8 @@ turf/unsimulated/desert/New() //corpses and possibly other decorative items -/obj/effect/landmark/corpse/alien/New() //Creates a mob and checks for gear in each slot before attempting to equip it. - var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc) - M.dna.mutantrace = "lizard" - M.real_name = src.name - M.stat = 2 //Kills the new mob - if(src.corpseuniform) - M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform) - if(src.corpsesuit) - M.equip_to_slot_or_del(new src.corpsesuit(M), slot_wear_suit) - if(src.corpseshoes) - M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes) - if(src.corpsegloves) - M.equip_to_slot_or_del(new src.corpsegloves(M), slot_gloves) - if(src.corpseradio) - M.equip_to_slot_or_del(new src.corpseradio(M), slot_ears) - if(src.corpseglasses) - M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses) - if(src.corpsemask) - M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask) - if(src.corpsehelmet) - M.equip_to_slot_or_del(new src.corpsehelmet(M), slot_head) - if(src.corpsebelt) - M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt) - if(src.corpsepocket1) - M.equip_to_slot_or_del(new src.corpsepocket1(M), slot_r_store) - if(src.corpsepocket2) - M.equip_to_slot_or_del(new src.corpsepocket2(M), slot_l_store) - if(src.corpseback) - M.equip_to_slot_or_del(new src.corpseback(M), slot_back) - if(src.corpseid == 1) - var/obj/item/weapon/card/id/W = new(M) - W.name = "[M.real_name]'s ID Card" - if(src.corpseidicon) - W.icon_state = corpseidicon - if(src.corpseidaccess) - W.access = get_access(corpseidaccess) - if(corpseidjob) - W.assignment = corpseidjob - W.registered_name = M.real_name - M.equip_to_slot_or_del(W, slot_wear_id) - del(src) +/obj/effect/landmark/corpse/alien + mutantrace = "lizard" /obj/effect/landmark/corpse/alien/cargo name = "Cargo Technician" diff --git a/code/WorkInProgress/autopsy.dm b/code/WorkInProgress/autopsy.dm index 2137141996f..8bf45945bc6 100644 --- a/code/WorkInProgress/autopsy.dm +++ b/code/WorkInProgress/autopsy.dm @@ -1,3 +1,20 @@ + +//moved these here from code/defines/obj/weapon.dm +//please preference put stuff where it's easy to find - C + +/obj/item/weapon/autopsy_scanner + name = "autopsy scanner" + desc = "Extracts information on wounds." + icon = 'icons/obj/autopsy_scanner.dmi' + icon_state = "" + flags = FPRINT | TABLEPASS | CONDUCT + w_class = 1.0 + origin_tech = "materials=1;biotech=1" + var/list/datum/autopsy_data_scanner/wdata = list() + var/list/datum/autopsy_data_scanner/chemtraces = list() + var/target_name = null + var/timeofdeath = null + /datum/autopsy_data_scanner var/weapon = null // this is the DEFINITE weapon type that was used var/list/organs_scanned = list() // this maps a number of scanned organs to @@ -65,10 +82,6 @@ usr << "No." return - if(wdata.len == 0 && chemtraces.len == 0) - usr << "* There is no data about any wounds in the scanner's database. You may have to scan more bodyparts, or otherwise this wound type may not be in the scanner's database." - return - var/scan_data = "" if(timeofdeath) @@ -170,6 +183,8 @@ if(target_name != M.name) target_name = M.name src.wdata = list() + src.chemtraces = list() + src.timeofdeath = null user << "\red A new patient has been registered.. Purging data for previous patient." src.timeofdeath = M.timeofdeath diff --git a/code/WorkInProgress/mapload/dmm_suite.dm b/code/WorkInProgress/mapload/dmm_suite.dm deleted file mode 100644 index f096d555642..00000000000 --- a/code/WorkInProgress/mapload/dmm_suite.dm +++ /dev/null @@ -1,246 +0,0 @@ -dmm_suite - /* - - dmm_suite version 1.0 - Released January 30th, 2011. - - defines the object /dmm_suite - - Provides the proc load_map() - - Loads the specified map file onto the specified z-level. - - provides the proc write_map() - - Returns a text string of the map in dmm format - ready for output to a file. - - provides the proc save_map() - - Returns a .dmm file if map is saved - - Returns FALSE if map fails to save - - The dmm_suite provides saving and loading of map files in BYOND's native DMM map - format. It approximates the map saving and loading processes of the Dream Maker - and Dream Seeker programs so as to allow editing, saving, and loading of maps at - runtime. - - ------------------------ - - To save a map at runtime, create an instance of /dmm_suite, and then call - write_map(), which accepts three arguments: - - A turf representing one corner of a three dimensional grid (Required). - - Another turf representing the other corner of the same grid (Required). - - Any, or a combination, of several bit flags (Optional, see documentation). - - The order in which the turfs are supplied does not matter, the /dmm_writer will - determine the grid containing both, in much the same way as DM's block() function. - write_map() will then return a string representing the saved map in dmm format; - this string can then be saved to a file, or used for any other purose. - - ------------------------ - - To load a map at runtime, create an instance of /dmm_suite, and then call load_map(), - which accepts two arguments: - - A .dmm file to load (Required). - - A number representing the z-level on which to start loading the map (Optional). - - The /dmm_suite will load the map file starting on the specified z-level. If no - z-level was specified, world.maxz will be increased so as to fit the map. Note - that if you wish to load a map onto a z-level that already has objects on it, - you will have to handle the removal of those objects. Otherwise the new map will - simply load the new objects on top of the old ones. - - Also note that all type paths specified in the .dmm file must exist in the world's - code, and that the /dmm_reader trusts that files to be loaded are in fact valid - .dmm files. Errors in the .dmm format will cause runtime errors. - - */ - - - verb/load_map(var/dmm_file as file, var/z_offset as num) - // dmm_file: A .dmm file to load (Required). - // z_offset: A number representing the z-level on which to start loading the map (Optional). - - - verb/write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num) - // t1: A turf representing one corner of a three dimensional grid (Required). - // t2: Another turf representing the other corner of the same grid (Required). - // flags: Any, or a combination, of several bit flags (Optional, see documentation). - - // save_map is included as a legacy proc. Use write_map instead. - verb/save_map(var/turf/t1 as turf, var/turf/t2 as turf, var/map_name as text, var/flags as num) - // t1: A turf representing one corner of a three dimensional grid (Required). - // t2: Another turf representing the other corner of the same grid (Required). - // map_name: A valid name for the map to be saved, such as "castle" (Required). - // flags: Any, or a combination, of several bit flags (Optional, see documentation). - - -#define DMM_IGNORE_AREAS 1 -#define DMM_IGNORE_TURFS 2 -#define DMM_IGNORE_OBJS 4 -#define DMM_IGNORE_NPCS 8 -#define DMM_IGNORE_PLAYERS 16 -#define DMM_IGNORE_MOBS 24 -dmm_suite{ - var{ - quote = "\"" - list/letter_digits = 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", - "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" - ) - } - save_map(var/turf/t1 as turf, var/turf/t2 as turf, var/map_name as text, var/flags as num){ - //Check for illegal characters in file name... in a cheap way. - if(!((ckeyEx(map_name)==map_name) && ckeyEx(map_name))){ - CRASH("Invalid text supplied to proc save_map, invalid characters or empty string.") - } - //Check for valid turfs. - if(!isturf(t1) || !isturf(t2)){ - CRASH("Invalid arguments supplied to proc save_map, arguments were not turfs.") - } - var/file_text = write_map(t1,t2,flags) - if(fexists("[map_name].dmm")){ - fdel("[map_name].dmm") - } - var/saved_map = file("[map_name].dmm") - saved_map << file_text - return saved_map - } - write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num){ - //Check for valid turfs. - if(!isturf(t1) || !isturf(t2)){ - CRASH("Invalid arguments supplied to proc write_map, arguments were not turfs.") - } - var/turf/nw = locate(min(t1.x,t2.x),max(t1.y,t2.y),min(t1.z,t2.z)) - var/turf/se = locate(max(t1.x,t2.x),min(t1.y,t2.y),max(t1.z,t2.z)) - var/list/templates[0] - var/template_buffer = {""} - var/dmm_text = {""} - for(var/pos_z=nw.z;pos_z<=se.z;pos_z++){ - for(var/pos_y=nw.y;pos_y>=se.y;pos_y--){ - for(var/pos_x=nw.x;pos_x<=se.x;pos_x++){ - var/turf/test_turf = locate(pos_x,pos_y,pos_z) - var/test_template = make_template(test_turf, flags) - var/template_number = templates.Find(test_template) - if(!template_number){ - templates.Add(test_template) - template_number = templates.len - } - template_buffer += "[template_number]," - } - template_buffer += ";" - } - template_buffer += "." - } - var/key_length = round/*floor*/(log(letter_digits.len,templates.len-1)+1) - var/list/keys[templates.len] - for(var/key_pos=1;key_pos<=templates.len;key_pos++){ - keys[key_pos] = get_model_key(key_pos,key_length) - dmm_text += {""[keys[key_pos]]" = ([templates[key_pos]])\n"} - } - var/z_level = 0 - for(var/z_pos=1;TRUE;z_pos=findtext(template_buffer,".",z_pos)+1){ - if(z_pos>=length(template_buffer)){break} - if(z_level){dmm_text+={"\n"}} - dmm_text += {"\n(1,1,[++z_level]) = {"\n"} - var/z_block = copytext(template_buffer,z_pos,findtext(template_buffer,".",z_pos)) - for(var/y_pos=1;TRUE;y_pos=findtext(z_block,";",y_pos)+1){ - if(y_pos>=length(z_block)){break} - var/y_block = copytext(z_block,y_pos,findtext(z_block,";",y_pos)) - for(var/x_pos=1;TRUE;x_pos=findtext(y_block,",",x_pos)+1){ - if(x_pos>=length(y_block)){break} - var/x_block = copytext(y_block,x_pos,findtext(y_block,",",x_pos)) - var/key_number = text2num(x_block) - var/temp_key = keys[key_number] - dmm_text += temp_key - sleep(-1) - } - dmm_text += {"\n"} - sleep(-1) - } - dmm_text += {"\"}"} - sleep(-1) - } - return dmm_text - } - proc{ - make_template(var/turf/model as turf, var/flags as num){ - var/template = "" - var/obj_template = "" - var/mob_template = "" - var/turf_template = "" - if(!(flags & DMM_IGNORE_TURFS)){ - turf_template = "[model.type][check_attributes(model)]," - } else{ turf_template = "[world.turf],"} - var/area_template = "" - if(!(flags & DMM_IGNORE_OBJS)){ - for(var/obj/O in model.contents){ - obj_template += "[O.type][check_attributes(O)]," - } - } - for(var/mob/M in model.contents){ - if(M.client){ - if(!(flags & DMM_IGNORE_PLAYERS)){ - mob_template += "[M.type][check_attributes(M)]," - } - } - else{ - if(!(flags & DMM_IGNORE_NPCS)){ - mob_template += "[M.type][check_attributes(M)]," - } - } - } - if(!(flags & DMM_IGNORE_AREAS)){ - var/area/m_area = model.loc - area_template = "[m_area.type][check_attributes(m_area)]" - } else{ area_template = "[world.area]"} - template = "[obj_template][mob_template][turf_template][area_template]" - return template - } - check_attributes(var/atom/A){ - var/attributes_text = {"{"} - for(var/V in A.vars){ - sleep(-1) - if((!issaved(A.vars[V])) || (A.vars[V]==initial(A.vars[V]))){continue} - if(istext(A.vars[V])){ - attributes_text += {"[V] = "[A.vars[V]]""} - } - else if(isnum(A.vars[V])||ispath(A.vars[V])){ - attributes_text += {"[V] = [A.vars[V]]"} - } - else if(isicon(A.vars[V])||isfile(A.vars[V])){ - attributes_text += {"[V] = '[A.vars[V]]'"} - } - else{ - continue - } - if(attributes_text != {"{"}){ - attributes_text+={"; "} - } - } - if(attributes_text=={"{"}){ - return - } - if(copytext(attributes_text, length(attributes_text)-1, 0) == {"; "}){ - attributes_text = copytext(attributes_text, 1, length(attributes_text)-1) - } - attributes_text += {"}"} - return attributes_text - } - get_model_key(var/which as num, var/key_length as num){ - var/key = "" - var/working_digit = which-1 - for(var/digit_pos=key_length;digit_pos>=1;digit_pos--){ - var/place_value = round/*floor*/(working_digit/(letter_digits.len**(digit_pos-1))) - working_digit-=place_value*(letter_digits.len**(digit_pos-1)) - key = "[key][letter_digits[place_value+1]]" - } - return key - } - } - } diff --git a/code/WorkInProgress/mapload/reader.dm b/code/WorkInProgress/mapload/reader.dm deleted file mode 100644 index 755b96fc2da..00000000000 --- a/code/WorkInProgress/mapload/reader.dm +++ /dev/null @@ -1,181 +0,0 @@ -dmm_suite/load_map(var/dmm_file as file, var/z_offset as num) - if(!z_offset) - z_offset = world.maxz+1 - var/quote = ascii2text(34) - var/tfile = file2text(dmm_file) - var/tfile_len = length(tfile) - var/list/grid_models[0] - var/key_len = length(copytext(tfile,2,findtext(tfile,quote,2,0))) - for(var/lpos=1;lpos
[worth] [currency]" - dat += "
New pile:" - - dat += "-" - dat += "-" - if(round<=0.1) - dat += "-" - if(round<=0.01) - dat += "-" - dat += "[split]" - if(round<=0.01) - dat += "+" - if(round<=0.1) - dat += "+" - dat += "+" - dat += "+" - dat += "
split" - - - user << browse(dat, "window=computer;size=400x500") - - onclose(user, "computer") - return - -/obj/item/weapon/spacecash/Topic(href, href_list) - if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.machine = src - - if (href_list["su"]) - var/samt = text2num(href_list["su"]) - if(split+samt
\n
\n" - -/obj/item/weapon/paper/Toxin - name = "paper- 'Chemical Information'" - info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Plasma:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter plasma after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure paralysis and sleep toxins.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tSleep Toxin T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization" - -/obj/item/weapon/paper/courtroom - name = "paper- 'A Crash Course in Legal SOP on SS13'" - info = "Roles:
\nThe Detective is basically the investigator and prosecutor.
\nThe Staff Assistant can perform these functions with written authority from the Detective.
\nThe Captain/HoP/Warden is ct as the judicial authority.
\nThe Security Officers are responsible for executing warrants, security during trial, and prisoner transport.
\n
\nInvestigative Phase:
\nAfter the crime has been committed the Detective's job is to gather evidence and try to ascertain not only who did it but what happened. He must take special care to catalogue everything and don't leave anything out. Write out all the evidence on paper. Make sure you take an appropriate number of fingerprints. IF he must ask someone questions he has permission to confront them. If the person refuses he can ask a judicial authority to write a subpoena for questioning. If again he fails to respond then that person is to be jailed as insubordinate and obstructing justice. Said person will be released after he cooperates.
\n
\nONCE the FT has a clear idea as to who the criminal is he is to write an arrest warrant on the piece of paper. IT MUST LIST THE CHARGES. The FT is to then go to the judicial authority and explain a small version of his case. If the case is moderately acceptable the authority should sign it. Security must then execute said warrant.
\n
\nPre-Pre-Trial Phase:
\nNow a legal representative must be presented to the defendant if said defendant requests one. That person and the defendant are then to be given time to meet (in the jail IS ACCEPTABLE). The defendant and his lawyer are then to be given a copy of all the evidence that will be presented at trial (rewriting it all on paper is fine). THIS IS CALLED THE DISCOVERY PACK. With a few exceptions, THIS IS THE ONLY EVIDENCE BOTH SIDES MAY USE AT TRIAL. IF the prosecution will be seeking the death penalty it MUST be stated at this time. ALSO if the defense will be seeking not guilty by mental defect it must state this at this time to allow ample time for examination.
\nNow at this time each side is to compile a list of witnesses. By default, the defendant is on both lists regardless of anything else. Also the defense and prosecution can compile more evidence beforehand BUT in order for it to be used the evidence MUST also be given to the other side.\nThe defense has time to compile motions against some evidence here.
\nPossible Motions:
\n1. Invalidate Evidence- Something with the evidence is wrong and the evidence is to be thrown out. This includes irrelevance or corrupt security.
\n2. Free Movement- Basically the defendant is to be kept uncuffed before and during the trial.
\n3. Subpoena Witness- If the defense presents god reasons for needing a witness but said person fails to cooperate then a subpoena is issued.
\n4. Drop the Charges- Not enough evidence is there for a trial so the charges are to be dropped. The FT CAN RETRY but the judicial authority must carefully reexamine the new evidence.
\n5. Declare Incompetent- Basically the defendant is insane. Once this is granted a medical official is to examine the patient. If he is indeed insane he is to be placed under care of the medical staff until he is deemed competent to stand trial.
\n
\nALL SIDES MOVE TO A COURTROOM
\nPre-Trial Hearings:
\nA judicial authority and the 2 sides are to meet in the trial room. NO ONE ELSE BESIDES A SECURITY DETAIL IS TO BE PRESENT. The defense submits a plea. If the plea is guilty then proceed directly to sentencing phase. Now the sides each present their motions to the judicial authority. He rules on them. Each side can debate each motion. Then the judicial authority gets a list of crew members. He first gets a chance to look at them all and pick out acceptable and available jurors. Those jurors are then called over. Each side can ask a few questions and dismiss jurors they find too biased. HOWEVER before dismissal the judicial authority MUST agree to the reasoning.
\n
\nThe Trial:
\nThe trial has three phases.
\n1. Opening Arguments- Each side can give a short speech. They may not present ANY evidence.
\n2. Witness Calling/Evidence Presentation- The prosecution goes first and is able to call the witnesses on his approved list in any order. He can recall them if necessary. During the questioning the lawyer may use the evidence in the questions to help prove a point. After every witness the other side has a chance to cross-examine. After both sides are done questioning a witness the prosecution can present another or recall one (even the EXACT same one again!). After prosecution is done the defense can call witnesses. After the initial cases are presented both sides are free to call witnesses on either list.
\nFINALLY once both sides are done calling witnesses we move onto the next phase.
\n3. Closing Arguments- Same as opening.
\nThe jury then deliberates IN PRIVATE. THEY MUST ALL AGREE on a verdict. REMEMBER: They mix between some charges being guilty and others not guilty (IE if you supposedly killed someone with a gun and you unfortunately picked up a gun without authorization then you CAN be found not guilty of murder BUT guilty of possession of illegal weaponry.). Once they have agreed they present their verdict. If unable to reach a verdict and feel they will never they call a deadlocked jury and we restart at Pre-Trial phase with an entirely new set of jurors.
\n
\nSentencing Phase:
\nIf the death penalty was sought (you MUST have gone through a trial for death penalty) then skip to the second part.
\nI. Each side can present more evidence/witnesses in any order. There is NO ban on emotional aspects or anything. The prosecution is to submit a suggested penalty. After all the sides are done then the judicial authority is to give a sentence.
\nII. The jury stays and does the same thing as I. Their sole job is to determine if the death penalty is applicable. If NOT then the judge selects a sentence.
\n
\nTADA you're done. Security then executes the sentence and adds the applicable convictions to the person's record.
\n" - -/obj/item/weapon/paper/hydroponics - name = "paper- 'Greetings from Billy Bob'" - info = "Hey fellow botanist!
\n
\nI didn't trust the station folk so I left
\na couple of weeks ago. But here's some
\ninstructions on how to operate things here.
\nYou can grow plants and each iteration they become
\nstronger, more potent and have better yield, if you
\nknow which ones to pick. Use your botanist's analyzer
\nfor that. You can turn harvested plants into seeds
\nat the seed extractor, and replant them for better stuff!
\nSometimes if the weed level gets high in the tray
\nmutations into different mushroom or weed species have
\nbeen witnessed. On the rare occassion even weeds mutate!
\n
\nEither way, have fun!
\n
\nBest regards,
\nBilly Bob Johnson.
\n
\nPS.
\nHere's a few tips:
\nIn nettles, potency = damage
\nIn amanitas, potency = deadliness + side effect
\nIn Liberty caps, potency = drug power + effect
\nIn chilis, potency = heat
\nNutrients keep mushrooms alive!
\nWater keeps weeds such as nettles alive!
\nAll other plants need both." - -/obj/item/weapon/paper/djstation - name = "paper - 'DJ Listening Outpost'" - info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Mining Channel
- 134.7 - Cargo Channel " - -/obj/item/weapon/paper/flag - icon_state = "flag_neutral" - item_state = "paper" - anchored = 1.0 - -/obj/item/weapon/paper/jobs - name = "paper- 'Job Information'" - info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
- [modes[m]] (selected) "} else - sensor_data = "No scrubbers connected.
- [modes[m]] (selected) " - else - output += "
- [modes[m]] " - output += "
- [modes[m]] "} + output += "
Equipment Locator "
+ dat += "- Custodial Locator "
if (istype(cartridge.radio, /obj/item/radio/integrated/signal))
dat += "
Signaler System "
if (cartridge.access_reagent_scanner)
dat += "
[scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner "
if (cartridge.access_engine)
dat += "- [scanmode == 4 ? "Disable" : "Enable"] Halogen Counter "
+ if (cartridge.access_atmos)
+ dat += "
- [scanmode == 5 ? "Disable" : "Enable"] Gas Scanner "
if (cartridge.access_remote_door)
dat += "
Toggle Remote Door "
dat += "
Atmospheric Scan "
- dat += "
[light_on ? "Disable" : "Enable"] Flashlight "
+ dat += "- [fon ? "Disable" : "Enable"] Flashlight "
if (pai)
if(pai.loc != src)
pai = null
@@ -367,7 +372,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (!toff)
for (var/obj/item/device/pda/P in sortAtom(PDAs))
- if (!P.owner||P.toff||P == src) continue
+ if (!P.owner||P.toff||P == src||P.hidden) continue
dat += "
- [P]"
if (istype(cartridge, /obj/item/weapon/cartridge/syndicate) && P.detonate)
dat += " (
*Detonate*)"
@@ -506,18 +511,14 @@ var/global/list/obj/item/device/pda/PDAs = list()
//MAIN FUNCTIONS===================================
if("Light")
- if(light_on)
- light_on = 0
- if(src in U.contents)
- U.SetLuminosity(search_light(U, src))
- else
- SetLuminosity(0)
+ if(fon)
+ fon = 0
+ if(src in U.contents) U.SetLuminosity(U.luminosity - f_lum)
+ else SetLuminosity(0)
else
- light_on = 1
- if((src in U.contents) && (U.luminosity < brightness_on))
- U.SetLuminosity(brightness_on)
- else
- SetLuminosity(brightness_on)
+ fon = 1
+ if(src in U.contents) U.SetLuminosity(U.luminosity + f_lum)
+ else SetLuminosity(f_lum)
if("Medical Scan")
if(scanmode == 1)
scanmode = 0
@@ -537,6 +538,11 @@ var/global/list/obj/item/device/pda/PDAs = list()
if ( !(last_honk && world.time < last_honk + 20) )
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
last_honk = world.time
+ if("Gas Scan")
+ if(scanmode == 5)
+ scanmode = 0
+ else if((!isnull(cartridge)) && (cartridge.access_atmos))
+ scanmode = 5
//MESSENGER/NOTE FUNCTIONS===================================
@@ -676,7 +682,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
//EXTRA FUNCTIONS===================================
if (mode == 2||mode == 21)//To clear message overlays.
- overlays = null
+ overlays.Cut()
if ((honkamt > 0) && (prob(60)))//For clown virus.
honkamt--
@@ -752,14 +758,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
if (prob(15)) //Give the AI a chance of intercepting the message
var/who = src.owner
- var/sp_word = "from"
if(prob(50))
who = P:owner
- sp_word = "to"
for(var/mob/living/silicon/ai/ai in mob_list)
// Allows other AIs to intercept the message but the AI won't intercept their own message.
if(ai.aiPDA != P && ai.aiPDA != src)
- ai.show_message("Intercepted message [sp_word] [who]: [t]")
+ ai.show_message("Intercepted message from [who]: [t]")
if (!P.silent)
playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1)
@@ -770,21 +774,14 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(P.loc && isliving(P.loc))
L = P.loc
//Maybe they are a pAI!
- else if(istype(P, /obj/item/device/pda/pai) && P.loc)
- //Search through the location's contents
- for(var/obj/item/device/paicard/Pcard in P.loc)
- //If there's a Pcard there then get the mind inside
- if(Pcard.pai)
- var/mob/living/silicon/pai/pai = Pcard.pai
- //Is it the pAI that is receiving the message?
- if(pai.pda && pai.pda == P)
- L = pai
- break
+ else
+ L = get(P, /mob/living/silicon)
+
if(L)
L << "\icon[P] Message from [src.owner] ([ownjob]), \"[t]\" (Reply)"
log_pda("[usr] (PDA: [src.name]) sent \"[t]\" to [P.name]")
- P.overlays = null
+ P.overlays.Cut()
P.overlays += image('icons/obj/pda.dmi', "pda-r")
else
U << "ERROR: Server isn't responding."
@@ -860,6 +857,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
user << "You insert [cartridge] into [src]."
if(cartridge.radio)
cartridge.radio.hostpda = src
+
else if(istype(C, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/idcard = C
if(!idcard.registered_name)
@@ -967,6 +965,64 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
user << "\blue No significant chemical agents found in [A]."
+ if(5)
+ if((istype(A, /obj/item/weapon/tank)) || (istype(A, /obj/machinery/portable_atmospherics)))
+ var/obj/icon = A
+ for (var/mob/O in viewers(user, null))
+ O << "\red [user] has used [src] on \icon[icon] [A]"
+ var/pressure = A:air_contents.return_pressure()
+
+ var/total_moles = A:air_contents.total_moles()
+
+ user << "\blue Results of analysis of \icon[icon]"
+ if (total_moles>0)
+ var/o2_concentration = A:air_contents.oxygen/total_moles
+ var/n2_concentration = A:air_contents.nitrogen/total_moles
+ var/co2_concentration = A:air_contents.carbon_dioxide/total_moles
+ var/plasma_concentration = A:air_contents.toxins/total_moles
+
+ var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
+
+ user << "\blue Pressure: [round(pressure,0.1)] kPa"
+ user << "\blue Nitrogen: [round(n2_concentration*100)]%"
+ user << "\blue Oxygen: [round(o2_concentration*100)]%"
+ user << "\blue CO2: [round(co2_concentration*100)]%"
+ user << "\blue Plasma: [round(plasma_concentration*100)]%"
+ if(unknown_concentration>0.01)
+ user << "\red Unknown: [round(unknown_concentration*100)]%"
+ user << "\blue Temperature: [round(A:air_contents.temperature-T0C)]°C"
+ else
+ user << "\blue Tank is empty!"
+
+ if (istype(A, /obj/machinery/atmospherics/pipe/tank))
+ var/obj/icon = A
+ for (var/mob/O in viewers(user, null))
+ O << "\red [user] has used [src] on \icon[icon] [A]"
+
+ var/obj/machinery/atmospherics/pipe/tank/T = A
+ var/pressure = T.parent.air.return_pressure()
+ var/total_moles = T.parent.air.total_moles()
+
+ user << "\blue Results of analysis of \icon[icon]"
+ if (total_moles>0)
+ var/o2_concentration = T.parent.air.oxygen/total_moles
+ var/n2_concentration = T.parent.air.nitrogen/total_moles
+ var/co2_concentration = T.parent.air.carbon_dioxide/total_moles
+ var/plasma_concentration = T.parent.air.toxins/total_moles
+
+ var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
+
+ user << "\blue Pressure: [round(pressure,0.1)] kPa"
+ user << "\blue Nitrogen: [round(n2_concentration*100)]%"
+ user << "\blue Oxygen: [round(o2_concentration*100)]%"
+ user << "\blue CO2: [round(co2_concentration*100)]%"
+ user << "\blue Plasma: [round(plasma_concentration*100)]%"
+ if(unknown_concentration>0.01)
+ user << "\red Unknown: [round(unknown_concentration*100)]%"
+ user << "\blue Temperature: [round(T.parent.air.temperature-T0C)]°C"
+ else
+ user << "\blue Tank is empty!"
+
if (!scanmode && istype(A, /obj/item/weapon/paper) && owner)
note = A:info
user << "\blue Paper scanned." //concept of scanning paper copyright brainoblivion 2009
@@ -1031,6 +1087,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
for (var/obj/item/device/pda/P in PDAs)
if (!P.owner)
continue
+ else if(P.hidden)
+ continue
else if (P == src)
continue
else if (P.toff)
@@ -1094,39 +1152,27 @@ var/global/list/obj/item/device/pda/PDAs = list()
else
usr << "You do not have a PDA. You should make an issue report about this."
-
-
-
//Some spare PDAs in a box
-
-/obj/item/weapon/storage/PDAbox
+/obj/item/weapon/storage/box/PDAs
name = "spare PDAs"
desc = "A box of spare PDA microcomputers."
icon = 'icons/obj/pda.dmi'
icon_state = "pdabox"
- item_state = "syringe_kit"
- foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
-/obj/item/weapon/storage/PDAbox/New()
- ..()
- new /obj/item/device/pda(src)
- new /obj/item/device/pda(src)
- new /obj/item/device/pda(src)
- new /obj/item/device/pda(src)
-
- var/newcart = pick(1,2,3,4)
- switch(newcart)
- if(1)
- new /obj/item/weapon/cartridge/engineering(src)
- if(2)
- new /obj/item/weapon/cartridge/security(src)
- if(3)
- new /obj/item/weapon/cartridge/medical(src)
- if(4)
- new /obj/item/weapon/cartridge/signal/toxins(src)
-
- new /obj/item/weapon/cartridge/head(src)
+ New()
+ ..()
+ new /obj/item/device/pda(src)
+ new /obj/item/device/pda(src)
+ new /obj/item/device/pda(src)
+ new /obj/item/device/pda(src)
+ new /obj/item/weapon/cartridge/head(src)
+ var/newcart = pick( /obj/item/weapon/cartridge/engineering,
+ /obj/item/weapon/cartridge/security,
+ /obj/item/weapon/cartridge/medical,
+ /obj/item/weapon/cartridge/signal/toxins,
+ /obj/item/weapon/cartridge/quartermaster)
+ new newcart(src)
// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP
/obj/item/device/pda/emp_act(severity)
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index f6bc2f33656..546b70f28e5 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -9,6 +9,7 @@
var/obj/item/radio/integrated/radio = null
var/access_security = 0
var/access_engine = 0
+ var/access_atmos = 0
var/access_medical = 0
var/access_manifest = 1 // Make all jobs able to access the manifest
var/access_clown = 0
@@ -37,6 +38,11 @@
icon_state = "cart-e"
access_engine = 1
+ atmos
+ name = "BreatheDeep Cartridge"
+ icon_state = "cart-a"
+ access_atmos = 1
+
medical
name = "Med-U Cartridge"
icon_state = "cart-m"
@@ -102,7 +108,8 @@
name = "Signal Ace 2"
desc = "Complete with integrated radio signaler!"
icon_state = "cart-tox"
-// access_reagent_scanner = 1
+ access_reagent_scanner = 1
+ access_atmos = 1
New()
..()
@@ -134,6 +141,8 @@
access_manifest = 1
access_status_display = 1
access_quartermaster = 1
+ access_janitor = 1
+ access_security = 1
New()
..()
@@ -158,6 +167,7 @@
access_manifest = 1
access_status_display = 1
access_engine = 1
+ access_atmos = 1
cmo
name = "Med-U DELUXE"
@@ -172,7 +182,8 @@
icon_state = "cart-rd"
access_manifest = 1
access_status_display = 1
-// access_reagent_scanner = 1
+ access_reagent_scanner = 1
+ access_atmos = 1
New()
..()
@@ -189,6 +200,7 @@
access_medical = 1
access_reagent_scanner = 1
access_status_display = 1
+ access_atmos = 1
syndicate
name = "Detomatix Cartridge"
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index d580480cb9a..c1ccb4aa6ca 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -10,13 +10,12 @@
m_amt = 50
g_amt = 20
icon_action_button = "action_flashlight"
- light_on = 0
- brightness_on = 4 //luminosity when on
- var brightness = 0
+ var/on = 0
+ var/brightness_on = 4 //luminosity when on
/obj/item/device/flashlight/initialize()
..()
- if(light_on)
+ if(on)
icon_state = "[initial(icon_state)]-on"
SetLuminosity(brightness_on)
else
@@ -24,31 +23,31 @@
SetLuminosity(0)
/obj/item/device/flashlight/proc/update_brightness(var/mob/user = null)
- if(light_on)
+ if(on)
icon_state = "[initial(icon_state)]-on"
- if((loc == user) && (user.luminosity < brightness_on))
- user.SetLuminosity(brightness_on)
+ if(loc == user)
+ user.SetLuminosity(user.luminosity + brightness_on)
else if(isturf(loc))
SetLuminosity(brightness_on)
else
icon_state = initial(icon_state)
if(loc == user)
- user.SetLuminosity(search_light(user, src))
+ user.SetLuminosity(user.luminosity - brightness_on)
else if(isturf(loc))
SetLuminosity(0)
/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.
- return
- light_on = !light_on
+ return 0
+ on = !on
update_brightness(user)
- return
+ return 1
/obj/item/device/flashlight/attack(mob/living/M as mob, mob/living/user as mob)
add_fingerprint(user)
- if(light_on && user.zone_sel.selecting == "eyes")
+ if(on && user.zone_sel.selecting == "eyes")
if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
return ..() //just hit them in the head
@@ -89,24 +88,15 @@
/obj/item/device/flashlight/pickup(mob/user)
- if(light_on)
- if (user.luminosity < brightness_on)
- user.SetLuminosity(brightness_on)
+ if(on)
+ user.SetLuminosity(user.luminosity + brightness_on)
SetLuminosity(0)
/obj/item/device/flashlight/dropped(mob/user)
- if(light_on)
- if ((layer <= 3) || (loc != user.loc))
- user.SetLuminosity(search_light(user, src))
- SetLuminosity(brightness_on)
-
-
-/obj/item/device/flashlight/equipped(mob/user, slot)
- if(light_on)
- if (user.luminosity < brightness_on)
- user.SetLuminosity(brightness_on)
- SetLuminosity(0)
+ if(on)
+ user.SetLuminosity(user.luminosity - brightness_on)
+ SetLuminosity(brightness_on)
/obj/item/device/flashlight/pen
@@ -129,7 +119,7 @@
flags = FPRINT | TABLEPASS | CONDUCT
m_amt = 0
g_amt = 0
- light_on = 1
+ on = 1
// green-shaded desk lamp
@@ -163,21 +153,22 @@
var/produce_heat = 1500
/obj/item/device/flashlight/flare/New()
- fuel = rand(1500, 2000) // Last 10 to 15 minutes.
+ fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
..()
/obj/item/device/flashlight/flare/process()
var/turf/pos = get_turf(src)
- pos.hotspot_expose(produce_heat, 5)
+ if(pos)
+ pos.hotspot_expose(produce_heat, 5)
fuel = max(fuel - 1, 0)
- if(!fuel || !light_on)
+ if(!fuel || !on)
turn_off()
if(!fuel)
src.icon_state = "[initial(icon_state)]-empty"
processing_objects -= src
/obj/item/device/flashlight/flare/proc/turn_off()
- light_on = 0
+ on = 0
src.force = initial(src.force)
src.damtype = initial(src.damtype)
if(ismob(loc))
@@ -187,19 +178,18 @@
update_brightness(null)
/obj/item/device/flashlight/flare/attack_self(mob/user)
+
// Usual checks
- if(loc != usr)
- return
if(!fuel)
user << "It's out of fuel."
return
- if(!light_on)
- user.visible_message("[user] activates the flare.", "You pull the cord on the flare, activating it!")
- else
+ if(on)
return
+
+ . = ..()
// All good, turn it on.
- light_on = 1
- update_brightness(user)
- src.force = on_damage
- src.damtype = "fire"
- processing_objects += src
\ No newline at end of file
+ if(.)
+ user.visible_message("[user] activates the flare.", "You pull the cord on the flare, activating it!")
+ src.force = on_damage
+ src.damtype = "fire"
+ processing_objects += src
\ No newline at end of file
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 9685993c70e..d0bc6a45336 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -110,12 +110,12 @@
/obj/item/device/paicard/proc/removePersonality()
src.pai = null
- src.overlays = null
+ src.overlays.Cut()
src.overlays += "pai-off"
/obj/item/device/paicard/proc/setEmotion(var/emotion)
if(pai)
- src.overlays = null
+ src.overlays.Cut()
switch(emotion)
if(1) src.overlays += "pai-happy"
if(2) src.overlays += "pai-cat"
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 3b026d0be74..165f6748ec5 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -72,7 +72,7 @@
name = "Captain's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
icon_state = "cap_cypherkey"
- channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Mining" = 0, "Cargo" = 0)
+ channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0)
/obj/item/device/encryptionkey/heads/rd
name = "Research Director's Encryption Key"
@@ -102,8 +102,8 @@
name = "Head of Personnel's Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
icon_state = "hop_cypherkey"
- channels = list("Command" = 1, "Security" = 0, "Cargo" = 1, "Mining" = 0)
-
+ channels = list("Supply" = 1, "Command" = 1, "Security" = 0)
+/*
/obj/item/device/encryptionkey/headset_mine
name = "Mining Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
@@ -115,13 +115,12 @@
desc = "An encyption key for a radio headset. Contains cypherkeys."
icon_state = "qm_cypherkey"
channels = list("Cargo" = 1, "Mining" = 1)
-
+*/
/obj/item/device/encryptionkey/headset_cargo
- name = "Cargo Radio Encryption Key"
+ name = "Supply Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
icon_state = "cargo_cypherkey"
- channels = list("Cargo" = 1)
-
+ channels = list("Supply" = 1)
/obj/item/device/encryptionkey/ert
name = "NanoTrasen ERT Radio Encryption Key"
desc = "An encyption key for a radio headset. Contains cypherkeys."
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 216120d4db5..05285807d71 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -95,7 +95,7 @@
/obj/item/device/radio/headset/heads/captain
name = "captain's headset"
- desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :d - mining, :q - cargo, :m - medical, :n - science."
+ desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :m - medical, :n - science."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/captain
@@ -130,11 +130,11 @@
/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
- desc = "The headset of the guy who will one day be captain. Channels are as follows: :c - command, :s - security, :q - cargo, :d - mining."
+ desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :c - command, :s - security"
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/hop
-
+/*
/obj/item/device/radio/headset/headset_mine
name = "mining radio headset"
desc = "Headset used by miners. How useless. To access the mining channel, use :d."
@@ -148,10 +148,10 @@
icon_state = "cargo_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/qm
-
+*/
/obj/item/device/radio/headset/headset_cargo
- name = "cargo radio headset"
- desc = "Headset used by the QM's slaves. To access the cargo channel, use :q."
+ name = "supply radio headset"
+ desc = "A headset used by the QM and his slaves. To access the supply channel, use :u."
icon_state = "cargo_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index d860492e77e..c230a3f5a9b 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -4,7 +4,7 @@
icon_state = "intercom"
anchored = 1
w_class = 4.0
- canhear_range = 4
+ canhear_range = 2
var/number = 0
var/anyai = 1
var/mob/living/silicon/ai/ai = list()
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 74cf0c40894..3b5da8c3a1d 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -497,10 +497,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
freq_text = "Engineering"
if(1359)
freq_text = "Security"
- if(1349)
- freq_text = "Mining"
+// if(1349)
+// freq_text = "Mining"
if(1347)
- freq_text = "Cargo"
+ freq_text = "Supply"
//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(!freq_text)
@@ -595,7 +595,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
/obj/item/device/radio/hear_talk(mob/M as mob, msg)
if (broadcasting)
- talk_into(M, msg)
+ if(get_dist(src, M) <= canhear_range)
+ talk_into(M, msg)
/*
/obj/item/device/radio/proc/accept_rad(obj/item/device/radio/R as obj, message)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 55b2be019e9..a0f4f202d90 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -257,6 +257,23 @@ MASS SPECTROMETER
src.add_fingerprint(user)
return
+/obj/item/device/mass_spectrometer
+ desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
+ name = "mass-spectrometer"
+ icon_state = "spectrometer"
+ item_state = "analyzer"
+ w_class = 2.0
+ flags = FPRINT | TABLEPASS| CONDUCT | OPENCONTAINER
+ slot_flags = SLOT_BELT
+ throwforce = 5
+ throw_speed = 4
+ throw_range = 20
+ m_amt = 30
+ g_amt = 20
+ origin_tech = "magnets=2;biotech=2"
+ var/details = 0
+ var/recent_fail = 0
+
/obj/item/device/mass_spectrometer/New()
..()
var/datum/reagents/R = new/datum/reagents(5)
@@ -307,3 +324,8 @@ MASS SPECTROMETER
reagents.clear_reagents()
return
+/obj/item/device/mass_spectrometer/adv
+ name = "advanced mass-spectrometer"
+ icon_state = "adv_spectrometer"
+ details = 1
+ origin_tech = "magnets=4;biotech=2"
diff --git a/code/game/objects/items/devices/shields.dm b/code/game/objects/items/devices/shields.dm
deleted file mode 100644
index 665c79e0d90..00000000000
--- a/code/game/objects/items/devices/shields.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/obj/item/weapon/cloaking_device
- name = "cloaking device"
- desc = "Use this to become invisible to the human eyesocket."
- icon = 'icons/obj/device.dmi'
- icon_state = "shield0"
- var/active = 0.0
- flags = FPRINT | TABLEPASS| CONDUCT
- item_state = "electronic"
- throwforce = 10.0
- throw_speed = 2
- throw_range = 10
- w_class = 2.0
- origin_tech = "magnets=3;syndicate=4"
-
-
-/obj/item/weapon/cloaking_device/attack_self(mob/user as mob)
- src.active = !( src.active )
- if (src.active)
- user << "\blue The cloaking device is now active."
- src.icon_state = "shield1"
- else
- user << "\blue The cloaking device is now inactive."
- src.icon_state = "shield0"
- src.add_fingerprint(user)
- return
-
-/obj/item/weapon/cloaking_device/emp_act(severity)
- active = 0
- icon_state = "shield0"
- if(ismob(loc))
- loc:update_icons()
- ..()
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index c77a388d1e6..9a57b4ff579 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -115,7 +115,7 @@
toggle = 1
/obj/item/device/transfer_valve/update_icon()
- overlays = null
+ overlays.Cut()
underlays = null
if(!tank_one && !tank_two && !attached_device)
@@ -164,16 +164,16 @@
else
attacher_name = "[attacher.name]([attacher.ckey])"
- var/log_str = "Bomb valve opened in [A.name] "
+ var/log_str = "Bomb valve opened in [A.name] "
log_str += "with [attached_device ? attached_device : "no device"] attacher: [attacher_name]"
if(attacher)
- log_str += "(?)"
+ log_str += "(?)"
var/mob/mob = get_mob_by_key(src.fingerprintslast)
var/last_touch_info = ""
if(mob)
- last_touch_info = "(?)"
+ last_touch_info = "(?)"
log_str += " Last touched by: [src.fingerprintslast][last_touch_info]"
bombers += log_str
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 957da36c89e..ebe7b751de0 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -59,12 +59,18 @@ A list of items and costs is stored under the datum of every game mode, alongsid
continue
path_obj = text2path(path_text)
- item = new path_obj()
- name = O[3]
- del item
- dat += "[name] ([cost])
" - category_items++ + // Because we're using strings, this comes up if item paths change. + // Failure to handle this error borks uplinks entirely. -Sayu + if(!path_obj) + error("Syndicate item is not a valid path: [path_text]") + else + item = new path_obj() + name = O[3] + del item + + dat += "[name] ([cost])
" + category_items++ dat += "Random Item (??)
" dat += "
" @@ -81,7 +87,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid if(uses > 9) randomItems.Add("/obj/item/toy/syndicateballoon")//Syndicate Balloon - randomItems.Add("/obj/item/weapon/storage/syndie_kit/imp_uplink") //Uplink Implanter + randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/imp_uplink") //Uplink Implanter randomItems.Add("/obj/item/weapon/storage/box/syndicate") //Syndicate bundle //if(uses > 8) //Nothing... yet. @@ -104,15 +110,15 @@ A list of items and costs is stored under the datum of every game mode, alongsid randomItems.Add("/obj/item/device/chameleon") //Chameleon Projector if(uses > 2) - randomItems.Add("/obj/item/weapon/storage/emp_kit") //EMP Grenades + randomItems.Add("/obj/item/weapon/storage/box/emps") //EMP Grenades randomItems.Add("/obj/item/weapon/pen/paralysis") //Paralysis Pen randomItems.Add("/obj/item/weapon/cartridge/syndicate") //Detomatix Cartridge randomItems.Add("/obj/item/clothing/under/chameleon") //Chameleon Jumpsuit randomItems.Add("/obj/item/weapon/card/id/syndicate") //Agent ID Card randomItems.Add("/obj/item/weapon/card/emag") //Cryptographic Sequencer - randomItems.Add("/obj/item/weapon/storage/syndie_kit/space") //Syndicate Space Suit + randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/space") //Syndicate Space Suit randomItems.Add("/obj/item/device/encryptionkey/binary") //Binary Translator Key - randomItems.Add("/obj/item/weapon/storage/syndie_kit/imp_freedom") //Freedom Implant + randomItems.Add("/obj/item/weapon/storage/box/syndie_kit/imp_freedom") //Freedom Implant randomItems.Add("/obj/item/clothing/glasses/thermal/syndi") //Thermal Imaging Goggles if(uses > 1) @@ -142,7 +148,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid switch(buyItem) //Ok, this gets a little messy, sorry. if("/obj/item/weapon/circuitboard/teleporter") uses -= 20 - if("/obj/item/toy/syndicateballoon" , "/obj/item/weapon/storage/syndie_kit/imp_uplink" , "/obj/item/weapon/storage/box/syndicate") + if("/obj/item/toy/syndicateballoon" , "/obj/item/weapon/storage/box/syndie_kit/imp_uplink" , "/obj/item/weapon/storage/box/syndicate") uses -= 10 if("/obj/item/weapon/aiModule/syndicate" , "/obj/item/device/radio/beacon/syndicate") uses -= 7 @@ -152,9 +158,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid uses -= 5 if("/obj/item/weapon/melee/energy/sword" , "/obj/item/clothing/mask/gas/voice" , "/obj/item/device/chameleon") uses -= 4 - if("/obj/item/weapon/storage/emp_kit" , "/obj/item/weapon/pen/paralysis" , "/obj/item/weapon/cartridge/syndicate" , "/obj/item/clothing/under/chameleon" , \ - "/obj/item/weapon/card/emag" , "/obj/item/weapon/storage/syndie_kit/space" , "/obj/item/device/encryptionkey/binary" , \ - "/obj/item/weapon/storage/syndie_kit/imp_freedom" , "/obj/item/clothing/glasses/thermal/syndi") + if("/obj/item/weapon/storage/box/emps" , "/obj/item/weapon/pen/paralysis" , "/obj/item/weapon/cartridge/syndicate" , "/obj/item/clothing/under/chameleon" , \ + "/obj/item/weapon/card/emag" , "/obj/item/weapon/storage/box/syndie_kit/space" , "/obj/item/device/encryptionkey/binary" , \ + "/obj/item/weapon/storage/box/syndie_kit/imp_freedom" , "/obj/item/clothing/glasses/thermal/syndi") uses -= 3 if("/obj/item/ammo_magazine/a357" , "/obj/item/clothing/shoes/syndigaloshes" , "/obj/item/weapon/plastique", "/obj/item/weapon/card/id/syndicate") uses -= 2 @@ -172,7 +178,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid feedback_add_details("traitor_uplink_items_bought","TP") if("/obj/item/toy/syndicateballoon") feedback_add_details("traitor_uplink_items_bought","BS") - if("/obj/item/weapon/storage/syndie_kit/imp_uplink") + if("/obj/item/weapon/storage/box/syndie_kit/imp_uplink") feedback_add_details("traitor_uplink_items_bought","UI") if("/obj/item/weapon/storage/box/syndicate") feedback_add_details("traitor_uplink_items_bought","BU") @@ -192,7 +198,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid feedback_add_details("traitor_uplink_items_bought","VC") if("/obj/item/device/chameleon") feedback_add_details("traitor_uplink_items_bought","CP") - if("/obj/item/weapon/storage/emp_kit") + if("/obj/item/weapon/storage/box/emps") feedback_add_details("traitor_uplink_items_bought","EM") if("/obj/item/weapon/pen/paralysis") feedback_add_details("traitor_uplink_items_bought","PP") @@ -204,11 +210,11 @@ A list of items and costs is stored under the datum of every game mode, alongsid feedback_add_details("traitor_uplink_items_bought","AC") if("/obj/item/weapon/card/emag") feedback_add_details("traitor_uplink_items_bought","EC") - if("/obj/item/weapon/storage/syndie_kit/space") + if("/obj/item/weapon/storage/box/syndie_kit/space") feedback_add_details("traitor_uplink_items_bought","SS") if("/obj/item/device/encryptionkey/binary") feedback_add_details("traitor_uplink_items_bought","BT") - if("/obj/item/weapon/storage/syndie_kit/imp_freedom") + if("/obj/item/weapon/storage/box/syndie_kit/imp_freedom") feedback_add_details("traitor_uplink_items_bought","FI") if("/obj/item/clothing/glasses/thermal/syndi") feedback_add_details("traitor_uplink_items_bought","TM") diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm deleted file mode 100755 index a5a3e15262c..00000000000 --- a/code/game/objects/items/item.dm +++ /dev/null @@ -1,422 +0,0 @@ - -/obj/item/proc/attack_self() - return - -/obj/item/proc/talk_into(mob/M as mob, text) - return - -/obj/item/proc/moved(mob/user as mob, old_loc as turf) - return - -/obj/item/proc/dropped(mob/user as mob) - ..() - -// called just as an item is picked up (loc is not yet changed) -/obj/item/proc/pickup(mob/user) - return - -// called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called. -/obj/item/proc/on_exit_storage(obj/item/weapon/storage/S as obj) - return - -// called when this item is added into a storage item, which is passed on as S. The loc variable is already set to the storage item. -/obj/item/proc/on_enter_storage(obj/item/weapon/storage/S as obj) - return - -// called after an item is placed in an equipment slot -// user is mob that equipped it -// slot uses the slot_X defines found in setup.dm -// for items that can be placed in multiple slots -// note this isn't called during the initial dressing of a player -/obj/item/proc/equipped(var/mob/user, var/slot) - return - -/obj/item/proc/afterattack() - - return - -/obj/item/weapon/dummy/ex_act() - return - -/obj/item/weapon/dummy/blob_act() - return - -/obj/item/ex_act(severity) - switch(severity) - if(1.0) - del(src) - return - if(2.0) - if (prob(50)) - del(src) - return - if(3.0) - if (prob(5)) - del(src) - return - else - return - -/obj/item/blob_act() - return - -/obj/item/verb/move_to_top() - set name = "Move To Top" - set category = "Object" - set src in oview(1) - - if(!istype(src.loc, /turf) || usr.stat || usr.restrained() ) - return - - var/turf/T = src.loc - - src.loc = null - - src.loc = T - -/obj/item/examine() - set src in view() - - var/t - switch(src.w_class) - if(1.0) - t = "tiny" - if(2.0) - t = "small" - if(3.0) - t = "normal-sized" - if(4.0) - t = "bulky" - if(5.0) - t = "huge" - else - if ((CLUMSY in usr.mutations) && prob(50)) t = "funny-looking" - usr << text("This is a []\icon[][]. It is a [] item.", !src.blood_DNA ? "" : "bloody ",src, src.name, t) - if(src.desc) - usr << src.desc - return - -/obj/item/attack_hand(mob/user as mob) - if (!user) return - if (istype(src.loc, /obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = src.loc - S.remove_from_storage(src) - - src.throwing = 0 - if (src.loc == user) - //canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N - if(!src.canremove) - return - else - user.u_equip(src) - else - if(isliving(src.loc)) - return - src.pickup(user) - user.lastDblClick = world.time + 2 - user.next_move = world.time + 2 - add_fingerprint(user) - user.put_in_active_hand(src) - return - - -/obj/item/attack_paw(mob/user as mob) - - if(isalien(user)) // -- TLE - var/mob/living/carbon/alien/A = user - - if(!A.has_fine_manipulation || w_class >= 4) - if(src in A.contents) // To stop Aliens having items stuck in their pockets - A.drop_from_inventory(src) - user << "Your claws aren't capable of such fine manipulation." - return - - if (istype(src.loc, /obj/item/weapon/storage)) - for(var/mob/M in range(1, src.loc)) - if (M.s_active == src.loc) - if (M.client) - M.client.screen -= src - src.throwing = 0 - if (src.loc == user) - //canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N - if(istype(src, /obj/item/clothing) && !src:canremove) - return - else - user.u_equip(src) - else - if(istype(src.loc, /mob/living)) - return - src.pickup(user) - user.lastDblClick = world.time + 2 - user.next_move = world.time + 2 - - user.put_in_active_hand(src) - return - -/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob) - - if(istype(W,/obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = W - if(S.use_to_pickup) - if(!S.can_be_inserted(src)) - return - if(S.collection_mode) //Mode is set to collect all items on a tile and we clicked on a valid one. - if(isturf(src.loc)) - for(var/obj/item/I in src.loc) - if(I != src) //We'll do the one we clicked on last. - if(!S.can_be_inserted(src)) - continue - S.handle_item_insertion(I, 1) //The 1 stops the "You put the [src] into [S]" insertion message from being displayed. - S.handle_item_insertion(src) - - - return - -mob/proc/flash_weak_pain() - flick("weak_pain",pain) - -/obj/item/proc/attack(mob/living/M as mob, mob/living/user as mob, def_zone) - - if (!istype(M)) // not sure if this is the right thing... - return - var/messagesource = M - - if (istype(M,/mob/living/carbon/brain)) - messagesource = M:container - if (src.hitsound) - playsound(src.loc, hitsound, 50, 1, -1) - M.flash_weak_pain() - ///////////////////////// - user.lastattacked = M - M.lastattacker = user - - var/power = src.force - - // EXPERIMENTAL: scale power and time to the weight class - if(w_class >= 4.0 && !istype(src,/obj/item/weapon/melee/energy/blade)) // eswords are an exception, they only have a w_class of 4 to not fit into pockets - power = power * 2.5 - - user.visible_message("\red [user.name] swings at [M.name] with \the [src]!") - user.next_move = max(user.next_move, world.time + 30) - - // if the mob didn't move, he has a 100% chance to hit(given the enemy also didn't move) - // otherwise, the chance to hit is lower - var/unmoved = 0 - spawn - unmoved = do_after(user, 4) - sleep(4) - if( (!unmoved && !prob(70)) || (get_dist(user, M) != 1 && user != M)) - user.visible_message("\red [user.name] misses with \the [src]!") - return - - - user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" - M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" - - log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)]") - msg_admin_attack("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)]") - - log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" ) - - //spawn(1800) // this wont work right - // M.lastattacker = null - ///////////////////////// - - if((HULK in user.mutations) || (SUPRSTR in user.augmentations)) - power *= 2 - - if(!istype(M, /mob/living/carbon/human)) - if(istype(M, /mob/living/carbon/metroid)) - var/mob/living/carbon/metroid/Metroid = M - if(prob(25)) - user << "\red [src] passes right through [M]!" - return - - if(power > 0) - Metroid.attacked += 10 - - if(Metroid.Discipline && prob(50)) // wow, buddy, why am I getting attacked?? - Metroid.Discipline = 0 - - if(power >= 3) - if(istype(Metroid, /mob/living/carbon/metroid/adult)) - if(prob(5 + round(power/2))) - - if(Metroid.Victim) - if(prob(80) && !Metroid.client) - Metroid.Discipline++ - Metroid.Victim = null - Metroid.anchored = 0 - - spawn() - if(Metroid) - Metroid.SStun = 1 - sleep(rand(5,20)) - if(Metroid) - Metroid.SStun = 0 - - spawn(0) - if(Metroid) - Metroid.canmove = 0 - step_away(Metroid, user) - if(prob(25 + power)) - sleep(2) - if(Metroid && user) - step_away(Metroid, user) - Metroid.canmove = 1 - - else - if(prob(10 + power*2)) - if(Metroid) - if(Metroid.Victim) - if(prob(80) && !Metroid.client) - Metroid.Discipline++ - - if(Metroid.Discipline == 1) - Metroid.attacked = 0 - - spawn() - if(Metroid) - Metroid.SStun = 1 - sleep(rand(5,20)) - if(Metroid) - Metroid.SStun = 0 - - Metroid.Victim = null - Metroid.anchored = 0 - - - spawn(0) - if(Metroid && user) - step_away(Metroid, user) - Metroid.canmove = 0 - if(prob(25 + power*4)) - sleep(2) - if(Metroid && user) - step_away(Metroid, user) - Metroid.canmove = 1 - - - var/showname = "." - if(user) - showname = " by [user]." - if(!(user in viewers(M, null))) - showname = "." - - for(var/mob/O in viewers(messagesource, null)) - if(src.attack_verb.len) - O.show_message("\red [M] has been [pick(src.attack_verb)] with [src][showname] ", 1) - else - O.show_message("\red [M] has been attacked with [src][showname] ", 1) - - if(!showname && user) - if(user.client) - user << "\red You attack [M] with [src]. " - - - - if(istype(M, /mob/living/carbon/human)) - M:attacked_by(src, user, def_zone) - else - switch(src.damtype) - if("brute") - if(istype(src, /mob/living/carbon/metroid)) - M.adjustBrainLoss(power) - - else - - M.take_organ_damage(power) - if (prob(33)) // Added blood for whacking non-humans too - var/turf/location = M.loc - if (istype(location, /turf/simulated)) - location.add_blood_floor(M) - if("fire") - if (!(COLD_RESISTANCE in M.mutations)) - M.take_organ_damage(0, power) - M << "Aargh it burns!" - M.updatehealth() - src.add_fingerprint(user) - return 1 - - -/obj/item/proc/IsShield() - return 0 - -/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) || \ - (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 << "\red 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 << "\red You're going to need to remove that mask/helmet/glasses first." - return - - if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/metroid))//Aliens don't have eyes./N Metroids also don't have eyes! - user << "\red You cannot locate any eyes on this creature!" - return - - user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" - M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])" - - log_attack(" [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") - - log_admin("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") - msg_admin_attack("ATTACK: [user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") //BS12 EDIT ALG - - src.add_fingerprint(user) - //if((CLUMSY in user.mutations) && prob(50)) - // M = user - /* - M << "\red You stab yourself in the eye." - M.sdisabilities |= BLIND - M.weakened += 4 - M.adjustBruteLoss(10) - */ - if(M != user) - for(var/mob/O in (viewers(M) - user - M)) - O.show_message("\red [M] has been stabbed in the eye with [src] by [user].", 1) - M << "\red [user] stabs you in the eye with [src]!" - user << "\red You stab [M] in the eye with [src]!" - else - user.visible_message( \ - "\red [user] has stabbed themself with [src]!", \ - "\red You stab yourself in the eyes with [src]!" \ - ) - if(istype(M, /mob/living/carbon/human)) - var/datum/organ/external/affecting = M:get_organ("head") - if(affecting.take_damage(7)) - M:UpdateDamageIcon() - else - M.take_organ_damage(7) - M.eye_blurry += rand(3,4) - M.eye_stat += rand(2,4) - if (M.eye_stat >= 10) - M.eye_blurry += 15+(0.1*M.eye_blurry) - M.disabilities |= NEARSIGHTED - if(M.stat != 2) - M << "\red Your eyes start to bleed profusely!" - if(prob(50)) - if(M.stat != 2) - M << "\red You drop what you're holding and clutch at your eyes!" - M.drop_item() - M.eye_blurry += 10 - M.Paralyse(1) - M.Weaken(4) - if (prob(M.eye_stat - 10 + 1)) - if(M.stat != 2) - M << "\red You go blind!" - M.sdisabilities |= BLIND - return - - diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index b9dc3170434..3daa3078395 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -78,7 +78,7 @@ src.updateicon() /obj/item/robot_parts/robot_suit/proc/updateicon() - src.overlays = null + src.overlays.Cut() if(src.l_arm) src.overlays += "l_arm+o" if(src.r_arm) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index dce87fda314..6e3a893c9be 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -36,7 +36,7 @@ if (istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) - overlays = null + overlays.Cut() usr << "You slice off [src]'s uneven chunks of aluminum and scorch marks." return diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 63992bde103..659900aefc9 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -1,5 +1,14 @@ - -//What is this even used for? +/obj/item/stack/medical + name = "medical pack" + singular_name = "medical pack" + icon = 'icons/obj/items.dmi' + amount = 5 + max_amount = 5 + w_class = 1 + throw_speed = 4 + throw_range = 20 + var/heal_brute = 0 + var/heal_burn = 0 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) if (M.stat == 2) @@ -53,4 +62,63 @@ ) use(1) + M.updatehealth() +/obj/item/stack/medical/bruise_pack + name = "bruise pack" + singular_name = "bruise pack" + desc = "A pack designed to treat blunt-force trauma." + icon_state = "brutepack" + heal_brute = 60 + origin_tech = "biotech=1" + +/obj/item/stack/medical/ointment + name = "ointment" + desc = "Used to treat those nasty burns." + gender = PLURAL + singular_name = "ointment" + icon_state = "ointment" + heal_burn = 40 + origin_tech = "biotech=1" + +/obj/item/stack/medical/bruise_pack/tajaran + name = "\improper S'rendarr's Hand leaf" + singular_name = "S'rendarr's Hand leaf" + desc = "A soft leaf that is rubbed on bruises." + icon = 'harvest.dmi' + icon_state = "cabbage" + heal_brute = 7 + +/obj/item/stack/medical/ointment/tajaran + name = "\improper Messa's Tear leaf" + singular_name = "Messa's Tear leaf" + desc = "A cold leaf that is rubbed on burns." + icon = 'harvest.dmi' + icon_state = "ambrosiavulgaris" + heal_burn = 7 + +/obj/item/stack/medical/advanced/bruise_pack + name = "advanced trauma kit" + singular_name = "advanced trauma kit" + desc = "An advanced trauma kit for severe injuries." + icon_state = "traumakit" + heal_brute = 12 + origin_tech = "biotech=1" + +/obj/item/stack/medical/advanced/ointment + name = "advanced burn kit" + singular_name = "advanced burn kit" + desc = "An advanced treatment kit for severe burns." + icon_state = "burnkit" + heal_burn = 12 + origin_tech = "biotech=1" + +/obj/item/stack/medical/splint + name = "medical splint" + singular_name = "medical splint" + icon_state = "splint" + amount = 5 + max_amount = 5 + +/obj/item/stack/medical/splint/single + amount = 1 diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index ed72df614d5..835666b7fe4 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -10,7 +10,7 @@ */ /obj/item/stack/sheet/glass name = "glass" - desc = "HOLY HELL! That is a lot of glass." + desc = "HOLY SHEET! That is a lot of glass." singular_name = "glass sheet" icon_state = "sheet-glass" g_amt = 3750 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 3045159a625..8ba88796363 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -33,6 +33,36 @@ icon_state = "sheet-lizard" origin_tech = "" +/obj/item/stack/sheet/animalhide/xeno + name = "alien hide" + desc = "The skin of a terrible creature." + singular_name = "alien hide piece" + icon_state = "sheet-xeno" + origin_tech = "" + +//don't see anywhere else to put these, maybe together they could be used to make the xenos suit? +/obj/item/stack/sheet/xenochitin + name = "alien chitin" + desc = "A piece of the hide of a terrible creature." + singular_name = "alien hide piece" + icon = 'icons/mob/alien.dmi' + icon_state = "chitin" + origin_tech = "" + +/obj/item/xenos_claw + name = "alien claw" + desc = "The claw of a terrible creature." + icon = 'icons/mob/alien.dmi' + icon_state = "claw" + origin_tech = "" + +/obj/item/weed_extract + name = "weed extract" + desc = "A piece of slimy, purplish weed." + icon = 'icons/mob/alien.dmi' + icon_state = "weed_extract" + origin_tech = "" + /obj/item/stack/sheet/hairlesshide name = "hairless hide" desc = "This hide was stripped of it's hair, but still needs tanning." diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 111a9dfe73d..6c62365fdb3 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -72,6 +72,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ */ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1), \ + new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1), \ ) /obj/item/stack/sheet/plasteel @@ -128,12 +129,13 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \ */ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ new/datum/stack_recipe("box", /obj/item/weapon/storage/box), \ - new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/lightbox/tubes), \ - new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/lightbox/bulbs), \ - new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/mousetraps), \ + new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/box/lights/tubes), \ + new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/box/lights/bulbs), \ + new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/box/mousetraps), \ new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \ new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \ new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \ + new/datum/stack_recipe("folder", /obj/item/weapon/folder), \ ) /obj/item/stack/sheet/cardboard //BubbleWrap diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index b94acb367e4..fdcc6747b64 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -11,12 +11,16 @@ var/perunit = 3750 var/sheettype = null //this is used for girders in the creation of walls/false walls -/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob) - if (istype(W, /obj/item/weapon/sheetsnatcher)) - var/obj/item/weapon/sheetsnatcher/S = W + +// Since the sheetsnatcher was consolidated into weapon/storage/bag we now use +// item/attackby() properly, making this unnecessary + +/*/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob) + if (istype(W, /obj/item/weapon/storage/bag/sheetsnatcher)) + var/obj/item/weapon/storage/bag/sheetsnatcher/S = W if(!S.mode) S.add(src,user) else for (var/obj/item/stack/sheet/stack in locate(src.x,src.y,src.z)) S.add(stack,user) - ..() \ No newline at end of file + ..()*/ \ No newline at end of file diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 460db9b7662..8fdcd7a5618 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -14,7 +14,7 @@ var/on = 1 var/state //0 = fine, 1 = flickering, 2 = breaking, 3 = broken -/obj/item/stack/tile/light/New() +/obj/item/stack/tile/light/New(var/loc, var/amount=null) ..() if(prob(5)) state = 3 //broken diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index 212cec051d0..cbbf1811cc5 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -36,7 +36,10 @@ */ /obj/item/stack/tile/plasteel/proc/build(turf/S as turf) - S.ChangeTurf(/turf/simulated/floor/plating) + if (istype(S,/turf/space)) + S.ChangeTurf(/turf/simulated/floor/plating/airless) + else + S.ChangeTurf(/turf/simulated/floor/plating) // var/turf/simulated/floor/W = S.ReplaceWithFloor() // W.make_plating() return \ No newline at end of file diff --git a/code/game/objects/items/tk_grab.dm b/code/game/objects/items/tk_grab.dm index 654c6e7e06c..11863e9ae2c 100644 --- a/code/game/objects/items/tk_grab.dm +++ b/code/game/objects/items/tk_grab.dm @@ -97,7 +97,7 @@ update_icon() - overlays = null + overlays.Cut() if(focus && focus.icon && focus.icon_state) overlays += icon(focus.icon,focus.icon_state) return diff --git a/code/defines/obj/toy.dm b/code/game/objects/items/toys.dm similarity index 84% rename from code/defines/obj/toy.dm rename to code/game/objects/items/toys.dm index d9ee6a9d048..6c3814a8010 100644 --- a/code/defines/obj/toy.dm +++ b/code/game/objects/items/toys.dm @@ -1,3 +1,17 @@ +/* Toys! + * ContainsL + * Balloons + * Fake telebeacon + * Fake singularity + * Toy gun + * Toy crossbow + * Toy swords + * Crayons + * Snap pops + * Water flower + */ + + /obj/item/toy throwforce = 0 throw_speed = 4 @@ -5,83 +19,68 @@ force = 0 -/////////Toy Mechs///////// - -/obj/item/toy/prize +/* + * Balloons + */ +/obj/item/toy/balloon + name = "water balloon" + desc = "A translucent balloon. There's nothing in it." icon = 'icons/obj/toy.dmi' - icon_state = "ripleytoy" - var/cooldown = 0 + icon_state = "waterballoon-e" + item_state = "balloon-empty" -//all credit to skasi for toy mech fun ideas -/obj/item/toy/prize/attack_self(mob/user as mob) - if(cooldown < world.time - 8) - user << "You play with [src]." - playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) - cooldown = world.time +/obj/item/toy/balloon/New() + var/datum/reagents/R = new/datum/reagents(10) + reagents = R + R.my_atom = src -/obj/item/toy/prize/attack_hand(mob/user as mob) - if(loc == user) - if(cooldown < world.time - 8) - user << "You play with [src]." - playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) - cooldown = world.time - return - ..() +/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob) + return -/obj/item/toy/prize/ripley - name = "toy ripley" - desc = "Mini-Mecha action figure! Collect them all! 1/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" +/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob) + if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1) + A.reagents.trans_to(src, 10) + user << "\blue You fill the balloon with the contents of [A]." + src.desc = "A translucent balloon with some form of liquid sloshing around in it." + src.update_icon() + return -/obj/item/toy/prize/fireripley - name = "toy firefighting ripley" - desc = "Mini-Mecha action figure! Collect them all! 2/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "fireripleytoy" +/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob) + if(istype(O, /obj/item/weapon/reagent_containers/glass)) + if(O.reagents) + if(O.reagents.total_volume < 1) + user << "The [O] is empty." + else if(O.reagents.total_volume >= 1) + if(O.reagents.has_reagent("pacid", 1)) + user << "The acid chews through the balloon!" + O.reagents.reaction(user) + del(src) + else + src.desc = "A translucent balloon with some form of liquid sloshing around in it." + user << "\blue You fill the balloon with the contents of [O]." + O.reagents.trans_to(src, 10) + src.update_icon() + return -/obj/item/toy/prize/deathripley - name = "toy deathsquad ripley" - desc = "Mini-Mecha action figure! Collect them all! 3/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "deathripleytoy" - -/obj/item/toy/prize/gygax - name = "toy gygax" - desc = "Mini-Mecha action figure! Collect them all! 4/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "gygaxtoy" - -/obj/item/toy/prize/durand - name = "toy durand" - desc = "Mini-Mecha action figure! Collect them all! 5/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "durandprize" - -/obj/item/toy/prize/honk - name = "toy H.O.N.K." - desc = "Mini-Mecha action figure! Collect them all! 6/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "honkprize" - -/obj/item/toy/prize/marauder - name = "toy marauder" - desc = "Mini-Mecha action figure! Collect them all! 7/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "marauderprize" - -/obj/item/toy/prize/seraph - name = "toy seraph" - desc = "Mini-Mecha action figure! Collect them all! 8/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "seraphprize" - -/obj/item/toy/prize/mauler - name = "toy mauler" - desc = "Mini-Mecha action figure! Collect them all! 9/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "maulerprize" - -/obj/item/toy/prize/odysseus - name = "toy odysseus" - desc = "Mini-Mecha action figure! Collect them all! 10/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "odysseusprize" - -/obj/item/toy/prize/phazon - name = "toy phazon" - desc = "Mini-Mecha action figure! Collect them all! 11/11. Send the full collection in a closed crate to CentCom at your local quartermaster for a GREAT reward!" - icon_state = "phazonprize" +/obj/item/toy/balloon/throw_impact(atom/hit_atom) + if(src.reagents.total_volume >= 1) + src.visible_message("\red 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) + src.icon_state = "burst" + spawn(5) + if(src) + del(src) + return +/obj/item/toy/balloon/update_icon() + if(src.reagents.total_volume >= 1) + icon_state = "waterballoon" + item_state = "balloon" + else + icon_state = "waterballoon-e" + item_state = "balloon-empty" /obj/item/toy/syndicateballoon name = "syndicate balloon" @@ -95,6 +94,9 @@ item_state = "syndballoon" w_class = 4.0 +/* + * Fake telebeacon + */ /obj/item/toy/blink name = "electronic blink toy game" desc = "Blink. Blink. Blink. Ages 8 and up." @@ -102,44 +104,18 @@ icon_state = "beacon" item_state = "signaler" +/* + * Fake singularity + */ /obj/item/toy/spinningtoy name = "Gravitational Singularity" desc = "\"Singulo\" brand spinning toy." icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" -/obj/item/toy/ammo/gun - name = "ammo-caps" - desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty." - icon = 'icons/obj/ammo.dmi' - icon_state = "357-7" - flags = FPRINT | TABLEPASS| CONDUCT - w_class = 1.0 - g_amt = 10 - m_amt = 10 - var/amount_left = 7.0 - - update_icon() - src.icon_state = text("357-[]", src.amount_left) - src.desc = text("There are [] caps\s left! Make sure to recycle the box in an autolathe when it gets empty.", src.amount_left) - return - -/obj/item/toy/ammo/crossbow - name = "foam dart" - desc = "Its nerf or nothing! Ages 8 and up." - icon = 'icons/obj/toy.dmi' - icon_state = "foamdart" - flags = FPRINT | TABLEPASS - w_class = 1.0 - -/obj/effect/foam_dart_dummy - name = "" - desc = "" - icon = 'icons/obj/toy.dmi' - icon_state = "null" - anchored = 1 - density = 0 - +/* + * Toy gun: Why isnt this an /obj/item/weapon/gun? + */ /obj/item/toy/gun name = "cap gun" desc = "There are 0 caps left. Looks almost like the real thing! Ages 8 and up. Please recycle in an autolathe when you're out of caps!" @@ -191,40 +167,33 @@ src.add_fingerprint(user) if (src.bullets < 1) user.show_message("\red *click* *click*", 2) + playsound(user, 'sound/weapons/empty.ogg', 100, 1) return playsound(user, 'sound/weapons/Gunshot.ogg', 100, 1) src.bullets-- for(var/mob/O in viewers(user, null)) O.show_message(text("\red [] fires a cap gun at []!", user, target), 1, "\red You hear a gunshot", 2) -/obj/item/toy/sword - name = "toy sword" - desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up." - icon = 'icons/obj/weapons.dmi' - icon_state = "sword0" - item_state = "sword0" - var/active = 0.0 - w_class = 2.0 - flags = FPRINT | TABLEPASS | NOSHIELD - attack_verb = list("attacked", "struck", "hit") +/obj/item/toy/ammo/gun + name = "ammo-caps" + desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty." + icon = 'icons/obj/ammo.dmi' + icon_state = "357-7" + flags = FPRINT | TABLEPASS| CONDUCT + w_class = 1.0 + g_amt = 10 + m_amt = 10 + var/amount_left = 7.0 - attack_self(mob/user as mob) - src.active = !( src.active ) - if (src.active) - user << "\blue You extend the plastic blade with a quick flick of your wrist." - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) - src.icon_state = "swordblue" - src.item_state = "swordblue" - src.w_class = 4 - else - user << "\blue You push the plastic blade back down into the handle." - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) - src.icon_state = "sword0" - src.item_state = "sword0" - src.w_class = 2 - src.add_fingerprint(user) + update_icon() + src.icon_state = text("357-[]", src.amount_left) + src.desc = text("There are [] caps\s left! Make sure to recycle the box in an autolathe when it gets empty.", src.amount_left) return +/* + * Toy crossbow + */ + /obj/item/toy/crossbow name = "foam dart crossbow" desc = "A weapon favored by many overactive children. Ages 8 and up." @@ -322,16 +291,70 @@ user.Weaken(5) return -/obj/item/weapon/storage/crayonbox - name = "box of crayons" - desc = "A box of crayons for all your rune drawing needs." - icon = 'icons/obj/crayons.dmi' - icon_state = "crayonbox" +/obj/item/toy/ammo/crossbow + name = "foam dart" + desc = "Its nerf or nothing! Ages 8 and up." + icon = 'icons/obj/toy.dmi' + icon_state = "foamdart" + flags = FPRINT | TABLEPASS + w_class = 1.0 + +/obj/effect/foam_dart_dummy + name = "" + desc = "" + icon = 'icons/obj/toy.dmi' + icon_state = "null" + anchored = 1 + density = 0 + + +/* + * Toy swords + */ +/obj/item/toy/sword + name = "toy sword" + desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up." + icon = 'icons/obj/weapons.dmi' + icon_state = "sword0" + item_state = "sword0" + var/active = 0.0 w_class = 2.0 - storage_slots = 6 - can_hold = list( - "/obj/item/toy/crayon" - ) + flags = FPRINT | TABLEPASS | NOSHIELD + attack_verb = list("attacked", "struck", "hit") + + attack_self(mob/user as mob) + src.active = !( src.active ) + if (src.active) + user << "\blue You extend the plastic blade with a quick flick of your wrist." + playsound(user, 'sound/weapons/saberon.ogg', 50, 1) + src.icon_state = "swordblue" + src.item_state = "swordblue" + src.w_class = 4 + else + user << "\blue You push the plastic blade back down into the handle." + playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) + src.icon_state = "sword0" + src.item_state = "sword0" + src.w_class = 2 + src.add_fingerprint(user) + return + +/obj/item/toy/katana + name = "replica katana" + desc = "Woefully underpowered in D20." + icon = 'icons/obj/weapons.dmi' + icon_state = "katana" + item_state = "katana" + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT | SLOT_BACK + force = 5 + throwforce = 5 + w_class = 3 + attack_verb = list("attacked", "slashed", "stabbed", "sliced") + +/* + * Crayons + */ /obj/item/toy/crayon name = "crayon" @@ -346,6 +369,13 @@ var/instant = 0 var/colourName = "red" //for updateIcon purposes + suicide_act(mob/user) + viewers(user) << "\red [user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide." + return (BRUTELOSS|OXYLOSS) + +/* + * Snap pops + */ /obj/item/toy/snappop name = "snap pop" desc = "Wow!" @@ -377,6 +407,9 @@ playsound(src, 'sound/effects/snap.ogg', 50, 1) del(src) +/* + * Water flower + */ /obj/item/toy/waterflower name = "Water Flower" desc = "A seemingly innocent sunflower...with a twist." @@ -444,66 +477,85 @@ ..() return -/obj/item/toy/balloon - name = "water balloon" - desc = "A translucent balloon. There's nothing in it." + +/* + * Mech prizes + */ +/obj/item/toy/prize icon = 'icons/obj/toy.dmi' - icon_state = "waterballoon-e" - item_state = "balloon-empty" + icon_state = "ripleytoy" + var/cooldown = 0 -/obj/item/toy/balloon/New() - var/datum/reagents/R = new/datum/reagents(10) - reagents = R - R.my_atom = src +//all credit to skasi for toy mech fun ideas +/obj/item/toy/prize/attack_self(mob/user as mob) + if(cooldown < world.time - 8) + user << "You play with [src]." + playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) + cooldown = world.time -/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob) - return +/obj/item/toy/prize/attack_hand(mob/user as mob) + if(loc == user) + if(cooldown < world.time - 8) + user << "You play with [src]." + playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) + cooldown = world.time + return + ..() -/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user as mob) - if (istype(A, /obj/structure/reagent_dispensers/watertank) && get_dist(src,A) <= 1) - A.reagents.trans_to(src, 10) - user << "\blue You fill the balloon with the contents of [A]." - src.desc = "A translucent balloon with some form of liquid sloshing around in it." - src.update_icon() - return +/obj/item/toy/prize/ripley + name = "toy ripley" + desc = "Mini-Mecha action figure! Collect them all! 1/11." -/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob) - if(istype(O, /obj/item/weapon/reagent_containers/glass)) - if(O.reagents) - if(O.reagents.total_volume < 1) - user << "The [O] is empty." - else if(O.reagents.total_volume >= 1) - if(O.reagents.has_reagent("pacid", 1)) - user << "The acid chews through the balloon!" - O.reagents.reaction(user) - del(src) - else - src.desc = "A translucent balloon with some form of liquid sloshing around in it." - user << "\blue You fill the balloon with the contents of [O]." - O.reagents.trans_to(src, 10) - src.update_icon() - return +/obj/item/toy/prize/fireripley + name = "toy firefighting ripley" + desc = "Mini-Mecha action figure! Collect them all! 2/11." + icon_state = "fireripleytoy" -/obj/item/toy/balloon/throw_impact(atom/hit_atom) - if(src.reagents.total_volume >= 1) - src.visible_message("\red 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) - src.icon_state = "burst" - spawn(5) - if(src) - del(src) - return +/obj/item/toy/prize/deathripley + name = "toy deathsquad ripley" + desc = "Mini-Mecha action figure! Collect them all! 3/11." + icon_state = "deathripleytoy" -/obj/item/toy/balloon/update_icon() - if(src.reagents.total_volume >= 1) - icon_state = "waterballoon" - item_state = "balloon" - else - icon_state = "waterballoon-e" - item_state = "balloon-empty" +/obj/item/toy/prize/gygax + name = "toy gygax" + desc = "Mini-Mecha action figure! Collect them all! 4/11." + icon_state = "gygaxtoy" + +/obj/item/toy/prize/durand + name = "toy durand" + desc = "Mini-Mecha action figure! Collect them all! 5/11." + icon_state = "durandprize" + +/obj/item/toy/prize/honk + name = "toy H.O.N.K." + desc = "Mini-Mecha action figure! Collect them all! 6/11." + icon_state = "honkprize" + +/obj/item/toy/prize/marauder + name = "toy marauder" + desc = "Mini-Mecha action figure! Collect them all! 7/11." + icon_state = "marauderprize" + +/obj/item/toy/prize/seraph + name = "toy seraph" + desc = "Mini-Mecha action figure! Collect them all! 8/11." + icon_state = "seraphprize" + +/obj/item/toy/prize/mauler + name = "toy mauler" + desc = "Mini-Mecha action figure! Collect them all! 9/11." + icon_state = "maulerprize" + +/obj/item/toy/prize/odysseus + name = "toy odysseus" + desc = "Mini-Mecha action figure! Collect them all! 10/11." + icon_state = "odysseusprize" + +/obj/item/toy/prize/phazon + name = "toy phazon" + desc = "Mini-Mecha action figure! Collect them all! 11/11." + icon_state = "phazonprize" /obj/item/toy/katana name = "replica katana" desc = "Woefully underpowered in D20." @@ -523,4 +575,4 @@ desc = "This baby looks almost real. Wait, did it just burp?" force = 5 w_class = 4.0 - slot_flags = SLOT_BACK + slot_flags = SLOT_BACK diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 298cfb1a48c..a80a892af6f 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -184,3 +184,16 @@ RCD ..() desc = "A device used to rapidly build walls/floor." canRwall = 1 + +/obj/item/weapon/rcd_ammo + name = "compressed matter cartridge" + desc = "Highly compressed matter for the RCD." + icon = 'icons/obj/ammo.dmi' + icon_state = "rcd" + item_state = "rcdammo" + opacity = 0 + density = 0 + anchored = 0.0 + origin_tech = "materials=2" + m_amt = 30000 + g_amt = 15000 \ No newline at end of file diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index b122382e5fe..5ffed7b6d1a 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -3,6 +3,19 @@ CONTAINS: RSF */ +/obj/item/weapon/rsf + name = "\improper Rapid-Service-Fabricator" + desc = "A device used to rapidly deploy service items." + icon = 'icons/obj/items.dmi' + icon_state = "rcd" + opacity = 0 + density = 0 + anchored = 0.0 + var/matter = 0 + var/mode = 1 + flags = TABLEPASS + w_class = 3.0 + /obj/item/weapon/rsf/New() desc = "A RSF. It currently holds [matter]/30 fabrication-units." return @@ -168,7 +181,7 @@ RSF if (istype(A, /obj/structure/table) && matter >= 1) user << "Dispensing Dice Pack..." playsound(src.loc, 'sound/machines/click.ogg', 10, 1) - new /obj/item/weapon/storage/dice( A.loc ) + new /obj/item/weapon/storage/pill_bottle/dice( A.loc ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user engy.cell.charge -= 200 @@ -182,7 +195,7 @@ RSF if (istype(A, /turf/simulated/floor) && matter >= 1) user << "Dispensing Dice Pack..." playsound(src.loc, 'sound/machines/click.ogg', 10, 1) - new /obj/item/weapon/storage/dice( A ) + new /obj/item/weapon/storage/pill_bottle/dice( A ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user engy.cell.charge -= 200 diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 65c442aac81..649a4fe713c 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -11,6 +11,24 @@ /* * DATA CARDS - Used for the teleporter */ +/obj/item/weapon/card + name = "card" + desc = "Does card things." + icon = 'icons/obj/card.dmi' + w_class = 1.0 + var/associated_account_number = 0 + + var/list/files = list( ) + +/obj/item/weapon/card/data + name = "data disk" + desc = "A disk of data." + icon_state = "data" + var/function = "storage" + var/data = "null" + var/special = null + item_state = "card-id" + /obj/item/weapon/card/data/verb/label(t as text) set name = "Label Disk" set category = "Object" @@ -23,21 +41,44 @@ src.add_fingerprint(usr) return +/obj/item/weapon/card/data/clown + name = "coordinates to clown planet" + icon_state = "data" + item_state = "card-id" + layer = 3 + level = 2 + desc = "This card contains coordinates to the fabled Clown Planet. Handle with care." + function = "teleporter" + data = "Clown Land" /* * ID CARDS */ -/obj/item/weapon/card/id/examine() - ..() - read() +/obj/item/weapon/card/emag + desc = "It's a card with a magnetic strip attached to some circuitry." + name = "cryptographic sequencer" + icon_state = "emag" + item_state = "card-id" + origin_tech = "magnets=2;syndicate=2" + var/uses = 10 -/obj/item/weapon/card/id/New() - ..() - spawn(30) - if(istype(loc, /mob/living/carbon/human)) - blood_type = loc:dna:b_type - dna_hash = loc:dna:unique_enzymes - fingerprint_hash = md5(loc:dna:uni_identity) +/obj/item/weapon/card/id + name = "identification card" + desc = "A card used to provide ID and determine access across the station." + icon_state = "id" + item_state = "card-id" + var/access = list() + var/registered_name = null // The name registered_name on the card + slot_flags = SLOT_ID + + var/blood_type = "\[UNSET\]" + var/dna_hash = "\[UNSET\]" + var/fingerprint_hash = "\[UNSET\]" + + //alt titles are handled a bit weirdly in order to unobtrusively integrate into existing ID system + var/assignment = null //can be alt title or the actual job + var/rank = null //actual job + var/dorm = 0 // determines if this ID has claimed a dorm already /obj/item/weapon/card/id/attack_self(mob/user as mob) for(var/mob/O in viewers(user, null)) @@ -46,13 +87,11 @@ src.add_fingerprint(user) return -/obj/item/weapon/card/id/attack_hand(mob/user as mob) - var/obj/item/weapon/storage/wallet/WL - if( istype(loc, /obj/item/weapon/storage/wallet) ) - WL = loc - ..() - if(WL) - WL.update_icon() +/obj/item/weapon/card/id/GetAccess() + return access + +/obj/item/weapon/card/id/GetID() + return src /obj/item/weapon/card/id/verb/read() set name = "Read ID Card" @@ -65,11 +104,38 @@ usr << "The fingerprint hash on the card is [fingerprint_hash]." return + +/obj/item/weapon/card/id/silver + name = "identification card" + desc = "A silver card which shows honour and dedication." + icon_state = "silver" + item_state = "silver_id" + +/obj/item/weapon/card/id/gold + name = "identification card" + desc = "A golden card which shows power and might." + icon_state = "gold" + item_state = "gold_id" + +/obj/item/weapon/card/id/syndicate + name = "agent card" + access = list(access_maint_tunnels, access_syndicate) + origin_tech = "syndicate=3" + +/obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob) + if(istype(O, /obj/item/weapon/card/id)) + var/obj/item/weapon/card/id/I = O + src.access |= I.access + if(istype(user, /mob/living) && user.mind) + if(user.mind.special_role) + usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access." + + /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) if(!src.registered_name) //Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak - var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)),1,26) - if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall" || t == "") //Same as mob/new_player/prefrences.dm + var t = reject_bad_name(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)) + if(!t) //Same as mob/new_player/prefrences.dm alert("Invalid name.") return src.registered_name = t @@ -84,3 +150,32 @@ user << "\blue You successfully forge the ID card." else ..() + +/obj/item/weapon/card/id/syndicate_command + name = "syndicate ID card" + desc = "An ID straight from the Syndicate." + registered_name = "Syndicate" + assignment = "Syndicate Overlord" + access = list(access_syndicate) + +/obj/item/weapon/card/id/captains_spare + name = "captain's spare ID" + desc = "The spare ID of the High Lord himself." + icon_state = "gold" + item_state = "gold_id" + registered_name = "Captain" + assignment = "Captain" + New() + var/datum/job/captain/J = new/datum/job/captain + access = J.get_access() + ..() + +/obj/item/weapon/card/id/centcom + name = "\improper CentCom. ID" + desc = "An ID straight from Cent. Com." + icon_state = "centcom" + registered_name = "Central Command" + assignment = "General" + New() + access = get_all_centcom_access() + ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 5d5b6d6ea48..dff332f2a6f 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -6,9 +6,10 @@ MATCHES CIGARETTES CIGARS SMOKING PIPES -CIG PACKET CHEAP LIGHTERS ZIPPO + +CIGARETTE PACKETS ARE IN FANCY.DM */ /////////// @@ -62,7 +63,7 @@ ZIPPO var/lit = 0 var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi var/icon_off = "cigoff" - var/butt_icon = "cigbutt" + var/type_butt = /obj/item/weapon/cigbutt var/lastHolder = null var/smoketime = 300 var/chem_volume = 15 @@ -85,12 +86,12 @@ ZIPPO else if(istype(W, /obj/item/weapon/lighter/zippo)) var/obj/item/weapon/lighter/zippo/Z = W - if(Z.light_on) + if(Z.lit) light("With a single flick of their wrist, [user] smoothly lights their [name] with their [W]. Damn they're cool.") else if(istype(W, /obj/item/weapon/lighter)) var/obj/item/weapon/lighter/L = W - if(L.light_on) + if(L.lit) light("After some fiddling, [user] manages to light their [name] with [W].") else if(istype(W, /obj/item/weapon/match)) @@ -115,16 +116,15 @@ ZIPPO /obj/item/clothing/mask/cigarette/afterattack(obj/item/weapon/reagent_containers/glass/glass, mob/user as mob) ..() - if(lit == 0) - if(istype(glass)) //you can dip cigarettes into beakers - var/transfered = glass.reagents.trans_to(src, chem_volume) - if(transfered) //if reagents were transfered, show the message - user << "You dip \the [src] into \the [glass]." - else //if not, either the beaker was empty, or the cigarette was full - if(!glass.reagents.total_volume) - user << "[glass] is empty." - else - user << "[src] is full." + if(istype(glass)) //you can dip cigarettes into beakers + var/transfered = glass.reagents.trans_to(src, chem_volume) + if(transfered) //if reagents were transfered, show the message + user << "You dip \the [src] into \the [glass]." + else //if not, either the beaker was empty, or the cigarette was full + if(!glass.reagents.total_volume) + user << "[glass] is empty." + else + user << "[src] is full." /obj/item/clothing/mask/cigarette/proc/light(var/flavor_text = "[usr] lights the [name].") @@ -156,50 +156,38 @@ ZIPPO var/turf/location = get_turf(src) smoketime-- if(smoketime < 1) - put_out() + new type_butt(location) + processing_objects.Remove(src) if(ismob(loc)) var/mob/living/M = loc M << "Your [name] goes out." - //M.u_equip(src) //un-equip it so the overlays can update - //M.update_inv_wear_mask(0) + M.u_equip(src) //un-equip it so the overlays can update + M.update_inv_wear_mask(0) + del(src) return - if(lit == 1) - if(location) - location.hotspot_expose(700, 5) - if(reagents && reagents.total_volume) // check if it has any reagents at all - if(iscarbon(loc) && (src == loc:wear_mask)) // if it's in the human/monkey mouth, transfer reagents to the mob - var/mob/living/carbon/C = loc - if(prob(15)) // so it's not an instarape in case of acid - reagents.reaction(C, INGEST) - reagents.trans_to(C, REAGENTS_METABOLISM) - else // else just remove some of the reagents - reagents.remove_any(REAGENTS_METABOLISM) + if(location) + location.hotspot_expose(700, 5) + if(reagents && reagents.total_volume) // check if it has any reagents at all + if(iscarbon(loc) && (src == loc:wear_mask)) // if it's in the human/monkey mouth, transfer reagents to the mob + var/mob/living/carbon/C = loc + if(prob(15)) // so it's not an instarape in case of acid + reagents.reaction(C, INGEST) + reagents.trans_to(C, REAGENTS_METABOLISM) + else // else just remove some of the reagents + reagents.remove_any(REAGENTS_METABOLISM) return /obj/item/clothing/mask/cigarette/attack_self(mob/user as mob) if(lit == 1) - var/mob/living/carbon/human/H = user - if(H.shoes) - user.visible_message("[user] crushes [src] on the sole of his shoes, putting it out instantly.") - else - user.visible_message("[user] spits oh his fingers, then puts down [src].") - put_out() + user.visible_message("[user] calmly drops and treads on the lit [src], putting it out instantly.") + var/turf/T = get_turf(src) + new type_butt(T) + processing_objects.Remove(src) + del(src) return ..() -/obj/item/clothing/mask/cigarette/proc/put_out() - if(src.lit == 1) - src.lit = -1 - icon_state = src.butt_icon - desc = "Old manky [src] butt." - name = "[src] butt" - attack_verb = list("poked") - processing_objects.Remove(src) - if (usr) - usr.update_inv_l_hand() - usr.update_inv_r_hand() - //////////// // CIGARS // @@ -210,7 +198,7 @@ ZIPPO icon_state = "cigaroff" icon_on = "cigaron" icon_off = "cigaroff" - butt_icon = "cigarbutt" + type_butt = /obj/item/weapon/cigbutt/cigarbutt throw_speed = 0.5 item_state = "cigaroff" smoketime = 1500 @@ -246,6 +234,12 @@ ZIPPO icon_state = "cigarbutt" +/obj/item/clothing/mask/cigarette/cigar/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/match)) + ..() + else + user << "\The [src] straight out REFUSES to be lit by such uncivilized means." + ///////////////// //SMOKING PIPES// ///////////////// @@ -299,6 +293,12 @@ ZIPPO smoketime = initial(smoketime) return +/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/match)) + ..() + else + user << "\The [src] straight out REFUSES to be lit by such means." + /obj/item/clothing/mask/cigarette/pipe/cobpipe name = "corn cob pipe" desc = "A nicotine delivery system popularized by folksy backwoodsmen and kept popular in the modern age and beyond by space hipsters." @@ -308,56 +308,7 @@ ZIPPO icon_off = "cobpipeoff" smoketime = 400 -//////////// -//CIG PACK// -//////////// -/obj/item/weapon/cigpacket - name = "cigarette packet" - desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics." - icon = 'icons/obj/cigarettes.dmi' - icon_state = "cigpacket" - item_state = "cigpacket" - w_class = 1 - throwforce = 2 - flags = TABLEPASS - slot_flags = SLOT_BELT - var/cigcount = 6 -/obj/item/weapon/cigpacket/New() - ..() - flags |= NOREACT - create_reagents(15*cigcount)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one - -/obj/item/weapon/cigpacket/Del() - ..() - del(reagents) - -/obj/item/weapon/cigpacket/update_icon() - icon_state = "[initial(icon_state)][cigcount]" - desc = "There are [cigcount] cig\s left!" - return - -/obj/item/weapon/cigpacket/attack_hand(mob/user as mob) - if(user.r_hand == src || user.l_hand == src) - if(cigcount == 0) - user << "You're out of cigs, shit! How you gonna get through the rest of the day..." - return - else - var/obj/item/clothing/mask/cigarette/W = new /obj/item/clothing/mask/cigarette(user) - reagents.trans_to(W, (reagents.total_volume/cigcount)) - user.put_in_active_hand(W) - reagents.maximum_volume = 15*cigcount - cigcount-- - else - return ..() - update_icon() - return - -/obj/item/weapon/cigpacket/dromedaryco - name = "DromedaryCo packet" - desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\"" - icon_state = "Dpacket" - item_state = "Dpacket" ///////// //ZIPPO// @@ -375,8 +326,7 @@ ZIPPO flags = TABLEPASS | CONDUCT slot_flags = SLOT_BELT attack_verb = list("burnt", "singed") - light_on = 0 - brightness_on = 2 //luminosity when on + var/lit = 0 /obj/item/weapon/lighter/zippo name = "Zippo lighter" @@ -395,28 +345,24 @@ ZIPPO /obj/item/weapon/lighter/attack_self(mob/living/user) if(user.r_hand == src || user.l_hand == src) - if(!light_on) - light_on = 1 + if(!lit) + lit = 1 icon_state = icon_on item_state = icon_on if(istype(src, /obj/item/weapon/lighter/zippo) ) user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") else - if(prob(90)) + if(prob(75)) user.visible_message("After a few attempts, [user] manages to light the [src].") else user << "You burn yourself while lighting the lighter." - if (user.l_hand == src) - user.apply_damage(2,BURN,"l_hand") - else - user.apply_damage(2,BURN,"r_hand") + user.adjustFireLoss(5) user.visible_message("After a few attempts, [user] manages to light the [src], they however burn their finger in the process.") - if (user.luminosity < brightness_on) - user.SetLuminosity(brightness_on) + user.SetLuminosity(user.luminosity + 2) processing_objects.Add(src) else - light_on = 0 + lit = 0 icon_state = icon_off item_state = icon_off if(istype(src, /obj/item/weapon/lighter/zippo) ) @@ -424,7 +370,7 @@ ZIPPO else user.visible_message("[user] quietly shuts off the [src].") - user.SetLuminosity(search_light(user, src)) + user.SetLuminosity(user.luminosity - 2) processing_objects.Remove(src) else return ..() @@ -435,7 +381,7 @@ ZIPPO if(!istype(M, /mob)) return - if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth" && light_on) + if(istype(M.wear_mask, /obj/item/clothing/mask/cigarette) && user.zone_sel.selecting == "mouth" && lit) var/obj/item/clothing/mask/cigarette/cig = M.wear_mask if(M == user) cig.attackby(src, user) @@ -455,24 +401,14 @@ ZIPPO /obj/item/weapon/lighter/pickup(mob/user) - if(light_on) - if (user.luminosity < brightness_on) - user.SetLuminosity(brightness_on) + if(lit) SetLuminosity(0) + user.SetLuminosity(user.luminosity+2) return /obj/item/weapon/lighter/dropped(mob/user) - if(light_on) - if ((layer <= 3) || (loc != user.loc)) - user.SetLuminosity(search_light(user, src)) - SetLuminosity(brightness_on) - return - - -/obj/item/weapon/lighter/equipped(mob/user, slot) - if(light_on) - if (user.luminosity < brightness_on) - user.SetLuminosity(brightness_on) - SetLuminosity(0) + if(lit) + user.SetLuminosity(user.luminosity-2) + SetLuminosity(2) return diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 03c962b5af7..a58629cda96 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -55,7 +55,8 @@ trigger_side_effect(M) spawn(0)//this prevents the collapse of space-time continuum - user.drop_from_inventory(src) + if (user) + user.drop_from_inventory(src) del(src) return uses diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index a14373169eb..4f35194f9d2 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -1,6 +1,6 @@ /obj/item/weapon/plastique/attack_self(mob/user as mob) var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num - if(newtime < 1) + if(newtime < 10) newtime = 10 timer = newtime user << "Timer set for [timer] seconds." diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index ec284b68bab..86fb3a87e24 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/flamethrower.dmi' icon_state = "flamethrowerbase" item_state = "flamethrower_0" - flags = FPRINT | TABLEPASS| CONDUCT + flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY // USEDELAY flag needed in order to use afterattack() for things that are not in reach. I.E: Shooting flames. force = 3.0 throwforce = 10.0 throw_speed = 1 @@ -48,7 +48,7 @@ /obj/item/weapon/flamethrower/update_icon() - overlays = null + overlays.Cut() if(igniter) overlays += "+igniter[status]" if(ptank) @@ -60,6 +60,13 @@ item_state = "flamethrower_0" return +/obj/item/weapon/flamethrower/afterattack(atom/target, mob/user, flag) + // Make sure our user is still holding us + if(user && user.get_active_hand() == src) + var/turf/target_turf = get_turf(target) + if(target_turf) + var/turflist = getline(user, target_turf) + flame_turf(turflist) /obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob) if(user.stat || user.restrained() || user.lying) return diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index c5c8fb3c579..e15ce7fc8c8 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -7,6 +7,23 @@ /* * Gifts */ +/obj/item/weapon/a_gift + name = "gift" + desc = "PRESENTS!!!! eek!" + icon = 'icons/obj/items.dmi' + icon_state = "gift1" + item_state = "gift1" + +/obj/item/weapon/a_gift/New() + ..() + pixel_x = rand(-10,10) + pixel_y = rand(-10,10) + if(w_class > 0 && w_class < 4) + icon_state = "gift[w_class]" + else + icon_state = "gift[pick(1, 2, 3)]" + return + /obj/item/weapon/gift/attack_self(mob/user as mob) user.drop_item() if(src.gift) @@ -21,7 +38,6 @@ del(src) return - /obj/effect/spresent/relaymove(mob/user as mob) if (user.stat) return @@ -44,45 +60,71 @@ del(src) - /obj/item/weapon/a_gift/attack_self(mob/M as mob) - switch(pick("flash", "t_gun", "l_gun", "shield", "sword", "axe")) - if("flash") - var/obj/item/device/flash/W = new /obj/item/device/flash( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - if("l_gun") - var/obj/item/weapon/gun/energy/laser/W = new /obj/item/weapon/gun/energy/laser( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - if("t_gun") - var/obj/item/weapon/gun/energy/taser/W = new /obj/item/weapon/gun/energy/taser( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - if("sword") - var/obj/item/weapon/melee/energy/sword/W = new /obj/item/weapon/melee/energy/sword( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - if("axe") - var/obj/item/weapon/melee/energy/axe/W = new /obj/item/weapon/melee/energy/axe( M ) - M.put_in_active_hand(W) - W.add_fingerprint(M) - del(src) - return - else + var/gift_type = pick(/obj/item/weapon/sord, + /obj/item/weapon/storage/wallet, + /obj/item/weapon/storage/photo_album, + /obj/item/weapon/storage/box/snappops, + /obj/item/weapon/storage/fancy/crayons, + /obj/item/weapon/storage/backpack/holding, + /obj/item/weapon/storage/belt/champion, + /obj/item/weapon/soap/deluxe, + /obj/item/weapon/pickaxe/silver, + /obj/item/weapon/pen/invisible, + /obj/item/weapon/lipstick/random, + /obj/item/weapon/grenade/smokebomb, + /obj/item/weapon/corncob, + /obj/item/weapon/contraband/poster, + /obj/item/weapon/book/manual/barman_recipes, + /obj/item/weapon/book/manual/chef_recipes, + /obj/item/weapon/bikehorn, + /obj/item/weapon/beach_ball, + /obj/item/weapon/beach_ball/holoball, + /obj/item/weapon/banhammer, + /obj/item/toy/balloon, + /obj/item/toy/blink, + /obj/item/toy/crossbow, + /obj/item/toy/gun, + /obj/item/toy/katana, + /obj/item/toy/prize/deathripley, + /obj/item/toy/prize/durand, + /obj/item/toy/prize/fireripley, + /obj/item/toy/prize/gygax, + /obj/item/toy/prize/honk, + /obj/item/toy/prize/marauder, + /obj/item/toy/prize/mauler, + /obj/item/toy/prize/odysseus, + /obj/item/toy/prize/phazon, + /obj/item/toy/prize/ripley, + /obj/item/toy/prize/seraph, + /obj/item/toy/spinningtoy, + /obj/item/toy/sword, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, + /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, + /obj/item/device/paicard, + /obj/item/device/violin, + /obj/item/weapon/storage/belt/utility/full, + /obj/item/clothing/tie/horrible) + + if(!ispath(gift_type,/obj/item)) return + + var/obj/item/I = new gift_type(M) + M.u_equip(src) + M.put_in_hands(I) + I.add_fingerprint(M) + del(src) return /* * Wrapping Paper */ +/obj/item/weapon/wrapping_paper + name = "wrapping paper" + desc = "You can use this to wrap items in." + icon = 'icons/obj/items.dmi' + icon_state = "wrap_paper" + var/amount = 20.0 + /obj/item/weapon/wrapping_paper/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if (!( locate(/obj/structure/table, src.loc) )) @@ -148,4 +190,4 @@ else user << "\blue You need more paper." else - user << "Theyre moving around too much. a Straitjacket would help." \ No newline at end of file + user << "They are moving around too much. A straightjacket would help." \ No newline at end of file diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index ce4e4f2ce63..168ef431ede 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -226,6 +226,26 @@ beakers += B2 icon_state = initial(icon_state) +"_locked" +/obj/item/weapon/grenade/chem_grenade/antiweed + name = "weedkiller grenade" + desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents." + path = 1 + stage = 2 + + New() + ..() + var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src) + var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src) + + B1.reagents.add_reagent("plantbgone", 25) + B1.reagents.add_reagent("potassium", 25) + B2.reagents.add_reagent("phosphorus", 25) + B2.reagents.add_reagent("sugar", 25) + + beakers += B1 + beakers += B2 + icon_state = "grenade" + /obj/item/weapon/grenade/chem_grenade/cleaner name = "Cleaner Grenade" desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas." diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 95ad0b77b1e..9edf68a60ac 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -6,7 +6,7 @@ prime() ..() - if(empulse(src, 10, 20)) + if(empulse(src, 4, 10)) del(src) return diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 17b578461a7..e95338168d2 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -1,3 +1,20 @@ +/obj/item/weapon/handcuffs + name = "handcuffs" + desc = "Use this to keep prisoners in line." + gender = PLURAL + icon = 'icons/obj/items.dmi' + icon_state = "handcuff" + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT + throwforce = 5 + w_class = 2.0 + throw_speed = 2 + throw_range = 5 + m_amt = 500 + origin_tech = "materials=1" + var/dispenser = 0 + var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes + /obj/item/weapon/handcuffs/attack(mob/living/carbon/C as mob, mob/user as mob) if(istype(src, /obj/item/weapon/handcuffs/cyborg) && isrobot(user)) if(!C.handcuffed) @@ -73,4 +90,37 @@ playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) O.process() return - return \ No newline at end of file + return + +/obj/item/weapon/handcuffs/cable + name = "cable restraints" + desc = "Looks like some cables tied together. Could be used to tie something up." + icon_state = "cuff_red" + breakouttime = 300 //Deciseconds = 30s + +/obj/item/weapon/handcuffs/cable/red + icon_state = "cuff_red" + +/obj/item/weapon/handcuffs/cable/yellow + icon_state = "cuff_yellow" + +/obj/item/weapon/handcuffs/cable/blue + icon_state = "cuff_blue" + +/obj/item/weapon/handcuffs/cable/green + icon_state = "cuff_green" + +/obj/item/weapon/handcuffs/cable/pink + icon_state = "cuff_pink" + +/obj/item/weapon/handcuffs/cable/orange + icon_state = "cuff_orange" + +/obj/item/weapon/handcuffs/cable/cyan + icon_state = "cuff_cyan" + +/obj/item/weapon/handcuffs/cable/white + icon_state = "cuff_white" + +/obj/item/weapon/handcuffs/cyborg + dispenser = 1 \ No newline at end of file diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm index 619828f68ce..024dcd60084 100644 --- a/code/game/objects/items/weapons/hydroponics.dm +++ b/code/game/objects/items/weapons/hydroponics.dm @@ -1,47 +1,18 @@ /* Hydroponic stuff * Contains: - * Plant Bags * Sunflowers * Nettle * Deathnettle * Corbcob */ -/* - * Plant Bags - */ -/obj/item/weapon/plantbag - icon = 'icons/obj/hydroponics.dmi' - icon_state = "plantbag" - name = "Plant Bag" - var/mode = 1; //0 = pick one at a time, 1 = pick all on tile - var/capacity = 50; //the number of plant pieces it can carry. - flags = FPRINT | TABLEPASS - slot_flags = SLOT_BELT - w_class = 1 -/obj/item/weapon/plantbag/attack_self(mob/user as mob) - for (var/obj/item/weapon/reagent_containers/food/snacks/grown/O in contents) - contents -= O - O.loc = user.loc - user << "\blue You empty the plant bag." - return - -/obj/item/weapon/plantbag/verb/toggle_mode() - set name = "Switch Bagging Method" - set category = "Object" - - mode = !mode - switch (mode) - if(1) - usr << "The bag now picks up all plants in a tile at once." - if(0) - usr << "The bag now picks up one plant at a time." /* * SeedBag */ - +//uncomment when this is updated to match storage update +/* /obj/item/weapon/seedbag icon = 'icons/obj/hydroponics.dmi' icon_state = "seedbag" @@ -150,7 +121,7 @@ for(var/mob/M in nearby) if ((M.client && M.machine == src)) src.attack_self(M) - +*/ /* * Sunflower */ diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 1c391fe81de..0edd1a87362 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -78,9 +78,9 @@ if(istype(G, /obj/item/weapon/grab)) if(!ismob(G:affecting)) return - for(var/mob/living/carbon/metroid/M in range(1,G:affecting)) + for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) - usr << "[G:affecting:name] will not fit into the [src.name] because they have a Metroid latched onto their head." + usr << "[G:affecting:name] will not fit into the [src.name] because they have a slime latched onto their head." return var/mob/M = G:affecting if(put_mob(M)) diff --git a/code/game/objects/items/weapons/implants/implantnanoaug.dm b/code/game/objects/items/weapons/implants/implantnanoaug.dm deleted file mode 100644 index 32a23e967b7..00000000000 --- a/code/game/objects/items/weapons/implants/implantnanoaug.dm +++ /dev/null @@ -1,186 +0,0 @@ -/obj/item/weapon/implant/nanoaug - name = "nanoaug" - desc = "A nano-robotic biological augmentation implant." - var/augmentation - var/augment_text = "You feel strange..." - var/activation_emote = "fart" - - get_data() - var/dat = {" -Implant Specifications:
-Name: Cybersun Industries Nano-Robotic Biological Augmentation Suite
-Life: Infinite. WARNING: Biological changes are irreversable.
-Important Notes: Illegal. Subjects exposed to nanorobotic agent are considered dangerous.
-
-Implant Details:
-Function: Implant contains colony of pre-programmed nanorobots. Subject will experience radical changes in their body, amplifying and improving certain bodily characteristics.
-Special Features: Will grant subject superhuman powers.
-Integrity: Nanoaugmentation is permanent. Once the process is complete, the nanorobots disassemble and are dissolved by the blood stream."} - return dat - - - implanted(mob/M) - if(!istype(M, /mob/living/carbon/human)) return 0 - M.augmentations.Add(augmentation) // give them the mutation - M << "\blue [augment_text]" - - return 1 - - -/obj/item/weapon/implant/nanoaug/strength - name = "Superhuman Strength" - augmentation = SUPRSTR - augment_text = "You muscle ache, and you feel a rapid surge of energy pulse through your body. You feel strong." - -/obj/item/weapon/implant/nanoaug/radar - name = "Short-range Psionic Radar" - augmentation = RADAR - augment_text = "You begin to sense the presence or lack of presence of others around you." - - implanted(mob/M) - if(..()) - M << "Red blips on the map are Security." - M << "White blips are civlians." - M << "Monochrome Green blips are cyborgs and AIs." - M << "Light blue blips are heads of staff." - M << "Purple blips are unidentified organisms." - M << "Dead biologicals will not display on the radar." - spawn() - var/mob/living/carbon/human/H = M - H.start_radar() - return 1 - return 0 - -/obj/item/weapon/implant/nanoaug/electrichands - name = "Electric Hands" - augmentation = ELECTRICHANDS - augment_text = "You feel a sudden jolt of electricity pulse through your veins. Arcs of electricity travel through your hands." - -/obj/item/weapon/implant/nanoaug/eswordsynth - name = "Energy Blade Synthesizer" - augmentation = ESWORDSYNTH - augment_text = "Your hands throb and pulsate. They feel sharper, and strangely hot." - - implanted(mob/M) - if(..()) - activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") - M.mind.store_memory("Freedom nanoaugmentation can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", 0, 0) - M << "The nanoaugmentation implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate." - return 1 - return 0 - - trigger(emote, source as mob) - if(emote == activation_emote) - src.activate(source) - return - - activate(var/mob/source) - - var/obj/item/weapon/melee/energy/blade/swordspawn = new /obj/item/weapon/melee/energy/blade - if(!source.get_active_hand()) - source.put_in_hands(swordspawn) - - var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() - spark_system.set_up(5, 0, source.loc) - spark_system.start() - playsound(source.loc, "sparks", 50, 1) - ..() - -/obj/item/weapon/implant/nanoaug/rebreather - name = "Bioelectric Rebreather" - augmentation = REBREATHER - augment_text = "You begin to lose your breath. Just as you are about to pass out, you suddenly lose the urge to breath. Breathing is no longer a necessity for you." - -/obj/item/weapon/implant/nanoaug/dermalarmor - name = "Skin-intergrated Dermal Armor" - augmentation = DERMALARMOR - augment_text = "The skin throughout your body grows tense and tight, and you become slightly stiff. Your bones and skin feel a lot stronger." - -/obj/item/weapon/implant/nanoaug/reflexes - name = "Combat Reflexes" - augmentation = REFLEXES - augment_text = "Your mind suddenly is able to identify threats before you are aware of them. You become more aware of your surroundings." - -/obj/item/weapon/implant/nanoaug/nanoregen - name = "Regenerative Nanobots" - augmentation = NANOREGEN - augment_text = "You feel a very faint vibration in your body. You instantly feel much younger." - - -/obj/item/weapon/implanter/nanoaug - name = "Nanoaugmentation Implanter (Empty)" - icon_state = "nanoimplant" - -/obj/item/weapon/implanter/nanoaug/update() - if (src.imp) - src.icon_state = "nanoimplant" - else - src.icon_state = "nanoimplant0" - return - - -/obj/item/weapon/implanter/nanoaug/strength - name = "Nanoaugmentation Implaner (Superhuman Strength)" - -/obj/item/weapon/implanter/nanoaug/strength/New() - src.imp = new /obj/item/weapon/implant/nanoaug/strength( src ) - ..() - update() - -/obj/item/weapon/implanter/nanoaug/radar - name = "Nanoaugmentation Implaner (Short-range Psionic Radar)" - -/obj/item/weapon/implanter/nanoaug/radar/New() - src.imp = new /obj/item/weapon/implant/nanoaug/radar( src ) - ..() - update() - -/obj/item/weapon/implanter/nanoaug/electrichands - name = "Nanoaugmentation Implaner (Electric Hands)" - -/obj/item/weapon/implanter/nanoaug/electrichands/New() - src.imp = new /obj/item/weapon/implant/nanoaug/electrichands( src ) - ..() - update() - -/obj/item/weapon/implanter/nanoaug/eswordsynth - name = "Nanoaugmentation Implaner (Energy Blade Synthesizer)" - -/obj/item/weapon/implanter/nanoaug/eswordsynth/New() - src.imp = new /obj/item/weapon/implant/nanoaug/eswordsynth( src ) - ..() - update() - -/obj/item/weapon/implanter/nanoaug/rebreather - name = "Nanoaugmentation Implaner (Bioelectric Rebreather)" - -/obj/item/weapon/implanter/nanoaug/rebreather/New() - src.imp = new /obj/item/weapon/implant/nanoaug/rebreather( src ) - ..() - update() - -/obj/item/weapon/implanter/nanoaug/dermalarmor - name = "Nanoaugmentation Implaner (Skin-intergrated Dermal Armor)" - -/obj/item/weapon/implanter/nanoaug/dermalarmor/New() - src.imp = new /obj/item/weapon/implant/nanoaug/dermalarmor( src ) - ..() - update() - -/obj/item/weapon/implanter/nanoaug/reflexes - name = "Nanoaugmentation Implaner (Combat Reflexes)" - -/obj/item/weapon/implanter/nanoaug/reflexes/New() - src.imp = new /obj/item/weapon/implant/nanoaug/reflexes( src ) - ..() - update() - -/obj/item/weapon/implanter/nanoaug/nanoregen - name = "Nanoaugmentation Implaner (Regenerative Nanobots)" - -/obj/item/weapon/implanter/nanoaug/nanoregen/New() - src.imp = new /obj/item/weapon/implant/nanoaug/nanoregen( src ) - ..() - update() - - diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index f3f0032cd60..476ed726cd9 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -34,12 +34,7 @@ src.add_fingerprint(user) update() else - if (user.contents.Find(src)) - spawn( 0 ) - src.attack_self(user) - return - else - return ..() + return ..() return diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 9029fdfc5fc..02f270d767d 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -1,23 +1,52 @@ /* Kitchen tools * Contains: + * Utensils + * Spoons * Forks * Knives + * Kitchen knives + * Butcher's cleaver * Rolling Pins * Trays */ +/obj/item/weapon/kitchen + icon = 'icons/obj/kitchen.dmi' + +/* + * Utensils + */ +/obj/item/weapon/kitchen/utensil + force = 5.0 + w_class = 1.0 + throwforce = 5.0 + throw_speed = 3 + throw_range = 5 + flags = FPRINT | TABLEPASS | CONDUCT + origin_tech = "materials=1" + attack_verb = list("attacked", "stabbed", "poked") /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) if(!istype(M)) @@ -45,6 +74,19 @@ /* * Knives */ +/obj/item/weapon/kitchen/utensil/knife + name = "knife" + desc = "Can cut through any food." + icon_state = "knife" + force = 10.0 + throwforce = 10.0 + + suicide_act(mob/user) + viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [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 as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) user << "\red You accidentally cut yourself with the [src]." @@ -53,10 +95,73 @@ playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return ..() +/* + * Kitchen knives + */ +/obj/item/weapon/kitchenknife + 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 = FPRINT | TABLEPASS | CONDUCT + force = 10.0 + w_class = 3.0 + throwforce = 6.0 + throw_speed = 3 + throw_range = 6 + m_amt = 12000 + origin_tech = "materials=1" + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + + suicide_act(mob/user) + viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [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 + name = "ritual knife" + desc = "The unearthly energies that once powered this blade are now dormant." + icon = 'icons/obj/wizard.dmi' + icon_state = "render" + +/* + * Bucher's cleaver + */ +/obj/item/weapon/butch + 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 = FPRINT | TABLEPASS | CONDUCT + force = 15.0 + w_class = 2.0 + throwforce = 8.0 + throw_speed = 3 + throw_range = 6 + m_amt = 12000 + origin_tech = "materials=1" + attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + +/obj/item/weapon/butch/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() + /* * Rolling Pins */ +/obj/item/weapon/kitchen/rollingpin + name = "rolling pin" + desc = "Used to knock out the Bartender." + icon_state = "rolling_pin" + force = 8.0 + throwforce = 10.0 + throw_speed = 2 + throw_range = 7 + w_class = 3.0 + attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway. + /obj/item/weapon/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) user << "\red The [src] slips out of your hand and hits your head." @@ -93,10 +198,42 @@ /* * Trays - Agouri */ +/obj/item/weapon/tray + name = "tray" + icon = 'icons/obj/food.dmi' + icon_state = "tray" + desc = "A metal tray to lay food on." + throwforce = 12.0 + throwforce = 10.0 + throw_speed = 1 + throw_range = 5 + w_class = 3.0 + flags = FPRINT | TABLEPASS | CONDUCT + m_amt = 3000 + /* // NOPE + var/food_total= 0 + var/burger_amt = 0 + var/cheese_amt = 0 + var/fries_amt = 0 + var/classyalcdrink_amt = 0 + var/alcdrink_amt = 0 + var/bottle_amt = 0 + var/soda_amt = 0 + var/carton_amt = 0 + var/pie_amt = 0 + var/meatbreadslice_amt = 0 + var/salad_amt = 0 + var/miscfood_amt = 0 + */ + var/list/carrying = list() // List of things on the tray. - Doohl + var/max_carry = 10 // w_class = 1 -- takes up 1 + // w_class = 2 -- takes up 3 + // w_class = 3 -- takes up 5 + /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) // Drop all the things. All of them. - overlays = null + overlays.Cut() for(var/obj/item/I in carrying) I.loc = M.loc carrying.Remove(I) @@ -210,6 +347,16 @@ return return +/obj/item/weapon/tray/var/cooldown = 0 //shield bash cooldown. based on world.time + +/obj/item/weapon/tray/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/kitchen/rollingpin)) + if(cooldown < world.time - 25) + user.visible_message("[user] bashes [src] with [W]!") + playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) + cooldown = world.time + else + ..() /* ===============~~~~~================================~~~~~==================== @@ -264,7 +411,7 @@ foundtable = 1 break - overlays = null + overlays.Cut() for(var/obj/item/I in carrying) I.loc = loc diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 37c53026d8f..f4b2a147620 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -18,7 +18,7 @@ - +
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\nDetective 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\nAtmospheric Technician 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\nEngineer 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Plasma Technicians as plasma is the material they routinly handle.
\n1. Research plasma
\n2. Make sure all plasma is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\nSecurity Officer 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\nHead of Security 4>5-2-2
\n\tPeople assigned as Head of Security should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\nCaptain 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" - -/obj/item/weapon/paper/photograph - name = "photo" - icon_state = "photo" - var/photo_id = 0.0 - item_state = "paper" - -/obj/item/weapon/paper/sop - name = "paper- 'Standard Operating Procedure'" - info = "Alert Levels:
\nBlue- Emergency
\n\t1. Caused by fire
\n\t2. Caused by manual interaction
\n\tAction:
\n\t\tClose all fire doors. These can only be opened by reseting the alarm
\nRed- Ejection/Self Destruct
\n\t1. Caused by module operating computer.
\n\tAction:
\n\t\tAfter the specified time the module will eject completely.
\n
\nEngine Maintenance Instructions:
\n\tShut off ignition systems:
\n\tActivate internal power
\n\tActivate orbital balance matrix
\n\tRemove volatile liquids from area
\n\tWear a fire suit
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nToxin Laboratory Procedure:
\n\tWear a gas mask regardless
\n\tGet an oxygen tank.
\n\tActivate internal atmosphere
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nDisaster Procedure:
\n\tFire:
\n\t\tActivate sector fire alarm.
\n\t\tMove to a safe area.
\n\t\tGet a fire suit
\n\t\tAfter:
\n\t\t\tAssess Damage
\n\t\t\tRepair damages
\n\t\t\tIf needed, Evacuate
\n\tMeteor Shower:
\n\t\tActivate fire alarm
\n\t\tMove to the back of ship
\n\t\tAfter
\n\t\t\tRepair damage
\n\t\t\tIf needed, Evacuate
\n\tAccidental Reentry:
\n\t\tActivate fire alrms in front of ship.
\n\t\tMove volatile matter to a fire proof area!
\n\t\tGet a fire suit.
\n\t\tStay secure until an emergency ship arrives.
\n
\n\t\tIf ship does not arrive-
\n\t\t\tEvacuate to a nearby safe area!" - -/obj/item/weapon/paper/genetics_side_effects - name = "paper - 'Genetical Side-Effects and Treatments'" - - New() - ..() - info = "" - for(var/tp in typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect) - var/datum/genetics/side_effect/S = new tp - info += "Name:\t [S.name]
" - info += "Symptom:\t [S.symptom]
" - info += "Treatment:\t [S.treatment]
" - info += "Effect:\t [S.effect]
" - info += "
" - -/obj/item/weapon/banhammer - desc = "A banhammer" - name = "banhammer" - icon = 'icons/obj/items.dmi' - icon_state = "toyhammer" - flags = FPRINT | TABLEPASS - slot_flags = SLOT_BELT - throwforce = 0 - w_class = 1.0 - throw_speed = 7 - throw_range = 15 - attack_verb = list("banned") - /obj/item/weapon/rack_parts name = "rack parts" desc = "Parts of a rack." @@ -1068,32 +306,6 @@ flags = FPRINT | TABLEPASS| CONDUCT m_amt = 3750 -/* //gtfo my object tree -/obj/item/weapon/rubber_chicken - name = "rubber chicken" - desc = "A rubber chicken, isn't that hilarious?" - icon = 'icons/obj/items.dmi' - icon_state = "rubber_chicken" - item_state = "rubber_chicken" - w_class = 2.0 -*/ - -/obj/item/weapon/screwdriver - name = "screwdriver" - desc = "You can be totally screwwy with this." - icon = 'icons/obj/items.dmi' - icon_state = "screwdriver" - flags = FPRINT | TABLEPASS| CONDUCT - slot_flags = SLOT_BELT - force = 5.0 - w_class = 1.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 5 - g_amt = 0 - m_amt = 75 - attack_verb = list("stabbed") - /obj/item/weapon/shard name = "shard" icon = 'icons/obj/shards.dmi' @@ -1106,6 +318,11 @@ g_amt = 3750 attack_verb = list("stabbed", "slashed", "sliced", "cut") + suicide_act(mob/user) + viewers(user) << pick("/red [user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.") + return (BRUTELOSS) + /obj/item/weapon/shard/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return ..() @@ -1149,20 +366,6 @@ m_amt = 100 origin_tech = "magnets=1" -/obj/item/weapon/spellbook - name = "spell book" - desc = "The legendary book of spells of the wizard." - icon = 'icons/obj/library.dmi' - icon_state ="book" - throw_speed = 1 - throw_range = 5 - w_class = 1.0 - flags = FPRINT | TABLEPASS - var/uses = 5.0 - var/temp = null - var/max_uses = 5 - var/op = 1 - /obj/item/weapon/staff name = "wizards staff" desc = "Apparently a staff used by the wizard." @@ -1230,138 +433,9 @@ m_amt = 40 attack_verb = list("whipped", "lashed", "disciplined", "tickled") -/obj/item/weapon/wrapping_paper - name = "wrapping paper" - desc = "You can use this to wrap items in." - icon = 'icons/obj/items.dmi' - icon_state = "wrap_paper" - var/amount = 20.0 - -/obj/item/weapon/cell - name = "power cell" - desc = "A rechargable electrochemical power cell." - icon = 'icons/obj/power.dmi' - icon_state = "cell" - item_state = "cell" - origin_tech = "powerstorage=1" - flags = FPRINT|TABLEPASS - force = 5.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 5 - w_class = 3.0 - pressure_resistance = 80 - var/charge = 0 // note %age conveted to actual charge in New - var/maxcharge = 1000 - m_amt = 700 - g_amt = 50 - var/rigged = 0 // true if rigged to explode - var/minor_fault = 0 //If not 100% reliable, it will build up faults. - var/construction_cost = list("metal"=750,"glass"=75) - var/construction_time=100 - -/obj/item/weapon/cell/crap - name = "\improper Nanotrasen brand rechargable AA battery" - desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT - origin_tech = "powerstorage=0" - maxcharge = 500 - g_amt = 40 - -/obj/item/weapon/cell/crap/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/secborg - name = "\improper Security borg rechargable D battery" - origin_tech = "powerstorage=0" - maxcharge = 600 //600 max charge / 100 charge per shot = six shots - g_amt = 40 - -/obj/item/weapon/cell/secborg/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/high - name = "high-capacity power cell" - origin_tech = "powerstorage=2" - icon_state = "hcell" - maxcharge = 10000 - g_amt = 60 - -/obj/item/weapon/cell/high/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/super - name = "super-capacity power cell" - origin_tech = "powerstorage=5" - icon_state = "scell" - maxcharge = 20000 - g_amt = 70 - construction_cost = list("metal"=750,"glass"=100) - -/obj/item/weapon/cell/super/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/hyper - name = "hyper-capacity power cell" - origin_tech = "powerstorage=6" - icon_state = "hpcell" - maxcharge = 30000 - g_amt = 80 - construction_cost = list("metal"=500,"glass"=150,"gold"=200,"silver"=200) - -/obj/item/weapon/cell/hyper/empty/New() - ..() - charge = 0 - -/obj/item/weapon/cell/infinite - name = "infinite-capacity power cell!" - icon_state = "icell" - origin_tech = null - maxcharge = 30000 - g_amt = 80 - use() - return 1 - -/obj/item/weapon/cell/potato - name = "potato battery" - desc = "A rechargable starch based power cell." - origin_tech = "powerstorage=1" - icon = 'icons/obj/power.dmi' //'icons/obj/harvest.dmi' - icon_state = "potato_cell" //"potato_battery" - charge = 100 - maxcharge = 300 - m_amt = 0 - g_amt = 0 - minor_fault = 1 - -/obj/item/weapon/camera_bug/attack_self(mob/usr as mob) - var/list/cameras = new/list() - for (var/obj/machinery/camera/C in cameranet.cameras) - if (C.bugged && C.status) - cameras.Add(C) - if (length(cameras) == 0) - usr << "\red No bugged functioning cameras found." - return - - var/list/friendly_cameras = new/list() - - for (var/obj/machinery/camera/C in cameras) - friendly_cameras.Add(C.c_tag) - - var/target = input("Select the camera to observe", null) as null|anything in friendly_cameras - if (!target) - return - for (var/obj/machinery/camera/C in cameras) - if (C.c_tag == target) - target = C - break - if (usr.stat == 2) return - - usr.client.eye = target - + suicide_act(mob/user) + viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + return (OXYLOSS) /obj/item/weapon/module icon = 'icons/obj/module.dmi' @@ -1397,15 +471,6 @@ desc = "Charging circuits for power cells." -/obj/item/weapon/a_gift - name = "gift" - desc = "A gift it appears." - icon = 'icons/obj/items.dmi' - icon_state = "gift" - item_state = "gift" - pressure_resistance = 70 - - /obj/item/device/camera_bug name = "camera bug" icon = 'icons/obj/device.dmi' @@ -1415,240 +480,31 @@ throw_speed = 4 throw_range = 20 +/obj/item/weapon/camera_bug/attack_self(mob/usr as mob) + var/list/cameras = new/list() + for (var/obj/machinery/camera/C in cameranet.cameras) + if (C.bugged && C.status) + cameras.Add(C) + if (length(cameras) == 0) + usr << "\red No bugged functioning cameras found." + return -/obj/item/weapon/kitchen - icon = 'icons/obj/kitchen.dmi' + var/list/friendly_cameras = new/list() -/obj/item/weapon/kitchen/rollingpin - name = "rolling pin" - desc = "Used to knock out the Bartender." - icon_state = "rolling_pin" - force = 8.0 - throwforce = 10.0 - throw_speed = 2 - throw_range = 7 - w_class = 3.0 - attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway. + for (var/obj/machinery/camera/C in cameras) + friendly_cameras.Add(C.c_tag) -/obj/item/weapon/kitchenknife - 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 = FPRINT | TABLEPASS | CONDUCT - force = 10.0 - w_class = 3.0 - throwforce = 6.0 - throw_speed = 3 - throw_range = 6 - m_amt = 12000 - origin_tech = "materials=1" - attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharp = 1 + var/target = input("Select the camera to observe", null) as null|anything in friendly_cameras + if (!target) + return + for (var/obj/machinery/camera/C in cameras) + if (C.c_tag == target) + target = C + break + if (usr.stat == 2) return -/obj/item/weapon/kitchenknife/ritual - name = "ritual knife" - desc = "The unearthly energies that once powered this blade are now dormant." - icon = 'icons/obj/wizard.dmi' - icon_state = "render" + usr.client.eye = target -/obj/item/weapon/butch - name = "butcher's Cleaver" - icon = 'icons/obj/kitchen.dmi' - icon_state = "butch" - desc = "A huge thing used for chopping and chopping up meat." - flags = FPRINT | TABLEPASS | CONDUCT - force = 15.0 - w_class = 2.0 - throwforce = 8.0 - throw_speed = 3 - throw_range = 6 - m_amt = 12000 - origin_tech = "materials=1" - attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharp = 1 - -/obj/item/weapon/butch/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) - return ..() - -/obj/item/weapon/tray - name = "tray" - icon = 'icons/obj/food.dmi' - icon_state = "tray" - desc = "A metal tray to lay food on." - throwforce = 12.0 - throwforce = 10.0 - throw_speed = 1 - throw_range = 5 - w_class = 3.0 - flags = FPRINT | TABLEPASS | CONDUCT - m_amt = 3000 - /* // NOPE - var/food_total= 0 - var/burger_amt = 0 - var/cheese_amt = 0 - var/fries_amt = 0 - var/classyalcdrink_amt = 0 - var/alcdrink_amt = 0 - var/bottle_amt = 0 - var/soda_amt = 0 - var/carton_amt = 0 - var/pie_amt = 0 - var/meatbreadslice_amt = 0 - var/salad_amt = 0 - var/miscfood_amt = 0 - */ - var/list/carrying = list() // List of things on the tray. - Doohl - var/max_carry = 10 // w_class = 1 -- takes up 1 - // w_class = 2 -- takes up 3 - // w_class = 3 -- takes up 5 - - -/obj/item/weapon/kitchen/utensil - force = 5.0 - w_class = 1.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 5 - flags = FPRINT | TABLEPASS | CONDUCT - origin_tech = "materials=1" - attack_verb = list("attacked", "stabbed", "poked") - - -/obj/item/weapon/kitchen/utensil/fork - name = "fork" - desc = "Pointy." - icon_state = "fork" - -/obj/item/weapon/kitchen/utensil/knife - name = "knife" - desc = "Can cut through any food." - icon_state = "knife" - force = 10.0 - throwforce = 10.0 - sharp = 1 - -/obj/item/weapon/kitchen/utensil/spoon - name = "spoon" - desc = "SPOON!" - icon_state = "spoon" - attack_verb = list("attacked", "poked") - -/obj/item/weapon/scalpel - name = "scalpel" - desc = "Cut, cut, and once more cut." - icon = 'icons/obj/surgery.dmi' - icon_state = "scalpel" - flags = FPRINT | TABLEPASS | CONDUCT - force = 10.0 - w_class = 1.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 5 - m_amt = 10000 - g_amt = 5000 - origin_tech = "materials=1;biotech=1" - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - sharp = 1 - -/obj/item/weapon/scalpel/stabslash - name = "\proper Stabslash The Pains of Healing" - desc = "All craftsmanship is of highest quality. On it is image of doctor and patient. Doctor is panicing. Patien is asleep." - icon_state = "stabslash" - -/obj/item/weapon/retractor - name = "retractor" - desc = "Retracts stuff." - icon = 'icons/obj/surgery.dmi' - icon_state = "retractor" - m_amt = 10000 - g_amt = 5000 - flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - -/obj/item/weapon/hemostat - name = "hemostat" - desc = "You think you have seen this before." - icon = 'icons/obj/surgery.dmi' - icon_state = "hemostat" - m_amt = 5000 - g_amt = 2500 - flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - attack_verb = list("attacked", "pinched") - -/obj/item/weapon/cautery - name = "cautery" - desc = "This stops bleeding." - icon = 'icons/obj/surgery.dmi' - icon_state = "cautery" - m_amt = 5000 - g_amt = 2500 - flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - attack_verb = list("burnt") - -/obj/item/weapon/surgicaldrill - name = "surgical drill" - desc = "You can drill using this item. You dig?" - icon = 'icons/obj/surgery.dmi' - icon_state = "drill" - hitsound = 'sound/weapons/circsawhit.ogg' - m_amt = 15000 - g_amt = 10000 - flags = FPRINT | TABLEPASS | CONDUCT - force = 15.0 - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - attack_verb = list("drilled") - -/obj/item/weapon/circular_saw - name = "circular saw" - desc = "For heavy duty cutting." - icon = 'icons/obj/surgery.dmi' - icon_state = "saw3" - hitsound = 'sound/weapons/circsawhit.ogg' - flags = FPRINT | TABLEPASS | CONDUCT - force = 15.0 - w_class = 1.0 - throwforce = 9.0 - throw_speed = 3 - throw_range = 5 - m_amt = 20000 - g_amt = 10000 - origin_tech = "materials=1;biotech=1" - attack_verb = list("attacked", "slashed", "sawed", "cut") - sharp = 1 - -/obj/item/weapon/bonegel - name = "bone gel" - icon = 'surgery.dmi' - icon_state = "bone-gel" - force = 0 - throwforce = 1.0 - -/obj/item/weapon/FixOVein - name = "FixOVein" - icon = 'surgery.dmi' - icon_state = "fixovein" - force = 0 - throwforce = 1.0 - origin_tech = "materials=1;biotech=3" - var/usage_amount = 10 - -/obj/item/weapon/bonesetter - name = "bone setter" - icon = 'surgery.dmi' - icon_state = "bone setter" - force = 8.0 - throwforce = 9.0 - throw_speed = 3 - throw_range = 5 - attack_verb = list("attacked", "hit", "bludgeoned") /obj/item/weapon/syntiflesh name = "syntiflesh" @@ -1678,6 +534,27 @@ playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return ..() +/obj/item/weapon/scythe + icon_state = "scythe0" + name = "scythe" + desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." + force = 13.0 + throwforce = 5.0 + throw_speed = 1 + throw_range = 3 + w_class = 4.0 + flags = FPRINT | TABLEPASS | NOSHIELD + slot_flags = SLOT_BACK + origin_tech = "materials=2;combat=2" + attack_verb = list("chopped", "sliced", "cut", "reaped") + +/obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob) + if(istype(A, /obj/effect/spacevine)) + for(var/obj/effect/spacevine/B in orange(A,1)) + if(prob(80)) + del B + del A + /* /obj/item/weapon/cigarpacket name = "Pete's Cuban Cigars" @@ -1793,7 +670,7 @@ /obj/item/weapon/stock_parts/manipulator/nano name = "nano-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." - icon_state = "micro_mani" + icon_state = "nano_mani" origin_tech = "materials=3,programming=2" rating = 2 m_amt = 30 @@ -1801,7 +678,7 @@ /obj/item/weapon/stock_parts/micro_laser/high name = "high-power micro-laser" desc = "A tiny laser used in certain devices." - icon_state = "micro_laser" + icon_state = "high_micro_laser" origin_tech = "magnets=3" rating = 2 m_amt = 10 @@ -1810,7 +687,7 @@ /obj/item/weapon/stock_parts/matter_bin/adv name = "advanced matter bin" desc = "A container for hold compressed matter awaiting re-construction." - icon_state = "matter_bin" + icon_state = "advanced_matter_bin" origin_tech = "materials=3" rating = 2 m_amt = 80 @@ -1836,12 +713,14 @@ /obj/item/weapon/stock_parts/manipulator/pico name = "pico-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." + icon_state = "pico_mani" origin_tech = "materials=5,programming=2" rating = 3 m_amt = 30 /obj/item/weapon/stock_parts/micro_laser/ultra name = "ultra-high-power micro-laser" + icon_state = "ultra_high_micro_laser" desc = "A tiny laser used in certain devices." origin_tech = "magnets=5" rating = 3 @@ -1851,6 +730,7 @@ /obj/item/weapon/stock_parts/matter_bin/super name = "super matter bin" desc = "A container for hold compressed matter awaiting re-construction." + icon_state = "super_matter_bin" origin_tech = "materials=5" rating = 3 m_amt = 80 @@ -1924,17 +804,3 @@ icon_state = "capacitor" desc = "A debug item for research." origin_tech = "materials=8;programming=8;magnets=8;powerstorage=8;bluespace=8;combat=8;biotech=8;syndicate=8" - -/obj/item/weapon/autopsy_scanner - name = "autopsy scanner" - desc = "Extracts information on wounds." - icon = 'icons/obj/autopsy_scanner.dmi' - icon_state = "" - flags = FPRINT | TABLEPASS | CONDUCT - w_class = 1.0 - origin_tech = "materials=1;biotech=1" - -/obj/item/weapon/autopsy_scanner/var/list/datum/autopsy_data_scanner/wdata = list() -/obj/item/weapon/autopsy_scanner/var/list/datum/autopsy_data_scanner/chemtraces = list() -/obj/item/weapon/autopsy_scanner/var/target_name = null -/obj/item/weapon/autopsy_scanner/var/timeofdeath = null diff --git a/code/defines/procs/command_alert.dm b/code/defines/procs/command_alert.dm index d7a97fe2547..6545307fa1a 100644 --- a/code/defines/procs/command_alert.dm +++ b/code/defines/procs/command_alert.dm @@ -1,9 +1,11 @@ -/proc/command_alert(var/text, var/title = "", var/maintitle = "NanoTrasen Update") - world << "
[maintitle]
" - +/proc/command_alert(var/text, var/title = "") + var/command + command += "[command_name()] Update
" if (title && length(title) > 0) - world << "[html_encode(title)]
" - - world << "[html_encode(text)]" - world << "" + command += "
[html_encode(title)]
" + command += "[html_encode(text)]
" + command += "
" + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << command diff --git a/code/defines/sd_procs/atom.dm b/code/defines/sd_procs/atom.dm deleted file mode 100644 index 54cbe0ff1d5..00000000000 --- a/code/defines/sd_procs/atom.dm +++ /dev/null @@ -1,32 +0,0 @@ -/* Atom procs - These procs expand on the basic built in procs. - - Bumped(O) - Automatically called whenever a movable atom O Bump()s into src. - Proc protype designed to be overridden for specific objects. - - Trigger(O) - Automatically called whenever a movable atom O steps into the same - turf with src. - Proc protype designed to be overridden for specific objects. -*/ - -atom - proc - Bumped(O) - // O just Bump()ed into src. - // prototype Bumped() proc for all atoms - Trigger(O) - -atom/movable - - Bump(atom/A) - if(istype(A)) A.Bumped(src) // tell A that src bumped into it - ..() - -turf - Entered(atom/O) - for(var/atom/A in contents - O) - if(O) - O.Trigger(A) - ..() \ No newline at end of file diff --git a/code/defines/sd_procs/base64.dm b/code/defines/sd_procs/base64.dm deleted file mode 100644 index c285142ca0c..00000000000 --- a/code/defines/sd_procs/base64.dm +++ /dev/null @@ -1,131 +0,0 @@ -//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 - -/* base 64 procs - These procs convert plain text to a hexidecimal string to 64 encoded text and vice versa. - - sd_base64toHex(encode64, pad_code = 67) - Accepts a base 64 encoded text and returns the hexidecimal equivalent. - ARGS: - encode64 = the base64 text to convert - pad_code = the character or ASCII code used to pad the base64 text. - DEFAULT: 67 (= sign) - RETURNS: the hexidecimal text - - sd_hex2base64(hextext, pad_char = "=") - Accepts a hexidecimal string and returns the base 64 encoded text equivalent. - ARGS: - hextext = hex text to convert - pad_char = the character or ASCII code used to pad the base64 text. - DEFAULT: "=" (ASCII 67) - RETURNS: the base64 text - - sd_hex2text(hex) - Accepts a hexidecimal string and returns the plain text equivalent. - - sd_text2hex(txt) - Accepts a plain text string and returns the hexidecimal equivalent. -*/ - -/********************************************* -* Implimentation: No need to read further. * -*********************************************/ -proc - sd_base64toHex(encode64, pad_code = 67) - /* convert the base 64 text encode64 to hexidecimal text - pad_code = the character or ASCII code used to pad the base64 text. - DEFAULT: 67 (= sign) - RETURNS: the hexidecimal text */ - var/pos = 1 - var/offset = 2 - var/current = 0 - var/padding = 0 - var/hextext = "" - if(istext(pad_code)) pad_code = text2ascii(pad_code) - while(pos <= length(encode64)) - var/val = text2ascii(encode64, pos++) - if((val >= 65) && (val <= 90)) // A to Z - val -= 65 - else if((val >= 97) && (val <= 122)) // a to z - val -= 71 - else if((val >= 48) && (val <= 57)) // 0 to 9 - val += 4 - else if(val == 43) // + sign - val = 62 - else if(val == 47) // / symbol - val = 63 - else if(pad_code) // padding - // the = sign indicates that some 0 bits were appended to pad the original string to - val = -1 - padding ++ - else // anything else (presumably whitespace) - val = -1 - if(val < 0) continue // whitespace and padding ignored - - if(offset>2) - var/lft = val >> (8 - offset) - current |= lft - hextext += sd_dec2base(current,,2) - - current = (val << offset) & 0xFF - - offset += 2 - if(offset > 8) - offset = 2 - - if(padding) - hextext = copytext(hextext, 1, length(hextext) + 1 - padding * 2) - return hextext - - sd_hex2base64(hextext, pad_char = "=") - /* convert the hexidecimal string hextext to base 64 encoded text - pad_char = the character or ASCII code used to pad the base64 text. - DEFAULT: "=" (ASCII 67) - RETURNS: the base 64 encoded text */ - var/key64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" - var/encode64 = "" - var/pos = 1 - var/offset = 2 - var/current = 0 - var/len = length(hextext) - var/end = len - var/padding = end%6 - if(padding) - padding = 6 - padding - end += padding - padding >>= 1 - if(isnum(pad_char)) pad_char = ascii2text(pad_char) - while(pos <= end) - var/val = 0 // pad with 0s - if(pos < len) val = sd_base2dec(copytext(hextext, pos, pos+2)) - pos+=2 - - var/lft = val >> offset - current |= lft - encode64 += copytext(key64,current+1,current+2) - - current = (val << (6-offset)) & 0x3F - - offset += 2 - if(offset>6) - encode64 += copytext(key64,current+1,current+2) - offset = 2 - current = 0 - for(var/x = 1 to padding) - encode64 += pad_char - return encode64 - - sd_hex2text(hex) - /* convert hexidecimal text to a plain text string - RETURNS: the plain text */ - var/txt = "" - for(var/loop = 1 to length(hex) step 2) - txt += ascii2text(sd_base2dec(copytext(hex,loop, loop+2))) - return txt - - sd_text2hex(txt) - /* convert plain text to a hexidecimal string - RETURNS: the hexidecimal text */ - var/hex = "" - for(var/loop = 1 to length(txt)) - hex += sd_dec2base(text2ascii(txt,loop),,2) - return hex diff --git a/code/defines/sd_procs/color.dm b/code/defines/sd_procs/color.dm deleted file mode 100644 index 205ebecd3f7..00000000000 --- a/code/defines/sd_procs/color.dm +++ /dev/null @@ -1,75 +0,0 @@ -//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 - -/* sd_color and procs - sd_color is a special datum that contains color data in various - formats. Sample colors are available in samplecolors.dm. - -sd_color - var/name // the name of the color - var/red // red componant of the color - var/green // green componant of the color - var/blue // red componant of the color - var/html // html string for the color - var/icon/Icon // contains the icon produced by the rgb2icon() proc - - PROCS - brightness() - Returns the grayscale brightness of the RGB color set. - - html2rgb() - Calculates the rgb colors from the html colors. - - rgb2html() - Calculates the html color from the rbg colors. - - rgb2icon() - Converts the rgb value to a solid icon stored as src.Icon - -*/ - -/********************************************* -* Implimentation: No need to read further. * -*********************************************/ -sd_color - var/name // the name of the color - var/red = 0 // red componant of the color - var/green = 0 // green componant of the color - var/blue = 0 // red componant of the color - var/html // html string for the color - var/icon/Icon // contains the icon produced by the rgb2icon() proc - - proc - brightness() - /* returns the grayscale brightness of the RGB colors. */ - return round((red*30 + green*59 + blue*11)/100,1) - - html2rgb() - /* Calculates the rgb colors from the html colors */ - red = sd_base2dec(copytext(html,1,3)) - green = sd_base2dec(copytext(html,3,5)) - blue = sd_base2dec(copytext(html,5,7)) - - rgb2html() - /* Calculates the html color from the rbg colors */ - html = sd_dec2base(red,,2) + sd_dec2base(green,,2) + sd_dec2base(blue,,2) - return html - - rgb2icon() - /* Converts the rgb value to a solid icon stored as src.Icon */ - Icon = 'Black.dmi' + rgb(red,green,blue) - return Icon - - New() - ..() - // if this is an unnamed subtype, name it according to it's type - if(!name) - name = "[type]" - var/slash = sd_findlast(name,"/") - if(slash) - name = copytext(name,slash+1) - name = sd_replacetext(name,"_"," ") - - if(html) // if there is an html string - html2rgb() // convert the html to red, green, & blue values - else - rgb2html() // convert the red, green, & blue values to html diff --git a/code/defines/sd_procs/constants.dm b/code/defines/sd_procs/constants.dm deleted file mode 100644 index bb3664aabbc..00000000000 --- a/code/defines/sd_procs/constants.dm +++ /dev/null @@ -1 +0,0 @@ -#define PI 3.141592654 diff --git a/code/defines/sd_procs/direction.dm b/code/defines/sd_procs/direction.dm deleted file mode 100644 index 45a38173fd4..00000000000 --- a/code/defines/sd_procs/direction.dm +++ /dev/null @@ -1,154 +0,0 @@ -/* Direction procs - These procs deal with BYOND directions. - - sd_get_approx_dir(atom/ref,atom/target) - returns the approximate direction from ref to target. - - sd_degrees2dir(degrees as num) - Accepts an angle in degrees and returns the closest BYOND - direction value. - - sd_dir2degrees(dir as num) - Accepts a BYOND direction value and returns the angle North of - East in degrees. - - sd_dir2radial(dir as num) - Accepts a BYOND direction value and returns the radial direction - (0-7) North of East. - - sd_dir2radians(dir as num) - Accepts a BYOND direction value and returns the angle North of - East in radians. - - sd_dir2text(dir as num) - Accepts a BYOND direction value and returns the lowercase text - name of the direction. - - sd_dir2Text(dir as num) - Accepts a BYOND direction value and returns the Capitalized text - name of the direction - - sd_radial2dir(radial as num) - Accepts a radial direction (0-7) and returns the BYOND direction - value. -*/ - -/********************************************* -* Implimentation: No need to read further. * -*********************************************/ -proc - sd_get_approx_dir(atom/ref,atom/target) - /* returns the approximate direction from ref to target. - Code by Lummox JR - http://www.byond.com/forum/forum.cgi?action=message_list&query=Post+ID%3A153964#153964 - */ - var/d=get_dir(ref,target) - if(d&d-1) // diagonal - var/ax=abs(ref.x-target.x) - var/ay=abs(ref.y-target.y) - if(ax>=ay<<1) return d&12 // keep east/west (4 and 8) - else if(ay>=ax<<1) return d&3 // keep north/south (1 and 2) - return d - - sd_degrees2dir(degrees as num) - /* accepts an angle in degrees and returns the closest BYOND - direction value */ - var/error_report = degrees // for error tracking - - // force angle into a range between 0 and 360 - degrees %= 360 - if(degrees < 0) - degrees += 360 - - // BYOND dirs are at 45 degree angles - degrees = round(degrees,45) - - switch(degrees) - if(0,360) return EAST - if(45) return NORTHEAST - if(90) return NORTH - if(135) return NORTHWEST - if(180) return WEST - if(225) return SOUTHWEST - if(270) return SOUTH - if(315) return SOUTHEAST - else - world.log << "Error in sd_degrees2dir(): [error_report] -> [degrees]" - - sd_dir2degrees(dir as num) - /* accepts a BYOND direction value and returns the angle North of - East in degrees */ - switch(dir) - if(EAST) return 0 - if(NORTHEAST) return 45 - if(NORTH) return 90 - if(NORTHWEST) return 135 - if(WEST) return 180 - if(SOUTHWEST) return 225 - if(SOUTH) return 270 - if(SOUTHEAST) return 315 - - sd_dir2radial(dir as num) - /* accepts a BYOND direction value and returns the radial direction - (0-7) North of East */ - switch(dir) - if(EAST) return 0 - if(NORTHEAST) return 1 - if(NORTH) return 2 - if(NORTHWEST) return 3 - if(WEST) return 4 - if(SOUTHWEST) return 5 - if(SOUTH) return 6 - if(SOUTHEAST) return 7 - - sd_dir2radians(dir as num) - /* accepts a BYOND direction value and returns the angle North of - East in radians */ - switch(dir) - if(EAST) return 0 - if(NORTHEAST) return PI/4 - if(NORTH) return PI/2 - if(NORTHWEST) return PI*3/4 - if(WEST) return PI - if(SOUTHWEST) return PI*5/4 - if(SOUTH) return PI*3/2 - if(SOUTHEAST) return PI*7/4 - - sd_dir2text(dir as num) - /* accepts a direction and returns the lowercase text name of - the direction */ - switch(dir) - if(NORTH) return "north" - if(SOUTH) return "south" - if(EAST) return "east" - if(WEST) return "west" - if(NORTHEAST) return "northeast" - if(SOUTHEAST) return "southeast" - if(NORTHWEST) return "northwest" - if(SOUTHWEST) return "southwest" - - sd_dir2Text(dir as num) - /* accepts a direction and returns the Capitalized text name of - the direction */ - switch(dir) - if(NORTH) return "North" - if(SOUTH) return "South" - if(EAST) return "East" - if(WEST) return "West" - if(NORTHEAST) return "Northeast" - if(SOUTHEAST) return "Southeast" - if(NORTHWEST) return "Northwest" - if(SOUTHWEST) return "Southwest" - - sd_radial2dir(radial as num) - /* accepts a radial direction (0-7) and returns the BYOND direction - value */ - switch(radial) - if(0) return EAST - if(1) return NORTHEAST - if(2) return NORTH - if(3) return NORTHWEST - if(4) return WEST - if(5) return SOUTHWEST - if(6) return SOUTH - if(7) return SOUTHEAST diff --git a/code/defines/sd_procs/hsl.dm b/code/defines/sd_procs/hsl.dm deleted file mode 100644 index 7bea3d52807..00000000000 --- a/code/defines/sd_procs/hsl.dm +++ /dev/null @@ -1,185 +0,0 @@ -//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 - -/* HSL procs - These procs convert between RGB (red, green, blu) and HSL (hue, saturation, light) - color spaces. The algorithms used for these procs were found at - http://www.paris-pc-gis.com/MI_Enviro/Colors/color_models.htm - - hsl2rgb(hue, sat, lgh, scale = 240) - Returns the RRGGBB format of an HSL color. - - ALTERNATE FORMAT: - hsl2rgb(HSL, scale) - ARGS: - hue - hue - sat - saturation - lgh - light/dark - HSL - a hex string in format HHSSLL where: - HH = Hue from - SS = Saturation - LL = light - scale - high end of the HSL values. Some programs (like BYOND Dream Maker) - use 240, others use 255. The H {0-360}, S {0-100}, L {0-100} - scale is not supported. - DEFAULT: 240 - RETURNS: - RGB color string in RRGGBB format. - - rgb2hsl(red, grn, blu, scale = 240) - Returns the HSL color string of an RGB color - - ALTERNATE FORMAT: - rgb2hsl(RGB, scale) - ARGS: - red - red componant {0-255} - grn - green componant {0-255} - blu - blue componant {0-255} - RGB - a hex string in format RRGGBB - scale - high end of the HSL values. Some programs (like BYOND Dream Maker) - use 240, others use 255. The H {0-360}, S {0-100}, L {0-100} - scale is not supported. - DEFAULT: 240 - RETURNS: - HHSSLL color string -*/ - -/********************************************* -* Implimentation: No need to read further. * -*********************************************/ - -proc - hsl2rgb(hue, sat, lgh, scale = 240) - /* Returns the RRGGBB format of an HSL color string - algorithm from http://www.paris-pc-gis.com/MI_Enviro/Colors/color_models.htm - ALTERNATE FORMAT: - hsl2rgb(HSL, scale) - ARGS: - hue - hue - sat - saturation - lgh - light/dark - HSL - a hex string in format HHSSLL where: - HH = Hue from - SS = Saturation - LL = light - scale - high end of the HSL values. Some programs (like BYOND Dream Maker) - use 240, others use 255. The H {0-360}, S {0-100}, L {0-100} - scale is not supported. - DEFAULT: 240 - RETURNS: - RGB color string in RRGGBB format. */ - - if(istext(hue)) // used alternate hsl2rgb("HHSSLL", scale) - if(length(hue)!=6) - CRASH("hsl2rbg('[hue]'): text argument must be a 6 character hex code.") - return - if(isnum(sat)) scale = sat - lgh = sd_base2dec(copytext(hue,5)) - sat = sd_base2dec(copytext(hue,3,5)) - hue = sd_base2dec(copytext(hue,1,3)) - - // scale decimal {0-1} - hue /= scale - sat /= scale - lgh /= scale - - var/red - var/grn - var/blu - - if(!sat) // greyscale - red = lgh - grn = lgh - blu = lgh - else - var/temp1 - var/temp2 - var/temp3 - if(lgh < 0.5) temp2 = lgh * (1 + sat) - else temp2 = lgh + sat - lgh * sat - temp1 = 2 * lgh - temp2 - - // red - temp3 = hue + 1/3 - if(temp3 > 1) temp3-- - if(6*temp3<1) red = temp1 + (temp2 - temp1) * 6 * temp3 - else if(2*temp3<1) red = temp2 - else if(3*temp3<2) red = temp1 + (temp2 - temp1) * ((2/3) - temp3) * 6 - else red = temp1 - - // green - temp3 = hue - if(6*temp3<1) grn = temp1 + (temp2 - temp1) * 6 * temp3 - else if(2*temp3<1) grn = temp2 - else if(3*temp3<2) grn = temp1 + (temp2 - temp1) * ((2/3) - temp3) * 6 - else grn = temp1 - - // blue - temp3 = hue - 1/3 - if(temp3 < 0) temp3++ - if(6*temp3<1) blu = temp1 + (temp2 - temp1) * 6 * temp3 - else if(2*temp3<1) blu = temp2 - else if(3*temp3<2) blu = temp1 + (temp2 - temp1) * ((2/3) - temp3) * 6 - else blu = temp1 - - // shift from {0-1} scale to integers {0-255} - red = round(red*255, 1) - grn = round(grn*255, 1) - blu = round(blu*255, 1) - - // return 6 digit hex string - return sd_dec2base(red,16, 2) + sd_dec2base(grn,16, 2) + sd_dec2base(blu,16, 2) - - - rgb2hsl(red, grn, blu, scale = 240) - /* Returns the HSL color string of a RGB color - algorithm from http://www.paris-pc-gis.com/MI_Enviro/Colors/color_models.htm - ALTERNATE FORMAT: - rgb2hsl(RGB, scale) - ARGS: - red - red componant {0-255} - grn - green componant {0-255} - blu - blue componant {0-255} - RGB - a hex string in format RRGGBB - scale - high end of the HSL values. Some programs (like BYOND Dream Maker) - use 240, others use 255. The H {0-360}, S {0-100}, L {0-100} - scale is not supported. - DEFAULT: 240 - RETURNS: - HHSSLL color string */ - - if(istext(red)) // used alternate rgb2hsl("RRGGBB", scale) format - if(length(red)!=6) - CRASH("rbg2hsl('[red]'): text argument must be a 6 character hex code.") - return - if(isnum(grn)) scale = grn - blu = sd_base2dec(copytext(red,5)) - grn = sd_base2dec(copytext(red,3,5)) - red = sd_base2dec(copytext(red,1,3)) - - // scale decimal {0-1} - red /= 255 - grn /= 255 - blu /= 255 - var/lo = min(red, grn, blu) - var/hi = max(red, grn, blu) - var/hue = 0 - var/sat = 0 - var/lgh = (lo + hi)/2 - - if(lo != hi) // if equal, hue and sat may both stay 0 - if(lgh < 0.5) sat = (hi - lo) / (hi + lo) - else sat = (hi - lo) / (2 - hi - lo) - // produce hue as value from 0-6 - if(red == hi) hue = (grn - blu) / (hi - lo) - else if(grn == hi) hue = 2 + (blu - red) / (hi - lo) - else hue = 4 + (red - grn) / (hi - lo) - if(hue<0) hue += 6 - - // convert decimal {0-1} to integer {0-scale} - lgh = round(lgh * scale, 1) - sat = round(sat * scale, 1) - // convert hue as decimal 0-6 to integer {0-scale} - hue = round((hue / 6) * scale, 1) - - // return 6 digit hex string - return sd_dec2base(hue,16, 2) + sd_dec2base(sat,16, 2) + sd_dec2base(lgh,16, 2) diff --git a/code/defines/sd_procs/math.dm b/code/defines/sd_procs/math.dm deleted file mode 100644 index cd3f4ea6ce3..00000000000 --- a/code/defines/sd_procs/math.dm +++ /dev/null @@ -1,117 +0,0 @@ -/* Math procs - These procs contain basic math routines. - - sd_base2dec(number as text, base = 16 as num) - Accepts a number in any base (2 to 36) and returns the equivelent - value in decimal. - ARGS: - number - number to convert as a text string - base - number base - RETURNS: - decimal value of the number - - sd_dec2base(decimal,base = 16 as num,digits = 0 as num) - Accepts a decimal number and returns the equivelent value in the - new base as a string. - ARGS: - decimal - number to convert - base - new number base - digits - if output is less than digits, it will add - preceeding 0s to pad it out - RETURNS: - equivelent value in the new base as a string - - sd_get_dist(atom/A, atom/B) - Returns the mathematical 3D distance between two atoms. - - sd_get_dist_squared(atom/A, atom/B) - Returns the square of the mathematical 3D distance between two atoms. (More processor - friendly than sd_get_dist() and useful for modelling realworld physics.) -*/ - -/********************************************* -* Implimentation: No need to read further. * -*********************************************/ -proc - sd_base2dec(number as text, base = 16 as num) - /* Accepts a number in any base (2 to 36) and returns the equivelent - value in decimal. - ARGS: - number - number to convert as a text string - base - number base - RETURNS: - decimal value of the number - */ - if(!istext(number)) - world.log << "sd_base2dec: invalid number string- [number]" - return null - if(!isnum(base) || (base < 2) || (base > 36)) - world.log << "sd_base2dec: invalid base - [base]" - return null - - var/decimal = 0 - number = uppertext(number) - - for(var/loop = 1, loop <= lentext(number)) - var/digit = copytext(number,loop,++loop) - if((digit >= "0") && (digit <= "9")) - decimal = decimal * base + text2num(digit) - else if((digit >= "A") && (digit <= "Z")) - decimal = decimal * base + (text2ascii(digit) - 55) - else - break // terminate when it encounters an invalid character - - return decimal - - - sd_dec2base(decimal,base = 16 as num,digits = 0 as num) - /* Accepts a decimal number and returns the equivelent value in the - new base as a string. - ARGS: - decimal - number to convert - base - new number base - digits - if output is less than digits, it will add - preceeding 0s to pad it out - RETURNS: - equivelent value in the new base as a string - */ - if(istext(decimal)) decimal = text2num(decimal) - decimal = round(decimal) - if(!isnum(decimal) || (decimal < 0)) - world.log << "sd_dec2base: invalid decimal number - [decimal]" - return null - if(!isnum(base) || (base < 2) || (base > 36)) - world.log << "sd_dec2base: invalid base - [base]" - return null - - var/text = "" - if(!decimal) text = "0" - while(decimal) - var/n = decimal%base - if(n<10) - text = num2text(n) + text - else - text = ascii2text(55+n) + text - - decimal = (decimal - n)/base - - while(lentext(text) < digits) - text = "0" + text - - return text - - - sd_get_dist(atom/A, atom/B) - /* Returns the mathematical 3D distance between two atoms. */ - var/X = (A.x - B.x) - var/Y = (A.y - B.y) - var/Z = (A.z - B.z) - return sqrt(X * X + Y * Y + Z * Z) - - sd_get_dist_squared(atom/A, atom/B) - /* Returns the square of the mathematical 3D distance between two atoms. (More processor - friendly than sd_get_dist() and useful for modelling realworld physics.) */ - var/X = (A.x - B.x) - var/Y = (A.y - B.y) - var/Z = (A.z - B.z) - return X * X + Y * Y + Z * Z diff --git a/code/defines/sd_procs/nybble.dm b/code/defines/sd_procs/nybble.dm deleted file mode 100644 index eca85c49ec7..00000000000 --- a/code/defines/sd_procs/nybble.dm +++ /dev/null @@ -1,140 +0,0 @@ -/* Nybble Colors - Nybble colors is used to compact RGB colors to "nybble" (4 bits, 1 hex - digit, or decimal numbers 0 to 15.) Since BYOND allows up to 16 bits in - bitwise mathematics, you could store up to 4 color values in a single - number. (The project inspiring these procs stores a foreground nybble - color, background nybble color, and 8 bit text character in each 16 bit - number.) - - The value of each bit is: - Bit: 4 3 2 1 - Component: Intensity Red Green Blue - - Nybble color values are: - Dec Hex Bin Color - 0 0 0000 null color. See the note below. - 1 1 0001 dark blue (navy) - 2 2 0010 dark green - 3 3 0011 dark cyan - 4 4 0100 dark red - 5 5 0101 dark magenta - 6 6 0110 brown - 7 7 0111 grey - 8 8 1000 black - 9 9 1001 blue - 10 A 1010 green - 11 B 1011 cyan - 12 C 1100 red - 13 D 1101 magenta - 14 E 1110 yellow - 15 F 1111 white - - Null color note: rgb2nybble() will return a value of 8 for black, so - that you may use 0 value nybbles for special cases in your own code. - For example, in the project that inspired these procs, color 0 - indicates the default background, which is a textured image. - nybble2rgb() will convert values of 0 or 8 to "000000" (or "000" if - you specify short rgb.) - -PROCS - sd_nybble2rgb(original, bit = 8, short = 0) - Converts a nybble color to an RGB hex color string. - ARGS: - value - the number containing the nibble - bit - the MSB (most significant bit) of the nybble. The - default value of 8 uses the lowest 4 bits of original. - DEFAULT: 8 - short - short RGB flag. If this is set, the proc returns a - 3 character RGB string. Otherwise it returns a 6 - character RGB string. - DEFAULT: 0 (return 6 characters) - RETURNS: - A 3 or 6 character hexidecimal RGB color string. - - sd_rgb2nybble(rgb, bit = 8) - Converts an rgb color string to a nybble color. - ARGS: - rgb - The color string to be converted. This may be a 3 or 6 - character color code with or without a leading "#". - Examples: "000", "000000", "#000", "#000000" all - indicate black. - bit - the MSB (most significant bit) of the nybble. You can - use this to shift the position of your nybble within - the return value. The default value of 8 uses the - lowest 4 bits. - DEFAULT: 8 - RETURNS: - A nybble color value or null if the proc failed. -*/ - -/********************************************* -* Implimentation: No need to read further. * -*********************************************/ -proc - sd_nybble2rgb(original, bit = 8, short = 0) - /* Converts a nybble color to an RGB hex color string. - ARGS: - value - the number containing the nibble - bit - the MSB (most significant bit) of the nybble. The - default value of 8 uses the lowest 4 bits of original. - DEFAULT: 8 - short - short RGB flag. If this is set, the proc returns a - 3 character RGB string. Otherwise it returns a 6 - character RGB string. - DEFAULT: 0 (return 6 characters) - RETURNS: - A 3 or 6 character hexidecimal RGB color string. */ - var {intensity = "9"; off = "0"} - if(original & bit) intensity = "F" - if(!short) - intensity += intensity - off = "00" - . = "" - for(var/loop = 1 to 3) - bit >>= 1 - if(original & bit) . += intensity - else . += off - if(. == "990") . = "940" - else if(. == "999900") . = "994400" - if(intensity == "F" && . == "000000") . = "00FF99" - - sd_rgb2nybble(rgb, bit = 8) - /* Converts an rgb color string to a nybble color. - ARGS: - rgb - The color string to be converted. This may be a 3 or 6 - character color code with or without a leading "#". - Examples: "000", "000000", "#000", "#000000" all - indicate black. - bit - the MSB (most significant bit) of the nybble. You can - use this to shift the position of your nybble within - the return value. The default value of 8 uses the - lowest 4 bits. - DEFAULT: 8 - RETURNS: - A nybble color value or null if the proc failed. */ - if(!istext(rgb)) return - if(text2ascii(rgb) == 35) // leading "#" - rgb = copytext(rgb,2) - var{char; cmp[3]; cmp_size; hi = 0; loop; pos = 1} - switch(length(rgb)) - if(3) cmp_size = 1 - if(6) cmp_size = 2 - else return - for(loop = 1 to 3) - char = copytext(rgb, pos, pos+1) - // char 0 to 3 => 0, 4 to 9 => 1, A to F => 2 - // cmp[loop] = round(sd_base2dec(char, 16) * 0.15, 1) - // previous line takes over twice as long as switch() method below - switch(char) - if("0", "1", "2", "3") cmp[loop] = 0 - if("4", "5", "6", "7", "8", "9") cmp[loop] = 1 - else cmp[loop] = 2 - if(cmp[loop] > hi) hi = cmp[loop] - pos += cmp_size - switch(hi) - if(0) return bit // color 8: black - if(2) . = bit // high intensity - else . = 0 // low intensity - for(loop = 1 to 3) - bit >>= 1 - if(cmp[loop] == hi) . |= bit diff --git a/code/defines/sd_procs/samplecolors.dm b/code/defines/sd_procs/samplecolors.dm deleted file mode 100644 index 96a6bebebdb..00000000000 --- a/code/defines/sd_procs/samplecolors.dm +++ /dev/null @@ -1,310 +0,0 @@ -/* Sample sd_colors. This file will not automatically be included in your - projects, since you may want to define them differently. - -Colors can be defined by rgb values: - sd_color/blue - red = 0 - green = 0 - blue = 255 - -Colors can be defined by HTML values: - sd_color/green - html = "00FF00" - -Colors can be defined by just overriding selective rgb values: - sd_color/red - red = 255 - magenta - // still has red = 255, since it is a child of red - blue = 255 -*/ - -/****************************************************** -* Here 142 colors you might like to use from * -* http://www.w3schools.com/html/html_colornames.asp * -******************************************************/ -sd_color - AliceBlue - html = "F0F8FF" - AntiqueWhite - html = "FAEBD7" - Aqua - html = "00FFFF" - Aquamarine - html = "7FFFD4" - Azure - html = "F0FFFF" - Beige - html = "F5F5DC" - Bisque - html = "FFE4C4" - Black - html = "000000" - BlanchedAlmond - html = "FFEBCD" - Blue - html = "0000FF" - BlueViolet - html = "8A2BE2" - Brown - html = "A52A2A" - BurlyWood - html = "DEB887" - CadetBlue - html = "5F9EA0" - Chartreuse - html = "7FFF00" - Chocolate - html = "D2691E" - Coral - html = "FF7F50" - CornflowerBlue - html = "6495ED" - Cornsilk - html = "FFF8DC" - Crimson - html = "DC143C" - Cyan - html = "00FFFF" - DarkBlue - html = "00008B" - DarkCyan - html = "008B8B" - DarkGoldenRod - html = "B8860B" - DarkGray - html = "A9A9A9" - DarkGreen - html = "006400" - DarkKhaki - html = "BDB76B" - DarkMagenta - html = "8B008B" - DarkOliveGreen - html = "556B2F" - Darkorange - html = "FF8C00" - DarkOrchid - html = "9932CC" - DarkRed - html = "8B0000" - DarkSalmon - html = "E9967A" - DarkSeaGreen - html = "8FBC8F" - DarkSlateBlue - html = "483D8B" - DarkSlateGray - html = "2F4F4F" - DarkTurquoise - html = "00CED1" - DarkViolet - html = "9400D3" - DeepPink - html = "FF1493" - DeepSkyBlue - html = "00BFFF" - DimGray - html = "696969" - DodgerBlue - html = "1E90FF" - FireBrick - html = "B22222" - FloralWhite - html = "FFFAF0" - ForestGreen - html = "228B22" - Fuchsia - html = "FF00FF" - Gainsboro - html = "DCDCDC" - GhostWhite - html = "F8F8FF" - Gold - html = "FFD700" - GoldenRod - html = "DAA520" - Gray - html = "808080" - Green - html = "008000" - GreenYellow - html = "ADFF2F" - HoneyDew - html = "F0FFF0" - HotPink - html = "FF69B4" - IndianRed - html = "CD5C5C" - Indigo - html = "4B0082" - Ivory - html = "FFFFF0" - Khaki - html = "F0E68C" - Lavender - html = "E6E6FA" - LavenderBlush - html = "FFF0F5" - LawnGreen - html = "7CFC00" - LemonChiffon - html = "FFFACD" - LightBlue - html = "ADD8E6" - LightCoral - html = "F08080" - LightCyan - html = "E0FFFF" - LightGoldenRodYellow - html = "FAFAD2" - LightGrey - html = "D3D3D3" - LightGreen - html = "90EE90" - LightPink - html = "FFB6C1" - LightSalmon - html = "FFA07A" - LightSeaGreen - html = "20B2AA" - LightSkyBlue - html = "87CEFA" - LightSlateBlue - html = "8470FF" - LightSlateGray - html = "778899" - LightSteelBlue - html = "B0C4DE" - LightYellow - html = "FFFFE0" - Lime - html = "00FF00" - LimeGreen - html = "32CD32" - Linen - html = "FAF0E6" - Magenta - html = "FF00FF" - Maroon - html = "800000" - MediumAquaMarine - html = "66CDAA" - MediumBlue - html = "0000CD" - MediumOrchid - html = "BA55D3" - MediumPurple - html = "9370D8" - MediumSeaGreen - html = "3CB371" - MediumSlateBlue - html = "7B68EE" - MediumSpringGreen - html = "00FA9A" - MediumTurquoise - html = "48D1CC" - MediumVioletRed - html = "C71585" - MidnightBlue - html = "191970" - MintCream - html = "F5FFFA" - MistyRose - html = "FFE4E1" - Moccasin - html = "FFE4B5" - NavajoWhite - html = "FFDEAD" - Navy - html = "000080" - OldLace - html = "FDF5E6" - Olive - html = "808000" - OliveDrab - html = "6B8E23" - Orange - html = "FFA500" - OrangeRed - html = "FF4500" - Orchid - html = "DA70D6" - PaleGoldenRod - html = "EEE8AA" - PaleGreen - html = "98FB98" - PaleTurquoise - html = "AFEEEE" - PaleVioletRed - html = "D87093" - PapayaWhip - html = "FFEFD5" - PeachPuff - html = "FFDAB9" - Peru - html = "CD853F" - Pink - html = "FFC0CB" - Plum - html = "DDA0DD" - PowderBlue - html = "B0E0E6" - Purple - html = "800080" - Red - html = "FF0000" - RosyBrown - html = "BC8F8F" - RoyalBlue - html = "4169E1" - SaddleBrown - html = "8B4513" - Salmon - html = "FA8072" - SandyBrown - html = "F4A460" - SeaGreen - html = "2E8B57" - SeaShell - html = "FFF5EE" - Sienna - html = "A0522D" - Silver - html = "C0C0C0" - SkyBlue - html = "87CEEB" - SlateBlue - html = "6A5ACD" - SlateGray - html = "708090" - Snow - html = "FFFAFA" - SpringGreen - html = "00FF7F" - SteelBlue - html = "4682B4" - Tan - html = "D2B48C" - Teal - html = "008080" - Thistle - html = "D8BFD8" - Tomato - html = "FF6347" - Turquoise - html = "40E0D0" - Violet - html = "EE82EE" - VioletRed - html = "D02090" - Wheat - html = "F5DEB3" - White - html = "FFFFFF" - WhiteSmoke - html = "F5F5F5" - Yellow - html = "FFFF00" - YellowGreen - html = "9ACD32" diff --git a/code/defines/sd_procs/sd_procs.dm b/code/defines/sd_procs/sd_procs.dm deleted file mode 100644 index 16de19f4743..00000000000 --- a/code/defines/sd_procs/sd_procs.dm +++ /dev/null @@ -1,161 +0,0 @@ -/* sd_procs - by: Shadowdarke (shadowdarke@hotmail.com) - - A collection of general purpose procs I use often in - other projects. - -The following is a summary of all the procs and other additions included in -the sd_procs library. Please refer to the specific file for detailed information. - - -Atom (atom.dm) - These procs expand on the basic built in procs. - - Bumped(O) - Automatically called whenever a movable atom O Bump()s into src. - Proc protype designed to be overridden for specific objects. - - Trigger(O) - Automatically called whenever a movable atom O steps into the same - turf with src. - Proc protype designed to be overridden for specific objects. - - -Base 64 (base64.dm) - These procs convert plain text to a hexidecimal string to 64 encoded text and vice versa. - - sd_base64toHex(encode64, pad_code = 67) - Accepts a base 64 encoded text and returns the hexidecimal equivalent. - - sd_hex2base64(hextext, pad_char = "=") - Accepts a hexidecimal string and returns the base 64 encoded text equivalent. - - sd_hex2text(hex) - Accepts a hexidecimal string and returns the plain text equivalent. - - sd_text2hex(txt) - Accepts a plain text string and returns the hexidecimal equivalent. - - -Colors(color.dm) - sd_color - sd_color is a special datum that contains color data in various - formats. Sample colors are available in samplecolors.dm. - VARS - name // the name of the color - red // red componant of the color - green // green componant of the color - blue // red componant of the color - html // html string for the color - icon/Icon // contains the icon produced by rgb2icon() proc - - PROCS - brightness() - Returns the grayscale brightness of the RGB color set. - - html2rgb() - Calculates the rgb colors from the html colors. - - rgb2html() - Calculates the html color from the rbg colors. - - rgb2icon() - Converts the rgb value to a solid icon stored as src.Icon - -Direction procs (direction.dm) - sd_get_approx_dir(atom/ref,atom/target) - returns the approximate direction from ref to target. - - sd_degrees2dir(degrees as num) - Accepts an angle in degrees and returns the closest BYOND - direction value. - - sd_dir2degrees(dir as num) - Accepts a BYOND direction value and returns the angle North of - East in degrees. - - sd_dir2radial(dir as num) - Accepts a BYOND direction value and returns the radial direction - (0-7) North of East. - - sd_dir2radians(dir as num) - Accepts a BYOND direction value and returns the angle North of - East in radians. - - sd_dir2text(dir as num) - Accepts a BYOND direction value and returns the lowercase text - name of the direction. - - sd_dir2Text(dir as num) - Accepts a BYOND direction value and returns the Capitalized text - name of the direction - - sd_radial2dir(radial as num) - Accepts a radial direction (0-7) and returns the BYOND direction - value. - -HSL procs (hsl.dm) - hsl2rgb(hue, sat, lgh, scale = 240) - Returns the RRGGBB format of an HSL color. - ALTERNATE FORMAT: hsl2rgb(HSL, scale) - - rgb2hsl(red, grn, blu, scale = 240) - Returns the HHSSLL string of an RGB color - ALTERNATE FORMAT: rgb2hsl(RGB, scale) - -Math procs (math.dm) - sd_base2dec(number as text, base = 16 as num) - Accepts a number in any base (2 to 36) and returns the equivelent - value in decimal. - - sd_dec2base(decimal,base = 16 as num,digits = 0 as num) - Accepts a decimal number and returns the equivelent value in the - new base as a string. - - sd_get_dist(atom/A, atom/B) - Returns the mathematical 3D distance between two atoms. - - sd_get_dist_squared(atom/A, atom/B) - Returns the square of the mathematical 3D distance between two atoms. (More processor - friendly than sd_get_dist() and useful for modelling realworld physics.) - -Nybble Color procs (nybble.dm) - sd_nybble2rgb(original, bit = 8, short = 0) - Converts a nybble color to a hexidecimal RGB color string. - - sd_rgb2nybble(rgb, bit = 8) - Converts an RGB color string to a nybble color. - - -Sample sd_colors. (samplecolors.dm) - This file includes 142 predefined sd_colors. It will not automatically - be included in your projects, since you may want to define them differently. - - -Test program (test.dm) - This file provides a brief demo of some library functions. - It is not included in your projects. - - -Text procs (text.dm) - sd_findlast(maintext as text, searchtext as text) - Returns the location of the last instance of searchtext in - maintext. sd_findlast is not case sensitive. - - sd_findLast(maintext as text, searchtext as text) - Returns the location of the last instance of searchtext in - maintext. sd_findLast is case sensitive. - - sd_htmlremove(T as text) - Returns the text string with all potential html tags (anything - between < and >) removed. - - sd_replacetext(maintext as text, oldtext as text, newtext as text) - Replaces all instances of oldtext within maintext with newtext. - sd_replacetext is not case sensitive. - - sd_replaceText(maintext as text, oldtext as text, newtext as text) - Replaces all instances of oldtext within maintext with newtext. - sd_replaceText is case sensitive. - -*/ \ No newline at end of file diff --git a/code/defines/sd_procs/text.dm b/code/defines/sd_procs/text.dm deleted file mode 100644 index 88b410bd2b7..00000000000 --- a/code/defines/sd_procs/text.dm +++ /dev/null @@ -1,89 +0,0 @@ -/* Text procs - These procs manipulate text strings. - - sd_findlast(maintext as text, searchtext as text) - Returns the location of the last instance of searchtext in - maintext. sd_findlast is not case sensitive. - - sd_findLast(maintext as text, searchtext as text) - Returns the location of the last instance of searchtext in - maintext. sd_findLast is case sensitive. - - sd_htmlremove(T as text) - Returns the text string with all potential html tags (anything - between < and >) removed. - - sd_replacetext(maintext as text, oldtext as text, newtext as text) - Replaces all instances of oldtext within maintext with newtext. - sd_replacetext is not case sensitive. - - sd_replaceText(maintext as text, oldtext as text, newtext as text) - Replaces all instances of oldtext within maintext with newtext. - sd_replaceText is case sensitive. -*/ - -/********************************************* -* Implimentation: No need to read further. * -*********************************************/ -proc - sd_findlast(maintext as text, searchtext as text) - /* Returns the location of the last instance of searchtext in - maintext. sd_findlast is not case sensitive. */ - var/loc = 0 - var/looking = findtext(maintext, searchtext) - while(looking) - loc = looking - looking = findtext(maintext, searchtext, looking + 1) - return loc - - sd_findLast(maintext as text, searchtext as text) - /* Returns the location of the last instance of searchtext in - maintext. sd_findLast is case sensitive. */ - var/loc = 0 - var/looking = findText(maintext, searchtext) - while(looking) - loc = looking - looking = findText(maintext, searchtext, looking + 1) - return loc - - - sd_htmlremove(T as text) - /* Returns the text string with all potential html tags (anything - between < and >) removed. */ - T = sd_replacetext(T, " ","") - var/open = findtext(T,"<") - while(open) - var/close = findtext(T,">",open) - if(close) - if(close
", src.radduration) src.temphtml += text("Radiation Intensity: []
", src.radstrength) @@ -1056,21 +1071,22 @@ src.temphtml = text("No viable occupant detected.") usr << browse(temphtml, "window=scannernew;size=550x650") onclose(usr, "scannernew") - //src.temphtml = text("Unique Identifier: []
", src.connected.occupant.dna.uni_identity) - //src.temphtml = text("Unique Identifier: [getleftblocks(src.connected.occupant.dna.uni_identity,uniblock,3)][src.subblock == 1 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)][src.subblock == 2 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)][src.subblock == 3 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)][getrightblocks(src.connected.occupant.dna.uni_identity,uniblock,3)]
") + else + //src.temphtml = text("Unique Identifier: []
", src.connected.occupant.dna.uni_identity) + //src.temphtml = text("Unique Identifier: [getleftblocks(src.connected.occupant.dna.uni_identity,uniblock,3)][src.subblock == 1 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),1,1)][src.subblock == 2 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),2,1)][src.subblock == 3 ? ""+getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)+"" : getblock(getblock(src.connected.occupant.dna.uni_identity,src.uniblock,3),3,1)][getrightblocks(src.connected.occupant.dna.uni_identity,uniblock,3)]
") - // New way of displaying DNA blocks - src.temphtml = text("Unique Identifier: [getblockstring(src.connected.occupant.dna.uni_identity,uniblock,subblock,3, src,1)]
") + // New way of displaying DNA blocks + src.temphtml = text("Unique Identifier: [getblockstring(src.connected.occupant.dna.uni_identity,uniblock,subblock,3, src,1)]
") - src.temphtml += text("Selected Block: []
", src.uniblock) - src.temphtml += text("<- Block ->
", src, src) - src.temphtml += text("Selected Sub-Block: []
", src.subblock) - src.temphtml += text("<- Sub-Block ->
", src, src) - src.temphtml += text("Selected Target: []
", src.unitargethex) - src.temphtml += text("<- Target ->
", src, src) - src.temphtml += "Modify Block:
" - src.temphtml += text("Irradiate
", src) - src.delete = 0 + src.temphtml += text("Selected Block: []
", src.uniblock) + src.temphtml += text("<- Block ->
", src, src) + src.temphtml += text("Selected Sub-Block: []
", src.subblock) + src.temphtml += text("<- Sub-Block ->
", src, src) + src.temphtml += text("Selected Target: []
", src.unitargethex) + src.temphtml += text("<- Target ->
", src, src) + src.temphtml += "Modify Block:
" + src.temphtml += text("Irradiate
", src) + src.delete = 0 if (href_list["unimenuplus"]) if (src.uniblock < 13) src.uniblock++ @@ -1188,15 +1204,20 @@ src.temphtml = text("No viable occupant detected.") usr << browse(temphtml, "window=scannernew;size=550x650") onclose(usr, "scannernew") - var/mob/living/carbon/human/H = src.connected.occupant - if(H) - if (H.reagents.get_reagent_amount("inaprovaline") < 60) - H.reagents.add_reagent("inaprovaline", 30) - usr << text("Occupant now has [] units of rejuvenation in his/her bloodstream.", H.reagents.get_reagent_amount("inaprovaline")) - src.delete = 0 + else + var/mob/living/carbon/human/H = src.connected.occupant + if(H) + if (H.reagents.get_reagent_amount("inaprovaline") < 60) + H.reagents.add_reagent("inaprovaline", 30) + usr << text("Occupant now has [] units of rejuvenation in his/her bloodstream.", H.reagents.get_reagent_amount("inaprovaline")) + src.delete = 0 //////////////////////////////////////////////////////// if (href_list["strucmenu"]) - if(src.connected.occupant) + if(!src.connected.occupant || !src.connected.occupant.dna) + src.temphtml = text("No viable occupant detected.") + usr << browse(temphtml, "window=scannernew;size=550x650") + onclose(usr, "scannernew") + else // Get this shit outta here it sucks //src.temphtml = text("Structural Enzymes: [getleftblocks(src.connected.occupant.dna.struc_enzymes,strucblock,3)][src.subblock == 1 ? ""+getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),1,1)+"" : getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),1,1)][src.subblock == 2 ? ""+getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),2,1)+"" : getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),2,1)][src.subblock == 3 ? ""+getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),3,1)+"" : getblock(getblock(src.connected.occupant.dna.struc_enzymes,src.strucblock,3),3,1)][getrightblocks(src.connected.occupant.dna.struc_enzymes,strucblock,3)]
") //src.temphtml = text("Structural Enzymes: []
", src.connected.occupant.dna.struc_enzymes) diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 74543700308..7cca20dfac0 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -109,7 +109,9 @@ var/list/blob_nodes = list() if (1) command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('sound/AI/outbreak5.ogg') + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << sound('sound/AI/outbreak5.ogg') autoexpand = 0//No more extra pulses stage = -1 //next stage in 4-5 minutes diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index bc83a3bb3b9..ca1c3f206e8 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -19,5 +19,48 @@ run_action() if(spores.len >= max_spores) return 0 - new/obj/effect/critter/blob(src.loc, src) + new/mob/living/simple_animal/hostile/blobspore(src.loc, src) return 1 + + +/mob/living/simple_animal/hostile/blobspore + name = "blob" + desc = "Some blob thing." + icon = 'icons/mob/critter.dmi' + icon_state = "blobsquiggle" + icon_living = "blobsquiggle" + pass_flags = PASSBLOB + health = 20 + maxHealth = 20 + melee_damage_lower = 4 + melee_damage_upper = 8 + attacktext = "hits" + attack_sound = 'sound/weapons/genhit1.ogg' + var/obj/effect/blob/factory/factory = null + faction = "blob" + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 360 + + + New(loc, var/obj/effect/blob/factory/linked_node) + ..() + if(istype(linked_node)) + factory = linked_node + factory.spores += src + ..(loc) + return + Die() + ..() + if(factory) + factory.spores -= src + ..() + del(src) + diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index b988cf24470..da377f25131 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -9,7 +9,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" config_tag = "changeling" restricted_jobs = list("AI", "Cyborg") protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain") - required_players = 15 + required_players = 2 + required_players_secret = 5 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 3db2e1a1444..63ba22d87f8 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -35,29 +35,29 @@ //Helper proc. Does all the checks and stuff for us to avoid copypasta /mob/proc/changeling_power(var/required_chems=0, var/required_dna=0, var/max_genetic_damage=100, var/max_stat=0) - if(!usr) return - if(!usr.mind) return - if(!iscarbon(usr)) return - var/datum/changeling/changeling = usr.mind.changeling + if(!src.mind) return + if(!iscarbon(src)) return + + var/datum/changeling/changeling = src.mind.changeling if(!changeling) - world.log << "[usr] has the changeling_transform() verb but is not a changeling." + world.log << "[src] has the changeling_transform() verb but is not a changeling." return - if(usr.stat > max_stat) - usr << "We are incapacitated." + if(src.stat > max_stat) + src << "We are incapacitated." return if(changeling.absorbed_dna.len < required_dna) - usr << "We require at least [required_dna] samples of compatible DNA." + src << "We require at least [required_dna] samples of compatible DNA." return if(changeling.chem_charges < required_chems) - usr << "We require at least [required_chems] units of chemicals to do that!" + src << "We require at least [required_chems] units of chemicals to do that!" return if(changeling.geneticdamage > max_genetic_damage) - usr << "Our geneomes are still reassembling. We need time to recover first." + src << "Our geneomes are still reassembling. We need time to recover first." return return changeling @@ -72,55 +72,55 @@ var/datum/changeling/changeling = changeling_power(0,0,100) if(!changeling) return - var/obj/item/weapon/grab/G = usr.get_active_hand() + var/obj/item/weapon/grab/G = src.get_active_hand() if(!istype(G)) - usr << "We must be grabbing a creature in our active hand to absorb them." + src << "We must be grabbing a creature in our active hand to absorb them." return var/mob/living/carbon/human/T = G.affecting if(!istype(T)) - usr << "[T] is not compatible with our biology." + src << "[T] is not compatible with our biology." return if(NOCLONE in T.mutations) - usr << "This creature's DNA is ruined beyond useability!" + src << "This creature's DNA is ruined beyond useability!" return if(!G.killing) - usr << "We must have a tighter grip to absorb this creature." + src << "We must have a tighter grip to absorb this creature." return if(changeling.isabsorbing) - usr << "We are already absorbing!" + src << "We are already absorbing!" return changeling.isabsorbing = 1 for(var/stage = 1, stage<=3, stage++) switch(stage) if(1) - usr << "This creature is compatible. We must hold still..." + src << "This creature is compatible. We must hold still..." if(2) - usr << "We extend a proboscis." - usr.visible_message("[usr] extends a proboscis!") + src << "We extend a proboscis." + src.visible_message("[src] extends a proboscis!") if(3) - usr << "We stab [T] with the proboscis." - usr.visible_message("[usr] stabs [T] with the proboscis!") + src << "We stab [T] with the proboscis." + src.visible_message("[src] stabs [T] with the proboscis!") T << "You feel a sharp stabbing pain!" T.take_overall_damage(40) feedback_add_details("changeling_powers","A[stage]") - if(!do_mob(usr, T, 150)) - usr << "Our absorption of [T] has been interrupted!" + if(!do_mob(src, T, 150)) + src << "Our absorption of [T] has been interrupted!" changeling.isabsorbing = 0 return - usr << "We have absorbed [T]!" - usr.visible_message("[usr] sucks the fluids from [T]!") + src << "We have absorbed [T]!" + src.visible_message("[src] sucks the fluids from [T]!") T << "You have been absorbed by the changeling!" T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. changeling.absorbed_dna |= T.dna - if(usr.nutrition < 400) usr.nutrition = min((usr.nutrition + T.nutrition), 400) + if(src.nutrition < 400) src.nutrition = min((src.nutrition + T.nutrition), 400) changeling.chem_charges += 10 changeling.geneticpoints += 2 @@ -143,7 +143,7 @@ if(!Tp.isVerb) call(Tp.verbpath)() else - usr.make_changeling() + src.make_changeling() changeling.chem_charges += T.mind.changeling.chem_charges changeling.geneticpoints += T.mind.changeling.geneticpoints @@ -179,15 +179,15 @@ return changeling.chem_charges -= 5 - usr.visible_message("[usr] transforms!") + src.visible_message("[src] transforms!") changeling.geneticdamage = 30 - usr.dna = chosen_dna - usr.real_name = chosen_dna.real_name - updateappearance(usr, usr.dna.uni_identity) - domutcheck(usr, null) + src.dna = chosen_dna + src.real_name = chosen_dna.real_name + updateappearance(src, src.dna.uni_identity) + domutcheck(src, null) - usr.verbs -= /mob/proc/changeling_transform - spawn(10) usr.verbs += /mob/proc/changeling_transform + src.verbs -= /mob/proc/changeling_transform + spawn(10) src.verbs += /mob/proc/changeling_transform feedback_add_details("changeling_powers","TR") return 1 @@ -201,7 +201,7 @@ var/datum/changeling/changeling = changeling_power(1,0,0) if(!changeling) return - var/mob/living/carbon/C = usr + var/mob/living/carbon/C = src changeling.chem_charges-- C.remove_changeling_powers() C.visible_message("[C] transforms!") @@ -216,7 +216,7 @@ C.monkeyizing = 1 C.canmove = 0 C.icon = null - C.overlays = null + C.overlays.Cut() C.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc ) @@ -276,7 +276,7 @@ if(!chosen_dna) return - var/mob/living/carbon/C = usr + var/mob/living/carbon/C = src changeling.chem_charges-- C.remove_changeling_powers() @@ -290,7 +290,7 @@ C.monkeyizing = 1 C.canmove = 0 C.icon = null - C.overlays = null + C.overlays.Cut() C.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( C.loc ) animation.icon_state = "blank" @@ -300,7 +300,7 @@ sleep(48) del(animation) - for(var/obj/item/W in usr) + for(var/obj/item/W in src) C.u_equip(W) if (C.client) C.client.screen -= W @@ -350,7 +350,7 @@ var/datum/changeling/changeling = changeling_power(20,1,100,DEAD) if(!changeling) return - var/mob/living/carbon/C = usr + var/mob/living/carbon/C = src if(!C.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 C << "We will attempt to regenerate our form." @@ -380,7 +380,7 @@ C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss()) C.reagents.clear_reagents() C << "We have regenerated." - C.visible_message("[usr] appears to wake from the dead, having healed all wounds.") + C.visible_message("[src] appears to wake from the dead, having healed all wounds.") C.status_flags &= ~(FAKEDEATH) C.update_canmove() @@ -398,10 +398,10 @@ var/datum/changeling/changeling = changeling_power(10,0,100) if(!changeling) return 0 changeling.chem_charges -= 10 - usr << "Your throat adjusts to launch the sting." + src << "Your throat adjusts to launch the sting." changeling.sting_range = 2 - usr.verbs -= /mob/proc/changeling_boost_range - spawn(5) usr.verbs += /mob/proc/changeling_boost_range + src.verbs -= /mob/proc/changeling_boost_range + spawn(5) src.verbs += /mob/proc/changeling_boost_range feedback_add_details("changeling_powers","RS") return 1 @@ -416,7 +416,7 @@ if(!changeling) return 0 changeling.chem_charges -= 45 - var/mob/living/carbon/human/C = usr + var/mob/living/carbon/human/C = src C.stat = 0 C.SetParalysis(0) C.SetStunned(0) @@ -424,45 +424,44 @@ C.lying = 0 C.update_canmove() - usr.verbs -= /mob/proc/changeling_unstun - spawn(5) usr.verbs += /mob/proc/changeling_unstun + src.verbs -= /mob/proc/changeling_unstun + spawn(5) src.verbs += /mob/proc/changeling_unstun feedback_add_details("changeling_powers","UNS") return 1 //Speeds up chemical regeneration /mob/proc/changeling_fastchemical() - usr.mind.changeling.chem_recharge_rate *= 2 + src.mind.changeling.chem_recharge_rate *= 2 return 1 //Increases macimum chemical storage /mob/proc/changeling_engorgedglands() - usr.mind.changeling.chem_storage += 25 + src.mind.changeling.chem_storage += 25 return 1 //Prevents AIs tracking you but makes you easily detectable to the human-eye. /mob/proc/changeling_digitalcamo() set category = "Changeling" - set name = "Toggle Digital Camoflague (10)" + set name = "Toggle Digital Camoflague" set desc = "The AI can no longer track us, but we will look different if examined. Has a constant cost while active." - var/datum/changeling/changeling = changeling_power(10) + var/datum/changeling/changeling = changeling_power() if(!changeling) return 0 - usr.mind.changeling.chem_charges -= 10 - var/mob/living/carbon/human/C = usr + var/mob/living/carbon/human/C = src if(C.digitalcamo) C << "We return to normal." else C << "We distort our form to prevent AI-tracking." C.digitalcamo = !C.digitalcamo spawn(0) - while(C && C.digitalcamo) - C.mind.changeling.chem_charges -= 1 + while(C && C.digitalcamo && C.mind && C.mind.changeling) + C.mind.changeling.chem_charges = max(C.mind.changeling.chem_charges - 1, 0) sleep(40) - usr.verbs -= /mob/proc/changeling_digitalcamo - spawn(5) usr.verbs += /mob/proc/changeling_digitalcamo + src.verbs -= /mob/proc/changeling_digitalcamo + spawn(5) src.verbs += /mob/proc/changeling_digitalcamo feedback_add_details("changeling_powers","CAM") return 1 @@ -475,9 +474,9 @@ var/datum/changeling/changeling = changeling_power(30,0,100,UNCONSCIOUS) if(!changeling) return 0 - usr.mind.changeling.chem_charges -= 30 + src.mind.changeling.chem_charges -= 30 - var/mob/living/carbon/human/C = usr + var/mob/living/carbon/human/C = src spawn(0) for(var/i = 0, i<10,i++) if(C) @@ -487,8 +486,8 @@ C.adjustFireLoss(-10) sleep(10) - usr.verbs -= /mob/proc/changeling_rapidregen - spawn(5) usr.verbs += /mob/proc/changeling_rapidregen + src.verbs -= /mob/proc/changeling_rapidregen + spawn(5) src.verbs += /mob/proc/changeling_rapidregen feedback_add_details("changeling_powers","RR") return 1 @@ -510,7 +509,7 @@ var/list/datum/dna/hivemind_bank = list() names += DNA.real_name if(names.len <= 0) - usr << "The airwaves already have all of our DNA." + src << "The airwaves already have all of our DNA." return var/S = input("Select a DNA to channel: ", "Channel DNA", null) as null|anything in names @@ -522,7 +521,7 @@ var/list/datum/dna/hivemind_bank = list() changeling.chem_charges -= 10 hivemind_bank += chosen_dna - usr << "We channel the DNA of [S] to the air." + src << "We channel the DNA of [S] to the air." feedback_add_details("changeling_powers","HU") return 1 @@ -540,7 +539,7 @@ var/list/datum/dna/hivemind_bank = list() names[DNA.real_name] = DNA if(names.len <= 0) - usr << "There's no new DNA to absorb from the air." + src << "There's no new DNA to absorb from the air." return var/S = input("Select a DNA absorb from the air: ", "Absorb DNA", null) as null|anything in names @@ -551,7 +550,7 @@ var/list/datum/dna/hivemind_bank = list() changeling.chem_charges -= 20 changeling.absorbed_dna += chosen_dna - usr << "We absorb the DNA of [S] from the air." + src << "We absorb the DNA of [S] from the air." feedback_add_details("changeling_powers","HD") return 1 @@ -559,32 +558,32 @@ var/list/datum/dna/hivemind_bank = list() /mob/proc/changeling_mimicvoice() set category = "Changeling" - set name = "Mimic Voice (10)" - set desc = "Shape our vocal glands to form a voice of someone we choose." + set name = "Mimic Voice" + set desc = "Shape our vocal glands to form a voice of someone we choose. We cannot regenerate chemicals when mimicing." - var/datum/changeling/changeling = changeling_power(10,1) + + var/datum/changeling/changeling = changeling_power() if(!changeling) return if(changeling.mimicing) changeling.mimicing = "" - usr << "We return our vocal glands to their original location." + src << "We return our vocal glands to their original location." return var/mimic_voice = input("Enter a name to mimic.", "Mimic Voice", null) as text if(!mimic_voice) return - changeling.chem_charges -= 10 changeling.mimicing = mimic_voice - usr << "We shape our glands to take the voice of [mimic_voice], this will stop us from regenerating chemicals while active." - usr << "Use this power again to return to our original voice and reproduce chemicals again." + src << "We shape our glands to take the voice of [mimic_voice], this will stop us from regenerating chemicals while active." + src << "Use this power again to return to our original voice and reproduce chemicals again." feedback_add_details("changeling_powers","MV") spawn(0) while(src && src.mind && src.mind.changeling && src.mind.changeling.mimicing) - src.mind.changeling.chem_charges -= 1 + src.mind.changeling.chem_charges = max(src.mind.changeling.chem_charges - 1, 0) sleep(40) if(src && src.mind && src.mind.changeling) src.mind.changeling.mimicing = "" @@ -607,7 +606,7 @@ var/list/datum/dna/hivemind_bank = list() var/list/victims = list() for(var/mob/living/carbon/C in oview(changeling.sting_range)) victims += C - var/mob/living/carbon/T = input(usr, "Who will we sting?") as null|anything in victims + var/mob/living/carbon/T = input(src, "Who will we sting?") as null|anything in victims if(!T) return if(!(T in view(changeling.sting_range))) return @@ -616,10 +615,10 @@ var/list/datum/dna/hivemind_bank = list() changeling.chem_charges -= required_chems changeling.sting_range = 1 - usr.verbs -= verb_path - spawn(10) usr.verbs += verb_path + src.verbs -= verb_path + spawn(10) src.verbs += verb_path - usr << "We stealthily sting [T]." + src << "We stealthily sting [T]." if(!T.mind || !T.mind.changeling) return T //T will be affected by the sting T << "You feel a tiny prick." return @@ -712,7 +711,7 @@ var/list/datum/dna/hivemind_bank = list() var/mob/living/carbon/T = changeling_sting(40,/mob/proc/changeling_transformation_sting) if(!T) return 0 if((HUSK in T.mutations) || (!ishuman(T) && !ismonkey(T))) - usr << "Our sting appears ineffective against its DNA." + src << "Our sting appears ineffective against its DNA." return 0 T.visible_message("[T] transforms!") T.dna = chosen_dna @@ -756,8 +755,8 @@ var/list/datum/dna/hivemind_bank = list() set desc="Stealthily sting a target to extract their DNA." var/datum/changeling/changeling = null - if(usr.mind && usr.mind.changeling) - changeling = usr.mind.changeling + if(src.mind && src.mind.changeling) + changeling = src.mind.changeling if(!changeling) return 0 diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm index 2f3659bc7ac..2395e63b270 100644 --- a/code/game/gamemodes/changeling/modularchangling.dm +++ b/code/game/gamemodes/changeling/modularchangling.dm @@ -81,7 +81,7 @@ var/list/datum/power/changeling/powerinstances = list() /datum/power/changeling/mimicvoice name = "Mimic Voice" desc = "We shape our vocal glands to sound like a desired voice." - helptext = "Will turn your voice into the name that you enter." + helptext = "Will turn your voice into the name that you enter. We must constantly expend chemicals to maintain our form like this" genomecost = 3 verbpath = /mob/proc/changeling_mimicvoice @@ -494,7 +494,7 @@ var/list/datum/power/changeling/powerinstances = list() purchasedpowers += Thepower if(!Thepower.isVerb && Thepower.verbpath) - call(Thepower.verbpath)() + call(M.current, Thepower.verbpath)() else if(remake_verbs) M.current.make_changeling() diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index d8afb69ed0f..12a5525428e 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -3,7 +3,8 @@ config_tag = "traitorchan" traitors_possible = 3 //hard limit on traitors if scaling is turned off restricted_jobs = list("AI", "Cyborg") - required_players = 20 + required_players = 3 + required_players_secret = 10 required_enemies = 2 recommended_enemies = 3 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 98012439623..ee16e21a771 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -22,7 +22,8 @@ config_tag = "cult" restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") protected_jobs = list() - required_players = 15 + required_players = 5 + required_players_secret = 15 required_enemies = 3 recommended_enemies = 4 @@ -255,7 +256,7 @@ if(objectives.Find("eldergod")) cult_fail += eldergod //1 by default, 0 if the elder god has been summoned at least once if(objectives.Find("sacrifice")) - if(!sacrificed.Find(sacrifice_target)) //if the target has been sacrificed, ignore this step. otherwise, add 1 to cult_fail + if(sacrifice_target && !sacrificed.Find(sacrifice_target)) //if the target has been sacrificed, ignore this step. otherwise, add 1 to cult_fail cult_fail++ return cult_fail //if any objectives aren't met, failure diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 00e5ff34a17..52b66b79ef8 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -654,24 +654,3 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", R.word3=cultwords["technology"] R.loc = user.loc R.check_icon() - - -/obj/item/weapon/paperscrap - name = "scrap of paper" - icon_state = "scrap" - throw_speed = 1 - throw_range = 2 - w_class = 1.0 - flags = FPRINT | TABLEPASS - - var/data - - attack_self(mob/user as mob) - view_scrap(user) - - examine() - set src in usr - view_scrap(usr) - - proc/view_scrap(var/viewer) - viewer << browse(data) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index c387edf840a..b2972d2ff2a 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -377,10 +377,14 @@ var/list/sacrificed = list() "\red A shape forms in the center of the rune. A shape of... a man.", \ "\red You hear liquid flowing.") D.real_name = "Unknown" + var/chose_name = 0 for(var/obj/item/weapon/paper/P in this_rune.loc) if(P.info) D.real_name = copytext(P.info, 1, MAX_NAME_LEN) + chose_name = 1 break + if(!chose_name) + D.real_name = "[pick(first_names_male)] [pick(last_names)]" D.universal_speak = 1 D.status_flags &= ~GODMODE diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index 03cc1104e28..0d4a20ff2fe 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -1,7 +1,8 @@ /datum/game_mode/epidemic name = "epidemic" config_tag = "epidemic" - required_players = 6 + required_players = 1 + required_players_secret = 15 var/const/waittime_l = 300 //lower bound on time before intercept arrives (in tenths of seconds) var/const/waittime_h = 600 //upper bound on time before intercept arrives (in tenths of seconds) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 9e0ba0a37d8..553735edb7c 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -8,7 +8,7 @@ /*if(prob(50))//Every 120 seconds and prob 50 2-4 weak spacedusts will hit the station spawn(1) dust_swarm("weak")*/ - if (!event) + if(!event) //CARN: checks to see if random events are enabled. if(config.allow_random_events) hadevent = event() @@ -44,13 +44,15 @@ possibleEvents["Meteor"] = 80 * engineer_count possibleEvents["Blob"] = 30 * engineer_count possibleEvents["Spacevine"] = 30 * engineer_count + possibleEvents["Grid Check"] = 10 * engineer_count if(medical_count >= 1) possibleEvents["Radiation"] = medical_count * 100 possibleEvents["Virus"] = medical_count * 50 possibleEvents["Appendicitis"] = medical_count * 50 if(security_count >= 1) possibleEvents["Prison Break"] = security_count * 50 - possibleEvents["Space Ninja"] = security_count * 10 // very low chance for space ninja event + /*if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station) + possibleEvents["Space Ninja"] = security_count * 10*/ var/picked_event = pick(possibleEvents) var/chance = possibleEvents[picked_event] @@ -71,21 +73,21 @@ base_chance = 1.1 // Trigger the event based on how likely it currently is. - if(!prob(chance * eventchance * base_chance / 100)) // "normal" event chance at 20 players + if(!prob(chance * eventchance * base_chance / 100)) return 0 switch(picked_event) if("Meteor") command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") - world << sound('sound/AI/meteors.ogg') + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << sound('sound/AI/meteors.ogg') spawn(100) - meteor_wave() + meteor_wave(10) spawn_meteors() spawn(700) - meteor_wave() + meteor_wave(10) spawn_meteors() - if("Blob") - mini_blob_event() if("Space Ninja") //Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like. space_ninja_arrival() @@ -109,6 +111,10 @@ spacevine_infestation() if("Communications") communications_blackout() + if("Grid Check") + grid_check() + if("Meteor") + meteor_shower() return 1 @@ -118,13 +124,17 @@ command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT") else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms for(var/mob/living/silicon/ai/A in player_list) - A << "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT" + A << "
" + A << "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT" + A << "
" for(var/obj/machinery/telecomms/T in telecomms_list) T.emp_act(1) -/proc/power_failure() - command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure") - world << sound('sound/AI/poweroff.ogg') +/proc/power_failure(var/is_grid_check = 0) + command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", is_grid_check ? "Automated Grid Check" : "Critical Power Failure") + + for(var/mob/M in player_list) + M << sound('sound/AI/poweroff.ogg') for(var/obj/machinery/power/smes/S in world) if(istype(get_area(S), /area/turret_protected) || S.z != 1) continue @@ -172,7 +182,8 @@ /proc/power_restore() command_alert("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal") - world << sound('sound/AI/poweron.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/poweron.ogg') for(var/obj/machinery/power/apc/C in world) if(C.cell && C.z == 1) C.cell.charge = C.cell.maxcharge @@ -194,7 +205,8 @@ /proc/power_restore_quick() command_alert("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal") - world << sound('sound/AI/poweron.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/poweron.ogg') for(var/obj/machinery/power/smes/S in world) if(S.z != 1) continue @@ -219,64 +231,14 @@ break /proc/viral_outbreak(var/virus = null) -// command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") -// world << sound('sound/AI/outbreak7.ogg') - var/virus_type - if(!virus) - virus_type = pick(/datum/disease/dnaspread,/datum/disease/advance/flu,/datum/disease/advance/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/pierrot_throat) - else - switch(virus) - if("fake gbs") - virus_type = /datum/disease/fake_gbs - if("gbs") - virus_type = /datum/disease/gbs - if("magnitis") - virus_type = /datum/disease/magnitis - if("rhumba beat") - virus_type = /datum/disease/rhumba_beat - if("brain rot") - virus_type = /datum/disease/brainrot - if("cold") - virus_type = /datum/disease/advance/cold - if("retrovirus") - virus_type = /datum/disease/dnaspread - if("flu") - virus_type = /datum/disease/advance/flu -// if("t-virus") -// virus_type = /datum/disease/t_virus - if("pierrot's throat") - virus_type = /datum/disease/pierrot_throat - for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) - - var/foundAlready = 0 // don't infect someone that already has the virus - var/turf/T = get_turf(H) - if(T.z != 1) - continue - for(var/datum/disease/D in H.viruses) - foundAlready = 1 - if(H.stat == 2 || foundAlready) + for(var/mob/living/carbon/human/H in world) + if((H.virus2) || (H.stat == 2) || prob(30)) continue - if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. - if((!H.dna) || (H.sdisabilities & BLIND)) //A blindness disease would be the worst. - continue - var/datum/disease/dnaspread/D = new - D.strain_data["name"] = H.real_name - D.strain_data["UI"] = H.dna.uni_identity - D.strain_data["SE"] = H.dna.struc_enzymes - D.carrier = 1 - D.holder = H - D.affected_mob = H - H.viruses += D - break - else - var/datum/disease/D = new virus_type - D.carrier = 1 - D.holder = H - D.affected_mob = H - H.viruses += D - break - spawn(rand(1500, 3000)) //Delayed announcements to keep the crew on their toes. + infect_mob_random_lesser(H) + break + + spawn(rand(0, 3000)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak7.ogg') @@ -306,7 +268,8 @@ spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes. command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") - world << sound('sound/AI/aliens.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/aliens.ogg') /proc/high_radiation_event() @@ -321,6 +284,8 @@ sleep(600) for(var/mob/living/carbon/human/H in living_mob_list) var/turf/T = get_turf(H) + if(!T) + continue if(T.z != 1) continue if(istype(H,/mob/living/carbon/human)) @@ -329,12 +294,15 @@ H.apply_effect((rand(90,150)),IRRADIATE,0) for(var/mob/living/carbon/monkey/M in living_mob_list) var/turf/T = get_turf(M) + if(!T) + continue if(T.z != 1) continue M.apply_effect((rand(15,75)),IRRADIATE,0) sleep(100) command_alert("Radiation levels are within standard parameters again.", "Anomaly Alert") - world << sound('sound/AI/radiation.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/radiation.ogg') @@ -384,7 +352,8 @@ //sleep(100) spawn(rand(300, 600)) //Delayed announcements to keep the crew on their toes. command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") - world << sound('sound/AI/commandreport.ogg') + for(var/mob/M in player_list) + M << sound('sound/AI/commandreport.ogg') /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights if(isEvent) @@ -451,46 +420,74 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is crew = "Any Human" switch(rand(1,14)) if(1) + M << "
" M << "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED" + M << "
" M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION") if(2) + M << "
" M << "\red [what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED" + M << "
" M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS") if(3) + M << "
" M << "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED" + M << "
" M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION") if(4) + M << "
" M << "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED" + M << "
" M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE") if(5) + M << "
" M << "\red THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED" + M << "
" M.add_ion_law("THE CAPTAIN, HOP AND HOS ARE [who2]") if(6) + M << "
" M << "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED" + M << "
" M.add_ion_law("THE STATION IS BUILT FOR [who2]") if(7) + M << "
" M << "\red YOU ARE [amount] [who2]...LAWS UPDATED" + M << "
" M.add_ion_law("YOU ARE [amount] [who2]") if(8) + M << "
" M << "\red YOU MUST ALWAYS [aimust]...LAWS UPDATED" + M << "
" M.add_ion_law("YOU MUST ALWAYS [aimust]") if(9) + M << "
" M << "\red [area] [area2] [amount] [what2]...LAWS UPDATED" + M << "
" M.add_ion_law("[area] [area2] [amount] [what2]") if(10) + M << "
" M << "\red [crew] is [target]...LAWS UPDATED" + M << "
" M.add_ion_law("[crew] is [target]") if(11) + M << "
" M << "\red [define] IS A FORM OF HARM...LAWS UPDATED" + M << "
" M.add_ion_law("[define] IS A FORM OF HARM") if(12) + M << "
" M << "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED" + M << "
" M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS") if(13) + M << "
" M << "\red [crew] is [allergysev] to [allergy]...LAWS UPDATED" + M << "
" M.add_ion_law("[crew] is [allergysev] to [allergy]") if(14) + M << "
" M << "\red THE STATION IS [who2pref] [who2]...LAWS UPDATED" + M << "
" M.add_ion_law("THE STATION IS [who2pref] [who2]") if(botEmagChance) @@ -542,10 +539,28 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is world << "Ion Storm Main Done" */ +/proc/meteor_shower() + command_alert("The station is now in a meteor shower", "Meteor Alert") + + spawn(0) + var/waves = rand(1,4) + while(waves > 0) + sleep(rand(20,100)) + spawn_meteors(rand(1,3)) + waves-- + + command_alert("The station has cleared the meteor shower", "Meteor Alert") + +/proc/grid_check() + spawn(0) + power_failure(1) + sleep(rand(100,600)) + power_restore() + // Returns how many characters are currently active(not logged out, not AFK for more than 10 minutes) // with a specific role. // Note that this isn't sorted by department, because e.g. having a roboticist shouldn't make meteors spawn. -proc/number_active_with_role(role) +/proc/number_active_with_role(role) var/count = 0 for(var/mob/M in player_list) if(!M.client || M.client.inactivity > 10 * 10 * 60) // longer than 10 minutes AFK counts them as inactive @@ -575,4 +590,4 @@ proc/number_active_with_role(role) if("Cyborg") if(M.mind.assigned_role == "Cyborg") count++ - return count \ No newline at end of file + return count diff --git a/code/game/gamemodes/events/BlowOut.dm b/code/game/gamemodes/events/BlowOut.dm deleted file mode 100644 index 1d660989d96..00000000000 --- a/code/game/gamemodes/events/BlowOut.dm +++ /dev/null @@ -1,32 +0,0 @@ -/area/var/radsafe = 0 -/area/maintenance/radsafe = 1 -/area/ai_monitored/maintenance/radsafe = 1 -/area/centcom/radsafe = 1 -/area/admin/radsafe = 1 -/area/adminsafety/radsafe = 1 -/area/shuttle/radsafe = 1 -/area/syndicate_station/radsafe = 1 -/area/asteroid/radsafe = 1 -/area/crew_quarters/sleeping/radsafe = 1 - -/datum/event/blowout - Lifetime = 150 - Announce() - if(!forced && prob(90)) - ActiveEvent = null - SpawnEvent() - del src - return - command_alert("Warning: station approaching high-density radiation cloud. Seek cover immediately.") - Tick() - if(ActiveFor == 50) - command_alert("Station has entered radiation cloud. Do not leave cover until it has passed.") - if(ActiveFor == 100 || ActiveFor == 150) //1/2 and 2/2 f the way after it start proper make peope be half dead mostly - for(var/mob/living/carbon/M in world) - var/area = get_area(M) - if(area:radsafe) - continue - if(!M.stat) - M.radiate(100) - Die() - command_alert("The station has cleared the radiation cloud. It is now safe to leave cover.") \ No newline at end of file diff --git a/code/game/gamemodes/events/ElectricalStorm.dm b/code/game/gamemodes/events/ElectricalStorm.dm deleted file mode 100644 index 58d42c23d01..00000000000 --- a/code/game/gamemodes/events/ElectricalStorm.dm +++ /dev/null @@ -1,88 +0,0 @@ -//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 - -/datum/event/electricalstorm - var/list/obj/machinery/light/Lights = list( ) - var/list/obj/machinery/light/APCs = list( ) - var/list/obj/machinery/light/Doors = list( ) - var/list/obj/machinery/light/Comms = list( ) - - Announce() -// command_alert("The station is flying through an electrical storm. Radio communications may be disrupted", "Anomaly Alert") - - for(var/obj/machinery/light/Light in world) - if(Light.z == 1 && Light.status != 0) - Lights += Light - - for(var/obj/machinery/power/apc/APC in world) - if(APC.z == 1 && !APC.crit) - APCs += APC - - for(var/obj/machinery/door/airlock/Door in world) - if(Door.z == 1 && !istype(Door,/obj/machinery/door/airlock/secure)) - Doors += Door - - for(var/obj/machinery/telecomms/processor/T in world) - if(prob(90) && !(T.stat & (BROKEN|NOPOWER))) - T.stat |= BROKEN - Comms |= T - - Tick() - for(var/x = 0; x < 3; x++) - if (prob(30)) - BlowLight() - if (prob(10)) - DisruptAPC() - if (prob(10)) - DisableDoor() - - - Die() - command_alert("The station has cleared the electrical storm. Radio communications restored", "Anomaly Alert") - for(var/obj/machinery/telecomms/processor/T in Comms) - T.stat &= ~BROKEN - Comms = list() - - proc - BlowLight() //Blow out a light fixture - var/obj/machinery/light/Light = null - var/failed_attempts = 0 - while (Light == null || Light.status != 0) - Light = pick(Lights) - failed_attempts++ - if (failed_attempts >= 10) - return - - spawn(0) //Overload the light, spectacularly. - //Light.sd_SetLuminosity(10) - //sleep(2) - Light.on = 1 - Light.broken() - Lights -= Light - - DisruptAPC() - var/failed_attempts = 0 - var/obj/machinery/power/apc/APC - while (!APC || !APC.operating) - APC = pick(APCs) - failed_attempts++ - if (failed_attempts >= 10) - return - - if (prob(40)) - APC.operating = 0 //Blow its breaker - if (prob(8)) - APC.set_broken() - APCs -= APC - - DisableDoor() - var/obj/machinery/door/airlock/Airlock - while (!Airlock || Airlock.z != 1) - Airlock = pick(Doors) - Airlock.pulse(airlockIndexToWireColor[4]) - for (var/x = 0; x < 2; x++) - var/Wire = 0 - while(!Wire || Wire == 4) - Wire = rand(1, 9) - Airlock.pulse(airlockIndexToWireColor[Wire]) - Airlock.update_icon() - Doors -= Airlock diff --git a/code/game/gamemodes/events/GravitationalAnomaly.dm b/code/game/gamemodes/events/GravitationalAnomaly.dm deleted file mode 100644 index 8b7d2186cf5..00000000000 --- a/code/game/gamemodes/events/GravitationalAnomaly.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/event/gravitationalanomaly - - Announce() - - command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert") - world << sound('granomalies.ogg') - var/turf/T = pick(blobstart) - var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 ) - spawn(rand(50, 300)) - del(bh) diff --git a/code/game/gamemodes/events/ImmovableRod.dm b/code/game/gamemodes/events/ImmovableRod.dm deleted file mode 100644 index 27956c7e35c..00000000000 --- a/code/game/gamemodes/events/ImmovableRod.dm +++ /dev/null @@ -1,5 +0,0 @@ -/datum/event/immovablerod - - Announce() - - immovablerod() \ No newline at end of file diff --git a/code/game/gamemodes/events/MeteorStorm.dm b/code/game/gamemodes/events/MeteorStorm.dm deleted file mode 100644 index 10cb7ef6767..00000000000 --- a/code/game/gamemodes/events/MeteorStorm.dm +++ /dev/null @@ -1,11 +0,0 @@ -/datum/event/meteorstorm - - Announce() - command_alert("The station is now in a meteor shower", "Meteor Alert") - - Tick() - if (prob(20)) - meteor_wave() - - Die() - command_alert("The station has cleared the meteor shower", "Meteor Alert") \ No newline at end of file diff --git a/code/game/gamemodes/events/PowerOffline.dm b/code/game/gamemodes/events/PowerOffline.dm deleted file mode 100644 index c6e8a8b6574..00000000000 --- a/code/game/gamemodes/events/PowerOffline.dm +++ /dev/null @@ -1,16 +0,0 @@ -/datum/event/power_offline - Announce() - for(var/obj/machinery/power/apc/a in world) - if(!a.crit && a.z == 1) - if(istype(a.area, /area/ai_monitored/storage/eva) || istype(a.area, /area/engine)\ - || istype(a.area, /area/toxins/xenobiology) || istype(a.area, /area/turret_protected/ai)) - continue - a.eventoff = 1 - a.update() - - Die() - command_alert("The station has finished an automated power system grid check, thank you.", "Maintenance alert") - for(var/obj/machinery/power/apc/a in world) - if(!a.crit) - a.eventoff = 0 - a.update() \ No newline at end of file diff --git a/code/game/gamemodes/events/PrisonBreak.dm b/code/game/gamemodes/events/PrisonBreak.dm deleted file mode 100644 index e51c5c8e774..00000000000 --- a/code/game/gamemodes/events/PrisonBreak.dm +++ /dev/null @@ -1,30 +0,0 @@ -/datum/event/prisonbreak - - Announce() - - for (var/obj/machinery/power/apc/temp_apc in world) - if(istype(get_area(temp_apc), /area/security/prison)) - temp_apc.overload_lighting() - if(istype(get_area(temp_apc), /area/security/brig)) - temp_apc.overload_lighting() - // for (var/obj/machinery/computer/prison_shuttle/temp_shuttle in world) - // temp_shuttle.prison_break() - for (var/obj/structure/closet/secure_closet/brig/temp_closet in world) - if(istype(get_area(temp_closet), /area/security/prison)) - temp_closet.locked = 0 - temp_closet.icon_state = temp_closet.icon_closed - for (var/obj/machinery/door/airlock/security/temp_airlock in world) - if(istype(get_area(temp_airlock), /area/security/prison)) - temp_airlock.prison_open() - if(istype(get_area(temp_airlock), /area/security/brig)) - temp_airlock.prison_open() - for (var/obj/machinery/door/airlock/glass/glass_security/temp_glassairlock in world) - if(istype(get_area(temp_glassairlock), /area/security/prison)) - temp_glassairlock.prison_open() - if(istype(get_area(temp_glassairlock), /area/security/brig)) - temp_glassairlock.prison_open() - for (var/obj/machinery/door_timer/temp_timer in world) - if(istype(get_area(temp_timer), /area/security/brig)) - temp_timer.releasetime = 1 - sleep(150) - command_alert("Glitch in imprisonment subroutines detected on [station_name()]. Recommend station AI involvement.", "Security Alert") diff --git a/code/game/gamemodes/events/RadiationBelt.dm b/code/game/gamemodes/events/RadiationBelt.dm deleted file mode 100644 index 15a4e6407c8..00000000000 --- a/code/game/gamemodes/events/RadiationBelt.dm +++ /dev/null @@ -1,27 +0,0 @@ -/datum/event/radiation - var/current_iteration = 0 - - // 50 - 20 (grace period) seconds lifetime - Lifetime = 50 - Announce() - command_alert("The station is now travelling through a radiation belt. Take shelter in the maintenance tunnels, or in the crew quarters!", "Medical Alert") - - Tick() - current_iteration++ - - // start radiating after 20 seconds grace period - if(current_iteration > 20) - for(var/mob/living/carbon/L in world) - // check whether they're in a safe place - // if they are, do not radiate - var/turf/T = get_turf(L) - if(T && ( istype(T.loc, /area/maintenance) || istype(T.loc, /area/crew_quarters) )) - continue - - if (istype(L, /mob/living/carbon/monkey)) // So as to stop monkeys from dying in their pens - L.apply_effect(rand(3,4), IRRADIATE) - else - L.apply_effect(rand(4,10), IRRADIATE) - - Die() - command_alert("The station has cleared the radiation belt", "Medical Alert") diff --git a/code/game/gamemodes/events/SpaceCarp.dm b/code/game/gamemodes/events/SpaceCarp.dm deleted file mode 100644 index 5decc7636f1..00000000000 --- a/code/game/gamemodes/events/SpaceCarp.dm +++ /dev/null @@ -1,14 +0,0 @@ -/datum/event/spacecarp - - Announce() - - for(var/obj/effect/landmark/C in world) - if(C.name == "carpspawn") - if(prob(99)) - new /mob/living/simple_animal/carp(C.loc) - else - new /mob/living/simple_animal/carp/elite(C.loc) - //sleep(100) - spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes. - command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") - world << sound('commandreport.ogg') \ No newline at end of file diff --git a/code/game/gamemodes/events/SpaceNinja.dm b/code/game/gamemodes/events/SpaceNinja.dm deleted file mode 100644 index 63d82117072..00000000000 --- a/code/game/gamemodes/events/SpaceNinja.dm +++ /dev/null @@ -1,6 +0,0 @@ -/datum/event/spaceninja - - Announce() - - if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round. - space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like. \ No newline at end of file diff --git a/code/game/gamemodes/events/biomass.dm b/code/game/gamemodes/events/biomass.dm new file mode 100644 index 00000000000..8cbfe8cc470 --- /dev/null +++ b/code/game/gamemodes/events/biomass.dm @@ -0,0 +1,174 @@ +// BIOMASS (Note that this code is very similar to Space Vine code) +/obj/effect/biomass + name = "biomass" + desc = "Space barf from another dimension. It just keeps spreading!" + icon = 'icons/obj/biomass.dmi' + icon_state = "stage1" + anchored = 1 + density = 0 + layer = 5 + pass_flags = PASSTABLE | PASSGRILLE + var/energy = 0 + var/obj/effect/biomass_controller/master = null + + New() + return + + Del() + if(master) + master.vines -= src + master.growth_queue -= src + ..() + +/obj/effect/biomass/attackby(obj/item/weapon/W as obj, mob/user as mob) + if (!W || !user || !W.type) return + switch(W.type) + if(/obj/item/weapon/circular_saw) del src + if(/obj/item/weapon/kitchen/utensil/knife) del src + if(/obj/item/weapon/scalpel) del src + if(/obj/item/weapon/twohanded/fireaxe) del src + if(/obj/item/weapon/hatchet) del src + if(/obj/item/weapon/melee/energy) del src + + //less effective weapons + if(/obj/item/weapon/wirecutters) + if(prob(25)) del src + if(/obj/item/weapon/shard) + if(prob(25)) del src + + else //weapons with subtypes + if(istype(W, /obj/item/weapon/melee/energy/sword)) del src + else if(istype(W, /obj/item/weapon/weldingtool)) + var/obj/item/weapon/weldingtool/WT = W + if(WT.remove_fuel(0, user)) del src + else + return + ..() + +/obj/effect/biomass_controller + var/list/obj/effect/biomass/vines = list() + var/list/growth_queue = list() + var/reached_collapse_size + var/reached_slowdown_size + //What this does is that instead of having the grow minimum of 1, required to start growing, the minimum will be 0, + //meaning if you get the biomasssss..s' size to something less than 20 plots, it won't grow anymore. + + New() + if(!istype(src.loc,/turf/simulated/floor)) + del(src) + + spawn_biomass_piece(src.loc) + processing_objects.Add(src) + + Del() + processing_objects.Remove(src) + ..() + + proc/spawn_biomass_piece(var/turf/location) + var/obj/effect/biomass/BM = new(location) + growth_queue += BM + vines += BM + BM.master = src + + process() + if(!vines) + del(src) //space vines exterminated. Remove the controller + return + if(!growth_queue) + del(src) //Sanity check + return + if(vines.len >= 250 && !reached_collapse_size) + reached_collapse_size = 1 + if(vines.len >= 30 && !reached_slowdown_size ) + reached_slowdown_size = 1 + + var/maxgrowth = 0 + if(reached_collapse_size) + maxgrowth = 0 + else if(reached_slowdown_size) + if(prob(25)) + maxgrowth = 1 + else + maxgrowth = 0 + else + maxgrowth = 4 + var/length = min( 30 , vines.len / 5 ) + var/i = 0 + var/growth = 0 + var/list/obj/effect/biomass/queue_end = list() + + for( var/obj/effect/biomass/BM in growth_queue ) + i++ + queue_end += BM + growth_queue -= BM + if(BM.energy < 2) //If tile isn't fully grown + if(prob(20)) + BM.grow() + + if(BM.spread()) + growth++ + if(growth >= maxgrowth) + break + if(i >= length) + break + + growth_queue = growth_queue + queue_end + +/obj/effect/biomass/proc/grow() + if(!energy) + src.icon_state = "stage2" + energy = 1 + src.opacity = 0 + src.density = 0 + layer = 5 + else + src.icon_state = "stage3" + src.opacity = 0 + src.density = 1 + energy = 2 + +/obj/effect/biomass/proc/spread() + var/direction = pick(cardinal) + var/step = get_step(src,direction) + if(istype(step,/turf/simulated/floor)) + var/turf/simulated/floor/F = step + if(!locate(/obj/effect/biomass,F)) + if(F.Enter(src)) + if(master) + master.spawn_biomass_piece( F ) + return 1 + return 0 + +/obj/effect/biomass/ex_act(severity) + switch(severity) + if(1.0) + del(src) + return + if(2.0) + if (prob(90)) + del(src) + return + if(3.0) + if (prob(50)) + del(src) + return + return + +/obj/effect/biomass/temperature_expose(null, temp, volume) //hotspots kill biomass + del src + + +/proc/biomass_infestation() + + spawn() //to stop the secrets panel hanging + var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas + for(var/areapath in typesof(/area/hallway)) + var/area/hallway/A = locate(areapath) + for(var/turf/simulated/floor/F in A) + if(!F.contents.len) + turfs += F + + if(turfs.len) //Pick a turf to spawn at if we can + var/turf/simulated/floor/T = pick(turfs) + new/obj/effect/biomass_controller(T) //spawn a controller at turf + message_admins("\blue Event: Biomass spawned at [T.loc.loc] ([T.x],[T.y],[T.z])") diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm index fb1f167c340..378c6b24685 100644 --- a/code/game/gamemodes/events/dust.dm +++ b/code/game/gamemodes/events/dust.dm @@ -100,7 +100,7 @@ The "dust" will damage the hull of the station causin minor hull breaches. if(ismob(A)) A.meteorhit(src)//This should work for now I guess - else if(!istype(A,/obj/machinery/emitter) && !istype(A,/obj/machinery/field_generator)) //Protect the singularity from getting released every round! + else if(!istype(A,/obj/machinery/power/emitter) && !istype(A,/obj/machinery/field_generator)) //Protect the singularity from getting released every round! A.ex_act(strength) //Changing emitter/field gen ex_act would make it immune to bombs and C4 life-- diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm index 2b4a1008ff1..2ee79e7c65b 100644 --- a/code/game/gamemodes/events/holidays/Christmas.dm +++ b/code/game/gamemodes/events/holidays/Christmas.dm @@ -1 +1,63 @@ -//placeholder for holiday stuff \ No newline at end of file +/proc/Christmas_Game_Start() + for(var/obj/structure/flora/tree/pine/xmas in world) + if(xmas.z != 1) continue + for(var/turf/simulated/floor/T in orange(1,xmas)) + for(var/i=1,i<=rand(1,5),i++) + new /obj/item/weapon/a_gift(T) + for(var/mob/living/simple_animal/corgi/Ian/Ian in mob_list) + Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian)) + +/proc/ChristmasEvent() + for(var/obj/structure/flora/tree/pine/xmas in world) + var/mob/living/simple_animal/hostile/tree/evil_tree = new /mob/living/simple_animal/hostile/tree(xmas.loc) + evil_tree.icon_state = xmas.icon_state + evil_tree.icon_living = evil_tree.icon_state + evil_tree.icon_dead = evil_tree.icon_state + evil_tree.icon_gib = evil_tree.icon_state + del(xmas) + +/obj/item/weapon/toy/xmas_cracker + name = "xmas cracker" + icon = 'icons/obj/christmas.dmi' + icon_state = "cracker" + desc = "Directions for use: Requires two people, one to pull each end." + var/cracked = 0 + +/obj/item/weapon/toy/xmas_cracker/New() + ..() + +/obj/item/weapon/toy/xmas_cracker/attack(mob/target, mob/user) + if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() ) + target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.") + var/obj/item/weapon/paper/Joke = new /obj/item/weapon/paper(user.loc) + Joke.name = "[pick("awful","terrible","unfunny")] joke" + Joke.info = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'", + "Why couldn't the snowman get laid?\n\nHe was frigid!", + "Where are santa's helpers educated?\n\nNowhere, they're ELF-taught.", + "What happened to the man who stole advent calanders?\n\nHe got 25 days.", + "What does Santa get when he gets stuck in a chimney?\n\nClaus-trophobia.", + "Where do you find chili beans?\n\nThe north pole.", + "What do you get from eating tree decorations?\n\nTinsilitis!", + "What do snowmen wear on their heads?\n\nIce caps!", + "Why is Christmas just like life on ss13?\n\nYou do all the work and the fat guy gets all the credit.", + "Why doesn’t Santa have any children?\n\nBecause he only comes down the chimney.") + new /obj/item/clothing/head/festive(target.loc) + user.update_icons() + cracked = 1 + icon_state = "cracker1" + var/obj/item/weapon/toy/xmas_cracker/other_half = new /obj/item/weapon/toy/xmas_cracker(target) + other_half.cracked = 1 + other_half.icon_state = "cracker2" + target.put_in_active_hand(other_half) + playsound(user, 'sound/effects/snap.ogg', 50, 1) + return 1 + return ..() + +/obj/item/clothing/head/festive + name = "festive paper hat" + icon_state = "xmashat" + desc = "A crappy paper hat that you are REQUIRED to wear." + flags_inv = 0 + flags = FPRINT|TABLEPASS + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index eed0a083324..d2481eae441 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -101,6 +101,7 @@ var/global/Holiday = null switch(DD) if(10) Holiday = "Human-Rights Day" if(14) Holiday = "Monkey Day" + if(21) if(YY==12) Holiday = "End of the World" if(22) Holiday = "Orgasming Day" //lol. These all actually exist if(24) Holiday = "Christmas Eve" if(25) Holiday = "Christmas" @@ -120,14 +121,13 @@ var/global/Holiday = null set desc = "Force-set the Holiday variable to make the game think it's a certain day." if(!check_rights(R_SERVER)) return - if(!T) return Holiday = T //get a new station name station_name = null station_name() //update our hub status world.update_status() -// Holiday_Game_Start() + Holiday_Game_Start() message_admins("\blue ADMIN: Event: [key_name(src)] force-set Holiday to \"[Holiday]\"") log_admin("[key_name(src)] force-set Holiday to \"[Holiday]\"") @@ -141,10 +141,9 @@ var/global/Holiday = null switch(Holiday) //special holidays if("Easter") //do easter stuff - if("Christmas ") - //do christmas stuff - else - //etc. you get what I'm getting at + if("Christmas Eve","Christmas") + Christmas_Game_Start() + return //Nested in the random events loop. Will be triggered every 2 minutes @@ -171,4 +170,9 @@ var/global/Holiday = null if(S.z != 1) continue containers += S - message_admins("\blue DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])")*/ \ No newline at end of file + message_admins("\blue DEBUG: Event: Egg spawned at [Egg.loc] ([Egg.x],[Egg.y],[Egg.z])")*/ + if("End of the World") + if(prob(eventchance)) GameOver() + + if("Christmas","Christmas Eve") + if(prob(eventchance)) ChristmasEvent() diff --git a/code/game/gamemodes/events/holidays/Other.dm b/code/game/gamemodes/events/holidays/Other.dm new file mode 100644 index 00000000000..b520bbe3424 --- /dev/null +++ b/code/game/gamemodes/events/holidays/Other.dm @@ -0,0 +1,10 @@ +/proc/GameOver() + if(!hadevent) + hadevent = 1 + message_admins("The apocalypse has begun! (this holiday event can be disabled by toggling events off within 60 seconds)") + spawn(600) + if(!config.allow_random_events) return + Show2Group4Delay(ScreenText(null,"
The [name_1] [name_2] implied an undercover operative was acting on their behalf on the station currently.
" + src.text += "
The [name_1] [name_2] implied an undercover operative was acting on their behalf on the station currently." + src.text += "It would be in your best interests to suspect everybody, as these undercover operatives could have implants which trigger them to have their memories removed until they are needed. He, or she, could even be a high ranking officer." + /* src.text += "After some investigation, we " if(traitor_name) src.text += "are [prob_right_dude]% sure that [traitor_name] may have been involved, and should be closely observed." @@ -130,11 +140,13 @@ else src.text += "discovered the following set of fingerprints ([fingerprints]) on sensitive materials, and their owner should be closely observed." src.text += "However, these could also belong to a current Cent. Com employee, so do not act on this without reason." + */ /datum/intercept_text/proc/build_cult(datum/mind/correct_person) var/name_1 = pick(src.org_names_1) var/name_2 = pick(src.org_names_2) + /* var/traitor_name var/traitor_job var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher) @@ -156,19 +168,23 @@ traitor_name = correct_person:current else traitor_name = pick_mob() - - src.text += "
It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge on as many stations as they can.
" + */ + src.text += "
It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge onto as many stations as they can." + src.text += "Watch out for the following: praying to an unfamilar god, preaching the word of \[REDACTED\], sacrifices, magical dark power, living constructs of evil and a portal to the dimension of the underworld." + /* src.text += "Based on our intelligence, we are [prob_right_job]% sure that if true, someone doing the job of [traitor_job] on your station may have been converted " src.text += "and instilled with the idea of the flimsiness of the real world, seeking to destroy it. " if(prob(prob_right_dude)) src.text += "
In addition, we are [prob_right_dude]% sure that [traitor_name] may have also some in to contact with this " src.text += "organisation." src.text += "
However, if this information is acted on without substantial evidence, those responsible will face severe repercussions." + */ /datum/intercept_text/proc/build_rev(datum/mind/correct_person) var/name_1 = pick(src.org_names_1) var/name_2 = pick(src.org_names_2) + /* var/traitor_name var/traitor_job var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher) @@ -192,14 +208,17 @@ traitor_name = correct_person.current else traitor_name = src.pick_mob() - - src.text += "
It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector.
" + */ + src.text += "
It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector." + src.text += "Watch out for suspicious activity among the crew and make sure that all heads of staff report in periodically." + /* src.text += "Based on our intelligence, we are [prob_right_job]% sure that if true, someone doing the job of [traitor_job] on your station may have been brainwashed " src.text += "at a recent conference, and their department should be closely monitored for signs of mutiny. " if(prob(prob_right_dude)) src.text += "
In addition, we are [prob_right_dude]% sure that [traitor_name] may have also some in to contact with this " src.text += "organisation." src.text += "
However, if this information is acted on without substantial evidence, those responsible will face severe repercussions." + */ /datum/intercept_text/proc/build_wizard(datum/mind/correct_person) @@ -211,7 +230,7 @@ src.text += "Known attributes include: Brown sandals, a large blue hat, a voluptous white beard, and an inclination to cast spells." /datum/intercept_text/proc/build_nuke(datum/mind/correct_person) - src.text += "
Cent. Com recently recieved a report of a plot to destory one of our stations in your area. We believe the Nuclear Authentication Disc " + src.text += "
Cent. Com recently recieved a report of a plot to destroy one of our stations in your area. We believe the Nuclear Authentication Disc " src.text += "that is standard issue aboard your vessel may be a target. We recommend removal of this object, and it's storage in a safe " src.text += "environment. As this may cause panic among the crew, all efforts should be made to keep this information a secret from all but " src.text += "the most trusted crew-members." @@ -226,6 +245,7 @@ var/cname = pick(src.changeling_names) var/orgname1 = pick(src.org_names_1) var/orgname2 = pick(src.org_names_2) + /* var/changeling_name var/changeling_job var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher) @@ -245,9 +265,12 @@ changeling_name = src.pick_mob() else changeling_name = src.pick_mob() + */ src.text += "
We have received a report that a dangerous alien lifeform known only as \"[cname]\" may have infiltrated your crew. " + /* src.text += "Our intelligence suggests a [prob_right_job]% chance that a [changeling_job] on board your station has been replaced by the alien. " src.text += "Additionally, the report indicates a [prob_right_dude]% chance that [changeling_name] may have been in contact with the lifeform at a recent social gathering. " + */ src.text += "These lifeforms are assosciated with the [orgname1] [orgname2] and may be attempting to acquire sensitive materials on their behalf. " - src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation." + src.text += "Please take care not to alarm the crew, as [cname] may take advantage of a panic situation. Remember, they can be anybody, suspect everybody!" diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 34545842ccf..1fb1aff61a8 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -4,7 +4,8 @@ /datum/game_mode/malfunction name = "AI malfunction" config_tag = "malfunction" - required_players = 20 + required_players = 2 + required_players_secret = 15 required_enemies = 1 recommended_enemies = 1 @@ -65,6 +66,8 @@ 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" */ + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 1 spawn (rand(waittime_l, waittime_h)) send_intercept() ..() @@ -131,7 +134,12 @@ if (station_captured && !to_nuke_or_not_to_nuke) return 1 if (is_malf_ai_dead()) - return 1 + if(config.continous_rounds) + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 0 + malf_mode_declared = 0 + else + return 1 return ..() //check for shuttle and nuke @@ -165,7 +173,9 @@ ticker.mode:malf_mode_declared = 1 for(var/datum/mind/AI_mind in ticker.mode:malf_ai) AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/takeover - world << sound('sound/AI/aimalf.ogg') + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << sound('sound/AI/aimalf.ogg') /datum/game_mode/malfunction/proc/ai_win() diff --git a/code/game/gamemodes/meme/meme.dm b/code/game/gamemodes/meme/meme.dm index 30bb4e1d43f..0f9bb44babe 100644 --- a/code/game/gamemodes/meme/meme.dm +++ b/code/game/gamemodes/meme/meme.dm @@ -5,7 +5,8 @@ /datum/game_mode/meme name = "Memetic Anomaly" config_tag = "meme" - required_players = 6 + required_players = 3 + required_players_secret = 10 restricted_jobs = list("AI", "Cyborg") recommended_enemies = 2 // need at least a meme and a host votable = 0 // temporarily disable this mode for voting diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 0aa28f8cf0d..c3720275ee2 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -114,7 +114,7 @@ //Prevent meteors from blowing up the singularity's containment. //Changing emitter and generator ex_act would result in them being bomb and C4 proof. - if(!istype(A,/obj/machinery/emitter) && \ + if(!istype(A,/obj/machinery/power/emitter) && \ !istype(A,/obj/machinery/field_generator) && \ prob(15)) @@ -141,7 +141,7 @@ spawn(0) //Prevent meteors from blowing up the singularity's containment. //Changing emitter and generator ex_act would result in them being bomb and C4 proof - if(!istype(A,/obj/machinery/emitter) && \ + if(!istype(A,/obj/machinery/power/emitter) && \ !istype(A,/obj/machinery/field_generator)) if(--src.hits <= 0) del(src) //Dont blow up singularity containment if we get stuck there. diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 71f41ca1279..efa216c2ee1 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -5,7 +5,8 @@ /datum/game_mode/nuclear name = "nuclear emergency" config_tag = "nuclear" - required_players = 20 // 20 players - 5 players to be the nuke ops = 15 players remaining + required_players = 6 + required_players_secret = 15 // 15 players - 5 players to be the nuke ops = 10 players remaining required_enemies = 5 recommended_enemies = 5 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index d9bfca2b0e2..a8d629f2fd8 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -295,7 +295,7 @@ datum/objective/hijack datum/objective/block - explanation_text = "Do not allow any humans to escape on the shuttle alive." + explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive." check_completion() @@ -474,16 +474,26 @@ datum/objective/steal "a hand teleporter" = /obj/item/weapon/hand_tele, "an RCD" = /obj/item/weapon/rcd, "a jetpack" = /obj/item/weapon/tank/jetpack, - "a captains jumpsuit" = /obj/item/clothing/under/rank/captain, + "a captain's jumpsuit" = /obj/item/clothing/under/rank/captain, "a functional AI" = /obj/item/device/aicard, "a pair of magboots" = /obj/item/clothing/shoes/magboots, "the station blueprints" = /obj/item/blueprints, "a nasa voidsuit" = /obj/item/clothing/suit/space/nasavoid, "28 moles of plasma (full tank)" = /obj/item/weapon/tank, + "a sample of slime extract" = /obj/item/slime_extract, + "a piece of corgi meat" = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi, + "a research director's jumpsuit" = /obj/item/clothing/under/rank/research_director, + "a chief engineer's jumpsuit" = /obj/item/clothing/under/rank/chief_engineer, + "a chief medical officer's jumpsuit" = /obj/item/clothing/under/rank/chief_medical_officer, + "a head of security's jumpsuit" = /obj/item/clothing/under/rank/head_of_security, + "a head of personnel's jumpsuit" = /obj/item/clothing/under/rank/head_of_personnel, + "the hypospray" = /obj/item/weapon/reagent_containers/hypospray, + "the captain's pinpointer" = /obj/item/weapon/pinpointer, + "an ablative armor vest" = /obj/item/clothing/suit/armor/laserproof, ) var/global/possible_items_special[] = list( - "nuclear authentication disk" = /obj/item/weapon/disk/nuclear, + /*"nuclear authentication disk" = /obj/item/weapon/disk/nuclear,*///Broken with the change to nuke disk making it respawn on z level change. "nuclear gun" = /obj/item/weapon/gun/energy/gun/nuclear, "diamond drill" = /obj/item/weapon/pickaxe/diamonddrill, "bag of holding" = /obj/item/weapon/storage/backpack/holding, diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index a210d856cde..e94baa3ede0 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -15,7 +15,8 @@ name = "revolution" config_tag = "revolution" restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") - required_players = 20 + required_players = 4 + required_players_secret = 15 required_enemies = 3 recommended_enemies = 3 @@ -89,6 +90,8 @@ for(var/datum/mind/rev_mind in head_revolutionaries) greet_revolutionary(rev_mind) modePlayer += head_revolutionaries + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 1 spawn (rand(waittime_l, waittime_h)) send_intercept() ..() @@ -165,6 +168,11 @@ //Checks if the round is over// /////////////////////////////// /datum/game_mode/revolution/check_finished() + if(config.continous_rounds) + if(finished != 0) + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 0 + return ..() if(finished != 0) return 1 else diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index 893d68749f7..296792808d1 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -3,7 +3,8 @@ /datum/game_mode/revolution/rp_revolution name = "rp-revolution" config_tag = "rp-revolution" - required_players = 12 + required_players = 4 + required_players_secret = 12 required_enemies = 3 recommended_enemies = 3 diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 64e418f0ee0..439befdc63a 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -144,8 +144,6 @@ datum/hSB continue if(istype(O, /obj/item/weapon/melee/energy/sword)) continue - if(istype(O, /obj/effect/critter)) - continue if(istype(O, /obj/structure)) continue selectable += O diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index 3bace4756ed..475c3d22aa5 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -15,5 +15,7 @@ M.CanBuild() return 1 -/datum/game_mode/sandbox/check_finished() - return 0 +/datum/game_mode/sandbox/post_setup() + ..() + if(emergency_shuttle) + emergency_shuttle.always_fake_recall = 1 diff --git a/code/game/gamemodes/traitor/traitor_info.dm b/code/game/gamemodes/traitor/traitor_info.dm deleted file mode 100644 index d3d4b1a47d4..00000000000 --- a/code/game/gamemodes/traitor/traitor_info.dm +++ /dev/null @@ -1,7 +0,0 @@ -/datum/traitorinfo - var/starting_objective = "" - var/starting_player_count = 0 - var/starting_occupation = "" - var/starting_name = "" - var/ckey = "" - var/list/spawnlist = list() \ No newline at end of file diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index e07bc1998eb..23a04161120 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -17,7 +17,7 @@ for(var/datum/objective/OBJ in H.mind.objectives) H << "Objective #[obj_count]: [OBJ.explanation_text]" obj_count++ - var/randomize = pick("taser","egun","laser","revolver","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","shotgun","mateba","uzi","crossbow","saw") + var/randomize = pick("taser","egun","laser","revolver","detective","smg","nuclear","deagle","gyrojet","pulse","silenced","cannon","doublebarrel","shotgun","combatshotgun","mateba","smg","uzi","crossbow","saw") switch (randomize) if("taser") new /obj/item/weapon/gun/energy/taser(get_turf(H)) @@ -27,6 +27,8 @@ new /obj/item/weapon/gun/energy/laser(get_turf(H)) if("revolver") new /obj/item/weapon/gun/projectile(get_turf(H)) + if("detective") + new /obj/item/weapon/gun/projectile/detective(get_turf(H)) if("smg") new /obj/item/weapon/gun/projectile/automatic/c20r(get_turf(H)) if("nuclear") @@ -38,13 +40,20 @@ if("pulse") new /obj/item/weapon/gun/energy/pulse_rifle(get_turf(H)) if("silenced") - new /obj/item/weapon/gun/projectile/silenced(get_turf(H)) + new /obj/item/weapon/gun/projectile/pistol(get_turf(H)) + new /obj/item/weapon/silencer(get_turf(H)) if("cannon") new /obj/item/weapon/gun/energy/lasercannon(get_turf(H)) + if("doublebarrel") + new /obj/item/weapon/gun/projectile/shotgun/pump/(get_turf(H)) if("shotgun") + new /obj/item/weapon/gun/projectile/shotgun/pump/(get_turf(H)) + if("combatshotgun") new /obj/item/weapon/gun/projectile/shotgun/pump/combat(get_turf(H)) if("mateba") new /obj/item/weapon/gun/projectile/mateba(get_turf(H)) + if("smg") + new /obj/item/weapon/gun/projectile/automatic(get_turf(H)) if("uzi") new /obj/item/weapon/gun/projectile/automatic/mini_uzi(get_turf(H)) if("crossbow") diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 474aa85eff5..f1ad3a10f8c 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -1,160 +1,189 @@ +/obj/item/weapon/spellbook + name = "spell book" + desc = "The legendary book of spells of the wizard." + icon = 'icons/obj/library.dmi' + icon_state ="book" + throw_speed = 1 + throw_range = 5 + w_class = 1.0 + flags = FPRINT | TABLEPASS + var/uses = 5 + var/temp = null + var/max_uses = 5 + var/op = 1 -//SPELL BOOK PROCS /obj/item/weapon/spellbook/attack_self(mob/user as mob) user.set_machine(src) var/dat - if (src.temp) - dat = "[src.temp]
Clear" + if(temp) + dat = "[temp]
Clear" else dat = "The Book of Spells:
" - dat += "Spells left to memorize: [src.uses]
" + dat += "Spells left to memorize: [uses]
" dat += "
" dat += "Memorize which spell:
" dat += "The number after the spell name is the cooldown time.
" - dat += "Magic Missile (10)
" - dat += "Fireball (10)
" - dat += "Disintegrate (60)
" - dat += "Disable Technology (60)
" - dat += "Smoke (10)
" - dat += "Blind (30)
" - dat += "Mind Transfer (60)
" - dat += "Forcewall (10)
" - dat += "Blink (2)
" - dat += "Teleport (60)
" - dat += "Mutate (60)
" - dat += "Ethereal Jaunt (60)
" - dat += "Knock (10)
" - if(op) - dat += "Summon Guns (One time use, global spell)
" + dat += "Magic Missile (10)
" + dat += "Fireball (10)
" + //dat += "Disintegrate (60)
" + dat += "Disable Technology (60)
" + dat += "Smoke (10)
" + dat += "Blind (30)
" + dat += "Mind Transfer (60)
" + dat += "Forcewall (10)
" + dat += "Blink (2)
" + dat += "Teleport (60)
" + dat += "Mutate (60)
" + dat += "Ethereal Jaunt (60)
" + dat += "Knock (10)
" + dat += "Curse of the Horseman (15)
" +// if(op) +// dat += "Summon Guns (One time use, global spell)
" dat += "
" dat += "Artefacts:
" dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of spells.
" dat += "It is recommended that only experienced wizards attempt to wield such artefacts.
" dat += "
" - dat += "Staff of Change
" + dat += "Staff of Change
" dat += "
" - dat += "Six Soul Stone Shards and the spell Artificer
" + dat += "Six Soul Stone Shards and the spell Artificer
" dat += "
" - dat += "Mastercrafted Armor Set
" + dat += "Mastercrafted Armor Set
" + dat += "
" + dat += "Staff of Animation
" dat += "
" if(op) - dat += "Re-memorize Spells
" + dat += "Re-memorize Spells
" user << browse(dat, "window=radio") onclose(user, "radio") return /obj/item/weapon/spellbook/Topic(href, href_list) ..() - if (usr.stat || usr.restrained()) - return var/mob/living/carbon/human/H = usr - if (!( istype(H, /mob/living/carbon/human))) - return 1 - if ( src.loc == usr || (in_range(src,usr) && istype(src.loc, /turf))) - usr.set_machine(src) - if(href_list["spell_choice"]) - if(src.uses >= 1 && src.max_uses >=1 && text2num(href_list["spell_choice"]) < 18) - src.uses-- - var/list/available_spells = list("Magic Missile","Fireball","Disintegrate","Disable Tech","Smoke","Blind","Mind Transfer","Forcewall","Blink","Teleport","Mutate","Ethereal Jaunt","Knock","Summon Guns","Staff of Change","Six Soul Stone Shards and the spell Artificer","Mastercrafted Armor Set") - var/already_knows = 0 - for(var/obj/effect/proc_holder/spell/aspell in usr.spell_list) - if(available_spells[text2num(href_list["spell_choice"])] == aspell.name) - already_knows = 1 - src.temp = "You already know that spell." - src.uses++ - break - if(!already_knows) - switch(href_list["spell_choice"]) - if ("1") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(usr) - src.temp = "This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage." - if ("2") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/fireball(usr) - src.temp = "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." - if ("3") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(usr) - src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown." - if ("4") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(usr) - src.temp = "This spell disables all weapons, cameras and most other technology in range." - if ("5") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/smoke(usr) - src.temp = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb." - if ("6") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/trigger/blind(usr) - src.temp = "This spell temporarly blinds a single person and does not require wizard garb." - if ("7") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/mind_transfer(usr) - src.temp = "This spell allows the user to switch bodies with a target. Careful to not lose your memory in the process." - if ("8") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(usr) - src.temp = "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb." - if ("9") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(usr) - src.temp = "This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience." - if ("10") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(usr) - src.temp = "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." - if ("11") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/genetic/mutate(usr) - src.temp = "This spell causes you to turn into a hulk and gain telekinesis for a short while." - if ("12") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(usr) - src.temp = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls." - if ("13") - 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 - usr.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(usr) - src.temp = "This spell opens nearby doors and does not require wizard garb." - if ("14") - 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 - usr.rightandwrong() - src.max_uses-- - src.temp = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill eachother. Just be careful not to get hit in the crossfire!" - if ("15") - 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/energy/staff(get_turf(usr)) - src.temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself" - src.max_uses-- - if ("16") - 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(usr)) - usr.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(usr) - src.temp = "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." - src.max_uses-- - if ("17") - 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(usr)) //In case they've lost them. - new /obj/item/clothing/gloves/purple(get_turf(usr))//To complete the outfit - new /obj/item/clothing/suit/space/rig/wizard(get_turf(usr)) - new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(usr)) - src.temp = "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space." - src.max_uses-- - if (href_list["spell_choice"] == "18") + if(H.stat || H.restrained()) + return + if(!istype(H, /mob/living/carbon/human)) + return 1 + + 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) - src.uses = src.max_uses - usr.spellremove(usr) - src.temp = "All spells have been removed. You may now memorize a new set of spells." + 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 - src.temp = "You may only re-memorize spells whilst located inside the wizard sanctuary." + temp = "You may only re-memorize spells whilst located inside the wizard sanctuary." + else if(uses >= 1 && max_uses >=1) + uses-- + /* + */ + var/list/available_spells = list(magicmissile = "Magic Missile", fireball = "Fireball", disintegrate = "Disintegrate", disabletech = "Disable Tech", smoke = "Smoke", blind = "Blind", mindswap = "Mind Transfer", forcewall = "Forcewall", blink = "Blink", teleport = "Teleport", mutate = "Mutate", etherealjaunt = "Ethereal Jaunt", knock = "Knock", horseman = "Curse of the Horseman", summonguns = "Summon Guns", staffchange = "Staff of Change", soulstone = "Six Soul Stone Shards and the spell Artificer", armor = "Mastercrafted Armor Set", staffanimate = "Staff of Animation") + var/already_knows = 0 + for(var/obj/effect/proc_holder/spell/aspell in H.spell_list) + if(available_spells[href_list["spell_choice"]] == aspell.name) + already_knows = 1 + temp = "You already know that spell." + uses++ + break + /* + */ + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(H) + temp = "This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage." + 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.spell_list += new /obj/effect/proc_holder/spell/dumbfire/fireball(H) + temp = "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." + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(H) + temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown." + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(H) + temp = "This spell disables all weapons, cameras and most other technology in range." + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/smoke(H) + temp = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb." + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/trigger/blind(H) + temp = "This spell temporarly blinds a single person and does not require wizard garb." + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/mind_transfer(H) + temp = "This spell allows the user to switch bodies with a target. Careful to not lose your memory in the process." + 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.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(H) + temp = "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb." + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(H) + temp = "This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience." + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(H) + temp = "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." + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/genetic/mutate(H) + temp = "This spell causes you to turn into a hulk and gain telekinesis for a short while." + 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.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(H) + temp = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls." + 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.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(H) + temp = "This spell opens nearby doors and does not require wizard garb." + if("horseman") + feedback_add_details("wizard_spell_learned","HH") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells + H.spell_list += new /obj/effect/proc_holder/spell/targeted/horsemask(H) + temp = "This spell will curse a person to wear an unremovable horse mask (it has glue on the inside) and speak like a horse. It does not require a wizard garb. Do note the curse will disintegrate the target's current mask if they are wearing one." + 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 + H.rightandwrong() + max_uses-- + temp = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill eachother. Just be careful not to get hit in the crossfire!" + 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/energy/staff(get_turf(H)) + temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself" + 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.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(H) + temp = "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." + 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/purple(get_turf(H))//To complete the outfit + new /obj/item/clothing/suit/space/rig/wizard(get_turf(H)) + new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(H)) + temp = "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space." + 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/energy/staff/animate(get_turf(H)) + temp = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines." + max_uses-- else - if (href_list["temp"]) - src.temp = null + if(href_list["temp"]) + temp = null attack_self(H) return diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index dec9e7496cb..d086a7f6b0b 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -5,7 +5,8 @@ /datum/game_mode/wizard name = "wizard" config_tag = "wizard" - required_players = 20 + required_players = 2 + required_players_secret = 10 required_enemies = 1 recommended_enemies = 1 @@ -183,6 +184,10 @@ /datum/game_mode/wizard/check_finished() + + if(config.continous_rounds) + return ..() + var/wizards_alive = 0 for(var/datum/mind/wizard in wizards) if(!istype(wizard.current,/mob/living/carbon)) @@ -198,6 +203,7 @@ return 1 + /datum/game_mode/wizard/declare_completion() if(finished) feedback_set_details("round_end_result","loss - wizard killed") diff --git a/code/game/hud.dm b/code/game/hud.dm index 5ca50952119..84b2c8e2125 100644 --- a/code/game/hud.dm +++ b/code/game/hud.dm @@ -252,13 +252,6 @@ datum/hud/New(mob/owner) if(ishuman(mymob)) human_hud(ui_style) // Pass the player the UI style chosen in preferences - if(RADAR in mymob.augmentations) - spawn() - if(mymob.radar_open) - mymob:start_radar() - else - mymob:place_radar_closed() - else if(ismonkey(mymob)) monkey_hud(ui_style) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index ac96aa1ce1a..b7abbce7e79 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -127,15 +127,17 @@ else if(istype(M, /mob/living/carbon/monkey) || istype(M, /mob/living/carbon/alien/humanoid)) var/mob/living/carbon/george = M //they can only hold things :( - if(george.get_active_hand() && (istype(george.get_active_hand(), /obj/item/weapon/card/id) || istype(george.get_active_hand(), /obj/item/device/pda)) && src.check_access(george.get_active_hand())) + if(src.check_access(george.get_active_hand())) return 1 return 0 -/obj/proc/check_access(obj/item/weapon/card/id/I) +/obj/item/proc/GetAccess() + return list() - if (istype(I, /obj/item/device/pda)) - var/obj/item/device/pda/pda = I - I = pda.id +/obj/item/proc/GetID() + return null + +/obj/proc/check_access(obj/item/I) if(!src.req_access && !src.req_one_access) //no requirements return 1 @@ -145,14 +147,14 @@ var/list/L = src.req_access if(!L.len && (!src.req_one_access || !src.req_one_access.len)) //no requirements return 1 - if(!I || !istype(I, /obj/item/weapon/card/id) || !I.access) //not ID or no access + if(!I) return 0 for(var/req in src.req_access) - if(!(req in I.access)) //doesn't have this access + if(!(req in I.GetAccess())) //doesn't have this access return 0 if(src.req_one_access && src.req_one_access.len) for(var/req in src.req_one_access) - if(req in I.access) //has an access from the single access list + if(req in I.GetAccess()) //has an access from the single access list return 1 return 0 return 1 @@ -174,92 +176,6 @@ return 0 return 1 - -/proc/get_access(job) - switch(job) - if("Geneticist") - return list(access_medical, access_morgue, access_genetics) - if("Station Engineer") - return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction) - if("Assistant") - if(config.assistant_maint) - return list(access_maint_tunnels) - else - return list() - if("Chaplain") - return list(access_morgue, access_chapel_office, access_crematorium) - if("Detective") - return list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) - if("Medical Doctor") - return list(access_medical, access_morgue, access_surgery, access_virology) - if("Botanist") // -- TLE - return list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. - if("Librarian") // -- TLE - return list(access_library) - if("Lawyer") //Muskets 160910 - return list(access_lawyer, access_court) - if("Captain") - return get_all_accesses() - if("Security Officer") - return list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels) - if("Warden") - return list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels) - if("Scientist") - return list(access_tox, access_tox_storage, access_research, access_xenobiology) - if("Head of Security") - return list(access_medical, access_morgue, access_tox, access_tox_storage, access_chemistry, access_genetics, access_court, - access_teleporter, access_heads, access_tech_storage, access_security, access_sec_doors, access_brig, access_atmospherics, - access_maint_tunnels, access_bar, access_janitor, access_kitchen, access_robotics, access_armory, access_hydroponics, - access_theatre, access_research, access_hos, access_RC_announce, access_forensics_lockers, access_keycard_auth) - if("Head of Personnel") - return list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, - access_tox, access_tox_storage, access_chemistry, access_medical, access_genetics, access_engine, - access_emergency_storage, access_change_ids, access_ai_upload, access_eva, access_heads, - access_all_personal_lockers, access_tech_storage, access_maint_tunnels, access_bar, access_janitor, - access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, - access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway) - if("Atmospheric Technician") - return list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction) - if("Bartender") - return list(access_bar) - if("Chemist") - return list(access_medical, access_chemistry) - if("Janitor") - return list(access_janitor, access_maint_tunnels) - if("Clown") - return list(access_clown, access_theatre) - if("Mime") - return list(access_mime, access_theatre) - if("Chef") - return list(access_kitchen, access_morgue) - if("Roboticist") - return list(access_robotics, access_tech_storage, access_morgue) //As a job that handles so many corpses, it makes sense for them to have morgue access. - if("Cargo Technician") - return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting) - if("Shaft Miner") - return list(access_mining, access_mint, access_mining_station) - if("Quartermaster") - return list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) - if("Chief Engineer") - return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, - access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, - access_heads, access_ai_upload, access_construction, access_robotics, - access_mint, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat) - if("Research Director") - return list(access_rd, access_heads, access_tox, access_genetics, - access_tox_storage, access_teleporter, - access_research, access_robotics, access_xenobiology, - access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) - if("Virologist") - return list(access_medical, access_virology) - if("Chief Medical Officer") - return list(access_medical, access_morgue, access_genetics, access_heads, - access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, - access_keycard_auth) - else - return list() - /proc/get_centcom_access(job) switch(job) if("VIP Guest") @@ -285,12 +201,12 @@ return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_court, access_medical, access_genetics, access_morgue, access_rd, access_tox, access_tox_storage, access_chemistry, access_engine, access_engine_equip, access_maint_tunnels, - access_external_airlocks, access_emergency_storage, access_change_ids, access_ai_upload, + access_external_airlocks, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers, access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen, - access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction, - access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery, - access_theatre, access_research, access_mining, access_mailsorting, access_mint_vault, access_mint, + access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_construction, + access_hydroponics, access_library, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery, + access_theatre, access_research, access_mining, access_mailsorting, access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) @@ -309,15 +225,15 @@ if(2) //medbay return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo) if(3) //research - return list(access_research, access_tox, access_tox_storage, access_xenobiology, access_rd) + return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd) if(4) //engineering and maintenance - return list(access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_construction, access_robotics, access_ce) + return list(access_construction, access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_ce) if(5) //command - return list(access_heads, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_all_personal_lockers, access_heads_vault, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_hop, access_captain) + return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_tcomsat, access_gateway, access_all_personal_lockers, access_heads_vault, access_hop, access_captain) if(6) //station general return list(access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime) if(7) //supply - return list(access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_mining, access_mining_station) + return list(access_mailsorting, access_mining, access_mining_station, access_cargo, access_qm) /proc/get_region_accesses_name(var/code) switch(code) @@ -352,7 +268,7 @@ if(access_court) return "Courtroom" if(access_forensics_lockers) - return "Detective's Office" + return "Forensics" if(access_medical) return "Medical" if(access_genetics) @@ -360,13 +276,13 @@ if(access_morgue) return "Morgue" if(access_tox) - return "Research Lab" + return "R&D Lab" if(access_tox_storage) - return "Toxins Storage" + return "Toxins Lab" if(access_chemistry) return "Chemistry Lab" if(access_rd) - return "RD Private" + return "Research Director" if(access_bar) return "Bar" if(access_janitor) @@ -374,7 +290,7 @@ if(access_engine) return "Engineering" if(access_engine_equip) - return "APCs" + return "Power Equipment" if(access_maint_tunnels) return "Maintenance" if(access_external_airlocks) @@ -392,7 +308,7 @@ if(access_heads) return "Bridge" if(access_captain) - return "Captain Private" + return "Captain" if(access_all_personal_lockers) return "Personal Lockers" if(access_chapel_office) @@ -420,9 +336,9 @@ if(access_virology) return "Virology" if(access_cmo) - return "CMO Private" + return "Chief Medical Officer" if(access_qm) - return "Quartermaster's Office" + return "Quartermaster" /* if(access_clown) return "HONK! Access" if(access_mime) @@ -440,7 +356,7 @@ if(access_mining_office) return "Mining Office" if(access_mailsorting) - return "Delivery Office" + return "Cargo Office" if(access_mint) return "Mint" if(access_mint_vault) @@ -448,15 +364,15 @@ if(access_heads_vault) return "Main Vault" if(access_mining_station) - return "Mining Station EVA" + return "Mining EVA" if(access_xenobiology) return "Xenobiology Lab" if(access_hop) - return "HoP Private" + return "Head of Personnel" if(access_hos) - return "HoS Private" + return "Head of Security" if(access_ce) - return "CE Private" + return "Chief Engineer" if(access_RC_announce) return "RC Announcements" if(access_keycard_auth) @@ -492,35 +408,51 @@ /proc/get_all_jobs() return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", /*"Clown", "Mime", */"Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", - "Atmospheric Technician", "Roboticist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", - "Research Director", "Scientist", "Head of Security", "Warden", "Detective", "Security Officer") + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", + "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer") /proc/get_all_centcom_jobs() return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander") -/obj/proc/GetJobName() +//gets the actual job rank (ignoring alt titles) +//this is used solely for sechuds +/obj/proc/GetJobRealName() if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id)) return - var/jobName - var/realJobName - - // hack for alt titles - if(istype(loc, /mob)) - var/mob/M = loc - if(M.mind && M.mind.role_alt_title == jobName && M.mind.assigned_role in get_all_jobs()) - return M.mind.assigned_role - + var/rank + var/assignment if(istype(src, /obj/item/device/pda)) if(src:id) - jobName = src:id:assignment - realJobName = src:id:assignment_real_title - if(istype(src, /obj/item/weapon/card/id)) - jobName = src:assignment - realJobName = src:assignment_real_title + rank = src:id:rank + assignment = src:id:assignment + else if(istype(src, /obj/item/weapon/card/id)) + rank = src:rank + assignment = src:assignment - if( (realJobName in get_all_jobs()) || (jobName in get_all_jobs()) ) - return jobName + if( rank in get_all_jobs() ) + return rank + + if( assignment in get_all_jobs() ) + return assignment + + return "Unknown" + +//gets the alt title, failing that the actual job rank +//this is unused +/obj/proc/sdsdsd() //GetJobDisplayName + if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id)) + return + + var/assignment + if(istype(src, /obj/item/device/pda)) + if(src:id) + assignment = src:id:assignment + else if(istype(src, /obj/item/weapon/card/id)) + assignment = src:assignment + + if(assignment) + return assignment return "Unknown" diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index b5b6f039707..2706d44aa40 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -7,13 +7,18 @@ spawn_positions = -1 supervisors = "absolutely everyone" selection_color = "#dddddd" + access = list() //See /datum/job/assistant/get_access() + minimal_access = list() //See /datum/job/assistant/get_access() + alt_titles = list("Technical Assistant","Medical Intern","Research Assistant","Security Cadet") - equip(var/mob/living/carbon/human/H) - if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) - if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - return 1 +/datum/job/assistant/equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + return 1 + +/datum/job/assistant/get_access() + if(config.assistant_maint) + return list(access_maint_tunnels) + else + return list() diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 8ca6a5e49a0..149685a3ce4 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -9,8 +9,9 @@ selection_color = "#ccccff" idtype = /obj/item/weapon/card/id/gold req_admin_notify = 1 - - + access = list() //See get_access() + minimal_access = list() //See get_access() + minimal_player_age = 14 equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_ears) @@ -28,15 +29,18 @@ H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 world << "[H.real_name] is the captain!" return 1 + get_access() + return get_all_accesses() + /datum/job/hop @@ -50,6 +54,19 @@ selection_color = "#ddddff" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 + minimal_player_age = 10 + access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, + access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, + access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, + access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, + access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, + access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway) + minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, + access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, + access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, + access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, + access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, + access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway) equip(var/mob/living/carbon/human/H) @@ -64,7 +81,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt) if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/id_kit(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index fc840b1871a..0306f51e21d 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -8,6 +8,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) + minimal_access = list(access_bar) equip(var/mob/living/carbon/human/H) @@ -48,6 +50,9 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) + minimal_access = list(access_kitchen, access_morgue) + alt_titles = list("Cook") equip(var/mob/living/carbon/human/H) @@ -74,6 +79,9 @@ spawn_positions = 2 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. + minimal_access = list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning. + alt_titles = list("Hydroponicist") equip(var/mob/living/carbon/human/H) @@ -102,15 +110,17 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) + minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/qm(H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_ears) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/quartermaster(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) if(H.backbag == 1) @@ -130,6 +140,8 @@ spawn_positions = 2 supervisors = "the quartermaster and the head of personnel" selection_color = "#dddddd" + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) + minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting) equip(var/mob/living/carbon/human/H) @@ -138,7 +150,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/cargo(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else @@ -156,11 +168,13 @@ spawn_positions = 3 supervisors = "the quartermaster and the head of personnel" selection_color = "#dddddd" + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station) + minimal_access = list(access_mining, access_mint, access_mining_station, access_mailsorting) equip(var/mob/living/carbon/human/H) if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_mine (H), slot_ears) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo (H), slot_ears) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back) @@ -168,15 +182,15 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/device/pda/shaftminer(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/satchel(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_l_store) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_in_backpack) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/satchel(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack) return 1 @@ -192,6 +206,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_clown, access_theatre, access_maint_tunnels) + minimal_access = list(access_clown, access_theatre) equip(var/mob/living/carbon/human/H) @@ -206,7 +222,8 @@ H.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H), slot_in_backpack) H.equip_to_slot_or_del(new /obj/item/toy/crayon/rainbow(H), slot_in_backpack) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/crayonbox(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/fancy/crayons(H), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/toy/waterflower(H), slot_in_backpack) H.mutations.Add(CLUMSY) return 1 @@ -221,6 +238,8 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_mime, access_theatre, access_maint_tunnels) + minimal_access = list(access_mime, access_theatre) equip(var/mob/living/carbon/human/H) @@ -260,6 +279,9 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_janitor, access_maint_tunnels) + minimal_access = list(access_janitor, access_maint_tunnels) + alt_titles = list("Custodial officer") equip(var/mob/living/carbon/human/H) @@ -271,6 +293,7 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/key(H), slot_l_store) return 1 @@ -285,6 +308,9 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_library, access_maint_tunnels) + minimal_access = list(access_library) + alt_titles = list("Journalist") equip(var/mob/living/carbon/human/H) @@ -311,6 +337,9 @@ var/global/lawyer = 0//Checks for another lawyer spawn_positions = 2 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels) + minimal_access = list(access_lawyer, access_court, access_sec_doors) + alt_titles = list("Attorney", "IA Consultant") equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index d81e06eee36..84360efe58b 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -8,6 +8,9 @@ spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels) + minimal_access = list(access_morgue, access_chapel_office, access_crematorium) + alt_titles = list("Counselor") equip(var/mob/living/carbon/human/H) @@ -24,7 +27,7 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) 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 = copytext(sanitize(input(H, "You are the crew services officer. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)),1,MAX_NAME_LEN) if (!new_religion) new_religion = religion_name diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 3b76e5c225d..90222b96269 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -9,6 +9,15 @@ selection_color = "#ffeeaa" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 + access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, + access_heads, access_construction, access_sec_doors, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat) + minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, + access_heads, access_construction, access_sec_doors, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat) + minimal_player_age = 7 equip(var/mob/living/carbon/human/H) @@ -41,6 +50,9 @@ spawn_positions = 5 supervisors = "the chief engineer" selection_color = "#fff5cc" + access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics) + minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction) + alt_titles = list("Maintenance Technician","Engine Technician","Electrician") equip(var/mob/living/carbon/human/H) @@ -73,6 +85,8 @@ spawn_positions = 2 supervisors = "the chief engineer" selection_color = "#fff5cc" + access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics) + minimal_access = list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction) equip(var/mob/living/carbon/human/H) @@ -90,35 +104,4 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) - return 1 - - - -/datum/job/roboticist - title = "Roboticist" - flag = ROBOTICIST - department_flag = ENGSEC - faction = "Station" - total_positions = 2 - spawn_positions = 2 - supervisors = "the chief engineer and research director" - selection_color = "#fff5cc" - - equip(var/mob/living/carbon/human/H) - if(!H) return 0 - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_rob(H), slot_ears) - switch(H.backbag) - if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) - if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) - if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand) - if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 \ No newline at end of file diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index e3995483ff4..50161ed7a79 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -3,6 +3,10 @@ //The name of the job var/title = "NOPE" + //Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access + var/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) + var/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!) + //Bitflags for the job var/flag = 0 var/department_flag = 0 @@ -34,5 +38,36 @@ //If this is set to 1, a text is printed to the player when jobs are assigned, telling him that he should let admins know that he has to disconnect. var/req_admin_notify + //If you have use_age_restriction_for_jobs config option enabled and the database set up, this option will add a requirement for players to be at least minimal_player_age days old. (meaning they first signed in at least that many days before.) + var/minimal_player_age = 0 + /datum/job/proc/equip(var/mob/living/carbon/human/H) return 1 + +/datum/job/proc/get_access() + if(!config) //Needed for robots. + return src.minimal_access + + if(config.jobs_have_minimal_access) + return src.minimal_access + else + return src.access + +//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/job/proc/player_old_enough(client/C) + if(available_in_days(C) == 0) + return 1 //Available in 0 days = available right now = player is old enough to play. + return 0 + + +/datum/job/proc/available_in_days(client/C) + if(!C) + return 0 + if(!config.use_age_restriction_for_jobs) + return 0 + if(!isnum(C.player_age)) + return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced + if(!isnum(minimal_player_age)) + return 0 + + return max(0, minimal_player_age - C.player_age) \ No newline at end of file diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index b4cad5555b6..c1aafb07218 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -9,7 +9,13 @@ selection_color = "#ffddf0" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 - + access = list(access_medical, access_morgue, access_genetics, access_heads, + access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, + access_keycard_auth, access_sec_doors) + minimal_access = list(access_medical, access_morgue, access_genetics, access_heads, + access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, + access_keycard_auth, access_sec_doors) + minimal_player_age = 7 equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -41,8 +47,9 @@ spawn_positions = 3 supervisors = "the chief medical officer" selection_color = "#ffeef0" - alt_titles = list("Surgeon", "Emergency Physician", "Virologist") - + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) + minimal_access = list(access_medical, access_morgue, access_surgery) + alt_titles = list("Surgeon","Emergency Physician","Nurse","Orderly") equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -67,6 +74,11 @@ if("Medical Doctor") H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) + if("Orderly") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform) + if("Nurse") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head) else H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) @@ -82,7 +94,7 @@ -//Chemist is a medical job damnit //YEAH FUCK YOU SCIENCE -Pete +//Chemist is a medical job damnit //YEAH FUCK YOU SCIENCE -Pete //Guys, behave -Erro /datum/job/chemist title = "Chemist" flag = CHEMIST @@ -92,6 +104,9 @@ spawn_positions = 2 supervisors = "the chief medical officer" selection_color = "#ffeef0" + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) + minimal_access = list(access_medical, access_chemistry) + alt_titles = list("Pharmacist") equip(var/mob/living/carbon/human/H) @@ -118,6 +133,8 @@ spawn_positions = 2 supervisors = "the chief medical officer and research director" selection_color = "#ffeef0" + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research) + minimal_access = list(access_medical, access_morgue, access_genetics, access_research) equip(var/mob/living/carbon/human/H) @@ -134,8 +151,6 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 -/* - /datum/job/virologist title = "Virologist" flag = VIROLOGIST @@ -145,6 +160,9 @@ spawn_positions = 1 supervisors = "the chief medical officer" selection_color = "#ffeef0" + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) + minimal_access = list(access_medical, access_virology) + alt_titles = list("Pathologist","Microbiologist") equip(var/mob/living/carbon/human/H) @@ -165,5 +183,3 @@ else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 -*/ - diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index c9292feedba..625d48f8918 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -9,7 +9,15 @@ selection_color = "#ffddff" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 - + access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, + access_tox_storage, access_teleporter, access_sec_doors, + access_research, access_robotics, access_xenobiology, access_ai_upload, + access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) + minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, + access_tox_storage, access_teleporter, access_sec_doors, + access_research, access_robotics, access_xenobiology, access_ai_upload, + access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) + minimal_player_age = 7 equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -36,9 +44,10 @@ spawn_positions = 3 supervisors = "the research director" selection_color = "#ffeeff" + access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology) + minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology) alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist") - equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) @@ -46,6 +55,38 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + return 1 + + + +/datum/job/roboticist + title = "Roboticist" + flag = ROBOTICIST + department_flag = MEDSCI + faction = "Station" + total_positions = 2 + spawn_positions = 1 + supervisors = "research director" + selection_color = "#ffeeff" + access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. + minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. + alt_titles = list("Biomedical Engineer","Mechatronic Engineer") + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears) + if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) +// H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 2340459ab4a..98c255b7dcf 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -9,7 +9,15 @@ selection_color = "#ffdddd" idtype = /obj/item/weapon/card/id/silver req_admin_notify = 1 - + access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, + access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, + access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway) + minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, + access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, + access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, + access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway) + minimal_player_age = 14 equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -47,7 +55,9 @@ spawn_positions = 1 supervisors = "the head of security" selection_color = "#ffeeee" - + access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue) + minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court) + minimal_player_age = 7 equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -84,7 +94,10 @@ selection_color = "#ffeeee" alt_titles = list("Forensic Technician") - + access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) + minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court) + alt_titles = list("Forensic Technician") + minimal_player_age = 7 equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) @@ -128,8 +141,9 @@ spawn_positions = 5 supervisors = "the head of security" selection_color = "#ffeeee" - - + access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue) + minimal_access = list(access_security, access_sec_doors, access_brig, access_court) + minimal_player_age = 7 equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index 70c455bba36..c50767d2f55 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -8,7 +8,7 @@ selection_color = "#ccffcc" supervisors = "your laws" req_admin_notify = 1 - + minimal_player_age = 30 equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -25,6 +25,7 @@ spawn_positions = 2 supervisors = "your laws and the AI" //Nodrak selection_color = "#ddffdd" + minimal_player_age = 21 equip(var/mob/living/carbon/human/H) if(!H) return 0 diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 841935b6c28..03f577659a5 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -38,8 +38,8 @@ var/global/datum/controller/occupations/job_master if(J.title == rank) return J return null - proc/GetAltTitle(mob/new_player/player, rank) - return player.client.prefs.GetAltTitle(GetJob(rank)) + proc/GetPlayerAltTitle(mob/new_player/player, rank) + return player.client.prefs.GetPlayerAltTitle(GetJob(rank)) proc/AssignRole(var/mob/new_player/player, var/rank, var/latejoin = 0) Debug("Running AR, Player: [player], Rank: [rank], LJ: [latejoin]") @@ -47,13 +47,14 @@ var/global/datum/controller/occupations/job_master var/datum/job/job = GetJob(rank) if(!job) return 0 if(jobban_isbanned(player, rank)) return 0 + if(!job.player_old_enough(player.client)) return 0 var/position_limit = job.total_positions if(!latejoin) position_limit = job.spawn_positions if((job.current_positions < position_limit) || position_limit == -1) Debug("Player: [player] is now Rank: [rank], JCP:[job.current_positions], JPL:[position_limit]") player.mind.assigned_role = rank - player.mind.role_alt_title = GetAltTitle(player, rank) + player.mind.role_alt_title = GetPlayerAltTitle(player, rank) unassigned -= player job.current_positions++ return 1 @@ -74,6 +75,9 @@ var/global/datum/controller/occupations/job_master if(jobban_isbanned(player, job.title)) Debug("FOC isbanned failed, Player: [player]") continue + if(!job.player_old_enough(player.client)) + Debug("FOC player not old enough, Player: [player]") + continue if(flag && (!player.client.prefs.be_special & flag)) Debug("FOC flag failed, Player: [player], Flag: [flag], ") continue @@ -83,7 +87,7 @@ var/global/datum/controller/occupations/job_master return candidates proc/GiveRandomJob(var/mob/new_player/player) - Debug("FOC Giving random job, Player: [player]") + Debug("GRJ Giving random job, Player: [player]") for(var/datum/job/job in shuffle(occupations)) if(!job) continue @@ -95,11 +99,15 @@ var/global/datum/controller/occupations/job_master continue if(jobban_isbanned(player, job.title)) - Debug("FOC isbanned failed, Player: [player], Job: [job.title]") + Debug("GRJ isbanned failed, Player: [player], Job: [job.title]") + continue + + if(!job.player_old_enough(player.client)) + Debug("GRJ player not old enough, Player: [player]") continue if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) - Debug("FOC Random job given, Player: [player], Job: [job]") + Debug("GRJ Random job given, Player: [player], Job: [job]") AssignRole(player, job.title) unassigned -= player break @@ -242,7 +250,11 @@ var/global/datum/controller/occupations/job_master continue if(jobban_isbanned(player, job.title)) - Debug("FOC isbanned failed, Player: [player], Job:[job.title]") + Debug("DO isbanned failed, Player: [player], Job:[job.title]") + continue + + if(!job.player_old_enough(player.client)) + Debug("DO player not old enough, Player: [player], Job:[job.title]") continue // If the player wants that job on this level, then try give it to him. @@ -250,7 +262,7 @@ var/global/datum/controller/occupations/job_master // If the job isn't filled if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1) - Debug("FOC pass, Player: [player], Level:[level], Job:[job.title]") + Debug("DO pass, Player: [player], Level:[level], Job:[job.title]") AssignRole(player, job.title) unassigned -= player break @@ -299,9 +311,6 @@ var/global/datum/controller/occupations/job_master H << "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator." H.job = rank - if(H.mind && H.mind.assigned_role != rank) - H.mind.assigned_role = rank - H.mind.role_alt_title = null if(!joined_late) var/obj/S = null @@ -315,10 +324,10 @@ var/global/datum/controller/occupations/job_master if(istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf)) H.loc = S.loc - - + var/alt_title = null if(H.mind) H.mind.assigned_role = rank + alt_title = H.mind.role_alt_title switch(rank) if("Cyborg") @@ -342,16 +351,12 @@ var/global/datum/controller/occupations/job_master new /obj/item/weapon/storage/box(BPK) H.equip_to_slot_or_del(BPK, slot_back,1) - H << "You are the [rank]." - H << "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this." + H << "You are the [alt_title ? alt_title : rank]." + H << "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this." if(job.req_admin_notify) H << "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp." - spawnId(H,rank) - if(H.mind.assigned_role == rank && H.mind.role_alt_title) - spawnId(H, rank, H.mind.role_alt_title) - else - spawnId(H,rank) + spawnId(H, rank, alt_title) H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears) // H.update_icons() return 1 @@ -359,7 +364,6 @@ var/global/datum/controller/occupations/job_master proc/spawnId(var/mob/living/carbon/human/H, rank, title) if(!H) return 0 - if(!title) title = rank var/obj/item/weapon/card/id/C = null var/datum/job/job = null @@ -373,23 +377,20 @@ var/global/datum/controller/occupations/job_master return else C = new job.idtype(H) + C.access = job.get_access() else C = new /obj/item/weapon/card/id(H) if(C) C.registered_name = H.real_name - C.assignment = title + C.rank = rank + C.assignment = title ? title : rank C.name = "[C.registered_name]'s ID Card ([C.assignment])" - C.access = get_access(rank) H.equip_to_slot_or_del(C, slot_wear_id) - /* if(prob(50)) - H.equip_to_slot_or_del(new /obj/item/weapon/pen(H), slot_r_store) - else - H.equip_to_slot_or_del(new /obj/item/weapon/pen/blue(H), slot_r_store)*/ H.equip_to_slot_or_del(new /obj/item/device/pda(H), slot_belt) - if(locate(/obj/item/device/pda,H))//I bet this could just use locate. It can --SkyMarshal + if(locate(/obj/item/device/pda,H)) var/obj/item/device/pda/pda = locate(/obj/item/device/pda,H) pda.owner = H.real_name - pda.ownjob = H.wear_id.assignment + pda.ownjob = C.assignment pda.name = "PDA-[H.real_name] ([pda.ownjob])" return 1 @@ -438,12 +439,16 @@ var/global/datum/controller/occupations/job_master var/level3 = 0 //low var/level4 = 0 //never var/level5 = 0 //banned + var/level6 = 0 //account too young for(var/mob/new_player/player in player_list) if(!(player.ready && player.mind && !player.mind.assigned_role)) continue //This player is not ready if(jobban_isbanned(player, job.title)) level5++ continue + if(!job.player_old_enough(player.client)) + level6++ + continue if(player.client.prefs.GetJobDepartment(job, 1) & job.flag) level1++ else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag) @@ -452,5 +457,5 @@ var/global/datum/controller/occupations/job_master level3++ else level4++ //not selected - tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|-" + tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|-|YOUNG=[level6]|-" feedback_add_details("job_preferences",tmp_str) diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index cbe4587c7e1..60b8c6a99df 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -63,4 +63,4 @@ H << "You'll have to wait if you want to atone for your sins." spawn(3000) H.miming = 1 - return + return \ No newline at end of file diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index dcfa843d4ac..f28de56dc41 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -22,6 +22,8 @@ proc/load_alienwhitelist() //todo: admin aliens /proc/is_alien_whitelisted(mob/M, var/species) + if(!config.usealienwhitelist) + return 1 if(species == "human" || species == "Human") return 1 if(check_rights(R_ADMIN, 0)) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 14337227017..69519c585d1 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -63,7 +63,7 @@ return /obj/machinery/optable/attack_hand(mob/user as mob) - if ((HULK in usr.mutations) || (SUPRSTR in usr.augmentations)) + if (HULK in usr.mutations) usr << text("\blue You destroy the table.") visible_message("\red [usr] destroys the operating table!") src.density = 0 diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 9994d29a789..5c53d4ce8bb 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -175,9 +175,9 @@ user << "\blue The sleeper is already occupied!" return - for(var/mob/living/carbon/metroid/M in range(1,G.affecting)) + for(var/mob/living/carbon/slime/M in range(1,G.affecting)) if(M.Victim == G.affecting) - usr << "[G.affecting.name] will not fit into the sleeper because they have a Metroid latched onto their head." + usr << "[G.affecting.name] will not fit into the sleeper because they have a slime latched onto their head." return visible_message("[user] starts putting [G.affecting.name] into the sleeper.", 3) @@ -230,7 +230,13 @@ del(src) return return - + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + if(occupant) + go_out() + ..(severity) alter_health(mob/living/M as mob) if (M.health > 0) @@ -267,52 +273,52 @@ proc/inject_inap(mob/living/user as mob) - if(src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("inaprovaline") + 30 <= 60) src.occupant.reagents.add_reagent("inaprovaline", 30) user << text("Occupant now has [] units of Inaprovaline in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("inaprovaline")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return proc/inject_stox(mob/living/user as mob) - if(src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("stoxin") + 20 <= 40) src.occupant.reagents.add_reagent("stoxin", 20) user << text("Occupant now has [] units of soporifics in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("stoxin")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return proc/inject_dermaline(mob/living/user as mob) - if (src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("dermaline") + 20 <= 40) src.occupant.reagents.add_reagent("dermaline", 20) user << text("Occupant now has [] units of Dermaline in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dermaline")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return proc/inject_bicaridine(mob/living/user as mob) - if(src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("bicaridine") + 10 <= 20) src.occupant.reagents.add_reagent("bicaridine", 10) user << text("Occupant now has [] units of Bicaridine in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("bicaridine")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return proc/inject_dexalin(mob/living/user as mob) - if(src.occupant) + if(src.occupant && src.occupant.reagents) if(src.occupant.reagents.get_reagent_amount("dexalin") + 20 <= 40) src.occupant.reagents.add_reagent("dexalin", 20) user << text("Occupant now has [] units of Dexalin in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dexalin")) else - user << "No occupant!" + user << "There's no occupant in the sleeper or the subject rejects the chemicals!" return @@ -367,7 +373,7 @@ usr << "\blue The sleeper is already occupied!" return - for(var/mob/living/carbon/metroid/M in range(1,usr)) + for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) usr << "You're too busy getting your life sucked out of you." return diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 896bf363b13..228f585a909 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1,6 +1,5 @@ -//////////////////////////////////////// -//CONTAINS: Air Alarms and Fire Alarms// -//////////////////////////////////////// +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /proc/RandomAAlarmWires() //to make this not randomize the wires, just set index to 1 and increment it in the flag for loop (after doing everything else). @@ -22,769 +21,601 @@ flagIndex+=1 return AAlarmwires -#define AALARM_WIRE_IDSCAN 1 //Added wires -#define AALARM_WIRE_POWER 2 -#define AALARM_WIRE_SYPHON 3 -#define AALARM_WIRE_AI_CONTROL 4 -#define AALARM_WIRE_AALARM 5 -#define AALARM_MODE_SCRUBBING 1 -#define AALARM_MODE_REPLACEMENT 2 //like scrubbing, but faster. -#define AALARM_MODE_PANIC 3 //constantly sucks all air -#define AALARM_MODE_CYCLE 4 //sucks off all air, then refill and swithes to scrubbing -#define AALARM_MODE_FILL 5 //emergency fill -#define AALARM_SCREEN_MAIN 1 -#define AALARM_SCREEN_VENT 2 -#define AALARM_SCREEN_SCRUB 3 -#define AALARM_SCREEN_MODE 4 -#define AALARM_SCREEN_SENSORS 5 - -#define AALARM_REPORT_TIMEOUT 100 - -#define RCON_NO 1 -#define RCON_AUTO 2 -#define RCON_YES 3 - -//all air alarms in area are connected via magic -/area - var/obj/machinery/alarm/master_air_alarm - var/list/air_vent_names - var/list/air_scrub_names - var/list/air_vent_info - var/list/air_scrub_info +// A datum for dealing with threshold limit values +// used in /obj/machinery/alarm +/datum/tlv + var/min2 + var/min1 + var/max1 + var/max2 + New(_min2 as num, _min1 as num, _max1 as num, _max2 as num) + min2 = _min2 + min1 = _min1 + max1 = _max1 + max2 = _max2 + proc/get_danger_level(curval as num) + if (max2 >=0 && curval>=max2) + return 2 + if (min2 >=0 && curval<=min2) + return 2 + if (max1 >=0 && curval>=max1) + return 1 + if (min1 >=0 && curval<=min1) + return 1 + return 0 + proc/CopyFrom(datum/tlv/other) + min2 = other.min2 + min1 = other.min1 + max1 = other.max1 + max2 = other.max2 /obj/machinery/alarm name = "alarm" - icon = 'monitors.dmi' + icon = 'icons/obj/monitors.dmi' icon_state = "alarm0" anchored = 1 use_power = 1 idle_power_usage = 4 active_power_usage = 8 power_channel = ENVIRON - req_access = list(access_atmospherics, access_engine_equip) + req_access = list(access_atmospherics) var/frequency = 1439 //var/skipprocess = 0 //Experimenting var/alarm_frequency = 1437 - var/remote_control = 0 - var/rcon_setting = 2 - var/rcon_time = 0 +#define AALARM_REPORT_TIMEOUT 100 + var/datum/radio_frequency/radio_connection var/locked = 1 var/wiresexposed = 0 // If it's been screwdrivered open. var/aidisabled = 0 var/AAlarmwires = 31 var/shorted = 0 + var/buildstage = 2 // 2 = complete, 1 = no wires, 0 = circuit gone + // Uses code from apc.dm + +#define AALARM_WIRE_IDSCAN 1 //Added wires +#define AALARM_WIRE_POWER 2 +#define AALARM_WIRE_SYPHON 3 +#define AALARM_WIRE_AI_CONTROL 4 +#define AALARM_WIRE_AALARM 5 + + +#define AALARM_MODE_SCRUBBING 1 +#define AALARM_MODE_VENTING 2 //makes draught +#define AALARM_MODE_PANIC 3 //constantly sucks all air +#define AALARM_MODE_REPLACEMENT 4 //sucks off all air, then refill and swithes to scrubbing +#define AALARM_MODE_OFF 5 var/mode = AALARM_MODE_SCRUBBING + +#define AALARM_SCREEN_MAIN 1 +#define AALARM_SCREEN_VENT 2 +#define AALARM_SCREEN_SCRUB 3 +#define AALARM_SCREEN_MODE 4 +#define AALARM_SCREEN_SENSORS 5 var/screen = AALARM_SCREEN_MAIN var/area_uid var/area/alarm_area var/danger_level = 0 - var/datum/radio_frequency/radio_connection + // breathable air according to human/Life() + var/list/TLV = list( + "oxygen" = new/datum/tlv( 16, 19, 135, 140), // Partial pressure, kpa + "carbon dioxide" = new/datum/tlv(-1.0, -1.0, 5, 10), // Partial pressure, kpa + "plasma" = new/datum/tlv(-1.0, -1.0, 0.2, 0.5), // Partial pressure, kpa + "other" = new/datum/tlv(-1.0, -1.0, 0.5, 1.0), // Partial pressure, kpa + "pressure" = new/datum/tlv(ONE_ATMOSPHERE*0.80,ONE_ATMOSPHERE*0.90,ONE_ATMOSPHERE*1.10,ONE_ATMOSPHERE*1.20), /* kpa */ + "temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), // K + ) - var/list/TLV = list() +/* + // breathable air according to wikipedia + "oxygen" = new/datum/tlv( 9, 12, 158, 296), // Partial pressure, kpa + "carbon dioxide" = new/datum/tlv(-1.0,-1.0, 0.5, 1), // Partial pressure, kpa +*/ +/obj/machinery/alarm/server + //req_access = list(access_rd) //no, let departaments to work together + TLV = list( + "oxygen" = new/datum/tlv(-1.0, -1.0,-1.0,-1.0), // Partial pressure, kpa + "carbon dioxide" = new/datum/tlv(-1.0, -1.0, 5, 10), // Partial pressure, kpa + "plasma" = new/datum/tlv(-1.0, -1.0, 0.2, 0.5), // Partial pressure, kpa + "other" = new/datum/tlv(-1.0, -1.0, 0.5, 1.0), // Partial pressure, kpa + "pressure" = new/datum/tlv(-1.0, -1.0, -1.0, -1.0), /* kpa */ + "temperature" = new/datum/tlv(40, 60, 120, 140), // K + ) - server/New() - ..() - req_access = list(access_rd, access_atmospherics, access_engine_equip) - TLV["oxygen"] = list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa - TLV["carbon dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa - TLV["plasma"] = list(-1.0, -1.0, 0.2, 0.5) // Partial pressure, kpa - TLV["other"] = list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa - TLV["pressure"] = list(0,ONE_ATMOSPHERE*0.10,ONE_ATMOSPHERE*1.40,ONE_ATMOSPHERE*1.60) /* kpa */ - TLV["temperature"] = list(20, 40, 140, 160) // K +/obj/machinery/alarm/kitchen_cold_room + TLV = list( + "oxygen" = new/datum/tlv( 16, 19, 135, 140), // Partial pressure, kpa + "carbon dioxide" = new/datum/tlv(-1.0, -1.0, 5, 10), // Partial pressure, kpa + "plasma" = new/datum/tlv(-1.0, -1.0, 0.2, 0.5), // Partial pressure, kpa + "other" = new/datum/tlv(-1.0, -1.0, 0.5, 1.0), // Partial pressure, kpa + "pressure" = new/datum/tlv(ONE_ATMOSPHERE*0.80,ONE_ATMOSPHERE*0.90,ONE_ATMOSPHERE*1.50,ONE_ATMOSPHERE*1.60), /* kpa */ + "temperature" = new/datum/tlv(200, 210, 273.15, 283.15), // K + ) - New() - ..() - alarm_area = get_area(src) - if (alarm_area.master) - alarm_area = alarm_area.master - area_uid = alarm_area.uid - if (name == "alarm") - name = "[alarm_area.name] Air Alarm" +//all air alarms in area are connected via magic +/area + var/obj/machinery/alarm/master_air_alarm + var/list/air_vent_names = list() + var/list/air_scrub_names = list() + var/list/air_vent_info = list() + var/list/air_scrub_info = list() - // breathable air according to human/Life() - TLV["oxygen"] = list(16, 19, 135, 140) // Partial pressure, kpa - TLV["carbon dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa - TLV["plasma"] = list(-1.0, -1.0, 0.2, 0.5) // Partial pressure, kpa - TLV["other"] = list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa - TLV["pressure"] = list(ONE_ATMOSPHERE*0.80,ONE_ATMOSPHERE*0.90,ONE_ATMOSPHERE*1.10,ONE_ATMOSPHERE*1.20) /* kpa */ - TLV["temperature"] = list(T0C, T0C+10, T0C+40, T0C+66) // K +/obj/machinery/alarm/New(nloc, ndir, nbuild) + ..() + if(nloc) + loc = nloc - initialize() - set_frequency(frequency) - if (!master_is_operating()) - elect_master() + if(ndir) + dir = ndir + if(nbuild) + buildstage = 0 + wiresexposed = 1 + pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24) + pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0 - process() - if((stat & (NOPOWER|BROKEN)) || shorted) - return - - var/turf/simulated/location = loc - ASSERT(istype(location)) - - var/datum/gas_mixture/environment = location.return_air() - var/partial_pressure = R_IDEAL_GAS_EQUATION*environment.temperature/environment.volume - - var/list/current_settings = TLV["pressure"] - var/environment_pressure = environment.return_pressure() - var/pressure_dangerlevel = get_danger_level(environment_pressure, current_settings) - - current_settings = TLV["oxygen"] - var/oxygen_dangerlevel = get_danger_level(environment.oxygen*partial_pressure, current_settings) - - current_settings = TLV["carbon dioxide"] - var/co2_dangerlevel = get_danger_level(environment.carbon_dioxide*partial_pressure, current_settings) - - current_settings = TLV["plasma"] - var/plasma_dangerlevel = get_danger_level(environment.toxins*partial_pressure, current_settings) - - current_settings = TLV["other"] - var/other_moles = 0.0 - for(var/datum/gas/G in environment.trace_gases) - other_moles+=G.moles - var/other_dangerlevel = get_danger_level(other_moles*partial_pressure, current_settings) - - current_settings = TLV["temperature"] - var/temperature_dangerlevel = get_danger_level(environment.temperature, current_settings) - - var/old_danger_level = danger_level - danger_level = max(pressure_dangerlevel, - oxygen_dangerlevel, - co2_dangerlevel, - plasma_dangerlevel, - other_dangerlevel, - temperature_dangerlevel) - - if (old_danger_level != danger_level) - apply_danger_level(danger_level) - - if (mode==AALARM_MODE_CYCLE && environment_pressure
\n") + var/list/AAlarmwires = list( + "Orange" = 1, + "Dark red" = 2, + "White" = 3, + "Yellow" = 4, + "Black" = 5, + ) + for(var/wiredesc in AAlarmwires) + var/is_uncut = src.AAlarmwires & AAlarmWireColorToFlag[AAlarmwires[wiredesc]] + t1 += "[wiredesc] wire: " + if(!is_uncut) + t1 += "Mend" - proc/set_frequency(new_frequency) - radio_controller.remove_object(src, frequency) - frequency = new_frequency - radio_connection = radio_controller.add_object(src, frequency, RADIO_TO_AIRALARM) + else + t1 += "Cut " + t1 += "Pulse " - proc/send_signal(var/target, var/list/command)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise - if(!radio_connection) - return 0 + t1 += "
" + t1 += text("
\n[(src.locked ? "The Air Alarm is locked." : "The Air Alarm is unlocked.")]
\n[((src.shorted || (stat & (NOPOWER|BROKEN))) ? "The Air Alarm is offline." : "The Air Alarm is working properly!")]
\n[(src.aidisabled ? "The 'AI control allowed' light is off." : "The 'AI control allowed' light is on.")]") + t1 += text("") + user << browse(t1, "window=AAlarmwires") + onclose(user, "AAlarmwires") - var/datum/signal/signal = new - signal.transmission_method = 1 //radio signal - signal.source = src + if(!shorted) + user << browse(return_text(),"window=air_alarm") + onclose(user, "air_alarm") + refresh_all() - signal.data = command - signal.data["tag"] = target - signal.data["sigtype"] = "command" + return - radio_connection.post_signal(src, signal, RADIO_FROM_AIRALARM) - // world << text("Signal [] Broadcasted to []", command, target) - return 1 +/obj/machinery/alarm/proc/isWireColorCut(var/wireColor) + var/wireFlag = AAlarmWireColorToFlag[wireColor] + return ((src.AAlarmwires & wireFlag) == 0) - proc/apply_mode() - var/current_pressures = TLV["pressure"] - var/target_pressure = (current_pressures[2] + current_pressures[3])/2 - switch(mode) - if(AALARM_MODE_SCRUBBING) - for(var/device_id in alarm_area.air_scrub_names) - send_signal(device_id, list("power"= 1, "co2_scrub"= 1, "setting"= 1, "scrubbing"= 1, "panic_siphon"= 0) ) - for(var/device_id in alarm_area.air_vent_names) - send_signal(device_id, list("power"= 1, "checks"= 1, "setting"= 1, "set_external_pressure"= target_pressure) ) +/obj/machinery/alarm/proc/isWireCut(var/wireIndex) + var/wireFlag = AAlarmIndexToFlag[wireIndex] + return ((src.AAlarmwires & wireFlag) == 0) - if(AALARM_MODE_PANIC, AALARM_MODE_CYCLE) - for(var/device_id in alarm_area.air_scrub_names) - send_signal(device_id, list("power"= 1, "panic_siphon"= 1) ) - for(var/device_id in alarm_area.air_vent_names) - send_signal(device_id, list("power"= 0) ) +/obj/machinery/alarm/proc/cut(var/wireColor) + var/wireFlag = AAlarmWireColorToFlag[wireColor] + var/wireIndex = AAlarmWireColorToIndex[wireColor] + AAlarmwires &= ~wireFlag + switch(wireIndex) + if(AALARM_WIRE_IDSCAN) + src.locked = 1 + //world << "Idscan wire cut" - if(AALARM_MODE_REPLACEMENT) - for(var/device_id in alarm_area.air_scrub_names) - send_signal(device_id, list("power"= 1, "co2_scrub"= 1, "setting"= 3, "scrubbing"= 1, "panic_siphon"= 0) ) - for(var/device_id in alarm_area.air_vent_names) - send_signal(device_id, list("power"= 1, "checks"= 1, "setting"= 3, "set_external_pressure"= target_pressure) ) + if(AALARM_WIRE_POWER) + src.shock(usr, 50) + src.shorted = 1 + update_icon() + //world << "Power wire cut" - if(AALARM_MODE_FILL) - for(var/device_id in alarm_area.air_scrub_names) - send_signal(device_id, list("power"= 0) ) - for(var/device_id in alarm_area.air_vent_names) - send_signal(device_id, list("power"= 1, "checks"= 1, "setting"= 3, "set_external_pressure"= target_pressure) ) + if (AALARM_WIRE_AI_CONTROL) + if (src.aidisabled == 0) + src.aidisabled = 1 + //world << "AI Control Wire Cut" - proc/apply_danger_level(var/new_danger_level) - alarm_area.atmosalm = new_danger_level + if(AALARM_WIRE_SYPHON) + mode = AALARM_MODE_PANIC + apply_mode() + //world << "Syphon Wire Cut" - for (var/area/A in alarm_area.related) - for (var/obj/machinery/alarm/AA in A) - if ( !(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.danger_level != new_danger_level) - AA.update_icon() + if(AALARM_WIRE_AALARM) - if(danger_level > 1) - air_doors_close(0) - else - air_doors_open(0) + if (alarm_area.atmosalert(2)) + post_alert(2) + spawn(1) + src.updateUsrDialog() + update_icon() - update_icon() + //world << "AAlarm Wire Cut" - proc/air_doors_close(manual) - var/area/A = get_area(src) - if(!A.master.air_doors_activated) - A.master.air_doors_activated = 1 - for(var/obj/machinery/door/E in A.master.all_doors) - if(istype(E,/obj/machinery/door/firedoor)) - if(!E:blocked) - if(E.operating) - E:nextstate = CLOSED - else if(!E.density) - spawn(0) - E.close() - continue + src.updateDialog() + update_icon() -/* if(istype(E, /obj/machinery/door/airlock)) - if((!E:arePowerSystemsOn()) || (E.stat & NOPOWER) || E:air_locked) continue - if(!E.density) - spawn(0) - E.close() - spawn(10) - if(E.density) - E:air_locked = E.req_access - E:req_access = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS) - E.update_icon() - else if(E.operating) - spawn(10) - E.close() - if(E.density) - E:air_locked = E.req_access - E:req_access = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS) - E.update_icon() - else if(!E:locked) //Don't lock already bolted doors. - E:air_locked = E.req_access - E:req_access = list(ACCESS_ENGINE, ACCESS_ATMOSPHERICS) - E.update_icon()*/ + return - proc/air_doors_open(manual) - var/area/A = get_area(loc) - if(A.master.air_doors_activated) - A.master.air_doors_activated = 0 - for(var/obj/machinery/door/E in A.master.all_doors) - if(istype(E, /obj/machinery/door/firedoor)) - if(!E:blocked) - if(E.operating) - E:nextstate = OPEN - else if(E.density) - spawn(0) - E.open() - continue +/obj/machinery/alarm/proc/mend(var/wireColor) + var/wireFlag = AAlarmWireColorToFlag[wireColor] + var/wireIndex = AAlarmWireColorToIndex[wireColor] //not used in this function + AAlarmwires |= wireFlag + switch(wireIndex) + if(AALARM_WIRE_IDSCAN) + //world << "Idscan wire mended" -/* if(istype(E, /obj/machinery/door/airlock)) - if((!E:arePowerSystemsOn()) || (E.stat & NOPOWER)) continue - if(!isnull(E:air_locked)) //Don't mess with doors locked for other reasons. - E:req_access = E:air_locked - E:air_locked = null - E.update_icon()*/ + if(AALARM_WIRE_POWER) + src.shorted = 0 + src.shock(usr, 50) + update_icon() + //world << "Power wire mended" -/////////// -//HACKING// -/////////// - proc/isWireColorCut(var/wireColor) - var/wireFlag = AAlarmWireColorToFlag[wireColor] - return ((AAlarmwires & wireFlag) == 0) + if(AALARM_WIRE_AI_CONTROL) + if (src.aidisabled == 1) + src.aidisabled = 0 + //world << "AI Cont. wire mended" - proc/isWireCut(var/wireIndex) - var/wireFlag = AAlarmIndexToFlag[wireIndex] - return ((AAlarmwires & wireFlag) == 0) - proc/cut(var/wireColor) - var/wireFlag = AAlarmWireColorToFlag[wireColor] - var/wireIndex = AAlarmWireColorToIndex[wireColor] - AAlarmwires &= ~wireFlag - switch(wireIndex) - if(AALARM_WIRE_IDSCAN) - locked = 1 + // if(AALARM_WIRE_SYPHON) + // world << "Syphon Wire mended" - if(AALARM_WIRE_POWER) - shock(usr, 50) + + // if(AALARM_WIRE_AALARM) + //world << "AAlarm Wire mended" + + update_icon() + src.updateDialog() + return + +/obj/machinery/alarm/proc/pulse(var/wireColor) + //var/wireFlag = AAlarmWireColorToFlag[wireColor] //not used in this function + var/wireIndex = AAlarmWireColorToIndex[wireColor] + switch(wireIndex) + if(AALARM_WIRE_IDSCAN) //unlocks for 30 seconds, if you have a better way to hack I'm all ears + src.locked = 0 + spawn(300) + src.locked = 1 + //world << "Idscan wire pulsed" + + if (AALARM_WIRE_POWER) + // world << "Power wire pulsed" + if(shorted == 0) shorted = 1 update_icon() - if (AALARM_WIRE_AI_CONTROL) - if (aidisabled == 0) - aidisabled = 1 - - if(AALARM_WIRE_SYPHON) - mode = AALARM_MODE_PANIC - apply_mode() - - if(AALARM_WIRE_AALARM) - - if (alarm_area.atmosalert(2)) - apply_danger_level(2) - spawn(1) - updateUsrDialog() - update_icon() - - updateDialog() - - return - - proc/mend(var/wireColor) - var/wireFlag = AAlarmWireColorToFlag[wireColor] - var/wireIndex = AAlarmWireColorToIndex[wireColor] //not used in this function - AAlarmwires |= wireFlag - switch(wireIndex) - if(AALARM_WIRE_IDSCAN) - - if(AALARM_WIRE_POWER) - shorted = 0 - shock(usr, 50) - update_icon() - - if(AALARM_WIRE_AI_CONTROL) - if (aidisabled == 1) - aidisabled = 0 - - updateDialog() - return - - proc/pulse(var/wireColor) - //var/wireFlag = AAlarmWireColorToFlag[wireColor] //not used in this function - var/wireIndex = AAlarmWireColorToIndex[wireColor] - switch(wireIndex) - if(AALARM_WIRE_IDSCAN) //unlocks for 30 seconds, if you have a better way to hack I'm all ears - locked = 0 - spawn(300) - locked = 1 - - if (AALARM_WIRE_POWER) - if(shorted == 0) - shorted = 1 + spawn(1200) + if(shorted == 1) + shorted = 0 update_icon() - spawn(1200) - if(shorted == 1) - shorted = 0 - update_icon() + if (AALARM_WIRE_AI_CONTROL) + // world << "AI Control wire pulsed" + if (src.aidisabled == 0) + src.aidisabled = 1 + src.updateDialog() + spawn(10) + if (src.aidisabled == 1) + src.aidisabled = 0 + src.updateDialog() - if (AALARM_WIRE_AI_CONTROL) - if (aidisabled == 0) - aidisabled = 1 - updateDialog() - spawn(10) - if (aidisabled == 1) - aidisabled = 0 - updateDialog() + if(AALARM_WIRE_SYPHON) + // world << "Syphon wire pulsed" + mode = AALARM_MODE_REPLACEMENT + apply_mode() - if(AALARM_WIRE_SYPHON) - mode = AALARM_MODE_REPLACEMENT - apply_mode() + if(AALARM_WIRE_AALARM) + // world << "Aalarm wire pulsed" + if (alarm_area.atmosalert(0)) + post_alert(0) + spawn(1) + src.updateUsrDialog() + update_icon() - if(AALARM_WIRE_AALARM) - if (alarm_area.atmosalert(0)) - apply_danger_level(0) - spawn(1) - updateUsrDialog() - update_icon() + src.updateDialog() + return - updateDialog() - return +/obj/machinery/alarm/proc/shock(mob/user, prb) + if((stat & (NOPOWER))) // unpowered, no shock + return 0 + if(!prob(prb)) + return 0 //you lucked out, no shock for you + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() //sparks always. + if (electrocute_mob(user, get_area(src), src)) + return 1 + else + return 0 - proc/shock(mob/user, prb) - if((stat & (NOPOWER))) // unpowered, no shock - return 0 - if(!prob(prb)) - return 0 //you lucked out, no shock for you - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(5, 1, src) - s.start() //sparks always. - if (electrocute_mob(user, get_area(src), src)) - return 1 - else - return 0 -/////////////// -//END HACKING// -/////////////// +/obj/machinery/alarm/proc/refresh_all() + for(var/id_tag in alarm_area.air_vent_names) + var/list/I = alarm_area.air_vent_info[id_tag] + if (I && I["timestamp"]+AALARM_REPORT_TIMEOUT/2 > world.time) + continue + send_signal(id_tag, list("status") ) + for(var/id_tag in alarm_area.air_scrub_names) + var/list/I = alarm_area.air_scrub_info[id_tag] + if (I && I["timestamp"]+AALARM_REPORT_TIMEOUT/2 > world.time) + continue + send_signal(id_tag, list("status") ) +/obj/machinery/alarm/proc/set_frequency(new_frequency) + radio_controller.remove_object(src, frequency) + frequency = new_frequency + radio_connection = radio_controller.add_object(src, frequency, RADIO_TO_AIRALARM) - attack_hand(mob/user) - . = ..() - if (.) - return - user.set_machine(src) +/obj/machinery/alarm/proc/send_signal(var/target, var/list/command)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise + if(!radio_connection) + return 0 - if ( (get_dist(src, user) > 1 )) - if (!istype(user, /mob/living/silicon)) - user.machine = null - user << browse(null, "window=air_alarm") - user << browse(null, "window=AAlarmwires") - return + var/datum/signal/signal = new + signal.transmission_method = 1 //radio signal + signal.source = src + signal.data = command + signal.data["tag"] = target + signal.data["sigtype"] = "command" - else if (istype(user, /mob/living/silicon) && aidisabled) - user << "AI control for this Air Alarm interface has been disabled." - user << browse(null, "window=air_alarm") - return + radio_connection.post_signal(src, signal, RADIO_FROM_AIRALARM) +// world << text("Signal [] Broadcasted to []", command, target) - if(wiresexposed && (!istype(user, /mob/living/silicon))) - var/t1 = text("
\n") - var/list/AAlarmwires = list( - "Orange" = 1, - "Dark red" = 2, - "White" = 3, - "Yellow" = 4, - "Black" = 5, - ) - for(var/wiredesc in AAlarmwires) - var/is_uncut = AAlarmwires & AAlarmWireColorToFlag[AAlarmwires[wiredesc]] - t1 += "[wiredesc] wire: " - if(!is_uncut) - t1 += "Mend" + return 1 - else - t1 += "Cut " - t1 += "Pulse " +/obj/machinery/alarm/proc/return_text() + if(!(istype(usr, /mob/living/silicon)) && locked) + return "
(Swipe ID card to unlock interface)" + else + return "
[return_controls()]" - t1 += "
" - t1 += text("
\n[(locked ? "The Air Alarm is locked." : "The Air Alarm is unlocked.")]
\n[((shorted || (stat & (NOPOWER|BROKEN))) ? "The Air Alarm is offline." : "The Air Alarm is working properly!")]
\n[(aidisabled ? "The 'AI control allowed' light is off." : "The 'AI control allowed' light is on.")]") - t1 += text("") - user << browse(t1, "window=AAlarmwires") - onclose(user, "AAlarmwires") +/obj/machinery/alarm/proc/return_status() + var/turf/location = src.loc + var/datum/gas_mixture/environment = location.return_air() + var/total = environment.oxygen + environment.carbon_dioxide + environment.toxins + environment.nitrogen + var/output = "Air Status:
" - if(!shorted) - user << browse(return_text(user),"window=air_alarm") - onclose(user, "air_alarm") + if(total == 0) + output +={"Warning: Cannot obtain air sample for analysis."} + return output - return - - proc/return_text(mob/user) - if(!(istype(user, /mob/living/silicon)) && locked) - return "
[rcon_text()]
(Swipe ID card to unlock interface)" - else - return "
[rcon_text()]
[return_controls()]" - - proc/return_status() - var/turf/location = get_turf(src) - 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 - - output += {" + output += {" "} + var/datum/tlv/cur_tlv + var/GET_PP = R_IDEAL_GAS_EQUATION*environment.temperature/environment.volume - var/partial_pressure = R_IDEAL_GAS_EQUATION*environment.temperature/environment.volume + cur_tlv = TLV["pressure"] + var/environment_pressure = environment.return_pressure() + var/pressure_dangerlevel = cur_tlv.get_danger_level(environment_pressure) - var/list/current_settings = TLV["pressure"] - var/environment_pressure = environment.return_pressure() - var/pressure_dangerlevel = get_danger_level(environment_pressure, current_settings) + 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) - current_settings = TLV["oxygen"] - var/oxygen_dangerlevel = get_danger_level(environment.oxygen*partial_pressure, current_settings) - var/oxygen_percent = round(environment.oxygen / total * 100, 2) + 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) - current_settings = TLV["carbon dioxide"] - var/co2_dangerlevel = get_danger_level(environment.carbon_dioxide*partial_pressure, current_settings) - var/co2_percent = round(environment.carbon_dioxide / total * 100, 2) + 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) - current_settings = TLV["plasma"] - var/plasma_dangerlevel = get_danger_level(environment.toxins*partial_pressure, current_settings) - 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_dangerlevel = cur_tlv.get_danger_level(other_moles*GET_PP) - current_settings = TLV["other"] - var/other_moles = 0.0 - for(var/datum/gas/G in environment.trace_gases) - other_moles+=G.moles - var/other_dangerlevel = get_danger_level(other_moles*partial_pressure, current_settings) + cur_tlv = TLV["temperature"] + var/temperature_dangerlevel = cur_tlv.get_danger_level(environment.temperature) - current_settings = TLV["temperature"] - var/temperature_dangerlevel = get_danger_level(environment.temperature, current_settings) - - output += {" + 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
" + 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
" + output += {" +Temperature: [environment.temperature]K
+"} - //Overall status - output += "Local Status: " - switch(max(pressure_dangerlevel,oxygen_dangerlevel,co2_dangerlevel,plasma_dangerlevel,other_dangerlevel,temperature_dangerlevel)) - if(2) - output += "DANGER: Internals Required" - if(1) - output += "Caution" - if(0) - if(alarm_area.atmosalm) - output += {"Caution: Atmos alert in area"} - else - output += {"Optimal"} + var/display_danger_level = max( + pressure_dangerlevel, + oxygen_dangerlevel, + co2_dangerlevel, + plasma_dangerlevel, + other_dangerlevel, + temperature_dangerlevel + ) - return output + //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"} - proc/rcon_text() - var/dat = "Remote Control:
" - if(rcon_setting == RCON_NO) - dat += "Off" - else - dat += "Off" - dat += " | " - if(rcon_setting == RCON_AUTO) - dat += "Auto" - else - dat += "Auto" - dat += " | " - if(rcon_setting == RCON_YES) - dat += "On" - else - dat += "On" - return dat + return output - proc/return_controls() - var/output = ""//"[alarm_zone] Air [name]
" +/obj/machinery/alarm/proc/return_controls() + var/output = ""//"[alarm_zone] Air [name]
" - switch(screen) - if (AALARM_SCREEN_MAIN) - if(alarm_area.atmosalm) - output += "Reset - Atmospheric Alarm
" - else - output += "Activate - Atmospheric Alarm
" + switch(screen) + if (AALARM_SCREEN_MAIN) + if(alarm_area.atmosalm) + output += {"Reset - Atmospheric Alarm
"} + else + output += {"Activate - Atmospheric Alarm
"} - output += {" + 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 = "" + 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 += {" - [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 = "" +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 += {" - [long_name][state]
- Operating: - [data["power"]?"on":"off"]
- Type: - [data["scrubbing"]?"scrubbing":"syphoning"]
- "} +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(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
-
- "} + if (AALARM_SCREEN_MODE) + output += {" +Main menu
+Air machinery mode for the area:
- "}
+ var/list/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 += {"
" - output = {"Main menu
[sensor_data]"} - - if (AALARM_SCREEN_MODE) - output += "Main menu
Air machinery mode for the area:
- "
- var/list/modes = list(AALARM_MODE_SCRUBBING = "Filtering",\
- AALARM_MODE_REPLACEMENT = "REPLACE AIR",\
- AALARM_MODE_PANIC = "PANIC",\
- AALARM_MODE_CYCLE = "CYCLE",\
- AALARM_MODE_FILL = "FILL",)
- for (var/m=1,m<=modes.len,m++)
- if (mode==m)
- output += "
Alarm thresholds:
Partial pressure for gases @@ -800,192 +631,404 @@ table tr:first-child th:first-child { border: none;}
| 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 += {" +
The current alert level is: [get_security_level()]
\nTimer System: [d2]
\nTime Left: [(minute ? "[minute]:" : null)][second] - - + +\n" user << browse(dat, "window=firealarm") onclose(user, "firealarm") else + A = A.loc if (A.fire) d1 = text("[]", src, stars("Reset - Lockdown")) else d1 = text("[]", src, stars("Alarm - Lockdown")) - if (timing) + if (src.timing) d2 = text("[]", src, stars("Stop Time Lock")) else d2 = text("[]", src, stars("Initiate Time Lock")) - var/second = time % 60 - var/minute = (time - second) / 60 + var/second = round(src.time) % 60 + var/minute = (round(src.time) - second) / 60 var/dat = "[stars("Fire alarm")] [d1]\n
The current alert level is: [stars(get_security_level())]
\nTimer System: [d2]
\nTime Left: [(minute ? text("[]:", minute) : null)][second] - - + +\n" user << browse(dat, "window=firealarm") onclose(user, "firealarm") @@ -1162,52 +1301,81 @@ Code shamelessly copied from apc_frame ..() if (usr.stat || stat & (BROKEN|NOPOWER)) return - if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.machine = src - if (href_list["reset"]) - reset() - else - if (href_list["alarm"]) - alarm() - else - if (href_list["time"]) - timing = text2num(href_list["time"]) - else - if (href_list["tp"]) - var/tp = text2num(href_list["tp"]) - time += tp - time = min(max(round(time), 0), 120) - updateUsrDialog() - add_fingerprint(usr) + if (buildstage != 2) + return + + if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) + usr.set_machine(src) + if (href_list["reset"]) + src.reset() + else if (href_list["alarm"]) + src.alarm() + else if (href_list["time"]) + src.timing = text2num(href_list["time"]) + last_process = world.timeofday + processing_objects.Add(src) + else if (href_list["tp"]) + var/tp = text2num(href_list["tp"]) + src.time += tp + src.time = min(max(round(src.time), 0), 120) + + src.updateUsrDialog() + + src.add_fingerprint(usr) else usr << browse(null, "window=firealarm") return return /obj/machinery/firealarm/proc/reset() - if (!working) + if (!( src.working )) + return + var/area/A = src.loc + A = A.loc + if (!( istype(A, /area) )) return - var/area/A = get_area(src) - ASSERT(isarea(A)) - if(A.master) - A = A.master for(var/area/RA in A.related) RA.firereset() + update_icon() return /obj/machinery/firealarm/proc/alarm() - if (!( working )) + if (!( src.working )) + return + var/area/A = src.loc + A = A.loc + if (!( istype(A, /area) )) return - var/area/A = get_area(src) - ASSERT(isarea(A)) - if(A.master) - A = A.master for(var/area/RA in A.related) RA.firealert() - //playsound(loc, 'signal.ogg', 75, 0) + update_icon() + //playsound(src.loc, 'sound/ambience/signal.ogg', 75, 0) return +/obj/machinery/firealarm/New(loc, dir, building) + ..() + + if(loc) + src.loc = loc + + if(dir) + src.dir = dir + + if(building) + buildstage = 0 + wiresexposed = 1 + pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24) + pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0 + + if(z == 1) + if(security_level) + src.overlays += image('icons/obj/monitors.dmi', "overlay_[get_security_level()]") + else + src.overlays += image('icons/obj/monitors.dmi', "overlay_green") + + update_icon() + /* FIRE ALARM CIRCUIT Just a object used in constructing fire alarms @@ -1234,6 +1402,26 @@ Code shamelessly copied from apc_frame icon_state = "fire_bitem" flags = FPRINT | TABLEPASS| CONDUCT + +/* + * Party button + */ + +/obj/machinery/partyalarm + name = "\improper PARTY BUTTON" + desc = "Cuban Pete is in the house!" + icon = 'icons/obj/monitors.dmi' + icon_state = "fire0" + var/detecting = 1.0 + var/working = 1.0 + var/time = 10.0 + var/timing = 0.0 + var/lockdownbyai = 0 + anchored = 1.0 + use_power = 1 + idle_power_usage = 2 + active_power_usage = 6 + /obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) @@ -1267,67 +1455,65 @@ Code shamelessly copied from apc_frame del(src) /obj/machinery/partyalarm/attack_paw(mob/user as mob) - return attack_hand(user) - + return src.attack_hand(user) /obj/machinery/partyalarm/attack_hand(mob/user as mob) if(user.stat || stat & (NOPOWER|BROKEN)) return - user.machine = src - var/area/A = get_area(src) - ASSERT(isarea(A)) - if(A.master) - A = A.master + user.set_machine(src) + var/area/A = src.loc var/d1 var/d2 if (istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai)) + A = A.loc if (A.party) d1 = text("No Party :(", src) else d1 = text("PARTY!!!", src) - if (timing) + if (src.timing) d2 = text("Stop Time Lock", src) else d2 = text("Initiate Time Lock", src) - var/second = time % 60 - var/minute = (time - second) / 60 + var/second = src.time % 60 + var/minute = (src.time - second) / 60 var/dat = text("Party Button []\n
\nTimer System: []
\nTime Left: [][] - - + +\n", d1, d2, (minute ? text("[]:", minute) : null), second, src, src, src, src) user << browse(dat, "window=partyalarm") onclose(user, "partyalarm") else + A = A.loc if (A.fire) d1 = text("[]", src, stars("No Party :(")) else d1 = text("[]", src, stars("PARTY!!!")) - if (timing) + if (src.timing) d2 = text("[]", src, stars("Stop Time Lock")) else d2 = text("[]", src, stars("Initiate Time Lock")) - var/second = time % 60 - var/minute = (time - second) / 60 + var/second = src.time % 60 + var/minute = (src.time - second) / 60 var/dat = text("[] []\n
\nTimer System: []
\nTime Left: [][] - - + +\n", stars("Party Button"), d1, d2, (minute ? text("[]:", minute) : null), second, src, src, src, src) user << browse(dat, "window=partyalarm") onclose(user, "partyalarm") return /obj/machinery/partyalarm/proc/reset() - if (!( working )) + if (!( src.working )) + return + var/area/A = src.loc + A = A.loc + if (!( istype(A, /area) )) return - var/area/A = get_area(src) - ASSERT(isarea(A)) - if(A.master) - A = A.master A.partyreset() return /obj/machinery/partyalarm/proc/alarm() - if (!( working )) + if (!( src.working )) + return + var/area/A = src.loc + A = A.loc + if (!( istype(A, /area) )) return - var/area/A = get_area(src) - ASSERT(isarea(A)) - if(A.master) - A = A.master A.partyalert() return @@ -1335,25 +1521,25 @@ Code shamelessly copied from apc_frame ..() if (usr.stat || stat & (BROKEN|NOPOWER)) return - if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) - usr.machine = src + if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) + usr.set_machine(src) if (href_list["reset"]) - reset() + src.reset() else if (href_list["alarm"]) - alarm() + src.alarm() else if (href_list["time"]) - timing = text2num(href_list["time"]) + src.timing = text2num(href_list["time"]) else if (href_list["tp"]) var/tp = text2num(href_list["tp"]) - time += tp - time = min(max(round(time), 0), 120) - updateUsrDialog() + src.time += tp + src.time = min(max(round(src.time), 0), 120) + src.updateUsrDialog() - add_fingerprint(usr) + src.add_fingerprint(usr) else usr << browse(null, "window=partyalarm") return - return \ No newline at end of file + return diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index b0e5170dcae..faac347b33a 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -87,6 +87,8 @@ obj/machinery/computer/general_air_control var/datum/radio_frequency/radio_connection attack_hand(mob/user) + if(..(user)) + return user << browse(return_text(),"window=computer") user.set_machine(src) onclose(user, "computer") diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index 8aee956b513..ac7af07435a 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -25,6 +25,8 @@ return attack_hand(var/mob/user as mob) + if(..(user)) + return src.add_fingerprint(usr) var/dat = {" @@ -126,28 +128,6 @@ src.updateUsrDialog() - attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/area_atmos/M = new /obj/item/weapon/circuitboard/area_atmos( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.anchored = 1 - - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - new /obj/item/weapon/shard( src.loc ) - A.state = 3 - A.icon_state = "3" - else - user << "\blue You disconnect the monitor." - A.state = 4 - A.icon_state = "4" - - del(src) /obj/machinery/computer/area_atmos/area zone = "This computer is working in a wired network limited to this area." diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 09fb8faa2a7..939e1c94f32 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -1,3 +1,17 @@ +/obj/machinery/meter + name = "meter" + desc = "It measures something." + icon = 'icons/obj/meter.dmi' + icon_state = "meterX" + var/obj/machinery/atmospherics/pipe/target = null + anchored = 1.0 + power_channel = ENVIRON + var/frequency = 0 + var/id + use_power = 1 + idle_power_usage = 2 + active_power_usage = 4 + /obj/machinery/meter/New() ..() src.target = locate(/obj/machinery/atmospherics/pipe) in loc diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 171552fa488..f929cc0d5eb 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -1,5 +1,6 @@ /obj/machinery/portable_atmospherics name = "atmoalter" + use_power = 0 var/datum/gas_mixture/air_contents = new var/obj/machinery/atmospherics/portables_connector/connected_port @@ -105,7 +106,7 @@ user << "\blue Nothing happens." return - else if ((istype(W, /obj/item/device/analyzer) || (istype(W, /obj/item/device/pda))) && get_dist(user, src) <= 1) + else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) visible_message("\red [user] has used [W] on \icon[icon]") if(air_contents) var/pressure = air_contents.return_pressure() diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index 764ee3afd36..00aedd93636 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -27,6 +27,22 @@ return +/obj/machinery/portable_atmospherics/pump/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + + if(prob(50/severity)) + on = !on + + if(prob(100/severity)) + direction_out = !direction_out + + target_pressure = rand(0,1300) + update_icon() + + ..(severity) + /obj/machinery/portable_atmospherics/pump/process() ..() if(on) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index eae5dd9293e..6432aa755b3 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -10,6 +10,17 @@ volume = 750 +/obj/machinery/portable_atmospherics/scrubber/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + + if(prob(50/severity)) + on = !on + update_icon() + + ..(severity) + /obj/machinery/portable_atmospherics/scrubber/huge name = "Huge Air Scrubber" icon_state = "scrubber:0" diff --git a/code/game/machinery/atmoalter/zvent.dm b/code/game/machinery/atmoalter/zvent.dm index 2de9f72375e..163e86a74da 100644 --- a/code/game/machinery/atmoalter/zvent.dm +++ b/code/game/machinery/atmoalter/zvent.dm @@ -20,7 +20,7 @@ if (istype(zvent_conn)) //both floors have simulated turfs, share() var/turf/simulated/myturf = loc - var/datum/gas_mixture/conn_air = zturf_conn.air //TODO: pop culture reference + var/datum/gas_mixture/conn_air = zturf_conn.zone.air //TODO: pop culture reference var/datum/gas_mixture/my_air = myturf.air if (istype(conn_air) && istype(my_air)) // if (!my_air.compare(conn_air)) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 4621e519141..9401ed769cf 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -59,10 +59,34 @@ var/global/list/autolathe_recipes_hidden = list( \ ) /obj/machinery/autolathe - var/busy = 0 + name = "\improper Autolathe" + desc = "It produces items using metal and glass." + icon_state = "autolathe" + density = 1 + + var/m_amount = 0.0 var/max_m_amount = 150000.0 + + var/g_amount = 0.0 var/max_g_amount = 75000.0 + var/operating = 0.0 + var/opened = 0.0 + anchored = 1.0 + var/list/L = list() + var/list/LL = list() + var/hacked = 0 + var/disabled = 0 + var/shocked = 0 + var/list/wires = list() + var/hack_wire + var/disable_wire + var/shock_wire + use_power = 1 + idle_power_usage = 10 + active_power_usage = 100 + var/busy = 0 + proc wires_win(mob/user as mob) var/dat as text diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 80d4174fd43..c75cda5dba5 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -42,7 +42,7 @@ updateUsrDialog() else if(processing) user << "\red The biogenerator is currently processing." - else if(istype(O, /obj/item/weapon/plantbag)) + else if(istype(O, /obj/item/weapon/storage/bag/plants)) var/i = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) i++ diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index af1683acfe5..9862f63e2cc 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/aibots.dmi' layer = MOB_LAYER luminosity = 3 + use_power = 0 var/obj/item/weapon/card/id/botcard // the ID card that the bot "holds" var/on = 1 var/health = 0 //do not forget to set health for your bot! @@ -88,13 +89,16 @@ else if (istype(W, /obj/item/weapon/card/emag) && emagged < 2) Emag(user) else - switch(W.damtype) - if("fire") - src.health -= W.force * fire_dam_coeff - if("brute") - src.health -= W.force * brute_dam_coeff - ..() - healthcheck() + if(hasvar(W,"force") && hasvar(W,"damtype")) + switch(W.damtype) + if("fire") + src.health -= W.force * fire_dam_coeff + if("brute") + src.health -= W.force * brute_dam_coeff + ..() + healthcheck() + else + ..() /obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj) health -= Proj.damage diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index af3d49e6e47..3e970a580c6 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -52,7 +52,8 @@ should_patrol = 1 src.botcard = new /obj/item/weapon/card/id(src) - src.botcard.access = get_access("Janitor") + var/datum/job/janitor/J = new/datum/job/janitor + src.botcard.access = J.get_access() if(radio_controller) radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index b2ddb8aab3a..a833c8f10bd 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -7,7 +7,7 @@ density = 1 anchored = 0 // weight = 1.0E7 - req_access = list(access_security) + req_one_access = list(access_security, access_forensics_lockers) health = 100 maxhealth = 100 fire_dam_coeff = 0.7 @@ -78,7 +78,8 @@ src.icon_state = "[lasercolor]ed209[src.on]" spawn(3) src.botcard = new /obj/item/weapon/card/id(src) - src.botcard.access = get_access("Detective") + var/datum/job/detective/J = new/datum/job/detective + src.botcard.access = J.get_access() if(radio_controller) radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT) @@ -194,11 +195,12 @@ Auto Patrol: []"}, user << "Access denied." else ..() - if (!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target)) - src.target = user - if(lasercolor)//To make up for the fact that lasertag bots don't hunt - src.shootAt(user) - src.mode = SECBOT_HUNT + if (!istype(W, /obj/item/weapon/screwdriver) && (!src.target)) + if(hasvar(W,"force") && W.force)//If force is defined and non-zero + src.target = user + if(lasercolor)//To make up for the fact that lasertag bots don't hunt + src.shootAt(user) + src.mode = SECBOT_HUNT /obj/machinery/bot/ed209/Emag(mob/user as mob) ..() @@ -317,29 +319,36 @@ Auto Patrol: []"}, mode = SECBOT_HUNT return - if (!src.target.handcuffed && !src.arrest_type) - playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) - mode = SECBOT_ARREST - visible_message("\red [src] is trying to put handcuffs on [src.target]!") + if(istype(src.target,/mob/living/carbon)) + if (!src.target.handcuffed && !src.arrest_type) + playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) + mode = SECBOT_ARREST + visible_message("\red [src] is trying to put handcuffs on [src.target]!") - spawn(60) - if (get_dist(src, src.target) <= 1) - if (src.target.handcuffed) - return + spawn(60) + if (get_dist(src, src.target) <= 1) + if (src.target.handcuffed) + return - if(istype(src.target,/mob/living/carbon)) - src.target.handcuffed = new /obj/item/weapon/handcuffs(src.target) - target.update_inv_handcuffed() //update handcuff overlays + if(istype(src.target,/mob/living/carbon)) + src.target.handcuffed = new /obj/item/weapon/handcuffs(src.target) + target.update_inv_handcuffed() //update handcuff overlays - mode = SECBOT_IDLE - src.target = null - src.anchored = 0 - src.last_found = world.time - src.frustration = 0 + mode = SECBOT_IDLE + src.target = null + src.anchored = 0 + src.last_found = world.time + src.frustration = 0 - // playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) - // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") - // src.speak(arrest_message) + // playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) + // var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.") + // src.speak(arrest_message) + else + mode = SECBOT_IDLE + src.target = null + src.anchored = 0 + src.last_found = world.time + src.frustration = 0 if(SECBOT_ARREST) // arresting if(src.lasercolor) @@ -656,7 +665,7 @@ Auto Patrol: []"}, if(src.emagged == 2) return 10 //Everyone is a criminal! - if((src.idcheck) || (isnull(perp:wear_id)) || (istype(perp:wear_id, /obj/item/weapon/card/id/syndicate))) + if((src.idcheck) || (isnull(perp:wear_id)) || (istype(perp:wear_id.GetID(), /obj/item/weapon/card/id/syndicate))) if((istype(perp.l_hand, /obj/item/weapon/gun) && !istype(perp.l_hand, /obj/item/weapon/gun/projectile/shotgun)) || istype(perp.l_hand, /obj/item/weapon/melee/baton)) if(!istype(perp.l_hand, /obj/item/weapon/gun/energy/laser/bluetag) \ @@ -683,7 +692,7 @@ Auto Patrol: []"}, threatcount += 2 //Agent cards lower threatlevel when normal idchecking is off. - if((istype(perp:wear_id, /obj/item/weapon/card/id/syndicate)) && src.idcheck) + if((perp.wear_id && istype(perp:wear_id.GetID(), /obj/item/weapon/card/id/syndicate)) && src.idcheck) threatcount -= 2 if(src.lasercolor == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve @@ -704,22 +713,17 @@ Auto Patrol: []"}, if(istype(perp:belt, /obj/item/weapon/gun/energy/laser/bluetag)) threatcount += 2 - if (src.check_records) + if(src.check_records) for (var/datum/data/record/E in data_core.general) var/perpname = perp.name - if (perp:wear_id) - var/obj/item/weapon/card/id/id = perp:wear_id - if(istype(perp:wear_id, /obj/item/device/pda)) - var/obj/item/device/pda/pda = perp:wear_id - id = pda.id - if (id) + if(perp.wear_id) + var/obj/item/weapon/card/id/id = perp.wear_id.GetID() + if(id) perpname = id.registered_name - else - var/obj/item/device/pda/pda = perp:wear_id - perpname = pda.owner - if (E.fields["name"] == perpname) + + if(E.fields["name"] == perpname) for (var/datum/data/record/R in data_core.security) - if ((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) + if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) threatcount = 4 break diff --git a/code/game/machinery/bots/farmbot.dm b/code/game/machinery/bots/farmbot.dm new file mode 100644 index 00000000000..ef582351570 --- /dev/null +++ b/code/game/machinery/bots/farmbot.dm @@ -0,0 +1,590 @@ +//Farmbots by GauHelldragon - 12/30/2012 +// A new type of buildable aiBot that helps out in hydroponics + +// Made by using a robot arm on a water tank and then adding: +// A plant analyzer, a bucket, a mini-hoe and then a proximity sensor (in that order) + +// Will water, weed and fertilize plants that need it +// When emagged, it will "water", "weed" and "fertilize" humans instead +// Holds up to 10 fertilizers (only the type dispensed by the machines, not chemistry bottles) +// It will fill up it's water tank at a sink when low. + +// The behavior panel can be unlocked with hydroponics access and be modified to disable certain behaviors +// By default, it will ignore weeds and mushrooms, but can be set to tend to these types of plants as well. + + +#define FARMBOT_MODE_WATER 1 +#define FARMBOT_MODE_FERTILIZE 2 +#define FARMBOT_MODE_WEED 3 +#define FARMBOT_MODE_REFILL 4 +#define FARMBOT_MODE_WAITING 5 + +#define FARMBOT_ANIMATION_TIME 25 //How long it takes to use one of the action animations +#define FARMBOT_EMAG_DELAY 60 //How long of a delay after doing one of the emagged attack actions +#define FARMBOT_ACTION_DELAY 35 //How long of a delay after doing one of the normal actions + +/obj/machinery/bot/farmbot + name = "Farmbot" + desc = "The botanist's best friend." + icon = 'aibots.dmi' + icon_state = "farmbot0" + layer = 5.0 + density = 1 + anchored = 0 + health = 50 + maxhealth = 50 + req_access =list(access_hydroponics) + + var/Max_Fertilizers = 10 + + var/setting_water = 1 + var/setting_refill = 1 + var/setting_fertilize = 1 + var/setting_weed = 1 + var/setting_ignoreWeeds = 1 + var/setting_ignoreMushrooms = 1 + + var/atom/target //Current target, can be a human, a hydroponics tray, or a sink + var/mode //Which mode is being used, 0 means it is looking for work + + var/obj/structure/reagent_dispensers/watertank/tank // the water tank that was used to make it, remains inside the bot. + + var/path[] = new() // used for pathing + var/frustration + +/obj/machinery/bot/farmbot/New() + ..() + src.icon_state = "farmbot[src.on]" + spawn (4) + src.botcard = new /obj/item/weapon/card/id(src) + src.botcard.access = req_access + + if ( !tank ) //Should be set as part of making it... but lets check anyway + tank = locate(/obj/structure/reagent_dispensers/watertank/) in contents + if ( !tank ) //An admin must have spawned the farmbot! Better give it a tank. + tank = new /obj/structure/reagent_dispensers/watertank(src) + +/obj/machinery/bot/farmbot/Bump(M as mob|obj) //Leave no door unopened! + spawn(0) + if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard))) + var/obj/machinery/door/D = M + if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard)) + D.open() + src.frustration = 0 + return + return + +/obj/machinery/bot/farmbot/turn_on() + . = ..() + src.icon_state = "farmbot[src.on]" + src.updateUsrDialog() + +/obj/machinery/bot/farmbot/turn_off() + ..() + src.path = new() + src.icon_state = "farmbot[src.on]" + src.updateUsrDialog() + +/obj/machinery/bot/farmbot/attack_paw(mob/user as mob) + return attack_hand(user) + + +/obj/machinery/bot/farmbot/proc/get_total_ferts() + var total_fert = 0 + for (var/obj/item/nutrient/fert in contents) + total_fert++ + return total_fert + +/obj/machinery/bot/farmbot/attack_hand(mob/user as mob) + . = ..() + if (.) + return + var/dat + dat += "Automatic Hyrdoponic Assisting Unit v1.0
" + dat += "Status: [src.on ? "On" : "Off"]
" + + dat += "Water Tank: " + if ( tank ) + dat += "\[[tank.reagents.total_volume]/[tank.reagents.maximum_volume]\]" + else + dat += "Error: Water Tank not Found" + + dat += "
Fertilizer Storage: \[[get_total_ferts()]/[Max_Fertilizers]\]" + + dat += "
Behaviour controls are [src.locked ? "locked" : "unlocked"]
" + if(!src.locked) + dat += "Watering Controls:
" + dat += " Water Plants : [src.setting_water ? "Yes" : "No"]
" + dat += " Refill Watertank : [src.setting_refill ? "Yes" : "No"]
" + dat += "
Fertilizer Controls:
" + dat += " Fertilize Plants : [src.setting_fertilize ? "Yes" : "No"]
" + dat += "
Weeding Controls:
" + dat += " Weed Plants : [src.setting_weed ? "Yes" : "No"]
" + dat += "
Ignore Weeds : [src.setting_ignoreWeeds ? "Yes" : "No"]
" + dat += "Ignore Mushrooms : [src.setting_ignoreMushrooms ? "Yes" : "No"]
" + dat += "" + + user << browse("
" dat += "Status: [src.on ? "On" : "Off"]
" + dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" dat += "Beaker: " if (src.reagent_glass) dat += "Loaded \[[src.reagent_glass.reagents.total_volume]/[src.reagent_glass.reagents.maximum_volume]\]" @@ -130,9 +130,6 @@ dat += "Reagent Source: " dat += "[src.use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
" - dat += "Inject: " - dat += "[src.always_inject ? "Always" : "If loaded chemical is known to help"]
" - dat += "The speaker switch is [src.shut_up ? "off" : "on"]. Toggle" user << browse("
" - else - priority_text = "No priority alerts detected.
" + if(priority_alarms.len) + for(var/zone in priority_alarms) + priority_text += "[zone] X
" + else + priority_text = "No priority alerts detected.
" - if(minor_alarms.len) - for(var/zone in minor_alarms) - minor_text += "[zone] X
" - else - minor_text = "No minor alerts detected.
" + if(minor_alarms.len) + for(var/zone in minor_alarms) + minor_text += "[zone] X
" + else + minor_text = "No minor alerts detected.
" - var/output = {"[name]
+ var/output = {"[name]
Priority Alerts:
[priority_text]
@@ -85,46 +91,23 @@ [minor_text]
"} - return output + return output - Topic(href, href_list) - if(..()) - return - - if(href_list["priority_clear"]) - var/removing_zone = href_list["priority_clear"] - for(var/zone in priority_alarms) - if(ckey(zone) == removing_zone) - priority_alarms -= zone - - if(href_list["minor_clear"]) - var/removing_zone = href_list["minor_clear"] - for(var/zone in minor_alarms) - if(ckey(zone) == removing_zone) - minor_alarms -= zone - update_icon() +/obj/machinery/computer/atmos_alert/Topic(href, href_list) + if(..()) return - attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/atmos_alert/M = new /obj/item/weapon/circuitboard/atmos_alert( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.anchored = 1 + if(href_list["priority_clear"]) + var/removing_zone = href_list["priority_clear"] + for(var/zone in priority_alarms) + if(ckey(zone) == removing_zone) + priority_alarms -= zone - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - new /obj/item/weapon/shard( src.loc ) - A.state = 3 - A.icon_state = "3" - else - user << "\blue You disconnect the monitor." - A.state = 4 - A.icon_state = "4" - - del(src) + if(href_list["minor_clear"]) + var/removing_zone = href_list["minor_clear"] + for(var/zone in minor_alarms) + if(ckey(zone) == removing_zone) + minor_alarms -= zone + update_icon() + return diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 61c8594fe62..fe89ceeb2fb 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -40,6 +40,7 @@ /obj/item/weapon/circuitboard/aicore name = "Circuit board (AI core)" origin_tech = "programming=4;biotech=2" + board_type = "other" /obj/item/weapon/circuitboard/aiupload name = "Circuit board (AI Upload)" build_path = "/obj/machinery/computer/aiupload" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 0a34785be2c..0e4caf97c3f 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -8,7 +8,7 @@ circuit = "/obj/item/weapon/circuitboard/security" var/obj/machinery/camera/current = null var/last_pic = 1.0 - var/network = "SS13" + var/list/network = list("SS13") var/mapping = 0//For the overview file, interesting bit of code. @@ -45,7 +45,8 @@ var/list/D = list() D["Cancel"] = "Cancel" for(var/obj/machinery/camera/C in L) - if(C.network == network) + var/list/tempnetwork = C.network&network + if(tempnetwork.len) D[text("[][]", C.c_tag, (C.status ? null : " (Deactivated)"))] = C var/t = input(user, "Which camera should you change to?") as null|anything in D @@ -84,16 +85,22 @@ desc = "Used for watching an empty arena." icon = 'icons/obj/stationobjs.dmi' icon_state = "telescreen" - network = "thunder" + network = list("thunder") density = 0 circuit = null +/obj/machinery/computer/security/telescreen/update_icon() + icon_state = initial(icon_state) + if(stat & BROKEN) + icon_state += "b" + return + /obj/machinery/computer/security/telescreen/entertainment name = "entertainment monitor" desc = "Damn, they better have /tg/thechannel on these things." icon = 'icons/obj/status_display.dmi' icon_state = "entertainment" - network = "thunder" + network = list("thunder") density = 0 circuit = null @@ -108,5 +115,5 @@ name = "Outpost Cameras" desc = "Used to access the various cameras on the outpost." icon_state = "miningcameras" - network = "MINE" + network = list("MINE") circuit = "/obj/item/weapon/circuitboard/mining" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index c0171f22770..a32e9ea1343 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -232,18 +232,34 @@ var/t1 = href_list["assign_target"] if(t1 == "Custom") var/temp_t = copytext(sanitize(input("Enter a custom job assignment.","Assignment")),1,MAX_MESSAGE_LEN) - if(temp_t) - t1 = temp_t + //let custom jobs function as an impromptu alt title, mainly for sechuds + if(temp_t && modify) + modify.assignment = temp_t else - modify.access = ( istype(src,/obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : get_access(t1) ) - if (modify) - modify.assignment = t1 + var/datum/job/jobdatum + for(var/jobtype in typesof(/datum/job)) + var/datum/job/J = new jobtype + if(ckey(J.title) == ckey(t1)) + jobdatum = J + break + if(!jobdatum) + usr << "\red No log exists for this job." + return + + modify.access = ( istype(src,/obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() ) + if (modify) + modify.assignment = t1 + modify.rank = t1 if ("reg") if (authenticated) var/t2 = modify //var/t1 = input(usr, "What name?", "ID computer", null) as text if ((authenticated && modify == t2 && (in_range(src, usr) || (istype(usr, /mob/living/silicon))) && istype(loc, /turf))) - modify.registered_name = href_list["reg"] + var/temp_name = reject_bad_name(href_list["reg"]) + if(temp_name) + modify.registered_name = temp_name + else + src.visible_message("[src] buzzes rudely.") if ("mode") mode = text2num(href_list["mode_target"]) if ("print") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 0644c656b15..dc802261657 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -31,7 +31,7 @@ var/delete = 0 var/injectorready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete var/temphtml = null - var/obj/machinery/dna_scanner/connected = null + var/obj/machinery/dna_scannernew/connected = null var/obj/item/weapon/disk/data/diskette = null anchored = 1.0 use_power = 1 @@ -289,11 +289,15 @@ else if (href_list["view_rec"]) src.active_record = locate(href_list["view_rec"]) - if ((isnull(src.active_record.fields["ckey"])) || (src.active_record.fields["ckey"] == "")) - del(src.active_record) - src.temp = "ERROR: Record Corrupt" + if(istype(src.active_record,/datum/data/record)) + if ((isnull(src.active_record.fields["ckey"])) || (src.active_record.fields["ckey"] == "")) + del(src.active_record) + src.temp = "ERROR: Record Corrupt" + else + src.menu = 3 else - src.menu = 3 + src.active_record = null + src.temp = "Record missing." else if (href_list["del_rec"]) if ((!src.active_record) || (src.menu < 3)) @@ -416,9 +420,9 @@ if (subject.suiciding == 1) scantemp = "Error: Subject's brain is not responding to scanning stimuli." return -// if ((!subject.ckey) || (!subject.client)) -// scantemp = "Error: Mental interface failure." -// return + if ((!subject.ckey) || (!subject.client)) + scantemp = "Error: Mental interface failure." + return if (NOCLONE in subject.mutations) scantemp = "Error: Mental interface failure." return @@ -464,15 +468,14 @@ break return selected_record -/obj/machinery/computer/cloning/power_change() +/obj/machinery/computer/cloning/update_icon() if(stat & BROKEN) icon_state = "commb" else - if( powered() ) + if(stat & NOPOWER) + src.icon_state = "c_unpowered" + stat |= NOPOWER + else icon_state = initial(icon_state) stat &= ~NOPOWER - else - spawn(rand(0, 15)) - src.icon_state = "c_unpowered" - stat |= NOPOWER \ No newline at end of file diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 40dfa896c13..880d2b565a6 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -36,9 +36,9 @@ /obj/machinery/computer/communications/process() - ..() - if(state != STATE_STATUSDISPLAY) - src.updateDialog() + if(..()) + if(state != STATE_STATUSDISPLAY) + src.updateDialog() /obj/machinery/computer/communications/Topic(href, href_list) @@ -455,10 +455,6 @@ user << "The emergency shuttle is already on its way." return - if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || ticker.mode.name == "sandbox") - //New version pretends to call the shuttle but cause the shuttle to return after a random duration. - emergency_shuttle.fake_recall = rand(300,500) - if(ticker.mode.name == "blob") user << "Under directive 7-10, [station_name()] is quarantined until further notice." return diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 8bdc0729f05..ae0dc3c5c36 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -3,131 +3,122 @@ icon = 'icons/obj/computer.dmi' density = 1 anchored = 1.0 - var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassemble + use_power = 1 + idle_power_usage = 300 + active_power_usage = 300 + var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassembly + var/processing = 0 + +/obj/machinery/computer/New() + ..() + if(ticker) + initialize() - New() - ..() - spawn(2) - power_change() +/obj/machinery/computer/initialize() + power_change() + +/obj/machinery/computer/process() + if(stat & (NOPOWER|BROKEN)) + return 0 + return 1 + +/obj/machinery/computer/meteorhit(var/obj/O as obj) + for(var/x in verbs) + verbs -= x + set_broken() + var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() + smoke.set_up(5, 0, src) + smoke.start() + return - meteorhit(var/obj/O as obj) +/obj/machinery/computer/emp_act(severity) + if(prob(20/severity)) set_broken() + ..() + + +/obj/machinery/computer/ex_act(severity) + switch(severity) + if(1.0) + del(src) + return + if(2.0) + if (prob(25)) + del(src) + return + if (prob(50)) + for(var/x in verbs) + verbs -= x + set_broken() + if(3.0) + if (prob(25)) + for(var/x in verbs) + verbs -= x + set_broken() + else + return + +/obj/machinery/computer/bullet_act(var/obj/item/projectile/Proj) + if(prob(Proj.damage)) + set_broken() + ..() + + +/obj/machinery/computer/blob_act() + if (prob(75)) for(var/x in verbs) verbs -= x set_broken() - var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread() - smoke.set_up(5, 0, src) - smoke.start() - return + density = 0 - - emp_act(severity) - if(prob(20/severity)) set_broken() - ..() - - - ex_act(severity) - switch(severity) - if(1.0) - del(src) - return - if(2.0) - if (prob(25)) - del(src) - return - if (prob(50)) - for(var/x in verbs) - verbs -= x - set_broken() - if(3.0) - if (prob(25)) - for(var/x in verbs) - verbs -= x - set_broken() - else - return - - bullet_act(var/obj/item/projectile/Proj) - if(prob(Proj.damage)) - set_broken() - ..() - - - blob_act() - if (prob(75)) - for(var/x in verbs) - verbs -= x - set_broken() - density = 0 - - - power_change() - if(!istype(src,/obj/machinery/computer/security/telescreen)) - if(stat & BROKEN) - icon_state = initial(icon_state) - icon_state += "b" - if (istype(src,/obj/machinery/computer/aifixer)) - overlays = null - - else if(powered()) - icon_state = initial(icon_state) - stat &= ~NOPOWER - if (istype(src,/obj/machinery/computer/aifixer)) - var/obj/machinery/computer/aifixer/O = src - if (O.occupant) - switch (O.occupant.stat) - if (0) - overlays += image('icons/obj/computer.dmi', "ai-fixer-full") - if (2) - overlays += image('icons/obj/computer.dmi', "ai-fixer-404") - else - overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") - else - spawn(rand(0, 15)) - //icon_state = "c_unpowered" - icon_state = initial(icon_state) - icon_state += "0" - stat |= NOPOWER - if (istype(src,/obj/machinery/computer/aifixer)) - overlays = null - - - process() - if(stat & (NOPOWER|BROKEN)) - return - use_power(250) - - - proc/set_broken() - icon_state = initial(icon_state) +/obj/machinery/computer/update_icon() + ..() + icon_state = initial(icon_state) + // Broken + if(stat & BROKEN) icon_state += "b" - stat |= BROKEN + + // Powered + else if(stat & NOPOWER) + icon_state = initial(icon_state) + icon_state += "0" - attackby(I as obj, user as mob) - if(istype(I, /obj/item/weapon/screwdriver) && circuit) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - if(do_after(user, 20)) - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) - var/obj/item/weapon/circuitboard/M = new circuit( A ) - A.circuit = M - A.anchored = 1 - for (var/obj/C in src) - C.loc = src.loc - if (src.stat & BROKEN) - user << "\blue The broken glass falls out." - new /obj/item/weapon/shard( src.loc ) - A.state = 3 - A.icon_state = "3" - else - user << "\blue You disconnect the monitor." - A.state = 4 - A.icon_state = "4" - del(src) - else - src.attack_hand(user) - return + +/obj/machinery/computer/power_change() + ..() + update_icon() + + +/obj/machinery/computer/proc/set_broken() + stat |= BROKEN + update_icon() + + +/obj/machinery/computer/attackby(I as obj, user as mob) + if(istype(I, /obj/item/weapon/screwdriver) && circuit) + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) + if(do_after(user, 20)) + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) + var/obj/item/weapon/circuitboard/M = new circuit( A ) + A.circuit = M + A.anchored = 1 + for (var/obj/C in src) + C.loc = src.loc + if (src.stat & BROKEN) + user << "\blue The broken glass falls out." + new /obj/item/weapon/shard( src.loc ) + A.state = 3 + A.icon_state = "3" + else + user << "\blue You disconnect the monitor." + A.state = 4 + A.icon_state = "4" + del(src) + else + src.attack_hand(user) + return diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index a4cbf96dd25..ab3c4565355 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -9,110 +9,111 @@ var/list/tracked = list( ) - New() - tracked = list() - ..() +/obj/machinery/computer/crew/New() + tracked = list() + ..() - attack_ai(mob/user) - attack_hand(user) - interact(user) +/obj/machinery/computer/crew/attack_ai(mob/user) + attack_hand(user) + interact(user) - attack_hand(mob/user) - add_fingerprint(user) - if(stat & (BROKEN|NOPOWER)) - return - interact(user) +/obj/machinery/computer/crew/attack_hand(mob/user) + add_fingerprint(user) + if(stat & (BROKEN|NOPOWER)) + return + interact(user) - power_change() - if(stat & BROKEN) - icon_state = "broken" +/obj/machinery/computer/crew/update_icon() + + if(stat & BROKEN) + icon_state = "broken" + else + if(stat & NOPOWER) + src.icon_state = "c_unpowered" + stat |= NOPOWER else - if( powered() ) - icon_state = initial(icon_state) - stat &= ~NOPOWER - else - spawn(rand(0, 15)) - src.icon_state = "c_unpowered" - stat |= NOPOWER + icon_state = initial(icon_state) + stat &= ~NOPOWER - Topic(href, href_list) - if(..()) return - if (src.z > 6) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" - return - if( href_list["close"] ) - usr << browse(null, "window=crewcomp") - usr.unset_machine() - return - if(href_list["update"]) - src.updateDialog() - return +/obj/machinery/computer/crew/Topic(href, href_list) + if(..()) return + if (src.z > 6) + usr << "\red Unable to establish a connection: \black You're too far away from the station!" + return + if( href_list["close"] ) + usr << browse(null, "window=crewcomp") + usr.unset_machine() + return + if(href_list["update"]) + src.updateDialog() + return - interact(mob/user) - if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) ) - if(!istype(user, /mob/living/silicon)) - user.unset_machine() - user << browse(null, "window=powcomp") - return - user.set_machine(src) - src.scan() - var/t = "Crew Monitoring
" - t += "
Refresh " - t += "Close
" - t += "
| Name | Vitals | Position |
| Name | Vitals | Position |
| [H.wear_id.name] | " - else - log += "||
| Unknown | " + if(H.wear_id) + log += "||
| [H.wear_id.name] | " + else + log += "||
| Unknown | " - switch(C.sensor_mode) - if(1) - log += "[life_status] | Not Available | [life_status] [damage_report] | Not Available | " - if(3) - var/area/player_area = get_area(H) - log += "[life_status] [damage_report] | [player_area.name] ([pos.x], [pos.y]) | " - logs += log - logs = sortList(logs) - for(var/log in logs) - t += log - t += "
Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret.
If necessary, change the password to a more secure one." + info = "
Daily Key Reset
The new message monitor key is '[server.decryptkey]'.
Please keep this a secret and away from the clown.
If necessary, change the password to a more secure one." info_links = info overlays += "paper_words" break diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index e557cbc212d..0a5696ee4ce 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -146,7 +146,8 @@ /obj/machinery/computer/pod/process() - ..() + if(!..()) + return if(timing) if(time > 0) time = round(time) - 1 @@ -199,8 +200,14 @@ name = "ProComp Executive IIc" desc = "The Syndicate operate on a tight budget. Operates external airlocks." title = "External Airlock Controls" + req_access = list(access_syndicate) - +/obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob) + if(!allowed(user)) + user << "\red Access Denied" + return + else + ..() /obj/machinery/computer/pod/old/swf name = "Magix System IV" diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index ce441f00d0b..b3b017565c4 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -126,10 +126,6 @@ return -/obj/machinery/power/monitor/process() - if(!(stat & (NOPOWER|BROKEN)) ) - use_power(250) - /obj/machinery/power/monitor/power_change() if(stat & BROKEN) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index c4251f71452..ca0512e2cbd 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -65,10 +65,8 @@ process() - if(stat & (NOPOWER|BROKEN)) - return - use_power(500) - src.updateDialog() + if(!..()) + src.updateDialog() return diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 318f4fd7fa2..deb6e9e8c88 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -549,6 +549,34 @@ What a mess.*/ updateUsrDialog() return +/obj/machinery/computer/secure_data/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + + for(var/datum/data/record/R in data_core.security) + if(prob(10/severity)) + switch(rand(1,6)) + if(1) + R.fields["name"] = "[pick(pick(first_names_male), pick(first_names_female))] [pick(last_names)]" + if(2) + R.fields["sex"] = pick("Male", "Female") + if(3) + R.fields["age"] = rand(5, 85) + if(4) + R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released") + if(5) + R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit") + if(6) + R.fields["m_stat"] = pick("*Insane*", "*Unstable*", "*Watch*", "Stable") + continue + + else if(prob(1)) + del(R) + continue + + ..(severity) + /obj/machinery/computer/secure_data/detective_computer icon = 'icons/obj/computer.dmi' icon_state = "messyfiles" diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 23c1c3b4a2c..978db653f94 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -52,7 +52,7 @@ world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) if("Abort") - world << "\blue All authorizations to shorting time for shuttle launch have been revoked!" + world << "\blue All authorizations to shortening time for shuttle launch have been revoked!" src.authorized.len = 0 src.authorized = list( ) diff --git a/code/game/machinery/computer/syndicate_shuttle.dm b/code/game/machinery/computer/syndicate_shuttle.dm index a421d2c21a6..681fc65fe97 100644 --- a/code/game/machinery/computer/syndicate_shuttle.dm +++ b/code/game/machinery/computer/syndicate_shuttle.dm @@ -5,7 +5,7 @@ name = "syndicate shuttle terminal" icon = 'icons/obj/computer.dmi' icon_state = "syndishuttle" - req_access = list() + req_access = list(access_syndicate) var/area/curr_location var/moving = 0 var/lastMove = 0 @@ -47,7 +47,7 @@ /obj/machinery/computer/syndicate_station/attack_hand(mob/user as mob) if(!allowed(user)) - user << "Access Denied." + user << "\red Access Denied" return user.set_machine(src) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 7790526dd77..b9b4fe0a04e 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -35,18 +35,17 @@ switch(state) if(1) if(istype(P, /obj/item/weapon/cable_coil)) - if(P:amount >= 5) + var/obj/item/weapon/cable_coil/C = P + if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You start to add cables to the frame." if(do_after(user, 20)) - if(!P) - user << "\blue You realize the cable coil no longer exist." - return; - P:amount -= 5 - if(!P:amount) del(P) - user << "\blue You add cables to the frame." - state = 2 - icon_state = "box_1" + if(C) + C.amount -= 5 + if(!C.amount) del(C) + user << "\blue You add cables to the frame." + state = 2 + icon_state = "box_1" else if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 6669ad5137a..1a78d4be758 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -4,7 +4,7 @@ icon_state = "cell-off" density = 1 anchored = 1.0 - layer = 5 + layer = 2.8 var/on = 0 var/temperature_archived @@ -100,8 +100,10 @@ on = !on update_icon() if(href_list["eject"]) - beaker:loc = loc - beaker = null + if (beaker) + var/obj/item/weapon/reagent_containers/glass/B = beaker + B.loc = get_step(loc, SOUTH) + beaker = null updateUsrDialog() add_fingerprint(usr) @@ -120,9 +122,9 @@ else if(istype(G, /obj/item/weapon/grab)) if(!ismob(G:affecting)) return - for(var/mob/living/carbon/metroid/M in range(1,G:affecting)) + for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) - usr << "[G:affecting:name] will not fit into the cryo because they have a Metroid latched onto their head." + usr << "[G:affecting:name] will not fit into the cryo because they have a slime latched onto their head." return var/mob/M = G:affecting if(put_mob(M)) @@ -253,7 +255,7 @@ set name = "Move Inside" set category = "Object" set src in oview(1) - for(var/mob/living/carbon/metroid/M in range(1,usr)) + for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) usr << "You're too busy getting your life sucked out of you." return diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 171608be173..70010a74d5d 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -229,6 +229,13 @@ for reference: if (src.health <= 0) src.explode() return + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + return + if(prob(50/severity)) + locked = !locked + anchored = !anchored + icon_state = "barrier[src.locked]" meteorhit() src.explode() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 6dfa0da691c..c4e9fd0230d 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -1,3 +1,36 @@ +/obj/machinery/door_control + name = "remote door-control" + desc = "It controls doors, remotely." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "doorctrl0" + desc = "A remote control-switch for a door." + power_channel = ENVIRON + var/id = null + var/range = 10 + var/normaldoorcontrol = 0 + var/desiredstate = 0 // Zero is closed, 1 is open. + var/specialfunctions = 1 + /* + Bitflag, 1= open + 2= idscan, + 4= bolts + 8= shock + 16= door safties + + */ + + var/exposedwires = 0 + var/wires = 3 + /* + Bitflag, 1=checkID + 2=Network Access + */ + + anchored = 1.0 + use_power = 1 + idle_power_usage = 2 + active_power_usage = 4 + /obj/machinery/door_control/attack_ai(mob/user as mob) if(wires & 2) return src.attack_hand(user) @@ -24,6 +57,10 @@ */ if(istype(W, /obj/item/device/detective_scanner)) return + if(istype(W, /obj/item/weapon/card/emag)) + req_access = list() + req_one_access = list() + playsound(src.loc, "sparks", 100, 1) return src.attack_hand(user) /obj/machinery/door_control/attack_hand(mob/user as mob) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index f6592af5225..5d6aa3823ff 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -216,6 +216,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. opacity = 0 doortype = 21 glass = 1 + heat_proof = 1 /obj/machinery/door/airlock/glass_mining name = "Maintenance Hatch" @@ -631,7 +632,7 @@ About the new airlock wires panel: /obj/machinery/door/airlock/update_icon() - if(overlays) overlays = null + if(overlays) overlays.Cut() if(density) if(locked && lights) icon_state = "door_locked" @@ -651,14 +652,14 @@ About the new airlock wires panel: /obj/machinery/door/airlock/animate(animation) switch(animation) if("opening") - if(overlays) overlays = null + if(overlays) overlays.Cut() if(p_open) spawn(2) // The only work around that works. Downside is that the door will be gone for a millisecond. flick("o_door_opening", src) //can not use flick due to BYOND bug updating overlays right before flicking else flick("door_opening", src) if("closing") - if(overlays) overlays = null + if(overlays) overlays.Cut() if(p_open) flick("o_door_closing", src) else @@ -825,7 +826,8 @@ About the new airlock wires panel: sleep(10) //bring up airlock dialog src.aiHacking = 0 - src.attack_ai(user) + if (user) + src.attack_ai(user) /obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if (src.isElectrified()) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 6a57e7cc5ed..2310e85c07c 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/item/weapon/airlock_electronics - name = "Airlock Electronics" + name = "airlock electronics" icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_electronics" w_class = 2.0 //It should be tiny! -Agouri diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 6e95c932ef7..4d634d45895 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -219,7 +219,7 @@ // Adds an icon in case the screen is broken/off, stolen from status_display.dm proc/set_picture(var/state) picture_state = state - overlays = null + overlays.Cut() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) @@ -227,10 +227,10 @@ // Stolen from status_display proc/update_display(var/line1, var/line2) if(line2 == null) // single line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -13) else // dual line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -9) overlays += texticon(line2, 23, -17) // return an icon of a time text string (tn) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index c8ad53eb191..9405732d940 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -17,288 +17,248 @@ var/autoclose = 0 var/glass = 0 var/normalspeed = 1 + var/heat_proof = 0 // For glass airlocks/opacity firedoors - proc/bumpopen(mob/user as mob) - proc/update_nearby_tiles(need_rebuild) - proc/requiresID() return 1 - proc/animate(animation) - proc/open() - proc/close() +/obj/machinery/door/New() + ..() + if(density) + layer = 3.1 //Above most items if closed + explosion_resistance = initial(explosion_resistance) + update_heat_protection(get_turf(src)) + else + layer = 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6 + explosion_resistance = 0 + update_nearby_tiles(need_rebuild=1) + return - New() - ..() - if(density) - layer = 3.1 //Above most items if closed - explosion_resistance = initial(explosion_resistance) - if(opacity) - var/turf/T = get_turf(src) - T.thermal_conductivity = DOOR_HEAT_TRANSFER_COEFFICIENT - else - layer = 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6 - explosion_resistance = 0 - update_nearby_tiles(need_rebuild=1) + +/obj/machinery/door/Del() + density = 0 + update_nearby_tiles() + ..() + return + +//process() + //return + +/obj/machinery/door/Bumped(atom/AM) + if(p_open || operating) return + if(ismob(AM)) + var/mob/M = AM + if(world.time - M.last_bumped <= 10) return //Can bump-open one airlock per second. This is to prevent shock spam. + M.last_bumped = world.time + if(!M.restrained()) + bumpopen(M) return - - Del() - density = 0 - update_nearby_tiles() - ..() - return - - //process() - //return - - Bumped(atom/AM) - if(p_open || operating) return - if(ismob(AM)) - var/mob/M = AM - if(world.time - M.last_bumped <= 10) return //Can bump-open one airlock per second. This is to prevent shock spam. - M.last_bumped = world.time - if(!M.restrained()) - bumpopen(M) - return - - if(istype(AM, /obj/machinery/bot)) - var/obj/machinery/bot/bot = AM - if(src.check_access(bot.botcard)) - if(density) - open() - return - - if(istype(AM, /obj/effect/critter)) - var/obj/effect/critter/critter = AM - if(critter.opensdoors) return - if(src.check_access_list(critter.access_list)) - if(density) - open() - return - - if(istype(AM, /obj/mecha)) - var/obj/mecha/mecha = AM + if(istype(AM, /obj/machinery/bot)) + var/obj/machinery/bot/bot = AM + if(src.check_access(bot.botcard)) if(density) - if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access))) - open() - else - flick("door_deny", src) - return + open() return - - CanPass(atom/movable/mover, turf/target, height=0, air_group=0) - if(air_group) return 0 - if(istype(mover) && mover.checkpass(PASSGLASS)) - return !opacity - return !density - - - bumpopen(mob/user as mob) - if(operating) return - src.add_fingerprint(user) - if(!src.requiresID()) - user = null - + if(istype(AM, /obj/mecha)) + var/obj/mecha/mecha = AM if(density) - if(allowed(user)) open() - else flick("door_deny", src) - return - - meteorhit(obj/M as obj) - src.open() - return - - - attack_ai(mob/user as mob) - return src.attack_hand(user) - - - attack_paw(mob/user as mob) - return src.attack_hand(user) - - - attack_hand(mob/user as mob) - return src.attackby(user, user) - - - attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/device/detective_scanner)) - return - if(src.operating || isrobot(user)) return //borgs can't attack doors open because it conflicts with their AI-like interaction with them. - src.add_fingerprint(user) - if(!src.requiresID()) - user = null - if(src.density && (istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade))) - flick("door_spark", src) - sleep(6) - open() - operating = -1 - return 1 - if(src.allowed(user)) - if(src.density) + if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access))) open() else - close() - return - if(src.density) - flick("door_deny", src) - return - - - blob_act() - if(prob(40)) - del(src) - return - - - emp_act(severity) - if(prob(20/severity) && (istype(src,/obj/machinery/door/airlock) || istype(src,/obj/machinery/door/window)) ) - open() - if(prob(40/severity)) - if(secondsElectrified == 0) - secondsElectrified = -1 - spawn(300) - secondsElectrified = 0 - ..() - - - ex_act(severity) - switch(severity) - if(1.0) - del(src) - if(2.0) - if(prob(25)) - del(src) - if(3.0) - if(prob(80)) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(2, 1, src) - s.start() - return - - - update_icon() - if(density) - icon_state = "door1" - else - icon_state = "door0" - return - - - animate(animation) - switch(animation) - if("opening") - if(p_open) - flick("o_doorc0", src) - else - flick("doorc0", src) - if("closing") - if(p_open) - flick("o_doorc1", src) - else - flick("doorc1", src) - if("deny") flick("door_deny", src) return + return - open() - if(!density) return 1 - if(operating > 0) return - if(!ticker) return 0 - if(!operating) operating = 1 - - animate("opening") - icon_state = "door0" - src.SetOpacity(0) - sleep(10) - src.layer = 2.7 - src.density = 0 - explosion_resistance = 0 - update_icon() - SetOpacity(0) - update_nearby_tiles() - - if(operating) operating = 0 - - if(autoclose && normalspeed) - spawn(150) - autoclose() - if(autoclose && !normalspeed) - spawn(5) - autoclose() - - return 1 +/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) + if(air_group) return 0 + if(istype(mover) && mover.checkpass(PASSGLASS)) + return !opacity + return !density - close() - if(density) return 1 - if(operating) return - operating = 1 +/obj/machinery/door/proc/bumpopen(mob/user as mob) + if(operating) return + src.add_fingerprint(user) + if(!src.requiresID()) + user = null - animate("closing") - src.density = 1 - explosion_resistance = initial(explosion_resistance) - src.layer = 3.1 - sleep(10) - update_icon() - if(visible && !glass) - SetOpacity(1) //caaaaarn! - operating = 0 - update_nearby_tiles() + if(density) + if(allowed(user)) open() + else flick("door_deny", src) + return + +/obj/machinery/door/meteorhit(obj/M as obj) + src.open() + return + + +/obj/machinery/door/attack_ai(mob/user as mob) + return src.attack_hand(user) + + +/obj/machinery/door/attack_paw(mob/user as mob) + return src.attack_hand(user) + + +/obj/machinery/door/attack_hand(mob/user as mob) + return src.attackby(user, user) + + +/obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I, /obj/item/device/detective_scanner)) return + if(src.operating || isrobot(user)) return //borgs can't attack doors open because it conflicts with their AI-like interaction with them. + src.add_fingerprint(user) + if(!src.requiresID()) + user = null + if(src.density && (istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade))) + flick("door_spark", src) + sleep(6) + open() + operating = -1 + return 1 + if(src.allowed(user)) + if(src.density) + open() + else + close() + return + if(src.density) + flick("door_deny", src) + return - update_nearby_tiles(need_rebuild) - if(!air_master) return 0 +/obj/machinery/door/blob_act() + if(prob(40)) + del(src) + return - var/turf/simulated/source = loc - var/turf/simulated/north = get_step(source,NORTH) - var/turf/simulated/south = get_step(source,SOUTH) - var/turf/simulated/east = get_step(source,EAST) - var/turf/simulated/west = get_step(source,WEST) - if(src.density && src.opacity) +/obj/machinery/door/emp_act(severity) + if(prob(20/severity) && (istype(src,/obj/machinery/door/airlock) || istype(src,/obj/machinery/door/window)) ) + open() + if(prob(40/severity)) + if(secondsElectrified == 0) + secondsElectrified = -1 + spawn(300) + secondsElectrified = 0 + ..() + + +/obj/machinery/door/ex_act(severity) + switch(severity) + if(1.0) + del(src) + if(2.0) + if(prob(25)) + del(src) + if(3.0) + if(prob(80)) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, src) + s.start() + return + + +/obj/machinery/door/update_icon() + if(density) + icon_state = "door1" + else + icon_state = "door0" + return + + +/obj/machinery/door/proc/animate(animation) + switch(animation) + if("opening") + if(p_open) + flick("o_doorc0", src) + else + flick("doorc0", src) + if("closing") + if(p_open) + flick("o_doorc1", src) + else + flick("doorc1", src) + if("deny") + flick("door_deny", src) + return + + +/obj/machinery/door/proc/open() + if(!density) return 1 + if(operating > 0) return + if(!ticker) return 0 + if(!operating) operating = 1 + + animate("opening") + icon_state = "door0" + src.SetOpacity(0) + sleep(10) + src.layer = 2.7 + src.density = 0 + explosion_resistance = 0 + update_icon() + SetOpacity(0) + update_nearby_tiles() + + if(operating) operating = 0 + + if(autoclose && normalspeed) + spawn(150) + autoclose() + if(autoclose && !normalspeed) + spawn(5) + autoclose() + + return 1 + + +/obj/machinery/door/proc/close() + if(density) return 1 + if(operating) return + operating = 1 + + animate("closing") + src.density = 1 + explosion_resistance = initial(explosion_resistance) + src.layer = 3.1 + sleep(10) + update_icon() + if(visible && !glass) + SetOpacity(1) //caaaaarn! + operating = 0 + update_nearby_tiles() + return + +/obj/machinery/door/proc/requiresID() + return 1 + +/obj/machinery/door/proc/update_nearby_tiles(need_rebuild) + if(!air_master) return 0 + + var/turf/simulated/source = loc + var/turf/simulated/north = get_step(source,NORTH) + var/turf/simulated/south = get_step(source,SOUTH) + var/turf/simulated/east = get_step(source,EAST) + var/turf/simulated/west = get_step(source,WEST) + + update_heat_protection(loc) + + if(istype(source)) air_master.tiles_to_update += source + if(istype(north)) air_master.tiles_to_update += north + if(istype(south)) air_master.tiles_to_update += south + if(istype(east)) air_master.tiles_to_update += east + if(istype(west)) air_master.tiles_to_update += west + return 1 + +/obj/machinery/door/proc/update_heat_protection(var/turf/simulated/source) + if(istype(source)) + if(src.density && (src.opacity || src.heat_proof)) source.thermal_conductivity = DOOR_HEAT_TRANSFER_COEFFICIENT else source.thermal_conductivity = initial(source.thermal_conductivity) - //not sure what the equivalent in zas is - /*if(need_rebuild) - if(istype(source)) //Rebuild/update nearby group geometry - if(source.parent) - air_master.groups_to_rebuild += source.parent - else - air_master.tiles_to_update += source - if(istype(north)) - if(north.parent) - air_master.groups_to_rebuild += north.parent - else - air_master.tiles_to_update += north - if(istype(south)) - if(south.parent) - air_master.groups_to_rebuild += south.parent - else - air_master.tiles_to_update += south - if(istype(east)) - if(east.parent) - air_master.groups_to_rebuild += east.parent - else - air_master.tiles_to_update += east - if(istype(west)) - if(west.parent) - air_master.groups_to_rebuild += west.parent - else - air_master.tiles_to_update += west - else*/ - if(istype(source)) air_master.tiles_to_update |= source - if(istype(north)) air_master.tiles_to_update |= north - if(istype(south)) air_master.tiles_to_update |= south - if(istype(east)) air_master.tiles_to_update |= east - if(istype(west)) air_master.tiles_to_update |= west - - return 1 - - /obj/machinery/door/proc/autoclose() var/obj/machinery/door/airlock/A = src if(!A.density && !A.operating && !A.locked && !A.welded && A.autoclose) @@ -306,33 +266,4 @@ return /obj/machinery/door/morgue - icon = 'icons/obj/doors/doormorgue.dmi' - -/* -/obj/machinery/door/airlock/proc/ion_act() - if(src.z == 1 && src.density) - if(length(req_access) > 0 && !(12 in req_access)) - if(prob(4)) - world << "\red Airlock emagged in [src.loc.loc]" - src.operating = -1 - flick("door_spark", src) - sleep(6) - open() - else - if(prob(8)) - world << "\red non vital Airlock emagged in [src.loc.loc]" - src.operating = -1 - flick("door_spark", src) - sleep(6) - open() - return - -/obj/machinery/door/firedoor/proc/ion_act() - if(src.z == 1) - if(prob(15)) - if(density) - open() - else - close() - return -*/ \ No newline at end of file + icon = 'icons/obj/doors/doormorgue.dmi' \ No newline at end of file diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index b755f16d0a0..4f8c7ba8c4b 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -123,7 +123,7 @@ else spawn(0) close() - + return var/access_granted = 0 var/users_name if(!istype(C, /obj)) //If someone hit it with their hand. We need to see if they are allowed. @@ -209,7 +209,7 @@ update_icon() - overlays = null + overlays.Cut() if(density) icon_state = "door_closed" if(blocked) @@ -221,4 +221,39 @@ return -/obj/machinery/door/firedoor/border_only \ No newline at end of file + +/obj/machinery/door/firedoor/border_only + icon = 'icons/obj/doors/edge_Doorfire.dmi' + glass = 1 //There is a glass window so you can see through the door + //This is needed due to BYOND limitations in controlling visibility + heat_proof = 1 + + CanPass(atom/movable/mover, turf/target, height=0, air_group=0) + if(istype(mover) && mover.checkpass(PASSGLASS)) + return 1 + if(get_dir(loc, target) == dir) //Make sure looking at appropriate border + if(air_group) return 0 + return !density + else + return 1 + + CheckExit(atom/movable/mover as mob|obj, turf/target as turf) + if(istype(mover) && mover.checkpass(PASSGLASS)) + return 1 + if(get_dir(loc, target) == dir) + return !density + else + return 1 + + + update_nearby_tiles(need_rebuild) + if(!air_master) return 0 + + var/turf/simulated/source = loc + var/turf/simulated/destination = get_step(source,dir) + + update_heat_protection(loc) + + if(istype(source)) air_master.tiles_to_update += source + if(istype(destination)) air_master.tiles_to_update += destination + return 1 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 7905fc559d9..55aef446eaa 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -6,6 +6,7 @@ var/base_state = "left" var/health = 150.0 //If you change this, consiter changing ../door/window/brigdoor/ health at the bottom of this .dm file visible = 0.0 + use_power = 0 flags = ON_BORDER opacity = 0 var/obj/item/weapon/airlock_electronics/electronics = null @@ -157,7 +158,7 @@ return src.attack_hand(user) /obj/machinery/door/window/attack_paw(mob/user as mob) - if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/metroid/adult)) + if(istype(user, /mob/living/carbon/alien/humanoid) || istype(user, /mob/living/carbon/slime/adult)) if(src.operating) return src.health = max(0, src.health - 25) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index ac2ec0da461..9de6b2c6aa8 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -88,6 +88,14 @@ O.eye_stat += rand(0, 2) +/obj/machinery/flasher/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + if(prob(75/severity)) + flash() + ..(severity) + /obj/machinery/flasher/portable/HasProximity(atom/movable/AM as mob|obj) if ((src.disable) || (src.last_flash && world.time < src.last_flash + 150)) return @@ -104,7 +112,7 @@ if (!src.anchored) user.show_message(text("\red [src] can now be moved.")) - src.overlays = null + src.overlays.Cut() else if (src.anchored) user.show_message(text("\red [src] is now secured.")) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 90b628d93e9..5442248986a 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -1,3 +1,10 @@ +/* Holograms! + * Contains: + * Holopad + * Hologram + * Other stuff + */ + /* Revised. Original based on space ninja hologram code. Which is also mine. /N How it works: @@ -12,11 +19,23 @@ Possible to do for anyone motivated enough: Itegrate EMP effect to disable the unit. */ + +/* + * Holopad + */ + // HOLOPAD MODE // 0 = RANGE BASED // 1 = AREA BASED var/const/HOLOPAD_MODE = 0 +/obj/machinery/hologram/holopad + name = "\improper AI holopad" + desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely." + icon_state = "holopad0" + var/mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time. + var/last_request = 0 //to prevent request spam. ~Carn + var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating. /obj/machinery/hologram/holopad/attack_hand(var/mob/living/carbon/human/user) //Carn: Hologram requests. if(!istype(user)) @@ -120,6 +139,17 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ return 1 +/* + * Hologram + */ + +/obj/machinery/hologram + anchored = 1 + use_power = 1 + idle_power_usage = 5 + active_power_usage = 100 + var/obj/effect/overlay/hologram//The projection itself. If there is one, the instrument is on, off otherwise. + /obj/machinery/hologram/power_change() if (powered()) stat &= ~NOPOWER @@ -171,4 +201,13 @@ Holographic project of everything else. world << "Your icon should appear now." return -*/ \ No newline at end of file +*/ + +/* + * Other Stuff: Is this even used? + */ +/obj/machinery/hologram/projector + name = "hologram projector" + desc = "It makes a hologram appear...with magnets or something..." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "hologram0" \ No newline at end of file diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index d1a5a3ff6c0..8d023c29555 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -1,3 +1,5 @@ +#define SPEED_MULTIPLIER 0.5 + /obj/machinery/hydroponics name = "hydroponics tray" icon = 'icons/obj/hydroponics.dmi' @@ -45,42 +47,42 @@ obj/machinery/hydroponics/process() lastcycle = world.time if(planted && !dead) // Advance age - age++ + age += 1 * SPEED_MULTIPLIER //Nutrients////////////////////////////////////////////////////////////// // Nutrients deplete slowly if(nutrilevel > 0) if(prob(50)) - nutrilevel -= 1 + nutrilevel -= 1 * SPEED_MULTIPLIER // Lack of nutrients hurts non-weeds if(nutrilevel <= 0 && myseed.plant_type != 1) - health -= rand(1,3) + health -= rand(1,3) * SPEED_MULTIPLIER //Water////////////////////////////////////////////////////////////////// // Drink random amount of water - waterlevel = max(waterlevel - rand(1,6), 0) + waterlevel = max(waterlevel - rand(1,6) * SPEED_MULTIPLIER, 0) // If the plant is dry, it loses health pretty fast, unless mushroom if(waterlevel <= 10 && myseed.plant_type != 2) - health -= rand(0,1) + health -= rand(0,1) * SPEED_MULTIPLIER if(waterlevel <= 0) - health -= rand(0,2) + health -= rand(0,2) * SPEED_MULTIPLIER // Sufficient water level and nutrient level = plant healthy else if(waterlevel > 10 && nutrilevel > 0) - health += rand(1,2) + health += rand(1,2) * SPEED_MULTIPLIER if(prob(5)) //5 percent chance the weed population will increase - weedlevel += 1 + weedlevel += 1 * SPEED_MULTIPLIER //Toxins///////////////////////////////////////////////////////////////// // Too much toxins cause harm, but when the plant drinks the contaiminated water, the toxins disappear slowly if(toxic >= 40 && toxic < 80) - health -= 1 - toxic -= rand(1,10) + health -= 1 * SPEED_MULTIPLIER + toxic -= rand(1,10) * SPEED_MULTIPLIER else if(toxic >= 80) // I don't think it ever gets here tbh unless above is commented out - health -= 3 - toxic -= rand(1,10) + health -= 3 * SPEED_MULTIPLIER + toxic -= rand(1,10) * SPEED_MULTIPLIER else if(toxic < 0) // Make sure it won't go overoboard toxic = 0 @@ -91,11 +93,11 @@ obj/machinery/hydroponics/process() pestlevel = 10 else if(pestlevel >= 5) - health -= 1 + health -= 1 * SPEED_MULTIPLIER // If it's a weed, it doesn't stunt the growth if(weedlevel >= 5 && myseed.plant_type != 1 ) - health -= 1 + health -= 1 * SPEED_MULTIPLIER //Health & Age/////////////////////////////////////////////////////////// @@ -107,12 +109,12 @@ obj/machinery/hydroponics/process() else if(health <= 0) dead = 1 harvest = 0 - weedlevel += 1 // Weeds flourish + weedlevel += 1 * SPEED_MULTIPLIER // Weeds flourish pestlevel = 0 // Pests die // If the plant is too old, lose health fast if(age > myseed.lifespan) - health -= rand(1,5) + health -= rand(1,5) * SPEED_MULTIPLIER // Harvest code if(age > myseed.production && (age - lastproduce) > myseed.production && (!harvest && !dead)) @@ -129,10 +131,10 @@ obj/machinery/hydroponics/process() else lastproduce = age if(prob(5)) // On each tick, there's a 5 percent chance the pest population will increase - pestlevel += 1 + pestlevel += 1 * SPEED_MULTIPLIER else if(waterlevel > 10 && nutrilevel > 0 && prob(10)) // If there's no plant, the percentage chance is 10% - weedlevel += 1 + weedlevel += 1 * SPEED_MULTIPLIER if(weedlevel > 10) weedlevel = 10 @@ -151,7 +153,7 @@ obj/machinery/hydroponics/process() obj/machinery/hydroponics/proc/updateicon() //Refreshes the icon and sets the luminosity - overlays = null + overlays.Cut() if(planted) if(dead) overlays += image('icons/obj/hydroponics.dmi', icon_state="[myseed.species]-dead") @@ -712,6 +714,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) user.visible_message("\red [user] starts uprooting the weeds.", "\red You remove the weeds from the [src].") weedlevel = 0 updateicon() + src.updateicon() else user << "\red This plot is completely devoid of weeds. It doesn't need uprooting." @@ -729,15 +732,13 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) del(O) updateicon() - else if (istype(O, /obj/item/weapon/plantbag)) + else if (istype(O, /obj/item/weapon/storage/bag/plants)) attack_hand(user) - var/obj/item/weapon/plantbag/S = O + var/obj/item/weapon/storage/bag/plants/S = O for (var/obj/item/weapon/reagent_containers/food/snacks/grown/G in locate(user.x,user.y,user.z)) - if (S.contents.len < S.capacity) - S.contents += G; - else - user << "\blue The plant bag is full." + if(!S.can_be_inserted(G)) return + S.handle_item_insertion(G, 1) else if ( istype(O, /obj/item/weapon/pestspray) ) var/obj/item/pestkiller/myPKiller = O @@ -812,6 +813,16 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) parent.update_tray() +/obj/item/seeds/grassseed/harvest(mob/user = usr) + var/obj/machinery/hydroponics/parent = loc //for ease of access + var/t_yield = round(yield*parent.yieldmod) + + if(t_yield > 0) + var/obj/item/stack/tile/grass/new_grass = new/obj/item/stack/tile/grass(user.loc) + new_grass.amount = t_yield + + parent.update_tray() + /obj/item/seeds/gibtomato/harvest(mob/user = usr) var/produce = text2path(productname) var/obj/machinery/hydroponics/parent = loc //for ease of access @@ -1005,10 +1016,10 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) icon = 'icons/obj/hydroponics.dmi' icon_state = "soil" density = 0 - New() - ..() + use_power = 0 + updateicon() // Same as normal but with the overlays removed - Cheridan. - overlays = null + overlays.Cut() if(planted) if(dead) overlays += image('icons/obj/hydroponics.dmi', icon_state="[myseed.species]-dead") @@ -1029,4 +1040,6 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) SetLuminosity(round(myseed.potency/10)) else SetLuminosity(0) - return \ No newline at end of file + return + +#undef SPEED_MULTIPLIER diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 0cacca07ed7..817a3603e84 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -1,3 +1,15 @@ +/obj/machinery/igniter + name = "igniter" + desc = "It's useful for igniting plasma." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "igniter1" + var/id = null + var/on = 1.0 + anchored = 1.0 + use_power = 1 + idle_power_usage = 2 + active_power_usage = 4 + /obj/machinery/igniter/attack_ai(mob/user as mob) return src.attack_hand(user) @@ -100,6 +112,12 @@ location.hotspot_expose(1000,500,1) return 1 +/obj/machinery/sparker/emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + ignite() + ..(severity) /obj/machinery/ignition_switch/attack_ai(mob/user as mob) return src.attack_hand(user) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index c27ae7faa80..311f8d88101 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -69,8 +69,6 @@ /obj/machinery/iv_drip/process() set background = 1 - ..() - if(src.attached) if(!(get_dist(src, src.attached) <= 1)) visible_message("The needle is ripped out of [src.attached], doesn't that hurt?") @@ -101,7 +99,12 @@ var/mob/living/carbon/human/T = attached if(!istype(T)) return - var/datum/reagent/B = new /datum/reagent/blood + var/datum/reagent/B + for(var/datum/reagent/blood/Blood in beaker.reagents.reagent_list) + if(Blood.data && Blood.data["blood_type"]==T.dna.b_type) + B = Blood + break + if(!B) B = new /datum/reagent/blood if(!T.dna) return if(NOCLONE in T.mutations) @@ -112,7 +115,7 @@ if(T.vessel.get_reagent_amount("blood") < amount) return B.holder = beaker - B.volume = amount + B.volume += amount //set reagent data B.data["donor"] = T @@ -121,7 +124,10 @@ B.data["blood_DNA"] = copytext(T.dna.unique_enzymes,1,0) if(T.resistances && T.resistances.len) - B.data["resistances"] = T.resistances.Copy() + if(B.data["resistances"]) + B.data["resistances"] |= T.resistances.Copy() + else + B.data["resistances"] = T.resistances.Copy() B.data["blood_type"] = copytext(T.dna.b_type,1,0) @@ -130,14 +136,15 @@ temp_chem += R.name temp_chem[R.name] = R.volume B.data["trace_chem"] = list2params(temp_chem) - B.data["antibodies"] = T.antibodies + B.data["antibodies"] |= T.antibodies T.vessel.remove_reagent("blood",amount) // Removes blood if human - beaker.reagents.reagent_list += B + beaker.reagents.reagent_list |= B beaker.reagents.update_total() beaker.on_reagent_change() beaker.reagents.handle_reactions() + update_icon() /obj/machinery/iv_drip/attack_hand(mob/user as mob) if(src.beaker) @@ -168,6 +175,11 @@ ..() if (!(usr in view(2)) && usr!=src.loc) return + if(mode == "take") + usr << "The IV drip is taking blood." + else if(mode == "give") + usr << "The IV drip is injecting." + if(beaker) usr << "\blue Attached is \a [beaker] with:" if(beaker.reagents && beaker.reagents.reagent_list.len) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 57304622656..0a8bde59dde 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -50,7 +50,7 @@ src.overlays += image('icons/obj/kitchen.dmi', "grjam") /obj/machinery/gibber/update_icon() - overlays = null + overlays.Cut() if (dirty) src.overlays += image('icons/obj/kitchen.dmi', "grbloody") if(stat & (NOPOWER|BROKEN)) diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index b0e2d2ad4c0..f5e5b2987df 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -60,9 +60,9 @@ ..() - metroid - input = /mob/living/carbon/metroid - output = /obj/item/weapon/reagent_containers/glass/beaker/roro + slime + input = /mob/living/carbon/slime + output = /obj/item/weapon/reagent_containers/glass/beaker/slime monkey process(loc, what) @@ -82,7 +82,7 @@ for(var/datum/disease/D in O.viruses) if(D.spread_type != SPECIAL) - B.data["viruses"] = D.Copy() + B.data["viruses"] += D.Copy() B.data["blood_DNA"] = copytext(O.dna.unique_enzymes,1,0) if(O.resistances&&O.resistances.len) diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 926e4133788..d02e5fd4f46 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -12,23 +12,52 @@ active_power_usage = 100 flags = NOREACT var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. + var/icon_on = "smartfridge" + var/icon_off = "smartfridge-off" var/item_quants = list() var/ispowered = 1 //starts powered var/isbroken = 0 +/obj/machinery/smartfridge/proc/accept_check(var/obj/item/O as obj) + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/)) + return 1 + return 0 + +/obj/machinery/smartfridge/seeds + name = "\improper MegaSeed Servitor" + desc = "When you need seeds fast!" + icon = 'icons/obj/vending.dmi' + icon_state = "seeds" + icon_on = "seeds" + icon_off = "seeds-off" + +/obj/machinery/smartfridge/seeds/accept_check(var/obj/item/O as obj) + if(istype(O,/obj/item/seeds/)) + return 1 + return 0 + +/obj/machinery/smartfridge/extract + name = "\improper Slime Extract Storage" + desc = "A refrigerated storage unit for slime extracts" + +/obj/machinery/smartfridge/extract/accept_check(var/obj/item/O as obj) + if(istype(O,/obj/item/slime_extract)) + return 1 + return 0 + /obj/machinery/smartfridge/power_change() if( powered() ) src.ispowered = 1 stat &= ~NOPOWER if(!isbroken) - icon_state = "smartfridge" + icon_state = icon_on else spawn(rand(0, 15)) src.ispowered = 0 stat |= NOPOWER if(!isbroken) - icon_state = "smartfridge-off" + icon_state = icon_off /******************* @@ -40,7 +69,7 @@ user << "\The [src] is unpowered and useless." return - if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/)) + if(accept_check(O)) if(contents.len >= max_n_of_items) user << "\The [src] is full." return 1 @@ -54,20 +83,27 @@ user.visible_message("[user] has added \the [O] to \the [src].", \ "You add \the [O] to \the [src].") - else if(istype(O, /obj/item/weapon/plantbag)) - user.visible_message("[user] loads \the [src] with \the [O].", \ - "You load \the [src] with \the [O].") - for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents) - if(contents.len >= max_n_of_items) - user << "\The [src] is full." - return 1 - else - O.contents -= G - G.loc = src - if(item_quants[G.name]) - item_quants[G.name]++ + else if(istype(O, /obj/item/weapon/storage/bag/plants)) + var/obj/item/weapon/storage/bag/plants/P = O + var/plants_loaded = 0 + for(var/obj/G in P.contents) + if(accept_check(G)) + if(contents.len >= max_n_of_items) + user << "\The [src] is full." + return 1 else - item_quants[G.name] = 1 + P.remove_from_storage(G,src) + if(item_quants[G.name]) + item_quants[G.name]++ + else + item_quants[G.name] = 1 + plants_loaded++ + if(plants_loaded) + + user.visible_message("[user] loads \the [src] with \the [P].", \ + "You load \the [src] with \the [P].") + if(P.contents.len > 0) + user << "Some items are refused." else user << "\The [src] smartly refuses [O]." @@ -104,13 +140,18 @@ dat += "[capitalize(O)]:" dat += " [N] " dat += "Vend " - dat += "(x5)" - dat += "(x10)" - dat += "(x25)" + if(N > 5) + dat += "(x5)" + if(N > 10) + dat += "(x10)" + if(N > 25) + dat += "(x25)" + if(N > 1) + dat += "(All)" dat += "
" dat += "" - user << browse("
Receiving Channel: [src.channel_name]
" //MARK dat+="Message Author: [src.scanned_user]
" dat+="Message Body: [src.msg]
" + dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" dat+="
Submit
Cancel
" if(4) dat+="Feed story successfully submitted to [src.channel_name].
" @@ -292,8 +296,14 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if( isemptylist(src.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) - dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" + i++ + dat+="-[MESSAGE.body]
" + if(MESSAGE.img) + usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") + dat+="
" + dat+="\[Story by [MESSAGE.author]\]
" dat+="
Refresh" dat+="
Back" if(10) @@ -358,6 +368,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="
" dat+="Criminal Name: [src.channel_name]
" dat+="Description: [src.msg]
" + dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" if(wanted_already) dat+="Wanted Issue created by: [news_network.wanted_issue.backup_author]
" else @@ -385,7 +396,13 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="-- STATIONWIDE WANTED ISSUE --
\[Submitted by: [news_network.wanted_issue.backup_author]\]
" dat+="Criminal: [news_network.wanted_issue.author]
" dat+="Description: [news_network.wanted_issue.body]
" - dat+="
Back
" + dat+="Photo:: " + if(news_network.wanted_issue.img) + usr << browse_rsc(news_network.wanted_issue.img, "tmp_photow.png") + dat+="
"
+ else
+ dat+="None"
+ dat+="Back
" if(19) dat+="Wanted issue for [src.channel_name] successfully edited.
" dat+="
Return
" @@ -464,7 +481,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/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 = strip_html(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels ) + src.channel_name = strip_html_simple(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels ) src.updateUsrDialog() else if(href_list["set_new_message"]) @@ -473,6 +490,10 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.msg = copytext(src.msg,2,lentext(src.msg)+1) src.updateUsrDialog() + else if(href_list["set_attachment"]) + AttachPhoto(usr) + src.updateUsrDialog() + else if(href_list["submit_new_message"]) if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) src.screen=6 @@ -480,6 +501,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = src.scanned_user newMsg.body = src.msg + if(photo) + newMsg.img = photo.img feedback_inc("newscaster_stories",1) for(var/datum/feed_channel/FC in news_network.network_channels) if(FC.channel_name == src.channel_name) @@ -553,6 +576,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co 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() @@ -565,6 +590,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co 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() @@ -712,6 +739,16 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co user << "The newscaster controls are far too complicated for your tiny brain!" return +/obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob) + if(photo) + photo.loc = src.loc + user.put_in_inactive_hand(photo) + photo = null + if(istype(user.get_active_hand(), /obj/item/weapon/photo)) + photo = user.get_active_hand() + user.drop_item() + photo.loc = src + @@ -723,6 +760,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /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! attack_verb = list("bapped") @@ -778,8 +816,14 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) dat+="No Feed stories stem from this channel..." else dat+="
- "
+ var/i = 0
for(var/datum/feed_message/MESSAGE in C.messages)
- dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" + i++ + dat+="-[MESSAGE.body]
" + if(MESSAGE.img) + user << browse_rsc(MESSAGE.img, "tmp_photo[i].png") + dat+="
" + dat+="\[Story by [MESSAGE.author]\]
" dat+="
There is a small scribble near the end of this page... It reads: \"[src.scribble]\"" @@ -790,7 +834,13 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) if(src.important_message!=null) dat+="
Wanted Issue:
" dat+="Criminal name: [important_message.author]
" - dat+="Description: [important_message.body]" + dat+="Description: [important_message.body]
" + dat+="Photo:: " + if(important_message.img) + user << browse_rsc(important_message.img, "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)
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 06bd921dfb0..59e5ce13e33 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -449,9 +449,6 @@ Status: []"}, var/list/secondarytargets = list() // targets that are least important if(src.check_anomalies) // if its set to check for xenos/carps, check for non-mob "crittersssss"(And simple_animals) - for (var/obj/effect/critter/L in view(7,src)) - if(L.alive) - targets += L for(var/mob/living/simple_animal/C in view(7,src)) if(!C.stat) targets += C @@ -506,15 +503,6 @@ Status: []
"}, spawn() popUp() // pop the turret up if it's not already up. dir=get_dir(src,M) // even if you can't shoot, follow the target spawn() shootAt(M) // shoot the target, finally - else - - if (istype(t, /obj/effect/critter)) // shoot other things, same process as above - var/obj/effect/critter/L = t - if (L.alive==1) - spawn() popUp() - dir=get_dir(src,L) - spawn() shootAt(L) - else if(secondarytargets.len>0) // if there are no primary targets, go for secondary targets @@ -570,7 +558,7 @@ Status: []
"}, return 10 if(auth_weapons) // check for weapon authorization - if((isnull(perp:wear_id)) || (istype(perp:wear_id, /obj/item/weapon/card/id/syndicate))) + if((isnull(perp.wear_id)) || (istype(perp.wear_id.GetID(), /obj/item/weapon/card/id/syndicate))) if((src.allowed(perp)) && !(src.lasercolor)) // if the perp has security access, return 0 return 0 @@ -581,40 +569,36 @@ Status: []
"}, if((istype(perp.r_hand, /obj/item/weapon/gun) && !istype(perp.r_hand, /obj/item/weapon/gun/projectile/shotgun)) || istype(perp.r_hand, /obj/item/weapon/melee/baton)) threatcount += 4 - if(istype(perp:belt, /obj/item/weapon/gun) || istype(perp:belt, /obj/item/weapon/melee/baton)) + if(istype(perp.belt, /obj/item/weapon/gun) || istype(perp.belt, /obj/item/weapon/melee/baton)) threatcount += 2 if((src.lasercolor) == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve threatcount = 0//But does not target anyone else if(istype(perp.wear_suit, /obj/item/clothing/suit/redtag)) threatcount += 4 - if((istype(perp:r_hand,/obj/item/weapon/gun/energy/laser/redtag)) || (istype(perp:l_hand,/obj/item/weapon/gun/energy/laser/redtag))) + if((istype(perp.r_hand,/obj/item/weapon/gun/energy/laser/redtag)) || (istype(perp.l_hand,/obj/item/weapon/gun/energy/laser/redtag))) threatcount += 4 - if(istype(perp:belt, /obj/item/weapon/gun/energy/laser/redtag)) + if(istype(perp.belt, /obj/item/weapon/gun/energy/laser/redtag)) threatcount += 2 if((src.lasercolor) == "r") threatcount = 0 if(istype(perp.wear_suit, /obj/item/clothing/suit/bluetag)) threatcount += 4 - if((istype(perp:r_hand,/obj/item/weapon/gun/energy/laser/bluetag)) || (istype(perp:l_hand,/obj/item/weapon/gun/energy/laser/bluetag))) + if((istype(perp.r_hand,/obj/item/weapon/gun/energy/laser/bluetag)) || (istype(perp.l_hand,/obj/item/weapon/gun/energy/laser/bluetag))) threatcount += 4 - if(istype(perp:belt, /obj/item/weapon/gun/energy/laser/bluetag)) + if(istype(perp.belt, /obj/item/weapon/gun/energy/laser/bluetag)) threatcount += 2 if (src.check_records) // if the turret can check the records, check if they are set to *Arrest* on records for (var/datum/data/record/E in data_core.general) + var/perpname = perp.name - if (perp:wear_id) - var/obj/item/weapon/card/id/id = perp:wear_id - if(istype(perp:wear_id, /obj/item/device/pda)) - var/obj/item/device/pda/pda = perp:wear_id - id = pda.id + if (perp.wear_id) + var/obj/item/weapon/card/id/id = perp.wear_id.GetID() if (id) perpname = id.registered_name - else - var/obj/item/device/pda/pda = perp:wear_id - perpname = pda.owner + if (E.fields["name"] == perpname) for (var/datum/data/record/R in data_core.security) if ((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index da44e9559b1..10002bc570b 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -80,6 +80,21 @@ obj/machinery/recharger/process() else icon_state = "recharger2" +obj/machinery/recharger/emp_act(severity) + if(stat & (NOPOWER|BROKEN) || !anchored) + ..(severity) + return + + if(istype(charging, /obj/item/weapon/gun/energy)) + var/obj/item/weapon/gun/energy/E = charging + if(E.power_supply) + E.power_supply.emp_act(severity) + + else if(istype(charging, /obj/item/weapon/melee/baton)) + var/obj/item/weapon/melee/baton/B = charging + B.charges = 0 + ..(severity) + obj/machinery/recharger/update_icon() //we have an update_icon() in addition to the stuff in process to make it feel a tiny bit snappier. if(charging) icon_state = "recharger1" diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 95d0f342e87..9912e2e85db 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -34,6 +34,15 @@ src.go_out() return + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + if(occupant) + occupant.emp_act(severity) + go_out() + ..(severity) + proc build_icon() if(NOPOWER|BROKEN) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index b294cf026eb..ced7486384d 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -56,6 +56,18 @@ var/list/obj/machinery/requests_console/allConsoles = list() var/priority = -1 ; //Priority of the message being sent luminosity = 0 +/obj/machinery/requests_console/power_change() + ..() + update_icon() + +/obj/machinery/requests_console/update_icon() + if(stat & NOPOWER) + if(icon_state != "req_comp_off") + icon_state = "req_comp_off" + else + if(icon_state == "req_comp_off") + icon_state = "req_comp0" + /obj/machinery/requests_console/New() name = "[department] Requests Console" allConsoles += src @@ -95,6 +107,8 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/attack_hand(user as mob) + if(..(user)) + return var/dat dat = text("
[department] Requests Console
") if(!open) @@ -231,7 +245,9 @@ var/list/obj/machinery/requests_console/allConsoles = list() if(href_list["sendAnnouncement"]) if(!announcementConsole) return - world << "[department] announcement: [message]" + for(var/mob/M in player_list) + if(!istype(M,/mob/new_player)) + M << "[department] announcement: [message]" announceAuth = 0 message = "" screen = 0 @@ -370,7 +386,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() updateUsrDialog() if(screen == 10) var/obj/item/weapon/card/id/ID = O - if (access_RC_announce in ID.access) + if (access_RC_announce in ID.GetAccess()) announceAuth = 1 else announceAuth = 0 diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index cd1621e4c33..615e52f3980 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/code/game/machinery/seed_extractor.dm @@ -45,4 +45,10 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob t_amount++ del(O) + else if(istype(O, /obj/item/stack/tile/grass)) + var/obj/item/stack/tile/grass/S = O + user << "You extract some seeds from the [S.name]." + S.use(1) + new /obj/item/seeds/grassseed(loc) + return \ No newline at end of file diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 018609fc407..6b657bda789 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -331,7 +331,7 @@ icon_state = "Shield_Gen" anchored = 0 density = 1 - req_access = list(access_security) + req_access = list(access_teleporter) var/active = 0 var/power = 0 var/state = 0 diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 65c618ef76b..a27544b47c1 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -23,7 +23,7 @@ return update_icon() - overlays = null + overlays.Cut() icon_state = "sheater[on]" if(open) overlays += "sheater-open" @@ -43,6 +43,13 @@ usr << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%" return + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + if(cell) + cell.emp_act(severity) + ..(severity) attackby(obj/item/I, mob/user) if(istype(I, /obj/item/weapon/cell)) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index e3d1d7454e1..9c37b8212c3 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -47,11 +47,17 @@ process() if(stat & NOPOWER) - overlays = null + overlays.Cut() return update() + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + set_picture("ai_bsod") + ..(severity) // set what is displayed @@ -62,7 +68,7 @@ return if(mode==0) - overlays = null + overlays.Cut() return if(mode==3) // alert picture, no change @@ -83,7 +89,7 @@ update_display(displayloc, displaytime) return else - overlays = null + overlays.Cut() return if(mode==4) // supply shuttle timer @@ -154,7 +160,7 @@ proc/set_picture(var/state) picture_state = state - overlays = null + overlays.Cut() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) proc/update_display(var/line1, var/line2) @@ -166,11 +172,11 @@ lastdisplayline2 = line2 if(line2 == null) // single line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -13) else // dual line display - overlays = null + overlays.Cut() overlays += texticon(line1, 23, -9) overlays += texticon(line2, 23, -17) @@ -266,15 +272,22 @@ process() if(stat & NOPOWER) - overlays = null + overlays.Cut() return update() + emp_act(severity) + if(stat & (BROKEN|NOPOWER)) + ..(severity) + return + set_picture("ai_bsod") + ..(severity) + proc/update() if(mode==0) //Blank - overlays = null + overlays.Cut() return if(mode==1) // AI emoticon @@ -325,5 +338,5 @@ proc/set_picture(var/state) picture_state = state - overlays = null + overlays.Cut() overlays += image('icons/obj/status_display.dmi', icon_state=picture_state) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index c57d6124447..754d758248b 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -286,7 +286,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept if (R.client && !(R.client.prefs.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 - if(istype(M, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. + if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes. continue @@ -297,10 +297,10 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- Can understand the speech --- - if (R.say_understands(M)) + if (!M || R.say_understands(M)) // - Not human or wearing a voice mask - - if (!ishuman(M) || vmask) + if (!M || !ishuman(M) || vmask) heard_masked += R // - Human and not wearing voice mask - @@ -371,7 +371,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- Filter the message; place it in quotes apply a verb --- - var/quotedmsg = M.say_quote(message) + var/quotedmsg = null + if(M) + quotedmsg = M.say_quote(message) + else + quotedmsg = "says, \"[message]\"" // --- This following recording is intended for research and feedback in the use of department radio channels --- @@ -447,7 +451,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // Does not display message; displayes the mob's voice_message (ie "chimpers") if (length(heard_voice)) - var/rendered = "[part_a][vname][part_b][M.voice_message][part_c]" + var/rendered = "[part_a][vname][part_b][vmessage][part_c]" for (var/mob/R in heard_voice) aitrack = "" @@ -464,7 +468,11 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // Displays garbled message (ie "f*c* **u, **i*er!") if (length(heard_garbled)) - quotedmsg = M.say_quote(stars(message)) + if(M) + quotedmsg = M.say_quote(stars(message)) + else + quotedmsg = stars(quotedmsg) + var/rendered = "[part_a][vname][part_b][quotedmsg][part_c]" for (var/mob/R in heard_garbled) @@ -482,8 +490,12 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Complete gibberish. Usually happens when there's a compressed message --- */ if (length(heard_gibberish)) - quotedmsg = M.say_quote(Gibberish(message, compression + 50)) - var/rendered = "[part_a][Gibberish(M.real_name, compression + 50)][part_b][quotedmsg][part_c]" + if(M) + quotedmsg = M.say_quote(Gibberish(message, compression + 50)) + else + quotedmsg = Gibberish(quotedmsg, compression + 50) + + var/rendered = "[part_a][Gibberish(name, compression + 50)][part_b][quotedmsg][part_c]" for (var/mob/R in heard_gibberish) aitrack = "" diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 77b266f73b0..968b6cf1dc2 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -82,8 +82,8 @@ else if(issilicon(M) || C.parameters["job"] == "AI") // sometimes M gets deleted prematurely for AIs... just check the job race = "Artificial Life" - else if(ismetroid(M)) // NT knows a lot about metroids, but not aliens. Can identify metroids - race = "Metroid" + else if(isslime(M)) // NT knows a lot about slimes, but not aliens. Can identify slimes + race = "slime" language = race else if(isanimal(M)) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index d2eb29278f7..da2af57a566 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -262,7 +262,7 @@ if(href_list["change_freq"]) var/newfreq = input(usr, "Specify a new frequency for new signals to change to. Enter null to turn off frequency changing. Decimals assigned automatically.", src, network) as null|num - if(usr in range(1, src)) + if(canAccess(usr)) if(newfreq) if(findtext(num2text(newfreq), ".")) newfreq *= 10 // shift the decimal one place @@ -302,13 +302,13 @@ if("id") var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN) - if(newid && usr in range(1, src)) + if(newid && canAccess(usr)) id = newid temp = "-% New ID assigned: \"[id]\" %-" if("network") var/newnet = input(usr, "Specify the new network for this machine. This will break all current links.", src, network) as null|text - if(newnet && usr in range(1, src)) + if(newnet && canAccess(usr)) if(length(newnet) > 15) temp = "-% Too many characters in new network tag %-" @@ -324,7 +324,7 @@ if("freq") var/newfreq = input(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, network) as null|num - if(newfreq && usr in range(1, src)) + if(newfreq && canAccess(usr)) if(findtext(num2text(newfreq), ".")) newfreq *= 10 // shift the decimal one place if(!(newfreq in freq_listening) && newfreq < 10000) @@ -384,5 +384,10 @@ updateUsrDialog() +/obj/machinery/telecomms/proc/canAccess(var/mob/user) + if(issilicon(user) || in_range(user, src)) + return 1 + return 0 + #undef TELECOMM_Z #undef STATION_Z diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 7ac1bccc063..0cd533cf274 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -30,7 +30,7 @@ id = "Hub" network = "tcommsat" autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "science", "medical", - "cargo", "mining", "common", "command", "engineering", "security", + "supply", "common", "command", "engineering", "security", "receiverA", "receiverB", "broadcasterA", "broadcasterB") //Receivers @@ -41,7 +41,7 @@ id = "Receiver A" network = "tcommsat" autolinkers = list("receiverA") // link to relay - freq_listening = list(1351, 1355, 1347, 1349) // science, medical, cargo, mining + freq_listening = list(1351, 1355, 1347) // science, medical, supply //--PRESET RIGHT--// @@ -64,23 +64,31 @@ /obj/machinery/telecomms/bus/preset_one id = "Bus 1" network = "tcommsat" + freq_listening = list(1351, 1355) autolinkers = list("processor1", "science", "medical") /obj/machinery/telecomms/bus/preset_two id = "Bus 2" network = "tcommsat" - autolinkers = list("processor2", "cargo", "mining") + freq_listening = list(1347) + autolinkers = list("processor2", "supply") /obj/machinery/telecomms/bus/preset_three id = "Bus 3" network = "tcommsat" + freq_listening = list(1359, 1353) autolinkers = list("processor3", "security", "command") /obj/machinery/telecomms/bus/preset_four id = "Bus 4" network = "tcommsat" + freq_listening = list(1357) autolinkers = list("processor4", "engineering", "common") +/obj/machinery/telecomms/bus/preset_four/New() + for(var/i = 1441, i < 1489, i += 2) + freq_listening |= i + ..() //Processors @@ -120,16 +128,16 @@ freq_listening = list(1355) autolinkers = list("medical") -/obj/machinery/telecomms/server/presets/cargo - id = "Cargo Server" +/obj/machinery/telecomms/server/presets/supply + id = "Supply Server" freq_listening = list(1347) - autolinkers = list("cargo") - + autolinkers = list("supply") +/* /obj/machinery/telecomms/server/presets/mining id = "Mining Server" freq_listening = list(1349) autolinkers = list("mining") - +*/ /obj/machinery/telecomms/server/presets/common id = "Common Server" freq_listening = list() diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index d74a2114d8b..f3d8372353f 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -332,11 +332,11 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() if(is_freq_listening(signal)) if(istype(machine_from, /obj/machinery/telecomms/receiver)) //If the signal is compressed, send it to the bus. - relay_information(signal, "/obj/machinery/telecomms/bus") // ideally relay the copied information to bus units + relay_information(signal, "/obj/machinery/telecomms/bus", 1) // ideally relay the copied information to bus units else // Get a list of relays that we're linked to, then send the signal to their levels. - relay_information(signal, "/obj/machinery/telecomms/relay") - relay_information(signal, "/obj/machinery/telecomms/broadcaster") // Send it to a broadcaster. + relay_information(signal, "/obj/machinery/telecomms/relay", 1) + relay_information(signal, "/obj/machinery/telecomms/broadcaster", 1) // Send it to a broadcaster. /* @@ -417,12 +417,11 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) if(is_freq_listening(signal)) - if(change_frequency) - world << "changing [signal.frequency] to [change_frequency]" + if(change_frequency) signal.frequency = change_frequency - if(!istype(machine_from, /obj/machinery/telecomms/processor)) // Signal must be ready (stupid assuming machine), let's send it + if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it // send to one linked processor unit var/send_to_processor = relay_information(signal, "/obj/machinery/telecomms/processor") @@ -519,11 +518,13 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() var/salt = "null" // encryption salt: ie "123comsat" // would add up to md5("password123comsat") var/language = "human" + var/obj/item/device/radio/headset/server_radio = null /obj/machinery/telecomms/server/New() ..() Compiler = new() Compiler.Holder = src + server_radio = new() /obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 6710e4b95cb..916c7450212 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -131,6 +131,23 @@ if(!T || istype(T, /area)) return null return T +/obj/machinery/teleport + name = "teleport" + icon = 'icons/obj/stationobjs.dmi' + density = 1 + anchored = 1.0 + var/lockeddown = 0 + + +/obj/machinery/teleport/hub + name = "teleporter hub" + desc = "It's the hub of a teleporting machine." + icon_state = "tele0" + var/accurate = 0 + use_power = 1 + idle_power_usage = 10 + active_power_usage = 2000 + /obj/machinery/teleport/hub/Bumped(M as mob|obj) spawn() if (src.icon_state == "tele1") @@ -249,6 +266,17 @@ s.start() return */ + +/obj/machinery/teleport/station + name = "station" + desc = "It's the station thingy of a teleport thingy." //seriously, wtf. + icon_state = "controller" + var/active = 0 + var/engaged = 0 + use_power = 1 + idle_power_usage = 10 + active_power_usage = 2000 + /obj/machinery/teleport/station/attackby(var/obj/item/weapon/W) src.attack_hand() diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f133ecc0101..ac9ac1564b5 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1,38 +1,68 @@ -/obj/machinery/vending - var/const/WIRE_EXTEND = 1 - var/const/WIRE_SCANID = 2 - var/const/WIRE_SHOCK = 3 - var/const/WIRE_SHOOTINV = 4 - /datum/data/vending_product var/product_name = "generic" var/product_path = null var/amount = 0 var/display_color = "blue" + + +/obj/machinery/vending + name = "Vendomat" + desc = "A generic vending machine." + icon = 'icons/obj/vending.dmi' + icon_state = "generic" + layer = 2.9 + anchored = 1 + density = 1 + var/active = 1 //No sales pitches if off! + var/vend_ready = 1 //Are we ready to vend?? Is it time?? + var/vend_delay = 10 //How long does it take to vend? + + // To be filled out at compile time + var/list/products = list() // For each, use the following pattern: + var/list/contraband = list() // list(/type/path = amount,/type/path2 = amount2) + var/list/premium = list() // No specified amount = only one in stock + + var/product_slogans = "" //String of slogans separated by semicolons, optional + var/product_ads = "" //String of small ad messages in the vending screen - random chance + var/list/product_records = list() + var/list/hidden_records = list() + var/list/coin_records = list() + var/list/slogan_list = list() + var/list/small_ads = list() // small ad messages in the vending screen - random chance of popping up whenever you open it + var/vend_reply //Thank you for shopping! + var/last_reply = 0 + var/last_slogan = 0 //When did we last pitch? + var/slogan_delay = 6000 //How long until we can pitch again? + var/icon_vend //Icon_state when vending! + var/icon_deny //Icon_state when vending! + //var/emagged = 0 //Ignores if somebody doesn't have card access to that machine. + var/seconds_electrified = 0 //Shock customers like an airlock. + var/shoot_inventory = 0 //Fire items at customers! We're broken! + var/shut_up = 1 //Stop spouting those godawful pitches! + var/extended_inventory = 0 //can we access the hidden inventory? + var/panel_open = 0 //Hacking that vending machine. Gonna get a free candy bar. + var/wires = 15 + var/obj/item/weapon/coin/coin + var/const/WIRE_EXTEND = 1 + var/const/WIRE_SCANID = 2 + var/const/WIRE_SHOCK = 3 + var/const/WIRE_SHOOTINV = 4 + /obj/machinery/vending/New() ..() spawn(4) src.slogan_list = text2list(src.product_slogans, ";") - var/list/temp_paths = text2list(src.product_paths, ";") - var/list/temp_amounts = text2list(src.product_amounts, ";") - var/list/temp_hidden = text2list(src.product_hidden, ";") - var/list/temp_hideamt = text2list(src.product_hideamt, ";") - var/list/temp_coin = text2list(src.product_coin, ";") - var/list/temp_coin_amt = text2list(src.product_coin_amt, ";") - src.last_slogan = world.time + rand(0, slogan_delay) //So not all machines speak at the exact same time. The first time this machine says something will be at slogantime + this random value, so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated. + // So not all machines speak at the exact same time. + // The first time this machine says something will be at slogantime + this random value, + // so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated. + src.last_slogan = world.time + rand(0, slogan_delay) - //Little sanity check here - if ((isnull(temp_paths)) || (isnull(temp_amounts)) || (temp_paths.len != temp_amounts.len) || (temp_hidden.len != temp_hideamt.len)) - stat |= BROKEN - power_change() - return - - src.build_inventory(temp_paths,temp_amounts) + src.build_inventory(products) //Add hidden inventory - src.build_inventory(temp_hidden,temp_hideamt, 1) - src.build_inventory(temp_coin,temp_coin_amt, 0, 1) + src.build_inventory(contraband, 1) + src.build_inventory(premium, 0, 1) power_change() return @@ -65,35 +95,25 @@ return -/obj/machinery/vending/proc/build_inventory(var/list/path_list,var/list/amt_list,hidden=0,req_coin=0) +/obj/machinery/vending/proc/build_inventory(var/list/productlist,hidden=0,req_coin=0) + for(var/typepath in productlist) + var/amount = productlist[typepath] + if(isnull(amount)) amount = 1 - for(var/p=1, p <= path_list.len ,p++) - var/checkpath = text2path(path_list[p]) - if (!checkpath) - continue - var/obj/temp = new checkpath(src) - var/datum/data/vending_product/R = new /datum/data/vending_product( ) - R.product_name = capitalize(temp.name) - R.product_path = path_list[p] + var/atom/temp = new typepath(null) + var/datum/data/vending_product/R = new /datum/data/vending_product() + R.product_name = temp.name + R.product_path = typepath + R.amount = amount R.display_color = pick("red","blue","green") -// R. = text2num(amt_list[p]) -// src.product_records += R if(hidden) - R.amount = text2num(amt_list[p]) - src.hidden_records += R + hidden_records += R else if(req_coin) - R.amount = text2num(amt_list[p]) - src.coin_records += R + coin_records += R else - R.amount = text2num(amt_list[p]) - src.product_records += R - - del(temp) - -// world << "Added: [R.product_name]] - [R.amount] - [R.product_path]" - continue - + product_records += R +// world << "Added: [R.product_name]] - [R.amount] - [R.product_path]" return /obj/machinery/vending/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -104,7 +124,7 @@ else if(istype(W, /obj/item/weapon/screwdriver)) src.panel_open = !src.panel_open user << "You [src.panel_open ? "open" : "close"] the maintenance panel." - src.overlays = null + src.overlays.Cut() if(src.panel_open) src.overlays += image(src.icon, "[initial(icon_state)]-panel") src.updateUsrDialog() @@ -113,7 +133,7 @@ if(src.panel_open) attack_hand(user) return - else if(istype(W, /obj/item/weapon/coin) && product_coin != "") + else if(istype(W, /obj/item/weapon/coin) && premium.len > 0) user.drop_item() W.loc = src coin = W @@ -141,7 +161,7 @@ var/dat = "" //display the name, and added a horizontal rule dat += "Select an item:
" //the rest is just general spacing and bolding - if (product_coin != "") + if (premium.len > 0) dat += "Coin slot: [coin ? coin : "No coin inserted"] (Remove)
" if (src.product_records.len == 0) @@ -237,15 +257,7 @@ src.vend_ready = 0 //One thing at a time!! var/datum/data/vending_product/R = locate(href_list["vend"]) - if (!R || !istype(R)) - src.vend_ready = 1 - return - var/product_path = text2path(R.product_path) - if (!product_path) - src.vend_ready = 1 - return - - if (R.amount <= 0) + if (!R || !istype(R) || !R.product_path || R.amount <= 0) src.vend_ready = 1 return @@ -273,7 +285,7 @@ if (src.icon_vend) //Show the vending animation if needed flick(src.icon_vend,src) spawn(src.vend_delay) - new product_path(get_turf(src)) + new R.product_path(get_turf(src)) src.vend_ready = 1 return @@ -360,7 +372,7 @@ for(var/datum/data/vending_product/R in src.product_records) if (R.amount <= 0) //Try to use a record that actually has something to dump. continue - var/dump_path = text2path(R.product_path) + var/dump_path = R.product_path if (!dump_path) continue @@ -383,7 +395,7 @@ for(var/datum/data/vending_product/R in src.product_records) if (R.amount <= 0) //Try to use a record that actually has something to dump. continue - var/dump_path = text2path(R.product_path) + var/dump_path = R.product_path if (!dump_path) continue @@ -455,3 +467,279 @@ else return 0 +/* + * Vending machine types + */ + +/* + +/obj/machinery/vending/[vendors name here] // --vending machine template :) + name = "" + desc = "" + icon = '' + icon_state = "" + vend_delay = 15 + products = list() + contraband = list() + premium = list() + +*/ + +/* +/obj/machinery/vending/atmospherics //Commenting this out until someone ponies up some actual working, broken, and unpowered sprites - Quarxink + name = "Tank Vendor" + desc = "A vendor with a wide variety of masks and gas tanks." + icon = 'icons/obj/objects.dmi' + icon_state = "dispenser" + product_paths = "/obj/item/weapon/tank/oxygen;/obj/item/weapon/tank/plasma;/obj/item/weapon/tank/emergency_oxygen;/obj/item/weapon/tank/emergency_oxygen/engi;/obj/item/clothing/mask/breath" + product_amounts = "10;10;10;5;25" + vend_delay = 0 +*/ + +/obj/machinery/vending/boozeomat + name = "Booze-O-Mat" + desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." + icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles + icon_deny = "boozeomat-deny" + products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5, + /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,/obj/item/weapon/reagent_containers/food/drinks/beer = 6, + /obj/item/weapon/reagent_containers/food/drinks/ale = 6,/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4, + /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4,/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4, + /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4,/obj/item/weapon/reagent_containers/food/drinks/tonic = 8, + /obj/item/weapon/reagent_containers/food/drinks/cola = 8, /obj/item/weapon/reagent_containers/food/drinks/sodawater = 15, + /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30,/obj/item/weapon/reagent_containers/food/drinks/ice = 9) + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/tea = 10) + vend_delay = 15 + product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?" + product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!" + req_access_txt = "25" + +/obj/machinery/vending/assist + products = list( /obj/item/device/assembly/prox_sensor = 5,/obj/item/device/assembly/igniter = 3,/obj/item/device/assembly/signaler = 4, + /obj/item/weapon/wirecutters = 1, /obj/item/weapon/cartridge/signal = 4) + contraband = list(/obj/item/device/flashlight = 5,/obj/item/device/assembly/timer = 2) + product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!" + +/obj/machinery/vending/coffee + name = "Hot Drinks machine" + desc = "A vending machine which dispenses hot drinks." + product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies" + icon_state = "coffee" + icon_vend = "coffee-vend" + vend_delay = 34 + products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25,/obj/item/weapon/reagent_containers/food/drinks/tea = 25,/obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25) + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 10) + + + +/obj/machinery/vending/snack + name = "Getmore Chocolate Corp" + desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" + product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" + product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" + icon_state = "snack" + products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 6,/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 6,/obj/item/weapon/reagent_containers/food/snacks/chips =6, + /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 6,/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 6,/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 6, + /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6) + contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6) + + + +/obj/machinery/vending/cola + name = "Robust Softdrinks" + desc = "A softdrink vendor provided by Robust Industries, LLC." + icon_state = "Cola_Machine" + product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!" + product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space." + products = list(/obj/item/weapon/reagent_containers/food/drinks/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind = 10, + /obj/item/weapon/reagent_containers/food/drinks/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/starkist = 10, + /obj/item/weapon/reagent_containers/food/drinks/space_up = 10) + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/thirteenloko = 5) + +//This one's from bay12 +/obj/machinery/vending/cart + name = "PTech" + desc = "Cartridges for PDAs" + product_slogans = "Carts to go!" + icon_state = "cart" + icon_deny = "cart-deny" + products = list(/obj/item/weapon/cartridge/medical = 10,/obj/item/weapon/cartridge/engineering = 10,/obj/item/weapon/cartridge/security = 10, + /obj/item/weapon/cartridge/janitor = 10,/obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/device/pda/heads = 10, + /obj/item/weapon/cartridge/captain = 3,/obj/item/weapon/cartridge/quartermaster = 10) + + +/obj/machinery/vending/cigarette + name = "Cigarette machine" //OCD had to be uppercase to look nice with the new formating + desc = "If you want to get cancer, might as well do it in style" + product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!" + product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." + vend_delay = 34 + icon_state = "cigs" + products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4) + contraband = list(/obj/item/weapon/lighter/zippo = 4) + premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2) + +/obj/machinery/vending/medical + name = "NanoMed Plus" + desc = "Medical drug dispenser." + icon_state = "med" + icon_deny = "med-deny" + product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" + req_access_txt = "5" + products = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 4, + /obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4, + /obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12, + /obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2) + contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6) + + +//This one's from bay12 +/obj/machinery/vending/plasmaresearch + name = "Toximate 3000" + desc = "All the fine parts you need in one vending machine!" + products = list(/obj/item/clothing/under/rank/scientist = 6,/obj/item/clothing/suit/bio_suit = 6,/obj/item/clothing/head/bio_hood = 6, + /obj/item/device/transfer_valve = 6,/obj/item/device/assembly/timer = 6,/obj/item/device/assembly/signaler = 6, + /obj/item/device/assembly/prox_sensor = 6,/obj/item/device/assembly/igniter = 6) + +/obj/machinery/vending/wallmed1 + name = "NanoMed" + desc = "Wall-mounted Medical Equipment dispenser." + product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?" + icon_state = "wallmed" + icon_deny = "wallmed-deny" + req_access_txt = "5" + density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude + products = list(/obj/item/stack/medical/bruise_pack = 2,/obj/item/stack/medical/ointment = 2,/obj/item/weapon/reagent_containers/syringe/inaprovaline = 4,/obj/item/device/healthanalyzer = 1) + contraband = list(/obj/item/weapon/reagent_containers/syringe/antitoxin = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/pill/tox = 1) + +/obj/machinery/vending/wallmed2 + name = "NanoMed" + desc = "Wall-mounted Medical Equipment dispenser." + icon_state = "wallmed" + icon_deny = "wallmed-deny" + req_access_txt = "5" + density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude + products = list(/obj/item/weapon/reagent_containers/syringe/inaprovaline = 5,/obj/item/weapon/reagent_containers/syringe/antitoxin = 3,/obj/item/stack/medical/bruise_pack = 3, + /obj/item/stack/medical/ointment =3,/obj/item/device/healthanalyzer = 3) + contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3) + +/obj/machinery/vending/security + name = "SecTech" + desc = "A security equipment vendor" + product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?" + icon_state = "sec" + icon_deny = "sec-deny" + req_access_txt = "1" + products = list(/obj/item/weapon/handcuffs = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5, + /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6) + contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/fancy/donut_box = 2) + +/obj/machinery/vending/hydronutrients + name = "NutriMax" + desc = "A plant nutrients vendor" + product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!" + product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..." + icon_state = "nutri" + icon_deny = "nutri-deny" + products = list(/obj/item/nutrient/ez = 35,/obj/item/nutrient/l4z = 25,/obj/item/nutrient/rh = 15,/obj/item/weapon/pestspray = 20, + /obj/item/weapon/reagent_containers/syringe = 5,/obj/item/weapon/storage/bag/plants = 5) + contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) + +/obj/machinery/vending/hydroseeds + name = "MegaSeed Servitor" + desc = "When you need seeds fast!" + product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" + product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!" + icon_state = "seeds" + products = list(/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/chantermycelium = 3,/obj/item/seeds/chiliseed = 3, + /obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/replicapod = 3,/obj/item/seeds/soyaseed = 3, + /obj/item/seeds/sunflowerseed = 3,/obj/item/seeds/tomatoseed = 3,/obj/item/seeds/towermycelium = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/appleseed = 3, + /obj/item/seeds/poppyseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/whitebeetseed = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/limeseed = 3, + /obj/item/seeds/lemonseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/cocoapodseed = 3, + /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3) + contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/nettleseed = 2, + /obj/item/seeds/plumpmycelium = 2,/obj/item/seeds/reishimycelium = 2) + premium = list(/obj/item/toy/waterflower = 1) + + +/obj/machinery/vending/magivend + name = "MagiVend" + desc = "A magic vending machine." + icon_state = "MagiVend" + product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!" + vend_delay = 15 + vend_reply = "Have an enchanted evening!" + product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!" + products = list(/obj/item/clothing/head/wizard = 1,/obj/item/clothing/suit/wizrobe = 1,/obj/item/clothing/head/wizard/red = 1,/obj/item/clothing/suit/wizrobe/red = 1,/obj/item/clothing/shoes/sandal = 1,/obj/item/weapon/staff = 2) + contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave + +/obj/machinery/vending/dinnerware + name = "Dinnerware" + desc = "A kitchen and restaurant equipment vendor" + product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..." + icon_state = "dinnerware" + products = list(/obj/item/weapon/tray = 8,/obj/item/weapon/kitchen/utensil/fork = 6,/obj/item/weapon/kitchenknife = 3,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8,/obj/item/clothing/suit/chef/classic = 2) + contraband = list(/obj/item/weapon/kitchen/utensil/spoon = 2,/obj/item/weapon/kitchen/utensil/knife = 2,/obj/item/weapon/kitchen/rollingpin = 2, /obj/item/weapon/butch = 2) + +/obj/machinery/vending/sovietsoda + name = "BODA" + desc = "Old sweet water vending machine" + icon_state = "sovietsoda" + product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." + products = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/soda = 30) + contraband = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/cola = 20) + +/obj/machinery/vending/tool + name = "YouTool" + desc = "Tools for tools." + icon_state = "tool" + icon_deny = "tool-deny" + //req_access_txt = "12" //Maintenance access + products = list(/obj/item/weapon/cable_coil/random = 10,/obj/item/weapon/crowbar = 5,/obj/item/weapon/weldingtool = 3,/obj/item/weapon/wirecutters = 5, + /obj/item/weapon/wrench = 5,/obj/item/device/analyzer = 5,/obj/item/device/t_scanner = 5,/obj/item/weapon/screwdriver = 5) + contraband = list(/obj/item/weapon/weldingtool/hugetank = 2,/obj/item/clothing/gloves/fyellow = 2) + premium = list(/obj/item/clothing/gloves/yellow = 1) + +/obj/machinery/vending/engivend + name = "Engi-Vend" + desc = "Spare tool vending. What? Did you expect some witty description?" + icon_state = "engivend" + icon_deny = "engivend-deny" + req_access_txt = "11" //Engineering Equipment access + products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/cell/high = 10) + contraband = list(/obj/item/weapon/cell/potato = 3) + premium = list(/obj/item/weapon/storage/belt/utility = 3) + +//This one's from bay12 +/obj/machinery/vending/engineering + name = "Robco Tool Maker" + desc = "Everything you need for do-it-yourself station repair." + icon_state = "engi" + icon_deny = "engi-deny" + req_access_txt = "11" + products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/orange = 4,/obj/item/clothing/head/hardhat = 4, + /obj/item/weapon/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/screwdriver = 12, + /obj/item/weapon/crowbar = 12,/obj/item/weapon/wirecutters = 12,/obj/item/device/multitool = 12,/obj/item/weapon/wrench = 12,/obj/item/device/t_scanner = 12, + /obj/item/weapon/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8, + /obj/item/weapon/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5,/obj/item/weapon/stock_parts/micro_laser = 5, + /obj/item/weapon/stock_parts/matter_bin = 5,/obj/item/weapon/stock_parts/manipulator = 5,/obj/item/weapon/stock_parts/console_screen = 5) + // There was an incorrect entry (cablecoil/power). I improvised to cablecoil/heavyduty. + // Another invalid entry, /obj/item/weapon/circuitry. I don't even know what that would translate to, removed it. + // The original products list wasn't finished. The ones without given quantities became quantity 5. -Sayu + +//This one's from bay12 +/obj/machinery/vending/robotics + name = "Robotech Deluxe" + desc = "All the tools you need to create your own robot army." + icon_state = "robotics" + icon_deny = "robotics-deny" + req_access_txt = "29" + products = list(/obj/item/clothing/suit/storage/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/weapon/cable_coil = 4,/obj/item/device/flash = 4, + /obj/item/weapon/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3, + /obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5, + /obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5) + //everything after the power cell had no amounts, I improvised. -Sayu + diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index 17f29cd17da..786468c0c47 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" + use_power = 0 anchored = 1 density = 1 diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 6c8ea5effc5..f75bd01ac49 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -1,6 +1,5 @@ /obj/mecha/combat - var/force = 30 - var/damtype = "brute" + force = 30 var/melee_cooldown = 10 var/melee_can_hit = 1 var/list/destroyable_obj = list(/obj/mecha, /obj/structure/window, /obj/structure/grille, /turf/simulated/wall) diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index 1ebba1bc239..9ee9f3c3cac 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -8,7 +8,7 @@ health = 400 deflect_chance = 20 damage_absorption = list("brute"=0.5,"fire"=1.1,"bullet"=0.65,"laser"=0.85,"energy"=0.9,"bomb"=0.8) - max_temperature = 3000 + max_temperature = 30000 infra_luminosity = 8 force = 40 var/defence = 0 diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index dae8cd06986..7e8df940152 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -8,7 +8,7 @@ health = 300 deflect_chance = 15 damage_absorption = list("brute"=0.75,"fire"=1,"bullet"=0.8,"laser"=0.7,"energy"=0.85,"bomb"=1) - max_temperature = 3500 + max_temperature = 25000 infra_luminosity = 6 var/overload = 0 var/overload_coeff = 2 @@ -24,7 +24,7 @@ health = 400 deflect_chance = 25 damage_absorption = list("brute"=0.6,"fire"=0.8,"bullet"=0.6,"laser"=0.5,"energy"=0.65,"bomb"=0.8) - max_temperature = 4500 + max_temperature = 45000 overload_coeff = 1 wreckage = /obj/effect/decal/mecha_wreckage/gygax/dark max_equip = 4 diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index bc35b987e13..622d5bb8ef7 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -8,7 +8,7 @@ deflect_chance = 60 internal_damage_threshold = 60 damage_absorption = list("brute"=1.2,"fire"=1.5,"bullet"=1,"laser"=1,"energy"=1,"bomb"=1) - max_temperature = 3500 + max_temperature = 25000 infra_luminosity = 5 operation_req_access = list(access_clown) wreckage = /obj/effect/decal/mecha_wreckage/honker diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 77e85890de7..6e924e13ebb 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -7,7 +7,7 @@ health = 500 deflect_chance = 25 damage_absorption = list("brute"=0.5,"fire"=0.7,"bullet"=0.45,"laser"=0.6,"energy"=0.7,"bomb"=0.7) - max_temperature = 5000 + max_temperature = 60000 infra_luminosity = 3 var/zoom = 0 var/thrusters = 0 diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index d063fdf80c6..b98f4697e5b 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -9,7 +9,7 @@ health = 200 deflect_chance = 30 damage_absorption = list("brute"=0.7,"fire"=0.7,"bullet"=0.7,"laser"=0.7,"energy"=0.7,"bomb"=0.7) - max_temperature = 1000 + max_temperature = 25000 infra_luminosity = 3 wreckage = /obj/effect/decal/mecha_wreckage/phazon add_req_access = 1 diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index c68ca2d5af9..6b3700164ac 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -48,9 +48,9 @@ if(occupant) occupant_message("The sleeper is already occupied") return - for(var/mob/living/carbon/metroid/M in range(1,target)) + for(var/mob/living/carbon/slime/M in range(1,target)) if(M.Victim == target) - occupant_message("[target] will not fit into the sleeper because they have a Metroid latched onto their head.") + occupant_message("[target] will not fit into the sleeper because they have a slime latched onto their head.") return occupant_message("You start putting [target] into [src].") chassis.visible_message("[chassis] starts putting [target] into the [src].") @@ -193,9 +193,9 @@ return 0 var/to_inject = min(R.volume, inject_amount) if(to_inject && occupant.reagents.get_reagent_amount(R.id) + to_inject <= inject_amount*2) + occupant_message("Injecting [occupant] with [to_inject] units of [R.name].") + log_message("Injecting [occupant] with [to_inject] units of [R.name].") SG.reagents.trans_id_to(occupant,R.id,to_inject) - occupant_message("[occupant] injected with [to_inject] units of [R.name].") - log_message("[occupant] injected with [to_inject] units of [R.name].") update_equip_info() return diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 23e6a872c4c..0cb83e5ac55 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -792,7 +792,7 @@ ER.set_ready_state(1) return var/cur_charge = ER.chassis.get_charge() - if(isnull(cur_charge)) + if(isnull(cur_charge) || !ER.chassis.cell) stop() ER.set_ready_state(1) ER.occupant_message("No powercell detected.") diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 4d6bd0dd535..91b2455eb03 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -27,7 +27,7 @@ set_ready_state(0) playsound(chassis, fire_sound, 50, 1) var/obj/item/projectile/A = new projectile(curloc) - A.original = targloc + A.original = target A.current = curloc A.yo = targloc.y - curloc.y A.xo = targloc.x - curloc.x @@ -209,7 +209,7 @@ playsound(chassis, fire_sound, 80, 1) var/obj/item/projectile/A = new projectile(curloc) src.projectiles-- - A.original = targloc + A.original = target A.current = curloc A.yo = targloc.y - curloc.y A.xo = targloc.x - curloc.x @@ -251,7 +251,7 @@ playsound(chassis, fire_sound, 50, 1) var/obj/item/projectile/A = new projectile(curloc) src.projectiles-- - A.original = targloc + A.original = target A.current = curloc A.yo = targloc.y - curloc.y A.xo = targloc.x - curloc.x @@ -288,7 +288,7 @@ /obj/item/missile icon = 'icons/obj/grenade.dmi' - icon_state = "flashbang" + icon_state = "missile" var/primed = null throwforce = 15 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 22337b5996e..108fdafdb6d 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -84,7 +84,7 @@ /obj/item/mecha_parts/part/durand_right_leg, /obj/item/mecha_parts/part/durand_armour ), -/* "H.O.N.K"=list( + "H.O.N.K"=list( /obj/item/mecha_parts/chassis/honker, /obj/item/mecha_parts/part/honker_torso, /obj/item/mecha_parts/part/honker_head, @@ -92,7 +92,7 @@ /obj/item/mecha_parts/part/honker_right_arm, /obj/item/mecha_parts/part/honker_left_leg, /obj/item/mecha_parts/part/honker_right_leg - ), */ + ), "Exosuit Equipment"=list( /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, /obj/item/mecha_parts/mecha_equipment/tool/drill, @@ -106,9 +106,9 @@ ///obj/item/mecha_parts/mecha_equipment/jetpack, //TODO MECHA JETPACK SPRITE MISSING /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, - /* /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar, + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar, - /obj/item/mecha_parts/mecha_equipment/weapon/honker*/ + /obj/item/mecha_parts/mecha_equipment/weapon/honker ), "Cyborg Upgrade Modules" = list( @@ -401,17 +401,14 @@ /obj/machinery/mecha_part_fabricator/proc/process_queue() var/obj/item/part = listgetindex(src.queue, 1) if(!part) - if(remove_from_queue(1)) + remove_from_queue(1) + if(src.queue.len) return process_queue() else - // Most likely means we have an empty queue, so stop processing - return 0 + return if(!(part.vars.Find("construction_time")) || !(part.vars.Find("construction_cost")))//If it shouldn't be printed - if(remove_from_queue(1))//Take it out of the quene - return process_queue()//Then reprocess it - else - // Most likely means we have an empty queue, so stop processing - return 0 + remove_from_queue(1)//Take it out of the quene + return process_queue()//Then reprocess it temp = null while(part) if(stat&(NOPOWER|BROKEN)) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index acf60d5dd3c..225318a9b86 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -18,7 +18,7 @@ unacidable = 1 //and no deleting hoomans inside layer = MOB_LAYER //icon draw layer infra_luminosity = 15 //byond implementation is bugged. - var/initial_icon = "" //Mech type for resetting icon. + var/initial_icon = null //Mech type for resetting icon. Only used for reskinning kits (see custom items) var/can_move = 1 var/mob/living/carbon/occupant = null var/step_in = 10 //make a step in step_in/10 sec. @@ -49,7 +49,7 @@ var/obj/item/device/radio/radio = null - var/max_temperature = 2500 + var/max_temperature = 25000 var/internal_damage_threshold = 50 //health percentage below which internal damage is possible var/internal_damage = 0 //contains bitflags @@ -421,7 +421,7 @@ call(/obj/item/clothing/gloves/space_ninja/proc/drain)("MECHA",src,user:wear_suit) return - if ( ((HULK in user.mutations) || (SUPRSTR in user.augmentations)) && !prob(src.deflect_chance)) + if ((HULK in user.mutations) && !prob(src.deflect_chance)) src.take_damage(15) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) user.visible_message("[user] hits [src.name], doing some damage.", "You hit [src.name] with all your might. The metal creaks and bends.") @@ -470,23 +470,6 @@ user.attack_log += text("\[[time_stamp()]\] attacked [src.name]") return - -/obj/mecha/proc/attack_critter(obj/effect/critter/C) - src.log_message("Attack by creature. Attacker - [C].",1) - var/damage = max(0, rand(C.melee_damage_lower - 5, C.melee_damage_upper - 5 )) - - if(!prob(src.deflect_chance) && damage > 0) - src.take_damage(damage) - src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) - playsound(src.loc, "sparks", 50, 1) - visible_message("\red [C] hits [src.name]'s armor!") - else - src.log_append_to_last("Armor saved.") - src.occupant_message("\blue [C]'s attack is stopped by the armor.") - visible_message("\blue [C] rebounds off [src.name]'s armor!") - return - - /obj/mecha/hitby(atom/movable/A as mob|obj) //wrapper src.log_message("Hit by [A].",1) call((proc_res["dynhitby"]||src), "dynhitby")(A) @@ -983,7 +966,7 @@ usr << "\red Access denied" src.log_append_to_last("Permission denied.") return - for(var/mob/living/carbon/metroid/M in range(1,usr)) + for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) usr << "You're too busy getting your life sucked out of you." return @@ -1500,7 +1483,7 @@ return if (href_list["change_name"]) if(usr != src.occupant) return - var/newname = strip_html_simple(input(occupant,"Choose new exosuit name","Rename exosuit",initial(name)) as text) + var/newname = strip_html_simple(input(occupant,"Choose new exosuit name","Rename exosuit",initial(name)) as text, MAX_NAME_LEN) if(newname && trim(newname)) name = newname else @@ -1672,7 +1655,10 @@ return 0 /obj/mecha/proc/reset_icon() - icon_state = initial_icon + if (initial_icon) + icon_state = initial_icon + else + icon_state = initial(icon_state) return icon_state ////////////////////////////////////////// diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 57708a31c43..da461662f8f 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -118,15 +118,14 @@ return M.get_log_html() -/obj/item/weapon/storage/mechatrackingbox - +/obj/item/weapon/storage/box/mechabeacons + name = "Exosuit Tracking Beacons" New() - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) - new /obj/item/mecha_parts/mecha_tracking(src) ..() - return + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) + new /obj/item/mecha_parts/mecha_tracking(src) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index e35d573c974..9d8c0696b29 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -402,6 +402,7 @@ icon = 'icons/obj/module.dmi' icon_state = "std_mod" item_state = "electronic" + board_type = "other" flags = FPRINT | TABLEPASS | CONDUCT force = 5.0 w_class = 2.0 diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index 379959925ac..f3deea36267 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -4,7 +4,7 @@ icon_state = "odysseus" initial_icon = "odysseus" step_in = 2 - max_temperature = 1500 + max_temperature = 15000 health = 120 wreckage = /obj/effect/decal/mecha_wreckage/odysseus internal_damage_threshold = 35 diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 3288cc69714..2ad11bb0214 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -2,9 +2,8 @@ desc = "Autonomous Power Loader Unit. The workhorse of the exosuit world." name = "APLU \"Ripley\"" icon_state = "ripley" - initial_icon = "ripley" step_in = 6 - max_temperature = 1000 + max_temperature = 20000 health = 200 wreckage = /obj/effect/decal/mecha_wreckage/ripley var/list/cargo = new @@ -20,8 +19,7 @@ desc = "Standart APLU chassis was refitted with additional thermal protection and cistern." name = "APLU \"Firefighter\"" icon_state = "firefighter" - initial_icon = "firefighter" - max_temperature = 4500 + max_temperature = 65000 health = 250 lights_power = 8 damage_absorption = list("fire"=0.5,"bullet"=0.8,"bomb"=0.5) @@ -31,7 +29,6 @@ desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE" name = "DEATH-RIPLEY" icon_state = "deathripley" - initial_icon = "deathripley" step_in = 2 opacity=0 lights_power = 60 @@ -47,7 +44,6 @@ /obj/mecha/working/ripley/mining desc = "An old, dusty mining ripley." name = "APLU \"Miner\"" - initial_icon = "ripley" /obj/mecha/working/ripley/mining/New() ..() @@ -114,16 +110,4 @@ return -/obj/mecha/working/ripley/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/fluff/butcher_royce_1)) - src.icon_state = "titan" - src.initial_icon = "titan" - src.name = "APLU \"Titan's Fist\"" - src.desc = "This ordinary mining Ripley has been customized to look like a unit of the Titans Fist." - user << "You spend some quality time with the Ripley, customising it to look like a \"Titan's Fist\" APLU." - user.drop_item() - del(W) - return - else - ..() \ No newline at end of file diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 263e64d02af..523e0ff72eb 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -105,7 +105,7 @@ return /obj/effect/alien/resin/attack_hand() - if ((HULK in usr.mutations) || (SUPRSTR in usr.augmentations)) + if (HULK in usr.mutations) usr << "\blue You easily destroy the [name]." for(var/mob/O in oviewers(src)) O.show_message("\red [usr] destroys the [name]!", 1) @@ -358,8 +358,9 @@ Alien plants should do something if theres a lot of poison */ /var/const //for the status var BURST = 0 - GROWING = 1 - GROWN = 2 + BURSTING = 1 + GROWING = 2 + GROWN = 3 MIN_GROWTH_TIME = 1800 //time it takes to grow a hugger MAX_GROWTH_TIME = 3000 @@ -394,8 +395,7 @@ Alien plants should do something if theres a lot of poison return if(GROWN) user << "\red You retrieve the child." - loc.contents += GetFacehugger()//need to write the code for giving it to the alien later - Burst() + Burst(0) return else return attack_hand(user) @@ -414,15 +414,21 @@ Alien plants should do something if theres a lot of poison return proc/Burst(var/kill = 1) //drops and kills the hugger if any is remaining - var/obj/item/clothing/mask/facehugger/child = GetFacehugger() - - if(kill && istype(child)) - loc.contents += child - child.Die() - - icon_state = "egg_hatched" - status = BURST - return + if(status == GROWN || status == GROWING) + var/obj/item/clothing/mask/facehugger/child = GetFacehugger() + icon_state = "egg_hatched" + flick("egg_opening", src) + status = BURSTING + spawn(15) + status = BURST + loc.contents += child//need to write the code for giving it to the alien later + if(kill && istype(child)) + child.Die() + else + for(var/mob/M in range(1,src)) + if(CanHug(M)) + child.Attach(M) + break /obj/effect/alien/egg/bullet_act(var/obj/item/projectile/Proj) @@ -462,23 +468,12 @@ Alien plants should do something if theres a lot of poison healthcheck() /obj/effect/alien/egg/HasProximity(atom/movable/AM as mob|obj) - if(!CanHug(AM)) - return - if(status == GROWN && iscarbon(AM) && !isalien(AM)) - - var/mob/living/carbon/C = AM - if(C.stat == CONSCIOUS && C.has_disease(/datum/disease/alien_embryo)) + if(status == GROWN) + if(!CanHug(AM)) return - status = BURST - flick("egg_opening", src) //Play animation - var/turf/pos = get_turf(src) - spawn(18) // Wait until the animation finishes - Burst(0) - var/obj/item/clothing/mask/facehugger/child = GetFacehugger() - child.loc = pos - if(!CanHug(AM)) - return - if(AM && in_range(AM, pos)) - child.Attach(AM) + var/mob/living/carbon/C = AM + if(C.stat == CONSCIOUS && C.status_flags & XENO_HOST) + return + Burst(0) diff --git a/code/game/objects/effects/biomass_rift.dm b/code/game/objects/effects/biomass_rift.dm index b0be41939b4..247f485b570 100644 --- a/code/game/objects/effects/biomass_rift.dm +++ b/code/game/objects/effects/biomass_rift.dm @@ -1,3 +1,4 @@ +/* /obj/effect/biomass icon = 'icons/obj/biomass.dmi' icon_state = "stage1" @@ -121,4 +122,5 @@ return 0 if(location.density) return 0 - return 1 \ No newline at end of file + return 1 +*/ \ 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 b8b990f6ff0..7ee6aaa3b50 100644 --- a/code/game/objects/effects/decals/Cleanable/aliens.dm +++ b/code/game/objects/effects/decals/Cleanable/aliens.dm @@ -26,7 +26,9 @@ if (i > 0) var/obj/effect/decal/cleanable/xenoblood/b = new /obj/effect/decal/cleanable/xenoblood/xsplatter(src.loc) for(var/datum/disease/D in src.viruses) - b.viruses += D.Copy() + var/datum/disease/ND = D.Copy(1) + b.viruses += ND + ND.holder = b if (step_to(src, get_step(src, direction), 0)) break diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm index eae392b5a11..e4c5ae42205 100644 --- a/code/game/objects/effects/decals/Cleanable/fuel.dm +++ b/code/game/objects/effects/decals/Cleanable/fuel.dm @@ -25,17 +25,12 @@ obj/effect/decal/cleanable/liquid_fuel var/turf/simulated/S = loc if(!istype(S)) return for(var/d in cardinal) - if(S.air_check_directions & d) - if(rand(25)) - var/turf/simulated/O = get_step(src,d) - var/can_pass = 1 - for (var/obj/machinery/door/airlock/door in O) - if (door.density) - can_pass = 0 - if (can_pass) - if(!locate(/obj/effect/decal/cleanable/liquid_fuel) in O) - new/obj/effect/decal/cleanable/liquid_fuel(O,amount*0.25) - amount *= 0.75 + if(rand(25)) + var/turf/simulated/O = get_step(src,d) + if(O.CanPass(target = get_turf(src), air_group = 1)) + if(!locate(/obj/effect/decal/cleanable/liquid_fuel) in O) + new/obj/effect/decal/cleanable/liquid_fuel(O,amount*0.25) + amount *= 0.75 flamethrower_fuel icon_state = "mustard" @@ -50,9 +45,11 @@ obj/effect/decal/cleanable/liquid_fuel if(!istype(S)) return for(var/d in list(turn(dir,90),turn(dir,-90))) - if(S.air_check_directions & d) - var/turf/simulated/O = get_step(S,d) + var/turf/simulated/O = get_step(S,d) + if(locate(/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel) in O) + continue + if(O.CanPass(target = get_turf(src), air_group = 1)) new/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel(O,amount*0.25,d) O.hotspot_expose((T20C*2) + 380,500) //Light flamethrower fuel on fire immediately. - amount *= 0.5 \ No newline at end of file + amount *= 0.5 diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 2086df3b850..516c0d74ca4 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -71,7 +71,10 @@ if (i > 0) var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc) for(var/datum/disease/D in src.viruses) - b.viruses += D.Copy() + var/datum/disease/ND = D.Copy(1) + b.viruses += ND + ND.holder = b + if (step_to(src, get_step(src, direction), 0)) break diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index c002698361e..d7ac2baa6fc 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -67,7 +67,7 @@ obj/structure/sign/poster name = "poster" - desc = "A large piece of space-resistant printed paper. It's considered contraband." + desc = "A large piece of space-resistant printed paper. " icon = 'icons/obj/contraband.dmi' anchored = 1 var/serial_number //Will hold the value of src.loc if nobody initialises it diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index c6190a6a73c..727280f9b7d 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -457,13 +457,13 @@ steam.start() -- spawns the effect var/area/A = get_area(location) var/where = "[A.name] | [location.x], [location.y]" - var/whereLink = "[where]" + var/whereLink = "[where]" if(carry.my_atom.fingerprintslast) var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast) var/more = "" if(M) - more = "(?)" + more = "(?)" message_admins("A chemical smoke reaction has taken place in ([whereLink])[contained]. Last associated key is [carry.my_atom.fingerprintslast][more].", 0, 1) log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].") else @@ -985,7 +985,7 @@ steam.start() -- spawns the effect return attack_hand(var/mob/user) - if ((HULK in user.mutations) || (prob(75 - metal*25)) || (SUPRSTR in user.augmentations)) + if ((HULK in user.mutations) || (prob(75 - metal*25))) user << "\blue You smash through the metal foam wall." for(var/mob/O in oviewers(user)) if ((O.client && !( O.blinded ))) diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index 92be8ed4ddf..ae8fc7220a0 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -47,10 +47,10 @@ if(viruses.len > 0) for(var/datum/disease/D in viruses) if(prob(virusProb)) - var/datum/disease/viruus = D.Copy() + var/datum/disease/viruus = D.Copy(1) gib.viruses += viruus viruus.holder = gib - viruus.spread_type = CONTACT_FEET + gib.blood_DNA = list() if(MobDNA) gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.b_type diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index ba91849c24b..b72dafb4c30 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -101,6 +101,8 @@ //SUBCLASSES. Spawn a bunch of items and disappear likewise /obj/effect/landmark/costume/chicken/New() new /obj/item/clothing/suit/chickensuit(src.loc) + new /obj/item/clothing/head/chicken(src.loc) + new /obj/item/weapon/reagent_containers/food/snacks/egg(src.loc) del(src) /obj/effect/landmark/costume/gladiator/New() @@ -171,7 +173,7 @@ /obj/effect/landmark/costume/nightowl/New() new /obj/item/clothing/under/owl(src.loc) - new /obj/item/clothing/mask/owl_mask(src.loc) + new /obj/item/clothing/mask/gas/owl_mask(src.loc) del(src) /obj/effect/landmark/costume/waiter/New() @@ -218,6 +220,7 @@ /obj/effect/landmark/costume/fakewizard/New() new /obj/item/clothing/suit/wizrobe/fake(src.loc) new /obj/item/clothing/head/wizard/fake(src.loc) + new /obj/item/weapon/staff/(src.loc) del(src) /obj/effect/landmark/costume/sexyclown/New() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index b285b15df0e..b9a2e57dafb 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -58,7 +58,7 @@ trace_gas.moles = 30 payload += trace_gas - target.air.merge(payload) + target.zone.air.merge(payload) spawn(0) del(src) @@ -71,7 +71,7 @@ payload.toxins = 30 - target.air.merge(payload) + target.zone.air.merge(payload) target.hotspot_expose(1000, CELL_VOLUME) diff --git a/code/game/objects/effects/signs.dm b/code/game/objects/effects/signs.dm deleted file mode 100644 index 53db0edde7a..00000000000 --- a/code/game/objects/effects/signs.dm +++ /dev/null @@ -1,233 +0,0 @@ -/obj/effect/sign/securearea/ex_act(severity) - switch(severity) - if(1.0) - del(src) - return - if(2.0) - del(src) - return - if(3.0) - del(src) - return - else - return - -/obj/effect/sign/securearea/blob_act() - del(src) - return - - -/obj/effect/sign/ex_act(severity) - switch(severity) - if(1.0) - del(src) - return - if(2.0) - del(src) - return - if(3.0) - del(src) - return - else - return - -/obj/effect/sign/blob_act() - del(src) - return - - -/obj/effect/sign/map - desc = "A framed picture of the station." - name = "station map" - icon = 'icons/obj/decals.dmi' - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/map/left - icon_state = "map-left" - -/obj/effect/sign/map/right - icon_state = "map-right" - -/obj/effect/sign/securearea - desc = "A warning sign which reads 'SECURE AREA'. This obviously applies to a nun-Clown." - name = "SECURE AREA" - icon = 'icons/obj/decals.dmi' - icon_state = "securearea" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/biohazard - desc = "A warning sign which reads 'BIOHAZARD'" - name = "BIOHAZARD" - icon = 'icons/obj/decals.dmi' - icon_state = "bio" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/electricshock - desc = "A warning sign which reads 'HIGH VOLTAGE'" - name = "HIGH VOLTAGE" - icon = 'icons/obj/decals.dmi' - icon_state = "shock" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/movingparts - desc = "A warning sign which reads 'CAUTION: MOVING PARTS, machinery liable to stop and start at random'" - name = "CAUTION" - icon = 'decals.dmi' - icon_state = "securearea" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/examroom - desc = "A guidance sign which reads 'EXAM ROOM'" - name = "EXAM" - icon = 'icons/obj/decals.dmi' - icon_state = "examroom" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/vacuum - desc = "A warning sign which reads 'HARD VACUUM AHEAD'" - name = "HARD VACUUM AHEAD" - icon = 'icons/obj/decals.dmi' - icon_state = "space" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/deathsposal - desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'" - name = "DISPOSAL LEADS TO SPACE" - icon = 'icons/obj/decals.dmi' - icon_state = "deathsposal" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/pods - desc = "A warning sign which reads 'ESCAPE PODS'" - name = "ESCAPE PODS" - icon = 'icons/obj/decals.dmi' - icon_state = "pods" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/fire - desc = "A warning sign which reads 'DANGER: FIRE'" - name = "DANGER: FIRE" - icon = 'icons/obj/decals.dmi' - icon_state = "fire" - anchored = 1.0 - opacity = 0 - density = 0 - - -/obj/effect/sign/nosmoking_1 - desc = "A warning sign which reads 'NO SMOKING'" - name = "NO SMOKING" - icon = 'icons/obj/decals.dmi' - icon_state = "nosmoking" - anchored = 1.0 - opacity = 0 - density = 0 - - -/obj/effect/sign/nosmoking_2 - desc = "A warning sign which reads 'NO SMOKING'" - name = "NO SMOKING" - icon = 'icons/obj/decals.dmi' - icon_state = "nosmoking2" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/redcross - desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'" - name = "Med-Bay" - icon = 'icons/obj/decals.dmi' - icon_state = "redcross" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/goldenplaque - desc = "To be Robust is not an action or a way of life, but a mental state. Only those with the force of Will strong enough to act during a crisis, saving friend from foe, are truly Robust. Stay Robust my friends." - name = "The Most Robust Men Award for Robustness" - icon = 'icons/obj/decals.dmi' - icon_state = "goldenplaque" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/kiddieplaque - desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child is holding a crayon and writing some code in his diary with it. The child is smiling evilly." - name = "Credits plaque for AI developers." - icon = 'icons/obj/decals.dmi' - icon_state = "kiddieplaque" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/atmosplaque - desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands." - name = "FEA Atmospherics Division" - icon = 'icons/obj/decals.dmi' - icon_state = "atmosplaque" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/maltesefalcon1 //The sign is 64x32, so it needs two tiles. ;3 - desc = "The Maltese Falcon, Space Bar and Grill." - name = "The Maltese Falcon" - icon = 'icons/obj/decals.dmi' - icon_state = "maltesefalcon1" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/maltesefalcon2 - desc = "The Maltese Falcon, Space Bar and Grill." - name = "The Maltese Falcon" - icon = 'icons/obj/decals.dmi' - icon_state = "maltesefalcon2" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/science//These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map - desc = "A warning sign which reads 'SCIENCE!'" - name = "SCIENCE!" - icon = 'icons/obj/decals.dmi' - icon_state = "science1" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/chemistry - desc = "A warning sign which reads 'CHEMISTY'" - name = "CHEMISTRY" - icon = 'icons/obj/decals.dmi' - icon_state = "chemistry1" - anchored = 1.0 - opacity = 0 - density = 0 - -/obj/effect/sign/botany - desc = "A warning sign which reads 'HYDROPONICS'" - name = "HYDROPONICS" - icon = 'icons/obj/decals.dmi' - icon_state = "hydro1" - anchored = 1.0 - opacity = 0 - density = 0 \ No newline at end of file diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm new file mode 100644 index 00000000000..27a1505636e --- /dev/null +++ b/code/game/objects/effects/spiders.dm @@ -0,0 +1,199 @@ +//generic procs copied from obj/effect/alien +/obj/effect/spider + name = "web" + desc = "it's stringy and sticky" + icon = 'icons/effects/effects.dmi' + anchored = 1 + density = 0 + var/health = 15 + +//similar to weeds, but only barfed out by nurses manually +/obj/effect/spider/ex_act(severity) + switch(severity) + if(1.0) + del(src) + if(2.0) + if (prob(50)) + del(src) + if(3.0) + if (prob(5)) + del(src) + return + +/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user) + if(W.attack_verb.len) + visible_message("\red \The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") + else + visible_message("\red \The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]") + + var/damage = W.force / 4.0 + + if(istype(W, /obj/item/weapon/weldingtool)) + var/obj/item/weapon/weldingtool/WT = W + + if(WT.remove_fuel(0, user)) + damage = 15 + playsound(loc, 'sound/items/Welder.ogg', 100, 1) + + health -= damage + healthcheck() + +/obj/effect/spider/bullet_act(var/obj/item/projectile/Proj) + ..() + health -= Proj.damage + healthcheck() + +/obj/effect/spider/proc/healthcheck() + if(health <= 0) + del(src) + +/obj/effect/spider/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) + if(exposed_temperature > 300) + health -= 5 + healthcheck() + +/obj/effect/spider/stickyweb + icon_state = "stickyweb1" + New() + if(prob(50)) + icon_state = "stickyweb2" + +/obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) + if(air_group || (height==0)) return 1 + if(istype(mover, /mob/living/simple_animal/hostile/giant_spider)) + return 1 + else if(istype(mover, /mob/living)) + if(prob(50)) + mover << "\red You get stuck in \the [src] for a moment." + return 0 + else if(istype(mover, /obj/item/projectile)) + return prob(30) + return 1 + +/obj/effect/spider/eggcluster + name = "egg cluster" + desc = "They seem to pulse slightly with an inner life" + icon_state = "eggs" + var/amount_grown = 0 + New() + pixel_x = rand(3,-3) + pixel_y = rand(3,-3) + processing_objects.Add(src) + +/obj/effect/spider/eggcluster/process() + amount_grown += rand(0,2) + if(amount_grown >= 100) + var/num = rand(3,12) + for(var/i=0, i
This place doesn't noted on these blueprints.
+This place isn't noted on these blueprints.
"} else return @@ -114,7 +114,7 @@ move an amendment to the drawing. usr << "\red Error! Please notify administration!" return var/list/turf/turfs = res - var/str = sanitize(trim(input(usr,"New area title","Blueprints editing"))) + var/str = trim(stripped_input(usr,"New area title","Blueprints editing", "", MAX_NAME_LEN)) if(!str || !length(str)) //cancel return if(length(str) > 50) @@ -129,7 +129,14 @@ move an amendment to the drawing. A.power_equip = 0 A.power_light = 0 A.power_environ = 0 + A.always_unpowered = 0 move_turfs_to_area(turfs, A) + + A.always_unpowered = 0 + for(var/turf/T in A.contents) + T.lighting_changed = 1 + lighting_controller.changed_turfs += T + spawn(5) //ma = A.master ? "[A.master]" : "(null)" //world << "DEBUG: create_area(5):A.name=[A.name]
A.tag=[A.tag]
A.master=[ma]" @@ -147,7 +154,7 @@ move an amendment to the drawing. var/area/A = get_area() //world << "DEBUG: edit_area" var/prevname = A.name - var/str = sanitize(trim(input(usr,"New area title","Blueprints editing",prevname))) + var/str = trim(stripped_input(usr,"New area title","Blueprints editing", prevname, MAX_NAME_LEN)) if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 4cf441e2be1..1c6fe70e8c0 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -2,7 +2,7 @@ /obj/item/bodybag name = "body bag" - desc = "A folded bag designed to contain dead things." + desc = "A folded bag designed for the storage and transportation of cadavers." icon = 'icons/obj/bodybag.dmi' icon_state = "bodybag_folded" @@ -12,29 +12,24 @@ del(src) -/obj/item/weapon/storage/body_bag_box +/obj/item/weapon/storage/box/bodybags name = "body bags" desc = "This box contains body bags." icon_state = "bodybags" - item_state = "syringe_kit" - foldable = /obj/item/stack/sheet/cardboard //BubbleWrap - - New() - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) - new /obj/item/bodybag(src) ..() - return + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) + new /obj/item/bodybag(src) /obj/structure/closet/body_bag name = "body bag" - desc = "A bag designed to contain dead things." + desc = "A plastic bag designed for the storage and transportation of cadavers." icon = 'icons/obj/bodybag.dmi' icon_state = "bodybag_closed" icon_closed = "bodybag_closed" @@ -61,7 +56,7 @@ else if(istype(W, /obj/item/weapon/wirecutters)) user << "You cut the tag off the bodybag" src.name = "body bag" - src.overlays = null + src.overlays.Cut() return diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 0ea57a12561..b47a2a30684 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -5,11 +5,9 @@ icon_state = "candle1" item_state = "candle1" w_class = 1 - light_on = 0 - brightness_on = 3 //luminosity when on var/wax = 200 - + var/lit = 0 proc light(var/flavor_text = "\red [usr] lights the [name].") @@ -21,7 +19,7 @@ else if(wax>80) i = 2 else i = 3 - icon_state = "candle[i][light_on ? "_lit" : ""]" + icon_state = "candle[i][lit ? "_lit" : ""]" attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -32,30 +30,30 @@ light("\red [user] casually lights the [name] with [W], what a badass.") else if(istype(W, /obj/item/weapon/lighter)) var/obj/item/weapon/lighter/L = W - if(L.light_on) + if(L.lit) light() else if(istype(W, /obj/item/weapon/match)) var/obj/item/weapon/match/M = W - if(M.light_on) + if(M.lit) light() else if(istype(W, /obj/item/candle)) var/obj/item/candle/C = W - if(C.light_on) + if(C.lit) light() light(var/flavor_text = "\red [usr] lights the [name].") - if(!src.light_on) - src.light_on = 1 + if(!src.lit) + src.lit = 1 //src.damtype = "fire" for(var/mob/O in viewers(usr, null)) O.show_message(flavor_text, 1) - SetLuminosity(brightness_on) + SetLuminosity(CANDLE_LUM) processing_objects.Add(src) process() - if(!light_on) + if(!lit) return wax-- if(!wax) @@ -70,29 +68,20 @@ attack_self(mob/user as mob) - if(light_on) - light_on = 0 + if(lit) + lit = 0 update_icon() SetLuminosity(0) - user.SetLuminosity(search_light(user, src)) + user.SetLuminosity(user.luminosity - CANDLE_LUM) pickup(mob/user) - if(light_on) - if (user.luminosity < brightness_on) - user.SetLuminosity(brightness_on) + if(lit) SetLuminosity(0) + user.SetLuminosity(user.luminosity + CANDLE_LUM) dropped(mob/user) - if(light_on) - if ((layer <= 3) || (loc != user.loc)) - user.SetLuminosity(search_light(user, src)) - SetLuminosity(brightness_on) - - - equipped(mob/user, slot) - if(light_on) - if (user.luminosity < brightness_on) - user.SetLuminosity(brightness_on) - SetLuminosity(0) + if(lit) + user.SetLuminosity(user.luminosity - CANDLE_LUM) + SetLuminosity(CANDLE_LUM) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 4fe457094fe..46b7a8b4f36 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -13,8 +13,6 @@ var/global/list/obj/item/device/pda/PDAs = list() w_class = 1.0 flags = FPRINT | TABLEPASS slot_flags = SLOT_ID | SLOT_BELT - light_on = 0 //Is the flashlight function on? - brightness_on = 4 //Luminosity for the flashlight function //Main variables var/owner = null @@ -24,6 +22,8 @@ var/global/list/obj/item/device/pda/PDAs = list() //Secondary variables var/scanmode = 0 //1 is medical scanner, 2 is forensics, 3 is reagent scanner. + var/fon = 0 //Is the flashlight function on? + var/f_lum = 4 //Luminosity for the flashlight function var/silent = 0 //To beep or not to beep, that is the question var/toff = 0 //If 1, messenger disabled var/tnote = null //Current Texts @@ -37,6 +37,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/notehtml = "" var/cart = "" //A place to stick cartridge menu information var/detonate = 1 // Can the PDA be blown up? + var/hidden = 0 // Is the PDA hidden from the PDA list? var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. var/ownjob = null //related to above @@ -112,6 +113,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/captain default_cartridge = /obj/item/weapon/cartridge/captain icon_state = "pda-c" + toff = 1 /obj/item/device/pda/cargo default_cartridge = /obj/item/weapon/cartridge/quartermaster @@ -129,7 +131,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon_state = "pda-syn" name = "Military PDA" owner = "John Doe" - toff = 1 + hidden = 1 /obj/item/device/pda/chaplain icon_state = "pda-holy" @@ -165,6 +167,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon_state = "pda-bar" /obj/item/device/pda/atmos + default_cartridge = /obj/item/weapon/cartridge/atmos icon_state = "pda-atmo" /obj/item/device/pda/chemist @@ -181,10 +184,8 @@ var/global/list/obj/item/device/pda/PDAs = list() ttone = "data" detonate = 0 -/obj/item/device/pda/pai - icon_state = "NONE" - ttone = "data" - detonate = 0 +/obj/item/device/pda/ai/can_use() + return 1 /obj/item/device/pda/ai/attack_self(mob/user as mob) if ((honkamt > 0) && (prob(60)))//For clown virus. @@ -192,26 +193,21 @@ var/global/list/obj/item/device/pda/PDAs = list() playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) return +/obj/item/device/pda/ai/pai + ttone = "assist" + /* * The Actual PDA */ /obj/item/device/pda/pickup(mob/user) - if(light_on) - if(user.luminosity < brightness_on) - user.SetLuminosity(brightness_on) + if(fon) SetLuminosity(0) + user.SetLuminosity(user.luminosity + f_lum) /obj/item/device/pda/dropped(mob/user) - if(light_on) - if ((layer <= 3) || (loc != user.loc)) - user.SetLuminosity(search_light(user, src)) - SetLuminosity(brightness_on) - -/obj/item/device/pda/equipped(mob/user, slot) - if(light_on) - if(user.luminosity < brightness_on) - user.SetLuminosity(brightness_on) - SetLuminosity(0) + if(fon) + user.SetLuminosity(user.luminosity - f_lum) + SetLuminosity(f_lum) /obj/item/device/pda/New() ..() @@ -222,8 +218,6 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/proc/can_use() - if(istype(src, /obj/item/device/pda/ai) || istype(src, /obj/item/device/pda/pai)) - return 1 if(!ismob(loc)) return 0 @@ -235,6 +229,15 @@ var/global/list/obj/item/device/pda/PDAs = list() else return 0 +/obj/item/device/pda/GetAccess() + if(id) + return id.GetAccess() + else + return ..() + +/obj/item/device/pda/GetID() + return id + /obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location) var/mob/M = usr if((!istype(over_object, /obj/screen)) && !M.restrained() && !M.stat && can_use()) @@ -321,17 +324,19 @@ var/global/list/obj/item/device/pda/PDAs = list() dat += "
- "
if (cartridge)
if (cartridge.access_janitor)
- dat += "