- Frequency: [format_frequency(frequency)] GHz (Reset) diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index f731efde5b7..c4dd8adeabb 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -28,6 +28,12 @@ Thus, the two variables affect pump operation are set in New(): var/id = null var/datum/radio_frequency/radio_connection +/obj/machinery/atmospherics/binary/volume_pump/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + /obj/machinery/atmospherics/binary/volume_pump/on on = 1 icon_state = "map_on" @@ -192,8 +198,8 @@ Thus, the two variables affect pump operation are set in New(): if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params) - if(!istype(W, /obj/item/weapon/wrench)) +/obj/machinery/atmospherics/binary/volume_pump/attackby(obj/item/W, mob/user, params) + if(!istype(W, /obj/item/wrench)) return ..() if(!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index ed3e6836fc9..086d2ff799f 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -94,8 +94,8 @@ if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) - if(!istype(W, /obj/item/weapon/wrench)) +/obj/machinery/atmospherics/omni/attackby(var/obj/item/W as obj, var/mob/user as mob, params) + if(!istype(W, /obj/item/wrench)) return ..() if(can_unwrench) @@ -237,11 +237,12 @@ return // Pipenet procs -/obj/machinery/atmospherics/omni/build_network() +/obj/machinery/atmospherics/omni/build_network(remove_deferral = FALSE) for(var/datum/omni_port/P in ports) if(!P.parent) P.parent = new /datum/pipeline() P.parent.build_pipeline(src) + ..() /obj/machinery/atmospherics/omni/disconnect(obj/machinery/atmospherics/reference) for(var/datum/omni_port/P in ports) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 2bf8f249185..427c77e8246 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -22,6 +22,13 @@ Filter types: var/frequency = 0 var/datum/radio_frequency/radio_connection + +/obj/machinery/atmospherics/trinary/filter/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + /obj/machinery/atmospherics/trinary/filter/flipped icon_state = "mmap" flipped = 1 diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 6dc5e5cc303..187b308fa3c 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -104,7 +104,7 @@ update_icon() update_underlays() -/obj/machinery/atmospherics/trinary/build_network() +/obj/machinery/atmospherics/trinary/build_network(remove_deferral = FALSE) if(!parent1) parent1 = new /datum/pipeline() parent1.build_pipeline(src) @@ -116,6 +116,7 @@ if(!parent3) parent3 = new /datum/pipeline() parent3.build_pipeline(src) + ..() /obj/machinery/atmospherics/trinary/disconnect(obj/machinery/atmospherics/reference) if(reference == node1) diff --git a/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm b/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm index 0987561f94c..ad9561fbf1d 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm @@ -7,7 +7,7 @@ name = "manual switching valve" desc = "A pipe valve" - + can_unwrench = 1 var/state = TVALVE_STATE_STRAIGHT @@ -15,16 +15,16 @@ /obj/machinery/atmospherics/trinary/tvalve/bypass icon_state = "map_tvalve1" state = TVALVE_STATE_SIDE - + /obj/machinery/atmospherics/trinary/tvalve/flipped icon_state = "map_tvalvem0" flipped = 1 - + /obj/machinery/atmospherics/trinary/tvalve/flipped/bypass icon_state = "map_tvalvem1" flipped = 1 state = TVALVE_STATE_SIDE - + /obj/machinery/atmospherics/trinary/tvalve/update_icon(animation) var/flipstate = "" if(flipped) @@ -40,7 +40,7 @@ var/turf/T = get_turf(src) if(!istype(T)) return - + add_underlay(T, node1, turn(dir, -180)) if(flipped) @@ -49,7 +49,7 @@ add_underlay(T, node2, turn(dir, -90)) add_underlay(T, node3, dir) - + /obj/machinery/atmospherics/trinary/tvalve/proc/switch_side() if(state == TVALVE_STATE_STRAIGHT) go_to_side() @@ -57,7 +57,7 @@ go_straight() /obj/machinery/atmospherics/trinary/tvalve/proc/go_to_side() - if(state == TVALVE_STATE_SIDE) + if(state == TVALVE_STATE_SIDE) return 0 state = TVALVE_STATE_SIDE @@ -74,7 +74,7 @@ /obj/machinery/atmospherics/trinary/tvalve/proc/go_straight() if(state == TVALVE_STATE_STRAIGHT) return 0 - + state = TVALVE_STATE_STRAIGHT update_icon() @@ -82,13 +82,13 @@ parent2.update = 0 parent3.update = 0 parent1.reconcile_air() - + investigate_log("was set to straight by [usr ? key_name(usr) : "a remote signal"]", "atmos") return 1 /obj/machinery/atmospherics/trinary/tvalve/attack_ai(mob/user) return - + /obj/machinery/atmospherics/trinary/tvalve/attack_ghost(mob/user) if(user.can_advanced_admin_interact()) return attack_hand(user) @@ -108,14 +108,20 @@ var/id = null var/datum/radio_frequency/radio_connection +/obj/machinery/atmospherics/trinary/tvalve/digital/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + /obj/machinery/atmospherics/trinary/tvalve/digital/bypass icon_state = "map_tvalve1" state = TVALVE_STATE_SIDE - + /obj/machinery/atmospherics/trinary/tvalve/digital/flipped icon_state = "map_tvalvem0" flipped = 1 - + /obj/machinery/atmospherics/trinary/tvalve/digital/flipped/bypass icon_state = "map_tvalvem1" flipped = 1 diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index 63070b19538..6028346df6d 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -31,6 +31,12 @@ if(id && !id_tag)//I'm not dealing with any more merge conflicts id_tag = id +/obj/machinery/atmospherics/unary/outlet_injector/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + /obj/machinery/atmospherics/unary/outlet_injector/update_icon() if(!powered()) icon_state = "off" @@ -158,7 +164,7 @@ on = 0 return*/ -/obj/machinery/atmospherics/unary/outlet_injector/multitool_menu(var/mob/user,var/obj/item/device/multitool/P) +/obj/machinery/atmospherics/unary/outlet_injector/multitool_menu(var/mob/user,var/obj/item/multitool/P) return {"
- Frequency: [format_frequency(frequency)] GHz (Reset) @@ -166,11 +172,11 @@
- Frequency: [format_frequency(frequency)] GHz (Reset) @@ -433,4 +433,7 @@ if(initial_loc) initial_loc.air_vent_info -= id_tag initial_loc.air_vent_names -= id_tag + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null return ..() diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index e86b8caa722..530dbe1d952 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -53,6 +53,9 @@ if(initial_loc && frequency == 1439) initial_loc.air_scrub_info -= id_tag initial_loc.air_scrub_names -= id_tag + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null return ..() /obj/machinery/atmospherics/unary/vent_pump/examine(mob/user) @@ -336,7 +339,7 @@ if(old_stat != stat) update_icon() -/obj/machinery/atmospherics/unary/vent_scrubber/multitool_menu(var/mob/user,var/obj/item/device/multitool/P) +/obj/machinery/atmospherics/unary/vent_scrubber/multitool_menu(var/mob/user,var/obj/item/multitool/P) return {"
- Frequency: [format_frequency(frequency)] GHz (Reset) @@ -369,9 +372,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/can_crawl_through() return !welded -/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) - if(istype(W, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = W +/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/W as obj, var/mob/user as mob, params) + if(istype(W, /obj/item/weldingtool)) + var/obj/item/weldingtool/WT = W if(WT.remove_fuel(0,user)) to_chat(user, "Now welding the scrubber.") if(do_after(user, 20 * WT.toolspeed, target = src)) @@ -391,10 +394,10 @@ else to_chat(user, "You need more welding fuel to complete this task.") return 1 - if(istype(W, /obj/item/device/multitool)) + if(istype(W, /obj/item/multitool)) update_multitool_menu(user) return 1 - if(istype(W, /obj/item/weapon/wrench)) + if(istype(W, /obj/item/wrench)) if(!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") return 1 diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index cd3cdfffb53..0692bf44efd 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -1,5 +1,3 @@ -var/global/list/deferred_pipenet_rebuilds = list() - /datum/pipeline var/datum/gas_mixture/air var/list/datum/gas_mixture/other_airs = list() diff --git a/code/ATMOSPHERICS/pipes/pipe.dm b/code/ATMOSPHERICS/pipes/pipe.dm index 05c5d18df99..48c482ac906 100644 --- a/code/ATMOSPHERICS/pipes/pipe.dm +++ b/code/ATMOSPHERICS/pipes/pipe.dm @@ -32,16 +32,16 @@ . = ..() // if we're somehow by ourself - if(parent && isnull(parent.gcDestroyed) && parent.members.len == 1 && parent.members[1] == src) + if(parent && !QDELETED(parent) && parent.members.len == 1 && parent.members[1] == src) qdel(parent) parent = null -/obj/machinery/atmospherics/pipe/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/device/analyzer)) +/obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/analyzer)) atmosanalyzer_scan(parent.air, user) return - if(istype(W,/obj/item/device/pipe_painter)) + if(istype(W,/obj/item/pipe_painter)) return return ..() @@ -66,10 +66,11 @@ return 0 return parent.air -/obj/machinery/atmospherics/pipe/build_network() +/obj/machinery/atmospherics/pipe/build_network(remove_deferral = FALSE) if(!parent) parent = new /datum/pipeline() parent.build_pipeline(src) + ..() /obj/machinery/atmospherics/pipe/setPipenet(datum/pipeline/P) parent = P diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm new file mode 100644 index 00000000000..6f14b75b2ec --- /dev/null +++ b/code/__DEFINES/components.dm @@ -0,0 +1,151 @@ +//shorthand +#define GET_COMPONENT_FROM(varname, path, target) var##path/##varname = ##target.GetComponent(##path) +#define GET_COMPONENT(varname, path) GET_COMPONENT_FROM(varname, path, src) + +#define COMPONENT_INCOMPATIBLE 1 + +// How multiple components of the exact same type are handled in the same datum + +#define COMPONENT_DUPE_HIGHLANDER 0 //old component is deleted (default) +#define COMPONENT_DUPE_ALLOWED 1 //duplicates allowed +#define COMPONENT_DUPE_UNIQUE 2 //new component is deleted +#define COMPONENT_DUPE_UNIQUE_PASSARGS 4 //old component is given the initialization args of the new + +// All signals. Format: +// When the signal is called: (signal arguments) + +// /datum signals +#define COMSIG_COMPONENT_ADDED "component_added" //when a component is added to a datum: (/datum/component) +#define COMSIG_COMPONENT_REMOVING "component_removing" //before a component is removed from a datum because of RemoveComponent: (/datum/component) +#define COMSIG_PARENT_QDELETED "parent_qdeleted" //before a datum's Destroy() is called: () + +// /atom signals +#define COMSIG_PARENT_ATTACKBY "atom_attackby" //from base of atom/attackby(): (/obj/item, /mob/living, params) + #define COMPONENT_NO_AFTERATTACK 1 //Return this in response if you don't want afterattack to be called +#define COMSIG_ATOM_HULK_ATTACK "hulk_attack" //from base of atom/attack_hulk(): (/mob/living/carbon/human) +#define COMSIG_PARENT_EXAMINE "atom_examine" //from base of atom/examine(): (/mob) +#define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name" //from base of atom/get_examine_name(): (/mob, list/overrides) + //Positions for overrides list + #define EXAMINE_POSITION_ARTICLE 1 + #define EXAMINE_POSITION_BEFORE 2 + //End positions + #define COMPONENT_EXNAME_CHANGED 1 +#define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (atom/movable/entering, /atom) +#define COMSIG_ATOM_EXITED "atom_exited" //from base of atom/Exited(): (atom/movable/exiting, atom/newloc) +#define COMSIG_ATOM_EX_ACT "atom_ex_act" //from base of atom/ex_act(): (severity, target) +#define COMSIG_ATOM_EMP_ACT "atom_emp_act" //from base of atom/emp_act(): (severity) +#define COMSIG_ATOM_FIRE_ACT "atom_fire_act" //from base of atom/fire_act(): (exposed_temperature, exposed_volume) +#define COMSIG_ATOM_BULLET_ACT "atom_bullet_act" //from base of atom/bullet_act(): (/obj/item/projectile, def_zone) +#define COMSIG_ATOM_BLOB_ACT "atom_blob_act" //from base of atom/blob_act(): (/obj/structure/blob) +#define COMSIG_ATOM_ACID_ACT "atom_acid_act" //from base of atom/acid_act(): (acidpwr, acid_volume) +#define COMSIG_ATOM_EMAG_ACT "atom_emag_act" //from base of atom/emag_act(): () +#define COMSIG_ATOM_RAD_ACT "atom_rad_act" //from base of atom/rad_act(intensity) +#define COMSIG_ATOM_NARSIE_ACT "atom_narsie_act" //from base of atom/narsie_act(): () +#define COMSIG_ATOM_RATVAR_ACT "atom_ratvar_act" //from base of atom/ratvar_act(): () +#define COMSIG_ATOM_RCD_ACT "atom_rcd_act" //from base of atom/rcd_act(): (/mob, /obj/item/construction/rcd, passed_mode) +#define COMSIG_ATOM_SING_PULL "atom_sing_pull" //from base of atom/singularity_pull(): (S, current_size) +#define COMSIG_ATOM_SET_LIGHT "atom_set_light" //from base of atom/set_light(): (l_range, l_power, l_color) +#define COMSIG_ATOM_ROTATE "atom_rotate" //from base of atom/shuttleRotate(): (rotation, params) +#define COMSIG_ATOM_DIR_CHANGE "atom_dir_change" //from base of atom/setDir(): (old_dir, new_dir) +#define COMSIG_ATOM_CONTENTS_DEL "atom_contents_del" //from base of atom/handle_atom_del(): (atom/deleted) +///////////////// +#define COMSIG_ATOM_ATTACK_GHOST "atom_attack_ghost" //from base of atom/attack_ghost(): (mob/dead/observer/ghost) +#define COMSIG_ATOM_ATTACK_HAND "atom_attack_hand" //from base of atom/attack_hand(): (mob/user) +#define COMSIG_ATOM_ATTACK_PAW "atom_attack_paw" //from base of atom/attack_paw(): (mob/user) + #define COMPONENT_NO_ATTACK_HAND 1 //works on all 3. +///////////////// + +#define COMSIG_ENTER_AREA "enter_area" //from base of area/Entered(): (/area) +#define COMSIG_EXIT_AREA "exit_area" //from base of area/Exited(): (/area) + +#define COMSIG_CLICK "atom_click" //from base of atom/Click(): (location, control, params) +#define COMSIG_CLICK_SHIFT "shift_click" //from base of atom/ShiftClick(): (/mob) +#define COMSIG_CLICK_CTRL "ctrl_click" //from base of atom/CtrlClickOn(): (/mob) +#define COMSIG_CLICK_ALT "alt_click" //from base of atom/AltClick(): (/mob) +#define COMSIG_CLICK_CTRL_SHIFT "ctrl_shift_click" //from base of atom/CtrlShiftClick(/mob) +#define COMSIG_MOUSEDROP_ONTO "mousedrop_onto" //from base of atom/MouseDrop(): (/atom/over, /mob/user) + #define COMPONENT_NO_MOUSEDROP 1 +#define COMSIG_MOUSEDROPPED_ONTO "mousedropped_onto" //from base of atom/MouseDrop_T: (/atom/from, /mob/user) + +// /area signals +#define COMSIG_AREA_ENTERED "area_entered" //from base of area/Entered(): (atom/movable/M) +#define COMSIG_AREA_EXITED "area_exited" //from base of area/Exited(): (atom/movable/M) + +// /atom/movable signals +#define COMSIG_MOVABLE_MOVED "movable_moved" //from base of atom/movable/Moved(): (/atom, dir) +#define COMSIG_MOVABLE_CROSSED "movable_crossed" //from base of atom/movable/Crossed(): (/atom/movable) +#define COMSIG_MOVABLE_UNCROSSED "movable_uncrossed" //from base of atom/movable/Uncrossed(): (/atom/movable) +#define COMSIG_MOVABLE_COLLIDE "movable_collide" //from base of atom/movable/Collide(): (/atom) +#define COMSIG_MOVABLE_IMPACT "movable_impact" //from base of atom/movable/throw_impact(): (/atom/hit_atom, /datum/thrownthing/throwingdatum) +#define COMSIG_MOVABLE_IMPACT_ZONE "item_impact_zone" //from base of mob/living/hitby(): (mob/living/target, hit_zone) +#define COMSIG_MOVABLE_BUCKLE "buckle" //from base of atom/movable/buckle_mob(): (mob, force) +#define COMSIG_MOVABLE_UNBUCKLE "unbuckle" //from base of atom/movable/unbuckle_mob(): (mob, force) +#define COMSIG_MOVABLE_THROW "movable_throw" //from base of atom/movable/throw_at(): (datum/thrownthing, spin) + +// /obj signals +#define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct" //from base of obj/deconstruct(): (disassembled) + +// /obj/item signals +#define COMSIG_ITEM_ATTACK "item_attack" //from base of obj/item/attack(): (/mob/living/target, /mob/living/user) +#define COMSIG_ITEM_ATTACK_SELF "item_attack_self" //from base of obj/item/attack_self(): (/mob) +#define COMSIG_ITEM_ATTACK_OBJ "item_attack_obj" //from base of obj/item/attack_obj(): (/obj, /mob) + #define COMPONENT_NO_ATTACK_OBJ 1 +#define COMSIG_ITEM_PRE_ATTACK "item_pre_attack" //from base of obj/item/pre_attack(): (atom/target, mob/user, params) + #define COMPONENT_NO_ATTACK 1 +#define COMSIG_ITEM_EQUIPPED "item_equip" //from base of obj/item/equipped(): (/mob/equipper, slot) +#define COMSIG_ITEM_DROPPED "item_drop" +#define COMSIG_ITEM_PICKUP "item_pickup" //from base of obj/item/pickup(): (/mob/taker) +#define COMSIG_ITEM_ATTACK_ZONE "item_attack_zone" //from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone) + +// /obj/item/clothing signals +#define COMSIG_SHOES_STEP_ACTION "shoes_step_action" //from base of obj/item/clothing/shoes/proc/step_action(): () + +// /obj/machinery signals +#define COMSIG_MACHINE_PROCESS "machine_process" //from machinery subsystem fire(): () +#define COMSIG_MACHINE_PROCESS_ATMOS "machine_process_atmos" //from air subsystem process_atmos_machinery(): () + +// /mob/living/carbon/human signals +#define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack" //from mob/living/carbon/human/UnarmedAttack(): (atom/target) +#define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby" //from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker) +#define COMSIG_HUMAN_DISARM_HIT "human_disarm_hit" //Hit by successful disarm attack (mob/living/carbon/human/attacker,zone_targeted) + +/*******Component Specific Signals*******/ +//Janitor +#define COMSIG_TURF_IS_WET "check_turf_wet" //(): Returns bitflags of wet values. +#define COMSIG_TURF_MAKE_DRY "make_turf_try" //(max_strength, immediate, duration_decrease = INFINITY): Returns bool. +#define COMSIG_COMPONENT_CLEAN_ACT "clean_act" //called on an object to clean it of cleanables. Usualy with soap: (num/strength) + +//Food +#define COMSIG_FOOD_EATEN "food_eaten" //from base of obj/item/reagent_containers/food/snacks/attack(): (mob/living/eater, mob/feeder) + +//Mood +#define COMSIG_ADD_MOOD_EVENT "add_mood" //Called when you send a mood event from anywhere in the code. +#define COMSIG_CLEAR_MOOD_EVENT "clear_mood" //Called when you clear a mood event from anywhere in the code. + +//NTnet +#define COMSIG_COMPONENT_NTNET_RECIEVE "ntnet_recieve" //called on an object by its NTNET connection component on recieve. (sending_id(number), sending_netname(text), data(datum/netdata)) + +// /datum/component/storage signals +#define COMSIG_CONTAINS_STORAGE "is_storage" //() - returns bool. +#define COMSIG_TRY_STORAGE_INSERT "storage_try_insert" //(obj/item/inserting, mob/user, silent, force) - returns bool +#define COMSIG_TRY_STORAGE_SHOW "storage_show_to" //(mob/show_to, force) - returns bool. +#define COMSIG_TRY_STORAGE_HIDE_FROM "storage_hide_from" //(mob/hide_from) - returns bool +#define COMSIG_TRY_STORAGE_HIDE_ALL "storage_hide_all" //returns bool +#define COMSIG_TRY_STORAGE_SET_LOCKSTATE "storage_lock_set_state" //(newstate) +#define COMSIG_IS_STORAGE_LOCKED "storage_get_lockstate" //() - returns bool. MUST CHECK IF STORAGE IS THERE FIRST! +#define COMSIG_TRY_STORAGE_TAKE_TYPE "storage_take_type" //(type, atom/destination, amount = INFINITY, check_adjacent, force, mob/user, list/inserted) - returns bool - type can be a list of types. +#define COMSIG_TRY_STORAGE_FILL_TYPE "storage_fill_type" //(type, amount = INFINITY, force = FALSE) //don't fuck this up. Force will ignore max_items, and amount is normally clamped to max_items. +#define COMSIG_TRY_STORAGE_TAKE "storage_take_obj" //(obj, new_loc, force = FALSE) - returns bool +#define COMSIG_TRY_STORAGE_QUICK_EMPTY "storage_quick_empty" //(loc) - returns bool - if loc is null it will dump at parent location. +#define COMSIG_TRY_STORAGE_RETURN_INVENTORY "storage_return_inventory" //(list/list_to_inject_results_into) +#define COMSIG_TRY_STORAGE_CAN_INSERT "storage_can_equip" //(obj/item/insertion_candidate, mob/user, silent) - returns bool + +/*******Non-Signal Component Related Defines*******/ + +//Arch +#define ARCH_PROB "probability" //Probability for each item +#define ARCH_MAXDROP "max_drop_amount" //each item's max drop amount + +//Ouch my toes! +#define CALTROP_BYPASS_SHOES 1 +#define CALTROP_IGNORE_WALKERS 2 diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 1e5599a998d..9d8ca0b3013 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -40,10 +40,12 @@ #define MAT_DIAMOND "$diamond" #define MAT_URANIUM "$uranium" #define MAT_PLASMA "$plasma" +#define MAT_BLUESPACE "$bluespace" #define MAT_BANANIUM "$bananium" #define MAT_TRANQUILLITE "$tranquillite" #define MAT_TITANIUM "$titanium" #define MAT_BIOMASS "$biomass" +#define MAT_PLASTIC "$plastic" //The amount of materials you get from a sheet of mineral like iron/diamond/glass etc #define MINERAL_MATERIAL_AMOUNT 2000 //The maximum size of a stack object. diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 0795d7bb78c..0ec1567f86d 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -22,6 +22,38 @@ #define BLOCK_GAS_SMOKE_EFFECT 8192 // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! #define THICKMATERIAL 8192 //prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with BLOCK_GAS_SMOKE_EFFECT) +#define DROPDEL 16384 // When dropped, it calls qdel on itself + + +/* Secondary atom flags, for the flags_2 var, denoted with a _2 */ + +#define SLOWS_WHILE_IN_HAND_2 1 +#define NO_EMP_WIRES_2 2 +#define HOLOGRAM_2 4 +#define FROZEN_2 8 +#define STATIONLOVING_2 16 +#define INFORM_ADMINS_ON_RELOCATE_2 32 +#define BANG_PROTECT_2 64 + +// An item worn in the ear slot with HEALS_EARS will heal your ears each +// Life() tick, even if normally your ears would be too damaged to heal. +#define HEALS_EARS_2 128 + +// A mob with OMNITONGUE has no restriction in the ability to speak +// languages that they know. So even if they wouldn't normally be able to +// through mob or tongue restrictions, this flag allows them to ignore +// those restrictions. +#define OMNITONGUE_2 256 + +// TESLA_IGNORE grants immunity from being targeted by tesla-style electricity +#define TESLA_IGNORE_2 512 + +// Stops you from putting things like an RCD or other items into an ORM or protolathe for materials. +#define NO_MAT_REDEMPTION_2 1024 + +// LAVA_PROTECT used on the flags_2 variable for both SUIT and HEAD items, and stops lava damage. Must be present in both to stop lava damage. +#define LAVA_PROTECT_2 2048 + //Reagent flags #define REAGENT_NOREACT 1 diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index b7ebec30f1e..5bc8ab5f5de 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -16,13 +16,13 @@ #define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable -#define is_pen(W) (istype(W, /obj/item/weapon/pen)) +#define is_pen(W) (istype(W, /obj/item/pen)) var/list/static/global/pointed_types = typecacheof(list( - /obj/item/weapon/pen, - /obj/item/weapon/screwdriver, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/kitchen/utensil/fork)) + /obj/item/pen, + /obj/item/screwdriver, + /obj/item/reagent_containers/syringe, + /obj/item/kitchen/utensil/fork)) #define is_pointed(W) (is_type_in_typecache(W, pointed_types)) @@ -43,6 +43,6 @@ var/list/static/global/pointed_types = typecacheof(list( // Misc #define isclient(A) istype(A, /client) -#define isradio(A) istype(A, /obj/item/device/radio) -#define ispill(A) istype(A, /obj/item/weapon/reagent_containers/food/pill) +#define isradio(A) istype(A, /obj/item/radio) +#define ispill(A) istype(A, /obj/item/reagent_containers/food/pill) diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 146d3bf27f0..160fa30a5c6 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -22,6 +22,7 @@ #define MECHFAB 16 //Remember, objects utilising this flag should have construction_time and construction_cost vars. #define PODFAB 32 //Used by the spacepod part fabricator. Same idea as the mechfab #define BIOGENERATOR 64 //Uses biomass +#define SMELTER 128 //uses various minerals //Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable. #define HYDRO_SPEED_MULTIPLIER 1 diff --git a/code/__DEFINES/qdel.dm b/code/__DEFINES/qdel.dm index 492918be671..14fd6ea0e36 100644 --- a/code/__DEFINES/qdel.dm +++ b/code/__DEFINES/qdel.dm @@ -1,11 +1,32 @@ //defines that give qdel hints. these can be given as a return in destory() or by calling + #define QDEL_HINT_QUEUE 0 //qdel should queue the object for deletion. #define QDEL_HINT_LETMELIVE 1 //qdel should let the object live after calling destory. #define QDEL_HINT_IWILLGC 2 //functionally the same as the above. qdel should assume the object will gc on its own, and not check it. +#define QDEL_HINT_HARDDEL 3 //qdel should assume this object won't gc, and queue a hard delete using a hard reference. #define QDEL_HINT_HARDDEL_NOW 4 //qdel should assume this object won't gc, and hard del it post haste. #define QDEL_HINT_FINDREFERENCE 5 //functionally identical to QDEL_HINT_QUEUE if TESTING is not enabled in _compiler_options.dm. //if TESTING is enabled, qdel will call this object's find_references() verb. +#define QDEL_HINT_IFFAIL_FINDREFERENCE 6 //Above but only if gc fails. +//defines for the gc_destroyed var -// A convenient wrapper around checking for qdeletion/non-existence -#define exists(A) (A && !qdeleted(A)) +#define GC_QUEUE_PREQUEUE 1 +#define GC_QUEUE_CHECK 2 +#define GC_QUEUE_HARDDELETE 3 +#define GC_QUEUE_COUNT 3 //increase this when adding more steps. + +#define GC_QUEUED_FOR_QUEUING -1 +#define GC_QUEUED_FOR_HARD_DEL -2 +#define GC_CURRENTLY_BEING_QDELETED -3 + +#define QDELING(X) (X.gc_destroyed) +#define QDELETED(X) (!X || QDELING(X)) +#define QDESTROYING(X) (!X || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) + +/proc/check_datum_qdeleted(datum/D) //for checking if something is a datum, first, then checking gc_destroyed; get rid of this eventually. TO-DO + if(!istype(D)) + return FALSE + if(D.gc_destroyed) + return TRUE + return FALSE \ No newline at end of file diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 602d3140849..f9dbff89d76 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -70,6 +70,7 @@ #define INIT_ORDER_STICKY_BAN -10 #define INIT_ORDER_LIGHTING -20 #define INIT_ORDER_SHUTTLE -21 +#define INIT_ORDER_NIGHTSHIFT -22 #define INIT_ORDER_SQUEAK -40 #define INIT_ORDER_PATH -50 #define INIT_ORDER_PERSISTENCE -100 @@ -77,6 +78,7 @@ // Subsystem fire priority, from lowest to highest priority // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child) +#define FIRE_PRIORITY_NIGHTSHIFT 10 #define FIRE_PRIORITY_IDLE_NPC 10 #define FIRE_PRIORITY_SERVER_MAINT 10 #define FIRE_PRIORITY_RESEARCH 10 diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm new file mode 100644 index 00000000000..0ed5dd944db --- /dev/null +++ b/code/__HELPERS/_logging.dm @@ -0,0 +1,185 @@ +//location of the rust-g library +#define RUST_G "rust_g" + +// On Linux/Unix systems the line endings are LF, on windows it's CRLF, admins that don't use notepad++ +// will get logs that are one big line if the system is Linux and they are using notepad. This solves it by adding CR to every line ending +// in the logs. ascii character 13 = CR + +/var/global/log_end = world.system_type == UNIX ? ascii2text(13) : "" + +#define DIRECT_OUTPUT(A, B) A << B +#define SEND_IMAGE(target, image) DIRECT_OUTPUT(target, image) +#define SEND_SOUND(target, sound) DIRECT_OUTPUT(target, sound) +#define SEND_TEXT(target, text) DIRECT_OUTPUT(target, text) +#define WRITE_FILE(file, text) DIRECT_OUTPUT(file, text) +#define WRITE_LOG(log, text) call(RUST_G, "log_write")(log, text) + +/proc/error(msg) + log_world("## ERROR: [msg]") + +//print a warning message to world.log +#define WARNING(MSG) warning("[MSG] in [__FILE__] at line [__LINE__] src: [src] usr: [usr].") +/proc/warning(msg) + log_world("## WARNING: [msg]") + +//print a testing-mode debug message to world.log and world +#ifdef TESTING +#define testing(msg) log_world("## TESTING: [msg]"); to_chat(world, "## TESTING: [msg]") +#else +#define testing(msg) +#endif + +/proc/log_admin(text) + admin_log.Add(text) + if(config.log_admin) + WRITE_LOG(GLOB.world_game_log, "ADMIN: [text][log_end]") + +/proc/log_debug(text) + if(config.log_debug) + WRITE_LOG(GLOB.world_game_log, "DEBUG: [text][log_end]") + + for(var/client/C in admins) + if(check_rights(R_DEBUG, 0, C.mob) && (C.prefs.toggles & CHAT_DEBUGLOGS)) + to_chat(C, "DEBUG: [text]") + +/proc/log_game(text) + if(config.log_game) + WRITE_LOG(GLOB.world_game_log, "GAME: [text][log_end]") + +/proc/log_vote(text) + if(config.log_vote) + WRITE_LOG(GLOB.world_game_log, "VOTE: [text][log_end]") + +/proc/log_access_in(client/new_client) + if(config.log_access) + var/message = "[key_name(new_client)] - IP:[new_client.address] - CID:[new_client.computer_id] - BYOND v[new_client.byond_version]" + WRITE_LOG(GLOB.world_game_log, "ACCESS IN: [message][log_end]") + +/proc/log_access_out(mob/last_mob) + if(config.log_access) + var/message = "[key_name(last_mob)] - IP:[last_mob.lastKnownIP] - CID:[last_mob.computer_id] - BYOND Logged Out" + WRITE_LOG(GLOB.world_game_log, "ACCESS OUT: [message][log_end]") + +/proc/log_say(text, mob/speaker) + if(config.log_say) + WRITE_LOG(GLOB.world_game_log, "SAY: [speaker.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_whisper(text, mob/speaker) + if(config.log_whisper) + WRITE_LOG(GLOB.world_game_log, "WHISPER: [speaker.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_ooc(text, client/user) + if(config.log_ooc) + WRITE_LOG(GLOB.world_game_log, "OOC: [user.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_aooc(text, client/user) + if(config.log_ooc) + WRITE_LOG(GLOB.world_game_log, "AOOC: [user.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_looc(text, client/user) + if(config.log_ooc) + WRITE_LOG(GLOB.world_game_log, "LOOC: [user.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_emote(text, mob/speaker) + if(config.log_emote) + WRITE_LOG(GLOB.world_game_log, "EMOTE: [speaker.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_attack(attacker, defender, message) + if(config.log_attack) + WRITE_LOG(GLOB.world_game_log, "ATTACK: [attacker] against [defender]: [message][log_end]") //Seperate attack logs? Why? + +/proc/log_adminsay(text, mob/speaker) + if(config.log_adminchat) + WRITE_LOG(GLOB.world_game_log, "ADMINSAY: [speaker.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_mentorsay(text, mob/speaker) + if(config.log_adminchat) + WRITE_LOG(GLOB.world_game_log, "MENTORSAY: [speaker.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_ghostsay(text, mob/speaker) + if(config.log_say) + WRITE_LOG(GLOB.world_game_log, "DEADCHAT: [speaker.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_ghostemote(text, mob/speaker) + if(config.log_emote) + WRITE_LOG(GLOB.world_game_log, "DEADEMOTE: [speaker.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_adminwarn(text) + if(config.log_adminwarn) + WRITE_LOG(GLOB.world_game_log, "ADMINWARN: [html_decode(text)][log_end]") + +/proc/log_pda(text, mob/speaker) + if(config.log_pda) + WRITE_LOG(GLOB.world_game_log, "PDA: [speaker.simple_info_line()]: [html_decode(text)][log_end]") + +/proc/log_chat(text, mob/speaker) + if(config.log_pda) + WRITE_LOG(GLOB.world_game_log, "CHAT: [speaker.simple_info_line()] [html_decode(text)][log_end]") + +/proc/log_misc(text) + WRITE_LOG(GLOB.world_game_log, "MISC: [text][log_end]") + +/proc/log_world(text) + SEND_TEXT(world.log, text) + if(config && config.log_world_output) + WRITE_LOG(GLOB.world_game_log, "WORLD: [html_decode(text)][log_end]") + +/proc/log_runtime_txt(text) // different from /tg/'s log_runtime because our error handler has a log_runtime proc already that does other stuff + WRITE_LOG(GLOB.world_runtime_log, text) + +/proc/log_config(text) + WRITE_LOG(GLOB.config_error_log, text) + SEND_TEXT(world.log, text) + +/proc/log_href(text) + WRITE_LOG(GLOB.world_href_log, "HREF: [html_decode(text)]") + +/** + * Standardized method for tracking startup times. + */ +/proc/log_startup_progress(var/message) + to_chat(world, "[message]") + log_world(message) + +// A logging proc that only outputs after setup is done, to +// help devs test initialization stuff that happens a lot +/proc/log_after_setup(var/message) + if(ticker && ticker.current_state > GAME_STATE_SETTING_UP) + to_chat(world, "[message]") + log_world(message) + +/* For logging round startup. */ +/proc/start_log(log) + WRITE_LOG(log, "Starting up.\n-------------------------") + +/* Close open log handles. This should be called as late as possible, and no logging should hapen after. */ +/proc/shutdown_logging() + call(RUST_G, "log_close_all")() + +// Helper procs for building detailed log lines + +/proc/datum_info_line(var/datum/d) + if(!istype(d)) + return + if(!istype(d, /mob)) + return "[d] ([d.type])" + var/mob/m = d + return "[m] ([m.ckey]) ([m.type])" + +/proc/atom_loc_line(var/atom/a) + if(!istype(a)) + return + var/turf/t = get_turf(a) + if(istype(t)) + return "[a.loc] ([t.x],[t.y],[t.z]) ([a.loc.type])" + else if(a.loc) + return "[a.loc] (0,0,0) ([a.loc.type])" + +/mob/proc/simple_info_line() + return "[key_name(src)] ([x],[y],[z])" + +/client/proc/simple_info_line() + return "[key_name(src)] ([mob.x],[mob.y],[mob.z])" + +//this is only used here (for now) +#undef RUST_G \ No newline at end of file diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index 2b02c212659..4b97b67e27e 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -31,6 +31,15 @@ /proc/cmp_subsystem_priority(datum/controller/subsystem/a, datum/controller/subsystem/b) return a.priority - b.priority +/proc/cmp_qdel_item_time(datum/qdel_item/A, datum/qdel_item/B) + . = B.hard_delete_time - A.hard_delete_time + if(!.) + . = B.destroy_time - A.destroy_time + if(!.) + . = B.failures - A.failures + if(!.) + . = B.qdels - A.qdels + /proc/cmp_atom_layer_asc(atom/A,atom/B) if(A.plane != B.plane) return A.plane - B.plane diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 082d473010d..2004b9d3159 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -137,9 +137,9 @@ if(sight_check && !isInSight(A, O)) continue L |= M - //log_to_dd("[recursion_limit] = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])") + //log_world("[recursion_limit] = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])") - else if(include_radio && istype(A, /obj/item/device/radio)) + else if(include_radio && istype(A, /obj/item/radio)) if(sight_check && !isInSight(A, O)) continue L |= A @@ -167,8 +167,8 @@ var/mob/M = A if(M.client || include_clientless) hear += M - //log_to_dd("Start = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])") - else if(istype(A, /obj/item/device/radio)) + //log_world("Start = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])") + else if(istype(A, /obj/item/radio)) hear += A if(isobj(A) || ismob(A)) @@ -177,17 +177,17 @@ return hear -/proc/get_mobs_in_radio_ranges(var/list/obj/item/device/radio/radios) +/proc/get_mobs_in_radio_ranges(var/list/obj/item/radio/radios) set background = 1 . = list() // Returns a list of mobs who can hear any of the radios given in @radios var/list/speaker_coverage = list() - for(var/obj/item/device/radio/R in radios) + for(var/obj/item/radio/R in radios) if(R) //Cyborg checks. Receiving message uses a bit of cyborg's charge. - var/obj/item/device/radio/borg/BR = R + var/obj/item/radio/borg/BR = R if(istype(BR) && BR.myborg) var/mob/living/silicon/robot/borg = BR.myborg var/datum/robot_component/CO = borg.get_component("radio") diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 43dcaa1c75d..d0e1feb3d62 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -50,8 +50,6 @@ init_subtypes(/datum/crafting_recipe, crafting_recipes) - all_cults = typesof(/datum/cult_info) - return 1 /* // Uncomment to debug chemical reaction list. diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index cc4b5459aa0..27ec6e7202f 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -109,7 +109,7 @@ return adjacencies /proc/smooth_icon(atom/A) - if(qdeleted(A)) + if(QDELETED(A)) return if(A && (A.smooth & SMOOTH_TRUE) || (A.smooth & SMOOTH_MORE)) var/adjacencies = calculate_adjacencies(A) diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index 799f94feebb..071c1afa202 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -416,7 +416,7 @@ //Don't use this on lists larger than half a dozen or so /proc/insertion_sort_numeric_list_ascending(var/list/L) - //log_to_dd("ascending len input: [L.len]") + //log_world("ascending len input: [L.len]") var/list/out = list(pop(L)) for(var/entry in L) if(isnum(entry)) @@ -429,13 +429,13 @@ if(!success) out.Add(entry) - //log_to_dd(" output: [out.len]") + //log_world(" output: [out.len]") return out /proc/insertion_sort_numeric_list_descending(var/list/L) - //log_to_dd("descending len input: [L.len]") + //log_world("descending len input: [L.len]") var/list/out = insertion_sort_numeric_list_ascending(L) - //log_to_dd(" output: [out.len]") + //log_world(" output: [out.len]") return reverselist(out) //Copies a list, and all lists inside it recusively diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm deleted file mode 100644 index 5b16083dbf2..00000000000 --- a/code/__HELPERS/logging.dm +++ /dev/null @@ -1,128 +0,0 @@ -//print an error message to world.log - -// On Linux/Unix systems the line endings are LF, on windows it's CRLF, admins that don't use notepad++ -// will get logs that are one big line if the system is Linux and they are using notepad. This solves it by adding CR to every line ending -// in the logs. ascii character 13 = CR - -/var/global/log_end= world.system_type == UNIX ? ascii2text(13) : "" - - -/proc/error(msg) - log_to_dd("## ERROR: [msg]") - -#define WARNING(MSG) warning("[MSG] in [__FILE__] at line [__LINE__] src: [src] usr: [usr].") -//print a warning message to world.log -/proc/warning(msg) - log_to_dd("## WARNING: [msg]") - -//print a testing-mode debug message to world.log -/proc/testing(msg) - log_to_dd("## TESTING: [msg]") - -/proc/log_admin(text) - admin_log.Add(text) - if(config.log_admin) - diary << "\[[time_stamp()]]ADMIN: [text]" - - -/proc/log_debug(text) - if(config.log_debug) - diary << "\[[time_stamp()]]DEBUG: [text]" - - for(var/client/C in admins) - if(check_rights(R_DEBUG, 0, C.mob) && (C.prefs.toggles & CHAT_DEBUGLOGS)) - to_chat(C, "DEBUG: [text]") - - -/proc/log_game(text) - if(config.log_game) - diary << "\[[time_stamp()]]GAME: [text]" - -/proc/log_vote(text) - if(config.log_vote) - diary << "\[[time_stamp()]]VOTE: [text]" - -/proc/log_access(text) - if(config.log_access) - diary << "\[[time_stamp()]]ACCESS: [text]" - -/proc/log_say(text) - if(config.log_say) - diary << "\[[time_stamp()]]SAY: [text]" - -/proc/log_robot(text) - if(config.log_say) - diary << "\[[time_stamp()]]ROBOT: [text]" - -/proc/log_ooc(text) - if(config.log_ooc) - diary << "\[[time_stamp()]]OOC: [text]" - -/proc/log_whisper(text) - if(config.log_whisper) - diary << "\[[time_stamp()]]WHISPER: [text]" - -/proc/log_emote(text) - if(config.log_emote) - diary << "\[[time_stamp()]]EMOTE: [text]" - -/proc/log_attack(text) - if(config.log_attack) - diary << "\[[time_stamp()]]ATTACK: [text]" //Seperate attack logs? Why? - -/proc/log_adminsay(text) - if(config.log_adminchat) - diary << "\[[time_stamp()]]ADMINSAY: [text]" - -/proc/log_adminwarn(text) - if(config.log_adminwarn) - diary << "\[[time_stamp()]]ADMINWARN: [text]" - -/proc/log_pda(text) - if(config.log_pda) - diary << "\[[time_stamp()]]PDA: [text][log_end]" - -/proc/log_chat(text) - if (config.log_pda) - diary << "\[[time_stamp()]]CHAT: [text]" - -/proc/log_misc(text) - diary << "\[[time_stamp()]]MISC: [text][log_end]" - -/proc/log_to_dd(text) - world.log << text - if(config && config.log_world_output) - diary << "\[[time_stamp()]]DD_OUTPUT: [text][log_end]" - -/** - * Standardized method for tracking startup times. - */ -/proc/log_startup_progress(var/message) - to_chat(world, "[message]") - log_to_dd(message) - -// A logging proc that only outputs after setup is done, to -// help devs test initialization stuff that happens a lot -/proc/log_after_setup(var/message) - if(ticker && ticker.current_state > GAME_STATE_SETTING_UP) - to_chat(world, "[message]") - log_to_dd(message) - -// Helper procs for building detailed log lines - -/proc/datum_info_line(var/datum/d) - if(!istype(d)) - return - if(!istype(d, /mob)) - return "[d] ([d.type])" - var/mob/m = d - return "[m] ([m.ckey]) ([m.type])" - -/proc/atom_loc_line(var/atom/a) - if(!istype(a)) - return - var/turf/t = get_turf(a) - if(istype(t)) - return "[a.loc] ([t.x],[t.y],[t.z]) ([a.loc.type])" - else if(a.loc) - return "[a.loc] (0,0,0) ([a.loc.type])" diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 94b7a9b4255..7f7b9715907 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -243,30 +243,28 @@ proc/age2agedescription(age) Proc for attack log creation, because really why not 1 argument is the actor 2 argument is the target of action -3 is the description of action(like punched, throwed, or any other verb) -4 is the tool with which the action was made(usually item) -5 is additional information, anything that needs to be added -6 is whether the attack should be logged to the log file and shown to admins +3 is the full description of the action +4 is whether or not to message admins +This is always put in the attack log. */ -proc/add_logs(mob/user, mob/target, what_done, var/object=null, var/addition=null, var/admin=1, var/print_attack_log = 1)//print_attack_log notifies admins with attack logs on - var/list/ignore=list("shaked", "CPRed", "grabbed", "disarmed") - if(!user) +/proc/add_attack_logs(mob/user, mob/target, what_done, admin_notify = TRUE) + if(islist(target)) // Multi-victim adding + var/list/targets = target + for(var/mob/M in targets) + add_attack_logs(user, M, what_done, admin_notify) return - if(ismob(user)) - user.create_attack_log("Has [what_done] [key_name(target)][object ? " with [object]" : " "][addition]") - if(ismob(target)) - target.create_attack_log("Has been [what_done] by [key_name(user)][object ? " with [object]" : " "][addition]") - if(admin) - log_attack("[key_name(user)] [what_done] [key_name(target)][object ? " with [object]" : " "][addition]") - if(istype(target) && (target.key)) - if(what_done in ignore) - return - if(target == user) - return - if(!print_attack_log) - return - msg_admin_attack("[key_name_admin(user)] [what_done] [key_name_admin(target)][object ? " with [object]" : " "][addition]") + + var/user_str = key_name(user) + var/target_str = key_name(target) + + if(istype(user)) + user.create_attack_log("Attacked [target_str]: [what_done]") + if(istype(target)) + target.create_attack_log("Attacked by [user_str]: [what_done]") + log_attack(user_str, target_str, what_done) + if(admin_notify) + msg_admin_attack("[key_name_admin(user)] vs [key_name_admin(target)]: [what_done]") /proc/do_mob(var/mob/user, var/mob/target, var/time = 30, var/uninterruptible = 0, progress = 1, datum/callback/extra_checks = null) if(!user || !target) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index ef2f8578783..54c79d26a7f 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -452,7 +452,7 @@ proc/checkhtml(var/t) // Pencode -/proc/pencode_to_html(text, mob/user, obj/item/weapon/pen/P = null, format = 1, sign = 1, fields = 1, deffont = PEN_FONT, signfont = SIGNFONT, crayonfont = CRAYON_FONT) +/proc/pencode_to_html(text, mob/user, obj/item/pen/P = null, format = 1, sign = 1, fields = 1, deffont = PEN_FONT, signfont = SIGNFONT, crayonfont = CRAYON_FONT) text = replacetext(text, "\[b\]", "") text = replacetext(text, "\[/b\]", "") text = replacetext(text, "\[i\]", "") @@ -505,7 +505,7 @@ proc/checkhtml(var/t) text = replacetext(text, "\[row\]", "
")
- text = replacetext(text, "\[time\]", "[gameTimestamp()]") // TO DO
+ text = replacetext(text, "\[time\]", "[station_time_timestamp()]") // TO DO
if(P)
text = "[text]"
else
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 6d28c2c0cd4..b47e60275e8 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -1,7 +1,15 @@
// So you can be all 10 SECONDS
#define SECONDS *10
-#define MINUTES *600
-#define HOURS *36000
+
+#define MINUTES SECONDS*60
+
+#define HOURS MINUTES*60
+
+#define TICKS *world.tick_lag
+
+#define DS2TICKS(DS) ((DS)/world.tick_lag)
+
+#define TICKS2DS(T) ((T) TICKS)
#define TimeOfGame (get_game_time())
#define TimeOfTick (world.tick_usage*0.01*world.tick_lag)
@@ -22,16 +30,39 @@
return wtime + (time_offset + wusage) * world.tick_lag
-//Returns the world time in english
-/proc/worldtime2text(time = world.time)
+/* This proc should only be used for world/Topic.
+ * If you want to display the time for which dream daemon has been running ("round time") use worldtime2text.
+ * If you want to display the canonical station "time" (aka the in-character time of the station) use station_time_timestamp
+ */
+/proc/classic_worldtime2text(time = world.time)
time = (round_start_time ? (time - round_start_time) : (time - world.time))
return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]"
-/proc/time_stamp()
- return time2text(world.timeofday, "hh:mm:ss")
+//Returns the world time in english
+/proc/worldtime2text()
+ return gameTimestamp("hh:mm:ss", world.time)
-/proc/gameTimestamp(format = "hh:mm:ss") // Get the game time in text
- return time2text(world.time - timezoneOffset + 432000, format)
+// This is ISO-8601
+// If anything that uses this proc shouldn't be ISO-8601, change that thing, not this proc. This is important for logging.
+/proc/time_stamp()
+ var/date_portion = time2text(world.timeofday, "YYYY-MM-DD")
+ var/time_portion = time2text(world.timeofday, "hh:mm:ss")
+ return "[date_portion]T[time_portion]"
+
+/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
+ if(!wtime)
+ wtime = world.time
+ return time2text(wtime - GLOB.timezoneOffset, format)
+
+/* This is used for displaying the "station time" equivelent of a world.time value
+ Calling it with no args will give you the current time, but you can specify a world.time-based value as an argument
+ - You can use this, for example, to do "This will expire at [station_time_at(world.time + 500)]" to display a "station time" expiration date
+ which is much more useful for a player)*/
+/proc/station_time(time=world.time, display_only=FALSE)
+ return ((((time - round_start_time)) + GLOB.gametime_offset) % 864000) - (display_only ? GLOB.timezoneOffset : 0)
+
+/proc/station_time_timestamp(format = "hh:mm:ss", time=world.time)
+ return time2text(station_time(time, TRUE), format)
/* Returns 1 if it is the selected month and day */
proc/isDay(var/month, var/day)
@@ -172,4 +203,4 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
/proc/update_midnight_rollover()
if(world.timeofday < GLOB.rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS!
return GLOB.midnight_rollovers++
- return GLOB.midnight_rollovers
\ No newline at end of file
+ return GLOB.midnight_rollovers
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 569c17d1dbe..f90a9c4e5ad 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -364,4 +364,19 @@
value = splittext(value, "]") //"name]!" --> list("name","!")
for(var/A in value)
if(var_source.vars.Find(A))
- . += A
\ No newline at end of file
+ . += A
+
+/proc/type2parent(child)
+ var/string_type = "[child]"
+ var/last_slash = findlasttext(string_type, "/")
+ if(last_slash == 1)
+ switch(child)
+ if(/datum)
+ return null
+ if(/obj || /mob)
+ return /atom/movable
+ if(/area || /turf)
+ return /atom
+ else
+ return /datum
+ return text2path(copytext(string_type, 1, last_slash))
\ No newline at end of file
diff --git a/code/__HELPERS/unique_ids.dm b/code/__HELPERS/unique_ids.dm
index f6f9393d937..1e9c699dcb9 100644
--- a/code/__HELPERS/unique_ids.dm
+++ b/code/__HELPERS/unique_ids.dm
@@ -16,7 +16,6 @@
var/global/next_unique_datum_id = 1
-/datum/var/tmp/unique_datum_id = null
/client/var/tmp/unique_datum_id = null
/datum/proc/UID()
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index c4d210088fd..b58ea20dbae 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1088,12 +1088,12 @@ var/list/can_embed_types = typecacheof(list(
//Quick type checks for some tools
var/global/list/common_tools = list(
/obj/item/stack/cable_coil,
-/obj/item/weapon/wrench,
-/obj/item/weapon/weldingtool,
-/obj/item/weapon/screwdriver,
-/obj/item/weapon/wirecutters,
-/obj/item/device/multitool,
-/obj/item/weapon/crowbar)
+/obj/item/wrench,
+/obj/item/weldingtool,
+/obj/item/screwdriver,
+/obj/item/wirecutters,
+/obj/item/multitool,
+/obj/item/crowbar)
/proc/istool(O)
if(O && is_type_in_list(O, common_tools))
@@ -1101,12 +1101,12 @@ var/global/list/common_tools = list(
return 0
/proc/iswrench(O)
- if(istype(O, /obj/item/weapon/wrench))
+ if(istype(O, /obj/item/wrench))
return 1
return 0
/proc/iswelder(O)
- if(istype(O, /obj/item/weapon/weldingtool))
+ if(istype(O, /obj/item/weldingtool))
return 1
return 0
@@ -1116,22 +1116,22 @@ var/global/list/common_tools = list(
return 0
/proc/iswirecutter(O)
- if(istype(O, /obj/item/weapon/wirecutters))
+ if(istype(O, /obj/item/wirecutters))
return 1
return 0
/proc/isscrewdriver(O)
- if(istype(O, /obj/item/weapon/screwdriver))
+ if(istype(O, /obj/item/screwdriver))
return 1
return 0
/proc/ismultitool(O)
- if(istype(O, /obj/item/device/multitool))
+ if(istype(O, /obj/item/multitool))
return 1
return 0
/proc/iscrowbar(O)
- if(istype(O, /obj/item/weapon/crowbar))
+ if(istype(O, /obj/item/crowbar))
return 1
return 0
@@ -1141,20 +1141,20 @@ var/global/list/common_tools = list(
return 0
/proc/is_hot(obj/item/W as obj)
- if(istype(W, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/O = W
+ if(istype(W, /obj/item/weldingtool))
+ var/obj/item/weldingtool/O = W
if(O.isOn())
return 3800
else
return 0
- if(istype(W, /obj/item/weapon/lighter))
- var/obj/item/weapon/lighter/O = W
+ if(istype(W, /obj/item/lighter))
+ var/obj/item/lighter/O = W
if(O.lit)
return 1500
else
return 0
- if(istype(W, /obj/item/weapon/match))
- var/obj/item/weapon/match/O = W
+ if(istype(W, /obj/item/match))
+ var/obj/item/match/O = W
if(O.lit == 1)
return 1000
else
@@ -1171,21 +1171,21 @@ var/global/list/common_tools = list(
return 1000
else
return 0
- if(istype(W, /obj/item/device/flashlight/flare))
- var/obj/item/device/flashlight/flare/O = W
+ if(istype(W, /obj/item/flashlight/flare))
+ var/obj/item/flashlight/flare/O = W
if(O.on)
return 1000
else
return 0
- if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
+ if(istype(W, /obj/item/gun/energy/plasmacutter))
return 3800
- if(istype(W, /obj/item/weapon/melee/energy))
- var/obj/item/weapon/melee/energy/O = W
+ if(istype(W, /obj/item/melee/energy))
+ var/obj/item/melee/energy/O = W
if(O.active)
return 3500
else
return 0
- if(istype(W, /obj/item/device/assembly/igniter))
+ if(istype(W, /obj/item/assembly/igniter))
return 1000
else
return 0
@@ -1200,12 +1200,12 @@ var/global/list/common_tools = list(
/proc/is_surgery_tool(obj/item/W as obj)
return ( \
- istype(W, /obj/item/weapon/scalpel) || \
- istype(W, /obj/item/weapon/hemostat) || \
- istype(W, /obj/item/weapon/retractor) || \
- istype(W, /obj/item/weapon/cautery) || \
- istype(W, /obj/item/weapon/bonegel) || \
- istype(W, /obj/item/weapon/bonesetter)
+ istype(W, /obj/item/scalpel) || \
+ istype(W, /obj/item/hemostat) || \
+ istype(W, /obj/item/retractor) || \
+ istype(W, /obj/item/cautery) || \
+ istype(W, /obj/item/bonegel) || \
+ istype(W, /obj/item/bonesetter)
)
//check if mob is lying down on something we can operate him on.
@@ -1239,11 +1239,11 @@ var/global/list/common_tools = list(
Checks if that loc and dir has a item on the wall
*/
var/list/static/global/wall_items = typecacheof(list(/obj/machinery/power/apc, /obj/machinery/alarm,
- /obj/item/device/radio/intercom, /obj/structure/extinguisher_cabinet, /obj/structure/reagent_dispensers/peppertank,
+ /obj/item/radio/intercom, /obj/structure/extinguisher_cabinet, /obj/structure/reagent_dispensers/peppertank,
/obj/machinery/status_display, /obj/machinery/requests_console, /obj/machinery/light_switch, /obj/structure/sign,
/obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/door_control,
/obj/machinery/computer/security/telescreen, /obj/machinery/embedded_controller/radio/airlock,
- /obj/item/weapon/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth,
+ /obj/item/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth,
/obj/structure/mirror, /obj/structure/closet/fireaxecabinet, /obj/machinery/computer/security/telescreen/entertainment,
/obj/structure/sign))
@@ -1482,13 +1482,13 @@ var/mob/dview/dview_mob = new
/mob/dview/New() //For whatever reason, if this isn't called, then BYOND will throw a type mismatch runtime when attempting to add this to the mobs list. -Fox
-/proc/IsValidSrc(var/A)
+/proc/IsValidSrc(A)
if(istype(A, /datum))
- var/datum/B = A
- return isnull(B.gcDestroyed)
+ var/datum/D = A
+ return !QDELETED(D)
if(istype(A, /client))
- return 1
- return 0
+ return TRUE
+ return FALSE
//Get the dir to the RIGHT of dir if they were on a clock
@@ -1751,13 +1751,13 @@ var/mob/dview/dview_mob = new
var/typename = "[type]"
var/static/list/TYPES_SHORTCUTS = list(
/obj/effect/decal/cleanable = "CLEANABLE",
- /obj/item/device/radio/headset = "HEADSET",
+ /obj/item/radio/headset = "HEADSET",
/obj/item/clothing/head/helmet/space = "SPESSHELMET",
- /obj/item/weapon/book/manual = "MANUAL",
- /obj/item/weapon/reagent_containers/food/drinks = "DRINK", //longest paths comes first
- /obj/item/weapon/reagent_containers/food = "FOOD",
- /obj/item/weapon/reagent_containers = "REAGENT_CONTAINERS",
- /obj/item/weapon = "WEAPON",
+ /obj/item/book/manual = "MANUAL",
+ /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+ /obj/item/reagent_containers/food = "FOOD",
+ /obj/item/reagent_containers = "REAGENT_CONTAINERS",
+ /obj/item = "WEAPON",
/obj/machinery/atmospherics = "ATMOS_MECH",
/obj/machinery/portable_atmospherics = "PORT_ATMOS",
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 5e9d9462d7f..c6b63b77271 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -1,6 +1,14 @@
#define DEBUG
//#define TESTING
+#ifdef TESTING
+//#define GC_FAILURE_HARD_LOOKUP //makes paths that fail to GC call find_references before del'ing.
+ //implies FIND_REF_NO_CHECK_TICK
+
+//#define FIND_REF_NO_CHECK_TICK //Sets world.loop_checks to false and prevents find references from sleeping
+
+#endif
+
#define IS_MODE_COMPILED(MODE) (ispath(text2path("/datum/game_mode/"+(MODE))))
#define BACKGROUND_ENABLED 0 // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm
index a6b78bce94c..148488a6ddf 100644
--- a/code/_globalvars/lists/misc.dm
+++ b/code/_globalvars/lists/misc.dm
@@ -30,3 +30,5 @@ var/list/round_end_sounds = list( // Maps available round end sounds to their du
'sound/goonstation/misc/newround1.ogg' = 6.9 SECONDS,
'sound/goonstation/misc/newround2.ogg' = 14.8 SECONDS
)
+
+GLOBAL_LIST(station_level_space_turfs)
\ No newline at end of file
diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm
index 7042cbe932a..30809943a8a 100644
--- a/code/_globalvars/lists/reagents.dm
+++ b/code/_globalvars/lists/reagents.dm
@@ -55,7 +55,7 @@ var/global/list/blocked_chems = list("polonium", "initropidril", "concentrated_i
"syndicate_nanites", "ripping_tendrils", "boiling_oil",
"envenomed_filaments", "lexorin_jelly", "kinetic",
"cryogenic_liquid", "dark_matter", "b_sorium",
- "reagent", "life","dragonsbreath")
+ "reagent", "life","dragonsbreath", "nanocalcium")
var/global/list/safe_chem_list = list("antihol", "charcoal", "epinephrine", "insulin", "teporone","silver_sulfadiazine", "salbutamol",
"omnizine", "stimulants", "synaptizine", "potass_iodide", "oculine", "mannitol", "styptic_powder",
diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm
index e4223fcee55..f96e83cb7a1 100644
--- a/code/_globalvars/logging.dm
+++ b/code/_globalvars/logging.dm
@@ -1,6 +1,13 @@
-var/diary = null
-var/diaryofmeanpeople = null
-var/href_logfile = null
+GLOBAL_VAR(log_directory)
+GLOBAL_PROTECT(log_directory)
+GLOBAL_VAR(world_game_log)
+GLOBAL_PROTECT(world_game_log)
+GLOBAL_VAR(config_error_log)
+GLOBAL_PROTECT(config_error_log)
+GLOBAL_VAR(world_runtime_log)
+GLOBAL_PROTECT(world_runtime_log)
+GLOBAL_VAR(world_href_log)
+GLOBAL_PROTECT(world_href_log)
var/list/jobMax = list()
var/list/bombers = list( )
@@ -13,4 +20,4 @@ var/list/IClog = list()
var/list/OOClog = list()
var/list/adminlog = list()
-var/list/investigate_log_subjects = list("notes", "watchlist", "hrefs")
+var/list/investigate_log_subjects = list("notes", "watchlist", "hrefs")
\ No newline at end of file
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index 15a61078514..b4f004c8e49 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -5,8 +5,8 @@ var/global/obj/effect/overlay/icemaster = null
// Event Manager, the manager for events.
var/datum/event_manager/event_manager = new()
// Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it.
-var/global/obj/item/device/radio/intercom/global_announcer = create_global_announcer()
-var/global/obj/item/device/radio/intercom/command/command_announcer = create_command_announcer()
+var/global/obj/item/radio/intercom/global_announcer = create_global_announcer()
+var/global/obj/item/radio/intercom/command/command_announcer = create_command_announcer()
// Load order issues means this can't be new'd until other code runs
// This is probably not the way I should be doing this, but I don't know how to do it right!
proc/create_global_announcer()
@@ -72,8 +72,10 @@ var/score_dmgestkey = null
var/TAB = " "
-var/timezoneOffset = 0 // The difference betwen midnight (of the host computer) and 0 world.ticks.
+GLOBAL_VAR_INIT(timezoneOffset, 0) // The difference betwen midnight (of the host computer) and 0 world.ticks.
// For FTP requests. (i.e. downloading runtime logs.)
// However it'd be ok to use for accessing attack logs and such too, which are even laggier.
-var/fileaccess_timer = 0
\ No newline at end of file
+var/fileaccess_timer = 0
+
+GLOBAL_VAR_INIT(gametime_offset, 432000) // 12:00 in seconds
\ No newline at end of file
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index 16ee49696bc..d88ff6201f8 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -39,7 +39,7 @@
if(pixel_turf)
turf_visible = cameranet.checkTurfVis(pixel_turf)
if(!turf_visible)
- if(istype(loc, /obj/item/device/aicard) && (pixel_turf in view(client.view, loc)))
+ if(istype(loc, /obj/item/aicard) && (pixel_turf in view(client.view, loc)))
turf_visible = TRUE
else
if(pixel_turf.obscured)
diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm
index df5cc6a4214..5fb4757a74f 100644
--- a/code/_onclick/click_override.dm
+++ b/code/_onclick/click_override.dm
@@ -18,14 +18,14 @@
/* Note, when making a new click override it is ABSOLUTELY VITAL that you set the source's clickOverride to null at some point if you don't want them to be stuck with it forever.
Calling the super will do this for you automatically, but if you want a click override to NOT clear itself after the first click, you must do it at some other point in the code*/
-/obj/item/weapon/badminBook/
+/obj/item/badminBook/
name = "old book"
desc = "An old, leather bound tome."
icon = 'icons/obj/library.dmi'
icon_state = "book"
var/datum/middleClickOverride/clickBehavior = new /datum/middleClickOverride/badminClicker
-/obj/item/weapon/badminBook/attack_self(mob/living/user as mob)
+/obj/item/badminBook/attack_self(mob/living/user as mob)
if(user.middleClickOverride)
to_chat(user, "You try to draw power from the [src], but you cannot hold the power at this time!")
return
@@ -33,7 +33,7 @@
to_chat(user, "You draw a bit of power from the [src], you can use middle click or alt click to release the power!")
/datum/middleClickOverride/badminClicker
- var/summon_path = /obj/item/weapon/reagent_containers/food/snacks/cookie
+ var/summon_path = /obj/item/reagent_containers/food/snacks/cookie
/datum/middleClickOverride/badminClicker/onClick(var/atom/A, var/mob/living/user)
var/atom/movable/newObject = new summon_path
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 0fb97f4dc46..803901ae668 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -433,7 +433,7 @@ so as to remain in compliance with the most up-to-date laws."
desc = "Someone is trying to capture your soul in a soul stone. Click to allow it."
icon_state = "template"
timeout = 10 SECONDS
- var/obj/item/device/soulstone/stone = null
+ var/obj/item/soulstone/stone = null
var/stoner = null
/obj/screen/alert/notify_soulstone/Click()
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 545dcfd0380..5bf3a483cd8 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -36,8 +36,8 @@
/obj/screen/close/Click()
if(master)
- if(istype(master, /obj/item/weapon/storage))
- var/obj/item/weapon/storage/S = master
+ if(istype(master, /obj/item/storage))
+ var/obj/item/storage/S = master
S.close(usr)
return 1
@@ -53,7 +53,7 @@
name = "grab"
/obj/screen/grab/Click()
- var/obj/item/weapon/grab/G = master
+ var/obj/item/grab/G = master
G.s_click(src)
return 1
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 58b12ed8857..6a658886f83 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -2,7 +2,7 @@
if(pre_attackby(target, user, params))
// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
var/resolved = target.attackby(src, user, params)
- if(!resolved && target && !qdeleted(src))
+ if(!resolved && target && !QDELETED(src))
afterattack(target, user, 1, params) // 1: clicking something Adjacent
// Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown.
@@ -14,10 +14,10 @@
// No comment
/atom/proc/attackby(obj/item/W, mob/user, params)
- return
+ return SendSignal(COMSIG_PARENT_ATTACKBY, W, user, params)
/obj/attackby(obj/item/I, mob/living/user, params)
- return I.attack_obj(src, user)
+ return ..() || I.attack_obj(src, user)
/mob/living/attackby(obj/item/I, mob/living/user, params)
user.changeNext_move(CLICK_CD_MELEE)
@@ -66,7 +66,7 @@
user.do_attack_animation(M)
M.attacked_by(src, user, def_zone)
- add_logs(user, M, "attacked", name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", print_attack_log = (force > 0))//print it if stuff deals damage
+ add_attack_logs(user, M, "Attacked with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])", admin_notify = (force > 0 && damtype != STAMINA))
add_fingerprint(user)
diff --git a/code/_onclick/rig.dm b/code/_onclick/rig.dm
index 41bf57a14f8..ff55f35cb57 100644
--- a/code/_onclick/rig.dm
+++ b/code/_onclick/rig.dm
@@ -54,10 +54,10 @@
return 1
/mob/living/carbon/brain/can_use_rig()
- return istype(loc, /obj/item/device/mmi)
+ return istype(loc, /obj/item/mmi)
/mob/living/silicon/ai/can_use_rig()
- return istype(loc, /obj/item/device/aicard)
+ return istype(loc, /obj/item/aicard)
/mob/living/silicon/pai/can_use_rig()
return loc == card
@@ -65,11 +65,11 @@
/mob/living/proc/HardsuitClickOn(var/atom/A, var/alert_ai = 0)
if(!can_use_rig() || (next_move > world.time))
return 0
- var/obj/item/weapon/rig/rig = get_rig()
+ var/obj/item/rig/rig = get_rig()
if(istype(rig) && !rig.offline && rig.selected_module)
if(src != rig.wearer)
if(rig.ai_can_move_suit(src, check_user_module = 1))
- message_admins("[key_name_admin(src, include_name = 1)] is trying to force \the [key_name_admin(rig.wearer, include_name = 1)] to use a hardsuit module.")
+ message_admins("[key_name_admin(src)] is trying to force \the [key_name_admin(rig.wearer)] to use a hardsuit module.")
else
return 0
rig.selected_module.engage(A, alert_ai)
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 02c2954b61f..5ab67ffb611 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -62,9 +62,9 @@ var/const/tk_maxrange = 15
desc = "Magic"
icon = 'icons/obj/magic.dmi'//Needs sprites
icon_state = "2"
- flags = NOBLUDGEON | ABSTRACT
+ flags = NOBLUDGEON | ABSTRACT | DROPDEL
//item_state = null
- w_class = 10
+ w_class = WEIGHT_CLASS_GIGANTIC
layer = 20
plane = HUD_PLANE
@@ -82,9 +82,8 @@ var/const/tk_maxrange = 15
/obj/item/tk_grab/dropped(mob/user)
if(focus && user && loc != user && loc != user.loc) // drop_item() gets called when you tk-attack a table/closet with an item
if(focus.Adjacent(loc))
- focus.loc = loc
-
- qdel(src)
+ focus.forceMove(loc)
+ . = ..()
//stops TK grabs being equipped anywhere but into hands
diff --git a/code/controllers/ProcessScheduler/core/process.dm b/code/controllers/ProcessScheduler/core/process.dm
index 4fc377e9e37..134eaec96a6 100644
--- a/code/controllers/ProcessScheduler/core/process.dm
+++ b/code/controllers/ProcessScheduler/core/process.dm
@@ -386,14 +386,14 @@
if(istype(thrower, /atom))
var/atom/A = thrower
ptext += " ([A]) ([A.x],[A.y],[A.z])"
- log_to_dd("\[[time_stamp()]\] Process [name] caught exception[ptext]: [etext]")
+ log_world("\[[time_stamp()]\] Process [name] caught exception[ptext]: [etext]")
if(exceptions[eid] >= 10)
- log_to_dd("This exception will now be ignored for ten minutes.")
+ log_world("This exception will now be ignored for ten minutes.")
spawn(6000)
exceptions[eid] = 0
/datum/controller/process/proc/catchBadType(var/datum/caught)
- if(isnull(caught) || !istype(caught) || !isnull(caught.gcDestroyed))
+ if(isnull(caught) || !istype(caught) || QDELETED(caught))
return // Only bother with types we can identify and that don't belong
catchException("Type [caught.type] does not belong in process' queue")
diff --git a/code/controllers/Processes/garbage.dm b/code/controllers/Processes/garbage.dm
deleted file mode 100644
index 1a93c8f13db..00000000000
--- a/code/controllers/Processes/garbage.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-var/global/datum/controller/process/garbage_collector/garbageCollector
-
-/datum/controller/process/garbage_collector/setup()
- name = "garbage"
- schedule_interval = 10
- start_delay = 3
-
-/datum/controller/process/garbage_collector/doWork()
- // Garbage collection code can be found in code\modules\garbage collection\garbage_collector.dm
- processGarbage()
-
-/datum/controller/process/garbage_collector/statProcess()
- ..()
- stat(null, "[del_everything ? "Off" : "On"], [queue.len] queued")
- stat(null, "Dels: [dels_count], [soft_dels] soft, [hard_dels] hard")
-
-DECLARE_GLOBAL_CONTROLLER(garbage_collector, garbageCollector)
diff --git a/code/controllers/Processes/machinery.dm b/code/controllers/Processes/machinery.dm
index 268e1c073a2..2466f802740 100644
--- a/code/controllers/Processes/machinery.dm
+++ b/code/controllers/Processes/machinery.dm
@@ -24,7 +24,7 @@
/datum/controller/process/machinery/proc/process_machines()
for(last_object in machine_processing)
var/obj/machinery/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
+ if(istype(M) && !QDELETED(M))
try
if(M.process() == PROCESS_KILL)
machine_processing.Remove(M)
@@ -43,7 +43,7 @@
/datum/controller/process/machinery/proc/process_power()
for(last_object in deferred_powernet_rebuilds)
var/obj/O = last_object
- if(istype(O) && isnull(O.gcDestroyed))
+ if(istype(O) && !QDELETED(O))
try
var/datum/powernet/newPN = new()// creates a new powernet...
propagate_network(O, newPN)//... and propagates it to the other side of the cable
@@ -56,7 +56,7 @@
for(last_object in powernets)
var/datum/powernet/powerNetwork = last_object
- if(istype(powerNetwork) && isnull(powerNetwork.gcDestroyed))
+ if(istype(powerNetwork) && !QDELETED(powerNetwork))
try
powerNetwork.reset()
catch(var/exception/e)
diff --git a/code/controllers/Processes/mob.dm b/code/controllers/Processes/mob.dm
index 86c76604606..2b11eff99be 100644
--- a/code/controllers/Processes/mob.dm
+++ b/code/controllers/Processes/mob.dm
@@ -21,7 +21,7 @@ var/global/datum/controller/process/mob/mob_master
/datum/controller/process/mob/doWork()
for(last_object in mob_list)
var/mob/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
+ if(istype(M) && !QDELETED(M))
try
M.Life()
catch(var/exception/e)
diff --git a/code/controllers/Processes/npcai.dm b/code/controllers/Processes/npcai.dm
index 09d8556187e..1f8d2a34e9e 100644
--- a/code/controllers/Processes/npcai.dm
+++ b/code/controllers/Processes/npcai.dm
@@ -25,7 +25,7 @@ var/global/datum/controller/process/npcai/npcai_master
/datum/controller/process/npcai/doWork()
for(last_object in simple_animal_list)
var/mob/living/simple_animal/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
+ if(istype(M) && !QDELETED(M))
if(!M.client && M.stat == CONSCIOUS)
try
M.process_ai()
@@ -44,7 +44,7 @@ var/global/datum/controller/process/npcai/npcai_master
for(last_object in snpc_list)
var/mob/living/carbon/human/interactive/M = last_object
- if(istype(M) && isnull(M.gcDestroyed))
+ if(istype(M) && !QDELETED(M))
try
if(!M.alternateProcessing || M.forceProcess)
M.doProcess()
diff --git a/code/controllers/Processes/obj.dm b/code/controllers/Processes/obj.dm
index 0e573bcc05c..454709b6194 100644
--- a/code/controllers/Processes/obj.dm
+++ b/code/controllers/Processes/obj.dm
@@ -15,7 +15,7 @@
/datum/controller/process/obj/doWork()
for(last_object in processing_objects)
var/datum/O = last_object
- if(istype(O) && isnull(O.gcDestroyed))
+ if(istype(O) && !QDELETED(O))
try
// Reagent datums get shoved in here, but the process proc isn't on the
// base datum type, so we just call it blindly.
diff --git a/code/controllers/Processes/shuttles.dm b/code/controllers/Processes/shuttles.dm
index 57ca886d6e1..0e7b3f05095 100644
--- a/code/controllers/Processes/shuttles.dm
+++ b/code/controllers/Processes/shuttles.dm
@@ -190,7 +190,7 @@ DECLARE_GLOBAL_CONTROLLER(shuttle, shuttle_master)
var/obj/machinery/computer/communications/C = thing
if(C.stat & BROKEN)
continue
- else if(istype(thing, /datum/computer_file/program/comm) || istype(thing, /obj/item/weapon/circuitboard/communications))
+ else if(istype(thing, /datum/computer_file/program/comm) || istype(thing, /obj/item/circuitboard/communications))
continue
var/turf/T = get_turf(thing)
diff --git a/code/controllers/Processes/timer.dm b/code/controllers/Processes/timer.dm
index 0dcaf128193..4b42d69221d 100644
--- a/code/controllers/Processes/timer.dm
+++ b/code/controllers/Processes/timer.dm
@@ -19,7 +19,7 @@ var/global/datum/controller/process/timer/timer_master
return
for(last_object in processing_timers)
var/datum/timedevent/event = last_object
- if(!event.thingToCall || qdeleted(event.thingToCall))
+ if(!event.thingToCall || check_datum_qdeleted(event.thingToCall))
qdel(event)
if(event.timeToRun <= world.time)
runevent(event)
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 88fdb83da10..b71531ee20f 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -55,7 +55,6 @@
var/guest_jobban = 1
var/usewhitelist = 0
var/mods_are_mentors = 0
- var/kick_inactive = 0 //force disconnect for inactive players
var/load_jobs_from_txt = 0
var/ToRban = 0
var/automute_on = 0 //enables automuting/spam prevention
@@ -199,22 +198,21 @@
var/high_pop_mc_mode_amount = 65
var/disable_high_pop_mc_mode_amount = 60
-/datum/configuration/New()
- var/list/L = subtypesof(/datum/game_mode)
- for(var/T in L)
- // I wish I didn't have to instance the game modes in order to look up
- // their information, but it is the only way (at least that I know of).
- var/datum/game_mode/M = new T()
+ // Nightshift
+ var/randomize_shift_time = FALSE
+ var/enable_night_shifts = FALSE
- if(M.config_tag)
- if(!(M.config_tag in modes)) // ensure each mode is added only once
- diary << "Adding game mode [M.name] ([M.config_tag]) to configuration."
- src.modes += M.config_tag
- src.mode_names[M.config_tag] = M.name
- src.probabilities[M.config_tag] = M.probability
- if(M.votable)
- src.votable_modes += M.config_tag
- qdel(M)
+/datum/configuration/New()
+ for(var/T in subtypesof(/datum/game_mode))
+ var/datum/game_mode/M = T
+
+ if(initial(M.config_tag))
+ if(!(initial(M.config_tag) in modes)) // ensure each mode is added only once
+ src.modes += initial(M.config_tag)
+ src.mode_names[initial(M.config_tag)] = initial(M.name)
+ src.probabilities[initial(M.config_tag)] = initial(M.probability)
+ if(initial(M.votable))
+ src.votable_modes += initial(M.config_tag)
src.votable_modes += "secret"
/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
@@ -423,16 +421,13 @@
if(prob_name in config.modes)
config.probabilities[prob_name] = text2num(prob_value)
else
- diary << "Unknown game mode probability configuration definition: [prob_name]."
+ log_config("Unknown game mode probability configuration definition: [prob_name].")
else
- diary << "Incorrect probability configuration definition: [prob_name] [prob_value]."
+ log_config("Incorrect probability configuration definition: [prob_name] [prob_value].")
if("allow_random_events")
config.allow_random_events = 1
- if("kick_inactive")
- config.kick_inactive = 1
-
if("load_jobs_from_txt")
load_jobs_from_txt = 1
@@ -605,26 +600,23 @@
shutdown_shell_command = value
if("disable_karma")
- disable_karma = 1
+ config.disable_karma = 1
if("tick_limit_mc_init")
- tick_limit_mc_init = text2num(value)
+ config.tick_limit_mc_init = text2num(value)
if("base_mc_tick_rate")
- base_mc_tick_rate = text2num(value)
+ config.base_mc_tick_rate = text2num(value)
if("high_pop_mc_tick_rate")
- high_pop_mc_tick_rate = text2num(value)
+ config.high_pop_mc_tick_rate = text2num(value)
if("high_pop_mc_mode_amount")
- high_pop_mc_mode_amount = text2num(value)
+ config.high_pop_mc_mode_amount = text2num(value)
if("disable_high_pop_mc_mode_amount")
- disable_high_pop_mc_mode_amount = text2num(value)
-
+ config.disable_high_pop_mc_mode_amount = text2num(value)
else
- diary << "Unknown setting in configuration: '[name]'"
+ log_config("Unknown setting in configuration: '[name]'")
else if(type == "game_options")
- if(!value)
- diary << "Unknown value for setting [name] in [filename]."
value = text2num(value)
switch(name)
@@ -680,8 +672,12 @@
MAX_EX_FLAME_RANGE = BombCap
if("default_laws")
config.default_laws = text2num(value)
+ if("randomize_shift_time")
+ config.randomize_shift_time = TRUE
+ if("enable_night_shifts")
+ config.enable_night_shifts = TRUE
else
- diary << "Unknown setting in configuration: '[name]'"
+ log_config("Unknown setting in configuration: '[name]'")
/datum/configuration/proc/loadsql(filename) // -- TLE
var/list/Lines = file2list(filename)
@@ -726,10 +722,10 @@
if("db_version")
db_version = text2num(value)
else
- diary << "Unknown setting in configuration: '[name]'"
+ log_config("Unknown setting in configuration: '[name]'")
if(config.sql_enabled && db_version != SQL_VERSION)
config.sql_enabled = 0
- diary << "WARNING: DB_CONFIG DEFINITION MISMATCH!"
+ log_config("WARNING: DB_CONFIG DEFINITION MISMATCH!")
spawn(60)
if(ticker.current_state == GAME_STATE_PREGAME)
going = 0
@@ -750,13 +746,10 @@
config.overflow_whitelist += t
/datum/configuration/proc/pick_mode(mode_name)
- // I wish I didn't have to instance the game modes in order to look up
- // their information, but it is the only way (at least that I know of).
for(var/T in subtypesof(/datum/game_mode))
- var/datum/game_mode/M = new T()
- if(M.config_tag && M.config_tag == mode_name)
- return M
- qdel(M)
+ var/datum/game_mode/M = T
+ if(initial(M.config_tag) && initial(M.config_tag) == mode_name)
+ return new T()
return new /datum/game_mode/extended()
/datum/configuration/proc/get_runnable_modes()
@@ -773,4 +766,4 @@
if(M.can_start())
runnable_modes[M] = probabilities[M.config_tag]
// to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]")
- return runnable_modes
+ return runnable_modes
\ No newline at end of file
diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm
index 78303449f26..923dece3c6b 100644
--- a/code/controllers/failsafe.dm
+++ b/code/controllers/failsafe.dm
@@ -28,7 +28,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
/datum/controller/failsafe/Initialize()
set waitfor = 0
Failsafe.Loop()
- if(!qdeleted(src))
+ if(!QDELETED(src))
qdel(src) //when Loop() returns, we delete ourselves and let the mc recreate us
/datum/controller/failsafe/Destroy()
diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm
index ab92ca49be7..62b83100fb4 100644
--- a/code/controllers/globals.dm
+++ b/code/controllers/globals.dm
@@ -16,8 +16,6 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
gvars_datum_in_built_vars = exclude_these.vars + list("gvars_datum_protected_varlist", "gvars_datum_in_built_vars", "gvars_datum_init_order")
qdel(exclude_these)
- log_to_dd("[vars.len - gvars_datum_in_built_vars.len] global variables")
-
Initialize()
/datum/controller/global_vars/Destroy(force)
@@ -60,7 +58,7 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
var/list/expected_global_procs = vars - gvars_datum_in_built_vars
for(var/I in global_procs)
expected_global_procs -= replacetext("[I]", "InitGlobal", "")
- log_to_dd("Missing procs: [expected_global_procs.Join(", ")]")
+ log_world("Missing procs: [expected_global_procs.Join(", ")]")
for(var/I in global_procs)
var/start_tick = world.time
call(src, I)()
diff --git a/code/controllers/hooks-defs.dm b/code/controllers/hooks-defs.dm
index 68db39c69dc..49919279242 100644
--- a/code/controllers/hooks-defs.dm
+++ b/code/controllers/hooks-defs.dm
@@ -75,14 +75,14 @@
/**
* Employee reassignment hook.
* Called in card.dm when someone's card is reassigned at the HoP's desk.
- * Parameters: var/obj/item/weapon/card/id
+ * Parameters: var/obj/item/card/id
*/
/hook/reassign_employee
/**
* Employee terminated hook.
* Called in card.dm when someone's card is terminated at the HoP's desk.
- * Parameters: var/obj/item/weapon/card/id
+ * Parameters: var/obj/item/card/id
*/
/hook/terminate_employee
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 28395717f08..ddde5460cef 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -63,6 +63,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
/datum/controller/master/New()
makeDatumRefLists()
+ //temporary file used to record errors with loading config, moved to log directory once logging is set up
+ GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = "data/logs/config_error.log"
load_configuration()
// Highlander-style: there can only be one! Kill off the old and replace it with the new.
@@ -96,9 +98,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
sortTim(subsystems, /proc/cmp_subsystem_init)
reverseRange(subsystems)
for(var/datum/controller/subsystem/ss in subsystems)
- log_to_dd("Shutting down [ss.name] subsystem...")
+ log_world("Shutting down [ss.name] subsystem...")
ss.Shutdown()
- log_to_dd("Shutdown complete")
+ log_world("Shutdown complete")
// Returns 1 if we created a new mc, 0 if we couldn't due to a recent restart,
// -1 if we encountered a runtime trying to recreate it
@@ -133,7 +135,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
msg += "\t [varname] = [D]([D.type])\n"
else
msg += "\t [varname] = [varval]\n"
- log_to_dd(msg)
+ log_world(msg)
var/datum/controller/subsystem/BadBoy = Master.last_type_processed
var/FireHim = FALSE
@@ -149,7 +151,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
BadBoy.flags |= SS_NO_FIRE
if(msg)
to_chat(admins, "[msg]")
- log_to_dd(msg)
+ log_world(msg)
if(istype(Master.subsystems))
if(FireHim)
@@ -191,7 +193,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!"
to_chat(world, "[msg]")
- log_to_dd(msg)
+ log_world(msg)
if(!current_runlevel)
SetRunLevel(1)
@@ -347,7 +349,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if(CheckQueue(subsystems_to_check) <= 0)
if(!SoftReset(tickersubsystems, runlevel_sorted_subsystems))
- log_to_dd("MC: SoftReset() failed, crashing")
+ log_world("MC: SoftReset() failed, crashing")
return
if(!error_level)
iteration++
@@ -359,7 +361,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if(queue_head)
if(RunQueue() <= 0)
if(!SoftReset(tickersubsystems, runlevel_sorted_subsystems))
- log_to_dd("MC: SoftReset() failed, crashing")
+ log_world("MC: SoftReset() failed, crashing")
return
if(!error_level)
iteration++
@@ -538,9 +540,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
// called if any mc's queue procs runtime or exit improperly.
/datum/controller/master/proc/SoftReset(list/ticker_SS, list/runlevel_SS)
. = 0
- log_to_dd("MC: SoftReset called, resetting MC queue state.")
+ log_world("MC: SoftReset called, resetting MC queue state.")
if(!istype(subsystems) || !istype(ticker_SS) || !istype(runlevel_SS))
- log_to_dd("MC: SoftReset: Bad list contents: '[subsystems]' '[ticker_SS]' '[runlevel_SS]'")
+ log_world("MC: SoftReset: Bad list contents: '[subsystems]' '[ticker_SS]' '[runlevel_SS]'")
return
var/subsystemstocheck = subsystems + ticker_SS
for(var/I in runlevel_SS)
@@ -554,26 +556,26 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
ticker_SS -= list(SS)
for(var/I in runlevel_SS)
I -= list(SS)
- log_to_dd("MC: SoftReset: Found bad entry in subsystem list, '[SS]'")
+ log_world("MC: SoftReset: Found bad entry in subsystem list, '[SS]'")
continue
if(SS.queue_next && !istype(SS.queue_next))
- log_to_dd("MC: SoftReset: Found bad data in subsystem queue, queue_next = '[SS.queue_next]'")
+ log_world("MC: SoftReset: Found bad data in subsystem queue, queue_next = '[SS.queue_next]'")
SS.queue_next = null
if(SS.queue_prev && !istype(SS.queue_prev))
- log_to_dd("MC: SoftReset: Found bad data in subsystem queue, queue_prev = '[SS.queue_prev]'")
+ log_world("MC: SoftReset: Found bad data in subsystem queue, queue_prev = '[SS.queue_prev]'")
SS.queue_prev = null
SS.queued_priority = 0
SS.queued_time = 0
SS.state = SS_IDLE
if(queue_head && !istype(queue_head))
- log_to_dd("MC: SoftReset: Found bad data in subsystem queue, queue_head = '[queue_head]'")
+ log_world("MC: SoftReset: Found bad data in subsystem queue, queue_head = '[queue_head]'")
queue_head = null
if(queue_tail && !istype(queue_tail))
- log_to_dd("MC: SoftReset: Found bad data in subsystem queue, queue_tail = '[queue_tail]'")
+ log_world("MC: SoftReset: Found bad data in subsystem queue, queue_tail = '[queue_tail]'")
queue_tail = null
queue_priority_count = 0
queue_priority_count_bg = 0
- log_to_dd("MC: SoftReset: Finished.")
+ log_world("MC: SoftReset: Finished.")
. = 1
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index a78750bf8d0..4b1d59fa82e 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -162,7 +162,7 @@
var/time = (REALTIMEOFDAY - start_timeofday) / 10
var/msg = "Initialized [name] subsystem within [time] second[time == 1 ? "" : "s"]!"
to_chat(world, "[msg]")
- log_to_dd(msg)
+ log_world(msg)
return time
//hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 4434053e4ec..bf791e61519 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -27,6 +27,7 @@ SUBSYSTEM_DEF(air)
var/list/excited_groups = list()
var/list/active_turfs = list()
var/list/hotspots = list()
+ var/list/deferred_pipenet_rebuilds = list()
var/list/networks = list()
var/list/atmos_machinery = list()
var/list/pipe_init_dirs_cache = list()
@@ -39,7 +40,7 @@ SUBSYSTEM_DEF(air)
var/list/currentrun = list()
- var/currentpart = SSAIR_PIPENETS
+ var/currentpart = SSAIR_DEFERREDPIPENETS
/datum/controller/subsystem/air/stat_entry(msg)
msg += "C:{"
@@ -141,7 +142,7 @@ SUBSYSTEM_DEF(air)
if(state != SS_RUNNING)
return
resumed = 0
- currentpart = SSAIR_PIPENETS
+ currentpart = SSAIR_DEFERREDPIPENETS
/datum/controller/subsystem/air/proc/process_deferred_pipenets(resumed = 0)
if(!resumed)
@@ -152,7 +153,7 @@ SUBSYSTEM_DEF(air)
var/obj/machinery/atmospherics/A = currentrun[currentrun.len]
currentrun.len--
if(A)
- A.build_network()
+ A.build_network(remove_deferral = TRUE)
else
deferred_pipenet_rebuilds.Remove(A)
if(MC_TICK_CHECK)
diff --git a/code/controllers/subsystem/fires.dm b/code/controllers/subsystem/fires.dm
index 50624aa8db0..ce66405e1c9 100644
--- a/code/controllers/subsystem/fires.dm
+++ b/code/controllers/subsystem/fires.dm
@@ -21,7 +21,7 @@ SUBSYSTEM_DEF(fires)
while(currentrun.len)
var/obj/O = currentrun[currentrun.len]
currentrun.len--
- if(!O || qdeleted(O))
+ if(!O || QDELETED(O))
processing -= O
if(MC_TICK_CHECK)
return
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
new file mode 100644
index 00000000000..067114e52be
--- /dev/null
+++ b/code/controllers/subsystem/garbage.dm
@@ -0,0 +1,467 @@
+SUBSYSTEM_DEF(garbage)
+ name = "Garbage"
+ priority = FIRE_PRIORITY_GARBAGE
+ wait = 2 SECONDS
+ flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
+ runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
+ init_order = INIT_ORDER_GARBAGE
+
+ var/list/collection_timeout = list(0, 2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level
+
+ //Stat tracking
+ var/delslasttick = 0 // number of del()'s we've done this tick
+ var/gcedlasttick = 0 // number of things that gc'ed last tick
+ var/totaldels = 0
+ var/totalgcs = 0
+
+ var/highest_del_time = 0
+ var/highest_del_tickusage = 0
+
+ var/list/pass_counts
+ var/list/fail_counts
+
+ var/list/items = list() // Holds our qdel_item statistics datums
+
+ //Queue
+ var/list/queues
+
+ #ifdef TESTING
+ var/list/reference_find_on_fail = list()
+ #endif
+
+
+/datum/controller/subsystem/garbage/PreInit()
+ queues = new(GC_QUEUE_COUNT)
+ pass_counts = new(GC_QUEUE_COUNT)
+ fail_counts = new(GC_QUEUE_COUNT)
+ for(var/i in 1 to GC_QUEUE_COUNT)
+ queues[i] = list()
+ pass_counts[i] = 0
+ fail_counts[i] = 0
+
+/datum/controller/subsystem/garbage/stat_entry(msg)
+ var/list/counts = list()
+ for(var/list/L in queues)
+ counts += length(L)
+ msg += "Q:[counts.Join(",")]|D:[delslasttick]|G:[gcedlasttick]|"
+ msg += "GR:"
+ if(!(delslasttick + gcedlasttick))
+ msg += "n/a|"
+ else
+ msg += "[round((gcedlasttick / (delslasttick + gcedlasttick)) * 100, 0.01)]%|"
+
+ msg += "TD:[totaldels]|TG:[totalgcs]|"
+ if(!(totaldels + totalgcs))
+ msg += "n/a|"
+ else
+ msg += "TGR:[round((totalgcs / (totaldels + totalgcs)) * 100, 0.01)]%"
+ msg += " P:[pass_counts.Join(",")]"
+ msg += "|F:[fail_counts.Join(",")]"
+ ..(msg)
+
+/* TO-DO
+/datum/controller/subsystem/garbage/Shutdown()
+ //Adds the del() log to the qdel log file
+ var/list/dellog = list()
+
+ //sort by how long it's wasted hard deleting
+ sortTim(items, cmp=/proc/cmp_qdel_item_time, associative = TRUE)
+ for(var/path in items)
+ var/datum/qdel_item/I = items[path]
+ dellog += "Path: [path]"
+ if(I.failures)
+ dellog += "\tFailures: [I.failures]"
+ dellog += "\tqdel() Count: [I.qdels]"
+ dellog += "\tDestroy() Cost: [I.destroy_time]ms"
+ if(I.hard_deletes)
+ dellog += "\tTotal Hard Deletes [I.hard_deletes]"
+ dellog += "\tTime Spent Hard Deleting: [I.hard_delete_time]ms"
+ if(I.slept_destroy)
+ dellog += "\tSleeps: [I.slept_destroy]"
+ if(I.no_respect_force)
+ dellog += "\tIgnored force: [I.no_respect_force] times"
+ if(I.no_hint)
+ dellog += "\tNo hint: [I.no_hint] times"
+ log_qdel(dellog.Join("\n"))
+*/
+
+/datum/controller/subsystem/garbage/fire()
+ //the fact that this resets its processing each fire (rather then resume where it left off) is intentional.
+ var/queue = GC_QUEUE_PREQUEUE
+
+ while(state == SS_RUNNING)
+ switch(queue)
+ if(GC_QUEUE_PREQUEUE)
+ HandlePreQueue()
+ queue = GC_QUEUE_PREQUEUE + 1
+ if(GC_QUEUE_CHECK)
+ HandleQueue(GC_QUEUE_CHECK)
+ queue = GC_QUEUE_CHECK + 1
+ if(GC_QUEUE_HARDDELETE)
+ HandleQueue(GC_QUEUE_HARDDELETE)
+ break
+
+ if(state == SS_PAUSED) //make us wait again before the next run.
+ state = SS_RUNNING
+
+//If you see this proc high on the profile, what you are really seeing is the garbage collection/soft delete overhead in byond.
+//Don't attempt to optimize, not worth the effort.
+/datum/controller/subsystem/garbage/proc/HandlePreQueue()
+ var/list/tobequeued = queues[GC_QUEUE_PREQUEUE]
+ var/static/count = 0
+ if(count)
+ var/c = count
+ count = 0 //so if we runtime on the Cut, we don't try again.
+ tobequeued.Cut(1, c + 1)
+
+ for(var/ref in tobequeued)
+ count++
+ Queue(ref, GC_QUEUE_PREQUEUE + 1)
+ if(MC_TICK_CHECK)
+ break
+ if(count)
+ tobequeued.Cut(1, count + 1)
+ count = 0
+
+/datum/controller/subsystem/garbage/proc/HandleQueue(level = GC_QUEUE_CHECK)
+ if(level == GC_QUEUE_CHECK)
+ delslasttick = 0
+ gcedlasttick = 0
+ var/cut_off_time = world.time - collection_timeout[level] //ignore entries newer then this
+ var/list/queue = queues[level]
+ var/static/lastlevel
+ var/static/count = 0
+ if(count) //runtime last run before we could do this.
+ var/c = count
+ count = 0 //so if we runtime on the Cut, we don't try again.
+ var/list/lastqueue = queues[lastlevel]
+ lastqueue.Cut(1, c + 1)
+
+ lastlevel = level
+
+ for(var/refID in queue)
+ if(!refID)
+ count++
+ if(MC_TICK_CHECK)
+ break
+ continue
+
+ var/GCd_at_time = queue[refID]
+ if(GCd_at_time > cut_off_time)
+ break // Everything else is newer, skip them
+ count++
+
+ var/datum/D
+ D = locate(refID)
+
+ if(!D || D.gc_destroyed != GCd_at_time) // So if something else coincidently gets the same ref, it's not deleted by mistake
+ ++gcedlasttick
+ ++totalgcs
+ pass_counts[level]++
+ #ifdef TESTING
+ reference_find_on_fail -= refID //It's deleted we don't care anymore.
+ #endif
+ if(MC_TICK_CHECK)
+ break
+ continue
+
+ // Something's still referring to the qdel'd object.
+ fail_counts[level]++
+ switch(level)
+ if(GC_QUEUE_CHECK)
+ #ifdef TESTING
+ if(reference_find_on_fail[refID])
+ D.find_references()
+ #ifdef GC_FAILURE_HARD_LOOKUP
+ else
+ D.find_references()
+ #endif
+ reference_find_on_fail -= refID
+ #endif
+ var/type = D.type
+ var/datum/qdel_item/I = items[type]
+ testing("GC: -- \ref[src] | [type] was unable to be GC'd --")
+ I.failures++
+ if(GC_QUEUE_HARDDELETE)
+ HardDelete(D)
+ if(MC_TICK_CHECK)
+ break
+ continue
+
+ Queue(D, level + 1)
+
+ if(MC_TICK_CHECK)
+ break
+ if(count)
+ queue.Cut(1, count + 1)
+ count = 0
+
+/datum/controller/subsystem/garbage/proc/PreQueue(datum/D)
+ if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
+ queues[GC_QUEUE_PREQUEUE] += D
+ D.gc_destroyed = GC_QUEUED_FOR_QUEUING
+
+/datum/controller/subsystem/garbage/proc/Queue(datum/D, level = GC_QUEUE_CHECK)
+ if(isnull(D))
+ return
+ if(D.gc_destroyed == GC_QUEUED_FOR_HARD_DEL)
+ level = GC_QUEUE_HARDDELETE
+ if(level > GC_QUEUE_COUNT)
+ HardDelete(D)
+ return
+ var/gctime = world.time
+ var/refid = "\ref[D]"
+
+ D.gc_destroyed = gctime
+ var/list/queue = queues[level]
+ if(queue[refid])
+ queue -= refid // Removing any previous references that were GC'd so that the current object will be at the end of the list.
+
+ queue[refid] = gctime
+
+//this is mainly to separate things profile wise.
+/datum/controller/subsystem/garbage/proc/HardDelete(datum/D)
+ var/time = world.timeofday
+ var/tick = TICK_USAGE
+ var/ticktime = world.time
+ ++delslasttick
+ ++totaldels
+ var/type = D.type
+ var/refID = "\ref[D]"
+
+ del(D)
+
+ tick = (TICK_USAGE - tick + ((world.time - ticktime) / world.tick_lag * 100))
+
+ var/datum/qdel_item/I = items[type]
+
+ I.hard_deletes++
+ I.hard_delete_time += TICK_DELTA_TO_MS(tick)
+
+
+ if(tick > highest_del_tickusage)
+ highest_del_tickusage = tick
+ time = world.timeofday - time
+ if(!time && TICK_DELTA_TO_MS(tick) > 1)
+ time = TICK_DELTA_TO_MS(tick) / 100
+ if(time > highest_del_time)
+ highest_del_time = time
+ if(time > 10)
+ log_game("Error: [type]([refID]) took longer than 1 second to delete (took [time / 10] seconds to delete)")
+ message_admins("Error: [type]([refID]) took longer than 1 second to delete (took [time / 10] seconds to delete).")
+ postpone(time)
+
+/datum/controller/subsystem/garbage/proc/HardQueue(datum/D)
+ if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
+ queues[GC_QUEUE_PREQUEUE] += D
+ D.gc_destroyed = GC_QUEUED_FOR_HARD_DEL
+
+/datum/controller/subsystem/garbage/Recover()
+ if(istype(SSgarbage.queues))
+ for(var/i in 1 to SSgarbage.queues.len)
+ queues[i] |= SSgarbage.queues[i]
+
+
+/datum/qdel_item
+ var/name = ""
+ var/qdels = 0 //Total number of times it's passed thru qdel.
+ var/destroy_time = 0 //Total amount of milliseconds spent processing this type's Destroy()
+ var/failures = 0 //Times it was queued for soft deletion but failed to soft delete.
+ var/hard_deletes = 0 //Different from failures because it also includes QDEL_HINT_HARDDEL deletions
+ var/hard_delete_time = 0//Total amount of milliseconds spent hard deleting this type.
+ var/no_respect_force = 0//Number of times it's not respected force=TRUE
+ var/no_hint = 0 //Number of times it's not even bother to give a qdel hint
+ var/slept_destroy = 0 //Number of times it's slept in its destroy
+
+/datum/qdel_item/New(mytype)
+ name = "[mytype]"
+
+#ifdef TESTING
+/proc/qdel_and_find_ref_if_fail(datum/D, force = FALSE)
+ SSgarbage.reference_find_on_fail["\ref[D]"] = TRUE
+ qdel(D, force)
+#endif
+
+// Should be treated as a replacement for the 'del' keyword.
+// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
+/proc/qdel(datum/D, force = FALSE, ...)
+ if(!istype(D))
+ del(D)
+ return
+ var/datum/qdel_item/I = SSgarbage.items[D.type]
+ if(!I)
+ I = SSgarbage.items[D.type] = new /datum/qdel_item(D.type)
+ I.qdels++
+
+
+ if(isnull(D.gc_destroyed))
+ D.SendSignal(COMSIG_PARENT_QDELETED)
+ D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
+ var/start_time = world.time
+ var/start_tick = world.tick_usage
+ var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up.
+ if(world.time != start_time)
+ I.slept_destroy++
+ else
+ I.destroy_time += TICK_USAGE_TO_MS(start_tick)
+ if(!D)
+ return
+ switch(hint)
+ if(QDEL_HINT_QUEUE) //qdel should queue the object for deletion.
+ SSgarbage.PreQueue(D)
+ if(QDEL_HINT_IWILLGC)
+ D.gc_destroyed = world.time
+ return
+ if(QDEL_HINT_LETMELIVE) //qdel should let the object live after calling destory.
+ if(!force)
+ D.gc_destroyed = null //clear the gc variable (important!)
+ return
+ // Returning LETMELIVE after being told to force destroy
+ // indicates the objects Destroy() does not respect force
+ #ifdef TESTING
+ if(!I.no_respect_force)
+ testing("WARNING: [D.type] has been force deleted, but is \
+ returning an immortal QDEL_HINT, indicating it does \
+ not respect the force flag for qdel(). It has been \
+ placed in the queue, further instances of this type \
+ will also be queued.")
+ #endif
+ I.no_respect_force++
+
+ SSgarbage.PreQueue(D)
+ if(QDEL_HINT_HARDDEL) //qdel should assume this object won't gc, and queue a hard delete using a hard reference to save time from the locate()
+ SSgarbage.HardQueue(D)
+ if(QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste.
+ SSgarbage.HardDelete(D)
+ if(QDEL_HINT_FINDREFERENCE)//qdel will, if TESTING is enabled, display all references to this object, then queue the object for deletion.
+ SSgarbage.PreQueue(D)
+ #ifdef TESTING
+ D.find_references()
+ #endif
+ if(QDEL_HINT_IFFAIL_FINDREFERENCE)
+ SSgarbage.PreQueue(D)
+ #ifdef TESTING
+ SSgarbage.reference_find_on_fail["\ref[D]"] = TRUE
+ #endif
+ else
+ #ifdef TESTING
+ if(!I.no_hint)
+ testing("WARNING: [D.type] is not returning a qdel hint. It is being placed in the queue. Further instances of this type will also be queued.")
+ #endif
+ I.no_hint++
+ SSgarbage.PreQueue(D)
+ else if(D.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
+ CRASH("[D.type] destroy proc was called multiple times, likely due to a qdel loop in the Destroy logic")
+
+#ifdef TESTING
+
+/datum/verb/find_refs()
+ set category = "Debug"
+ set name = "Find References"
+ set src in world
+
+ find_references(FALSE)
+
+/datum/proc/find_references(skip_alert)
+ running_find_references = type
+ if(usr && usr.client)
+ if(usr.client.running_find_references)
+ testing("CANCELLED search for references to a [usr.client.running_find_references].")
+ usr.client.running_find_references = null
+ running_find_references = null
+ //restart the garbage collector
+ SSgarbage.can_fire = 1
+ SSgarbage.next_fire = world.time + world.tick_lag
+ return
+
+ if(!skip_alert)
+ if(alert("Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", "Yes", "No") == "No")
+ running_find_references = null
+ return
+
+ //this keeps the garbage collector from failing to collect objects being searched for in here
+ SSgarbage.can_fire = 0
+
+ if(usr && usr.client)
+ usr.client.running_find_references = type
+
+ testing("Beginning search for references to a [type].")
+ last_find_references = world.time
+
+ DoSearchVar(GLOB) //globals
+ for(var/datum/thing in world) //atoms (don't beleive it's lies)
+ DoSearchVar(thing, "World -> [thing]")
+
+ for(var/datum/thing) //datums
+ DoSearchVar(thing, "World -> [thing]")
+
+ for(var/client/thing) //clients
+ DoSearchVar(thing, "World -> [thing]")
+
+ testing("Completed search for references to a [type].")
+ if(usr && usr.client)
+ usr.client.running_find_references = null
+ running_find_references = null
+
+ //restart the garbage collector
+ SSgarbage.can_fire = 1
+ SSgarbage.next_fire = world.time + world.tick_lag
+
+/datum/verb/qdel_then_find_references()
+ set category = "Debug"
+ set name = "qdel() then Find References"
+ set src in world
+
+ qdel(src, TRUE) //Force.
+ if(!running_find_references)
+ find_references(TRUE)
+
+/datum/verb/qdel_then_if_fail_find_references()
+ set category = "Debug"
+ set name = "qdel() then Find References if GC failure"
+ set src in world
+
+ qdel_and_find_ref_if_fail(src, TRUE)
+
+/datum/proc/DoSearchVar(X, Xname, recursive_limit = 64)
+ if(usr && usr.client && !usr.client.running_find_references)
+ return
+ if(!recursive_limit)
+ return
+
+ if(istype(X, /datum))
+ var/datum/D = X
+ if(D.last_find_references == last_find_references)
+ return
+
+ D.last_find_references = last_find_references
+ var/list/L = D.vars
+
+ for(var/varname in L)
+ if(varname == "vars")
+ continue
+ var/variable = L[varname]
+
+ if(variable == src)
+ testing("Found [src.type] \ref[src] in [D.type]'s [varname] var. [Xname]")
+
+ else if(islist(variable))
+ DoSearchVar(variable, "[Xname] -> list", recursive_limit - 1)
+
+ else if(islist(X))
+ var/normal = IS_NORMAL_LIST(X)
+ for(var/I in X)
+ if(I == src)
+ testing("Found [src.type] \ref[src] in list [Xname].")
+
+ else if(I && !isnum(I) && normal && X[I] == src)
+ testing("Found [src.type] \ref[src] in list [Xname]\[[I]\]")
+
+ else if(islist(I))
+ DoSearchVar(I, "[Xname] -> list", recursive_limit - 1)
+
+#ifndef FIND_REF_NO_CHECK_TICK
+ CHECK_TICK
+#endif
+
+#endif
diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm
new file mode 100644
index 00000000000..813cfd5012a
--- /dev/null
+++ b/code/controllers/subsystem/nightshift.dm
@@ -0,0 +1,61 @@
+SUBSYSTEM_DEF(nightshift)
+ name = "Night Shift"
+ init_order = INIT_ORDER_NIGHTSHIFT
+ priority = FIRE_PRIORITY_NIGHTSHIFT
+ wait = 600
+ flags = SS_NO_TICK_CHECK
+
+ var/nightshift_active = FALSE
+ var/nightshift_start_time = 702000 //7:30 PM, station time
+ var/nightshift_end_time = 270000 //7:30 AM, station time
+ var/nightshift_first_check = 30 SECONDS
+
+ var/high_security_mode = FALSE
+
+/datum/controller/subsystem/nightshift/Initialize()
+ if(!config.enable_night_shifts)
+ can_fire = FALSE
+ if(config.randomize_shift_time)
+ GLOB.gametime_offset = rand(0, 23) HOURS
+ return ..()
+
+/datum/controller/subsystem/nightshift/fire(resumed = FALSE)
+ if(world.time - round_start_time < nightshift_first_check)
+ return
+ check_nightshift()
+
+/datum/controller/subsystem/nightshift/proc/announce(message)
+ priority_announcement.Announce(message, new_sound = 'sound/misc/notice2.ogg', new_title = "Automated Lighting System Announcement")
+
+/datum/controller/subsystem/nightshift/proc/check_nightshift(check_canfire=FALSE)
+ if(check_canfire && !can_fire)
+ return
+ var/emergency = security_level >= SEC_LEVEL_RED
+ var/announcing = TRUE
+ var/time = station_time()
+ var/night_time = (time < nightshift_end_time) || (time > nightshift_start_time)
+ if(high_security_mode != emergency)
+ high_security_mode = emergency
+ if(night_time)
+ announcing = FALSE
+ if(!emergency)
+ announce("Restoring night lighting configuration to normal operation.")
+ else
+ announce("Disabling night lighting: Station is in a state of emergency.")
+ if(emergency)
+ night_time = FALSE
+ if(nightshift_active != night_time)
+ update_nightshift(night_time, announcing)
+
+/datum/controller/subsystem/nightshift/proc/update_nightshift(active, announce = TRUE)
+ nightshift_active = active
+ if(announce)
+ if(active)
+ announce("Good evening, crew. To reduce power consumption and stimulate the circadian rhythms of some species, all of the lights aboard the station have been dimmed for the night.")
+ else
+ announce("Good morning, crew. As it is now day time, all of the lights aboard the station have been restored to their former brightness.")
+ for(var/A in apcs)
+ var/obj/machinery/power/apc/APC = A
+ if(is_station_level(APC.z))
+ APC.set_nightshift(active)
+ CHECK_TICK
diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index 126defb41c2..73104f212ff 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -70,7 +70,7 @@
debug_variables(alarm_manager)
feedback_add_details("admin_verb", "DAlarm")
if("Garbage")
- debug_variables(garbageCollector)
+ debug_variables(SSgarbage)
feedback_add_details("admin_verb","DGarbage")
if("Nano")
debug_variables(SSnanoui)
diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm
index 55abf2834f1..a8890186bae 100644
--- a/code/controllers/voting.dm
+++ b/code/controllers/voting.dm
@@ -20,9 +20,9 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo
qdel(vote)
vote = src
spawn(0)
- while(!gcDestroyed)
+ while(!QDELETED(src))
try
- while(!gcDestroyed)
+ while(!QDELETED(src))
sleep(10)
process()
catch(var/exception/e)
diff --git a/code/datums/action.dm b/code/datums/action.dm
index 4ee33474049..e49002e8e9d 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -199,8 +199,8 @@
UpdateButtonIcon()
/datum/action/item_action/toggle_unfriendly_fire/UpdateButtonIcon()
- if(istype(target, /obj/item/weapon/hierophant_staff))
- var/obj/item/weapon/hierophant_staff/H = target
+ if(istype(target, /obj/item/hierophant_staff))
+ var/obj/item/hierophant_staff/H = target
if(H.friendly_fire_check)
button_icon_state = "vortex_ff_off"
name = "Toggle Friendly Fire \[OFF\]"
@@ -216,8 +216,8 @@
desc = "Change the type of instrument your synthesizer is playing as."
/datum/action/item_action/synthswitch/Trigger()
- if(istype(target, /obj/item/device/instrument/piano_synth))
- var/obj/item/device/instrument/piano_synth/synth = target
+ if(istype(target, /obj/item/instrument/piano_synth))
+ var/obj/item/instrument/piano_synth/synth = target
var/chosen = input("Choose the type of instrument you want to use", "Instrument Selection", "piano") as null|anything in synth.insTypes
if(!synth.insTypes[chosen])
return
@@ -230,8 +230,8 @@
button_icon_state = "vortex_recall"
/datum/action/item_action/vortex_recall/IsAvailable()
- if(istype(target, /obj/item/weapon/hierophant_staff))
- var/obj/item/weapon/hierophant_staff/H = target
+ if(istype(target, /obj/item/hierophant_staff))
+ var/obj/item/hierophant_staff/H = target
if(H.teleporting)
return 0
return ..()
@@ -320,7 +320,7 @@
name = "Toggle Jetpack Stabilization"
/datum/action/item_action/jetpack_stabilization/IsAvailable()
- var/obj/item/weapon/tank/jetpack/J = target
+ var/obj/item/tank/jetpack/J = target
if(!istype(J) || !J.on)
return 0
return ..()
@@ -357,8 +357,8 @@
desc = "Use the instrument specified"
/datum/action/item_action/instrument/Trigger()
- if(istype(target, /obj/item/device/instrument))
- var/obj/item/device/instrument/I = target
+ if(istype(target, /obj/item/instrument))
+ var/obj/item/instrument/I = target
I.interact(usr)
return
return ..()
diff --git a/code/datums/cargoprofile.dm b/code/datums/cargoprofile.dm
index 310593d0d6b..2f8e27d834e 100644
--- a/code/datums/cargoprofile.dm
+++ b/code/datums/cargoprofile.dm
@@ -101,8 +101,8 @@
name = "Move Small Containers"
id = "boxes"
blacklist = null
- whitelist = list(/obj/item/weapon/storage, /obj/item/weapon/moneybag, /obj/item/weapon/evidencebag,
- /obj/item/weapon/storage/bag/tray, /obj/item/pizzabox, /obj/item/weapon/clipboard,
+ whitelist = list(/obj/item/storage, /obj/item/storage/bag/money, /obj/item/evidencebag,
+ /obj/item/storage/bag/tray, /obj/item/pizzabox, /obj/item/clipboard,
/obj/item/smallDelivery, /obj/structure/bigDelivery)
/datum/cargoprofile/cargo
@@ -138,46 +138,46 @@
whitelist = list(/obj/item/stack/cable_coil,/obj/item/stack/rods,
/obj/item/stack/sheet/metal,/obj/item/stack/sheet/plasteel,
/obj/item/stack/sheet/glass,/obj/item/stack/sheet/rglass,
- /obj/item/stack/tile,/obj/item/weapon/light)
+ /obj/item/stack/tile,/obj/item/light)
//todo: maybe stack things while we're here?
/datum/cargoprofile/exotics
name = "Exotic materials"
id = "exotics"
blacklist = null
- whitelist = list(/obj/item/weapon/coin, /obj/item/stack/spacecash, /obj/item/seeds,
+ whitelist = list(/obj/item/coin, /obj/item/stack/spacecash, /obj/item/seeds,
/obj/item/stack/sheet/mineral,/obj/item/stack/sheet/wood,/obj/item/stack/sheet/leather)
/datum/cargoprofile/organics
name = "Organics, chemicals, and Paraphernalia"
id = "organics"
blacklist = null
- whitelist = list(/obj/item/weapon/tank,/obj/item/weapon/reagent_containers,
- /obj/item/stack/medical,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/gun/syringe,
- /obj/item/weapon/grenade/plastic/c4,/obj/item/weapon/grenade,/obj/item/ammo_box,
- /obj/item/weapon/gun/grenadelauncher,/obj/item/weapon/flamethrower, /obj/item/weapon/lighter,
- /obj/item/weapon/match,/obj/item/weapon/weldingtool)
+ whitelist = list(/obj/item/tank,/obj/item/reagent_containers,
+ /obj/item/stack/medical,/obj/item/storage/pill_bottle,/obj/item/gun/syringe,
+ /obj/item/grenade/plastic/c4,/obj/item/grenade,/obj/item/ammo_box,
+ /obj/item/gun/grenadelauncher,/obj/item/flamethrower, /obj/item/lighter,
+ /obj/item/match,/obj/item/weldingtool)
/datum/cargoprofile/food
name = "Food"
id = "food"
blacklist = null // something should probably go here
- whitelist = list(/obj/item/weapon/reagent_containers/food)
+ whitelist = list(/obj/item/reagent_containers/food)
/datum/cargoprofile/chemical
name = "Chemicals and Paraphernalia"
id = "chemical"
- blacklist = list(/obj/item/weapon/reagent_containers/food)
- whitelist = list(/obj/item/weapon/reagent_containers,/obj/item/stack/medical,/obj/item/weapon/storage/pill_bottle,
- /obj/item/weapon/gun/syringe,/obj/item/weapon/grenade/chem_grenade,/obj/item/weapon/dnainjector,
- /obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/firstaid,/obj/item/weapon/implanter)
+ blacklist = list(/obj/item/reagent_containers/food)
+ whitelist = list(/obj/item/reagent_containers,/obj/item/stack/medical,/obj/item/storage/pill_bottle,
+ /obj/item/gun/syringe,/obj/item/grenade/chem_grenade,/obj/item/dnainjector,
+ /obj/item/storage/belt/medical,/obj/item/storage/firstaid,/obj/item/implanter)
/datum/cargoprofile/pressure
name = "air tanks"
id = "pressure"
blacklist = null
- whitelist = list(/obj/item/weapon/tank,/obj/machinery/portable_atmospherics,
- /obj/item/weapon/flamethrower)
+ whitelist = list(/obj/item/tank,/obj/machinery/portable_atmospherics,
+ /obj/item/flamethrower)
//Am I missing any?
/datum/cargoprofile/pressure/empty
name = "empty air tanks"
@@ -187,11 +187,11 @@
contains(var/atom/A)
if(..())
var/pressure = ONE_ATMOSPHERE * 10 // In case of fallthrough, fail test
- if(istype(A,/obj/item/weapon/tank))
- var/obj/item/weapon/tank/T = A
+ if(istype(A,/obj/item/tank))
+ var/obj/item/tank/T = A
pressure = T.air_contents.return_pressure()
- if(istype(A,/obj/item/weapon/flamethrower))
- var/obj/item/weapon/flamethrower/T = A
+ if(istype(A,/obj/item/flamethrower))
+ var/obj/item/flamethrower/T = A
if(!T.ptank)
return 0
pressure = T.ptank.air_contents.return_pressure()
@@ -212,11 +212,11 @@
contains(var/atom/A)
if(..())
var/pressure = 0 // In case of fallthrough, fail test
- if(istype(A,/obj/item/weapon/tank))
- var/obj/item/weapon/tank/T = A
+ if(istype(A,/obj/item/tank))
+ var/obj/item/tank/T = A
pressure = T.air_contents.return_pressure()
- if(istype(A,/obj/item/weapon/flamethrower))
- var/obj/item/weapon/flamethrower/T = A
+ if(istype(A,/obj/item/flamethrower))
+ var/obj/item/flamethrower/T = A
if(!T.ptank)
return 0
pressure = T.ptank.air_contents.return_pressure()
@@ -232,44 +232,44 @@
/datum/cargoprofile/clothing
name = "Crew Kit"
id = "clothing"
- blacklist = list(/obj/item/weapon/tank/plasma,/obj/item/weapon/tank/anesthetic, // the rest are air tanks
+ blacklist = list(/obj/item/tank/plasma,/obj/item/tank/anesthetic, // the rest are air tanks
/obj/item/clothing/mask/facehugger) // NOT CLOTHING AT ALLLLL
- whitelist = list(/obj/item/clothing,/obj/item/weapon/storage/belt,/obj/item/weapon/storage/backpack,
- /obj/item/device/radio/headset,/obj/item/device/pda,/obj/item/weapon/card/id,/obj/item/weapon/tank,
- /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/restraints/legcuffs)
+ whitelist = list(/obj/item/clothing,/obj/item/storage/belt,/obj/item/storage/backpack,
+ /obj/item/radio/headset,/obj/item/pda,/obj/item/card/id,/obj/item/tank,
+ /obj/item/restraints/handcuffs, /obj/item/restraints/legcuffs)
/datum/cargoprofile/trash
name = "Trash"
id = "trash"
//Note that this filters out blueprints because they are a paper item. Do NOT throw out the station blueprints unless you be trollin'.
blacklist = null
- whitelist = list(/obj/item/trash,/obj/item/toy,/obj/item/weapon/reagent_containers/food/snacks/ectoplasm,/obj/item/weapon/grown/bananapeel,/obj/item/weapon/broken_bottle,/obj/item/weapon/bikehorn,
- /obj/item/weapon/cigbutt,/obj/item/weapon/poster/random_contraband,/obj/item/weapon/grown/corncob,/obj/item/weapon/paper,/obj/item/weapon/shard,
- /obj/item/weapon/sord,/obj/item/weapon/photo,/obj/item/weapon/folder,
- /obj/item/areaeditor/blueprints,/obj/item/weapon/poster/random_contraband,/obj/item/weapon/kitchen,/obj/item/weapon/book,/obj/item/clothing/mask/facehugger)
+ whitelist = list(/obj/item/trash,/obj/item/toy,/obj/item/reagent_containers/food/snacks/ectoplasm,/obj/item/grown/bananapeel,/obj/item/broken_bottle,/obj/item/bikehorn,
+ /obj/item/cigbutt,/obj/item/poster/random_contraband,/obj/item/grown/corncob,/obj/item/paper,/obj/item/shard,
+ /obj/item/sord,/obj/item/photo,/obj/item/folder,
+ /obj/item/areaeditor/blueprints,/obj/item/poster/random_contraband,/obj/item/kitchen,/obj/item/book,/obj/item/clothing/mask/facehugger)
/datum/cargoprofile/weapons
name = "Weapons & Illegals"
id = "weapons"
blacklist = null
//This one is hard since 'weapon contains a lot of things better categorized as devices
- whitelist = list(/obj/item/weapon/banhammer,/obj/item/weapon/sord,/obj/item/weapon/claymore,/obj/item/weapon/holo/esword,
- /obj/item/weapon/flamethrower,/obj/item/weapon/grenade,/obj/item/weapon/gun,/obj/item/weapon/hatchet,/obj/item/weapon/katana,
- /obj/item/weapon/kitchen/knife,/obj/item/weapon/melee,/obj/item/weapon/nullrod,/obj/item/weapon/pickaxe,/obj/item/weapon/twohanded,
- /obj/item/weapon/grenade/plastic/c4,/obj/item/weapon/scalpel,/obj/item/weapon/shield,/obj/item/weapon/grown/nettle/death)
+ whitelist = list(/obj/item/banhammer,/obj/item/sord,/obj/item/claymore,/obj/item/holo/esword,
+ /obj/item/flamethrower,/obj/item/grenade,/obj/item/gun,/obj/item/hatchet,/obj/item/katana,
+ /obj/item/kitchen/knife,/obj/item/melee,/obj/item/nullrod,/obj/item/pickaxe,/obj/item/twohanded,
+ /obj/item/grenade/plastic/c4,/obj/item/scalpel,/obj/item/shield,/obj/item/grown/nettle/death)
/datum/cargoprofile/tools
name = "Devices & Tools"
id = "tools"
blacklist = null
- whitelist = list(/obj/item/device,/obj/item/weapon/card,/obj/item/weapon/cartridge,/obj/item/weapon/cautery,/obj/item/weapon/stock_parts/cell,/obj/item/weapon/circuitboard,
- /obj/item/weapon/aiModule,/obj/item/weapon/airalarm_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/circular_saw,
- /obj/item/weapon/crowbar,/obj/item/weapon/disk,/obj/item/weapon/firealarm_electronics,/obj/item/weapon/hand_tele,
- /obj/item/weapon/hand_labeler,/obj/item/weapon/hemostat,/obj/item/weapon/mop,/obj/item/weapon/locator,/obj/item/weapon/cultivator,
- /obj/item/stack/packageWrap,/obj/item/weapon/pen,/obj/item/weapon/pickaxe,/obj/item/weapon/pinpointer,
- /obj/item/weapon/rcd,/obj/item/weapon/rcd_ammo,/obj/item/weapon/retractor,/obj/item/weapon/rsf,/obj/item/weapon/scalpel,
- /obj/item/weapon/screwdriver,/obj/item/weapon/shovel,/obj/item/weapon/soap,/obj/item/weapon/stamp,/obj/item/weapon/storage/bag/tray,/obj/item/weapon/weldingtool,
- /obj/item/weapon/wirecutters,/obj/item/weapon/wrench,/obj/item/weapon/extinguisher)
+ whitelist = list(/obj/item,/obj/item/card,/obj/item/cartridge,/obj/item/cautery,/obj/item/stock_parts/cell,/obj/item/circuitboard,
+ /obj/item/aiModule,/obj/item/airalarm_electronics,/obj/item/airlock_electronics,/obj/item/circular_saw,
+ /obj/item/crowbar,/obj/item/disk,/obj/item/firealarm_electronics,/obj/item/hand_tele,
+ /obj/item/hand_labeler,/obj/item/hemostat,/obj/item/mop,/obj/item/locator,/obj/item/cultivator,
+ /obj/item/stack/packageWrap,/obj/item/pen,/obj/item/pickaxe,/obj/item/pinpointer,
+ /obj/item/rcd,/obj/item/rcd_ammo,/obj/item/retractor,/obj/item/rsf,/obj/item/scalpel,
+ /obj/item/screwdriver,/obj/item/shovel,/obj/item/soap,/obj/item/stamp,/obj/item/storage/bag/tray,/obj/item/weldingtool,
+ /obj/item/wirecutters,/obj/item/wrench,/obj/item/extinguisher)
/datum/cargoprofile/finished
name = "Completed Robots"
@@ -519,7 +519,7 @@
name = "Paper Shredder"
id = "shredder"
blacklist = null
- whitelist = list(/obj/item/weapon/paper,/obj/item/weapon/book,/obj/item/weapon/clipboard,/obj/item/weapon/folder,/obj/item/weapon/photo)
+ whitelist = list(/obj/item/paper,/obj/item/book,/obj/item/clipboard,/obj/item/folder,/obj/item/photo)
universal = 1
dedicated_path = /obj/machinery/programmable/unary/shredder
@@ -569,23 +569,23 @@
outlet_reaction(var/atom/W,var/turf/D)
- if(istype(W,/obj/item/weapon/paper/crumpled))
+ if(istype(W,/obj/item/paper/crumpled))
qdel(W)
return
- if(istype(W,/obj/item/weapon/clipboard) || istype(W,/obj/item/weapon/folder))
+ if(istype(W,/obj/item/clipboard) || istype(W,/obj/item/folder))
// destroy folder, various effects on contents
for(var/obj/item/I in W.contents)
if(prob(25))//JUNK IT
qdel(I)
else if(prob(50)) //We've been over this. I can't just take it apart with a crowbar.
- var/obj/item/weapon/paper/crumpled/P = new(master.loc)
+ var/obj/item/paper/crumpled/P = new(master.loc)
if(I.name)
P.name = garbletext(I.name)
if(prob(66))
P.fingerprints = I.fingerprints
P.fingerprintshidden = I.fingerprintshidden
- if(istype(I,/obj/item/weapon/paper))
- var/obj/item/weapon/paper/O = I
+ if(istype(I,/obj/item/paper))
+ var/obj/item/paper/O = I
P.info = garble_keeptags(O.info)
qdel(I)
..(P,D)
@@ -594,18 +594,18 @@
qdel(W) //destroy container
return
if(prob(50)) //JUNK IT NOW!
- var/obj/item/weapon/paper/crumpled/P = new(master.loc)
+ var/obj/item/paper/crumpled/P = new(master.loc)
P.name = W.name
var/obj/item/I = W
if(prob(66))
P.fingerprints = I.fingerprints
P.fingerprintshidden = I.fingerprintshidden
- if(istype(I,/obj/item/weapon/paper))
- var/obj/item/weapon/paper/O = I
+ if(istype(I,/obj/item/paper))
+ var/obj/item/paper/O = I
if(O.info)
P.info = garble_keeptags(O.info)
- if(istype(I,/obj/item/weapon/book))
- var/obj/item/weapon/book/B = I
+ if(istype(I,/obj/item/book))
+ var/obj/item/book/B = I
if(B.dat)
P.info = garble_keeptags(B.dat)
if(B.carved && B.store)
diff --git a/code/datums/components/README.md b/code/datums/components/README.md
new file mode 100644
index 00000000000..ee156e45525
--- /dev/null
+++ b/code/datums/components/README.md
@@ -0,0 +1,120 @@
+# Datum Component System (DCS)
+
+## Concept
+
+Loosely adapted from /vg/. This is an entity component system for adding behaviours to datums when inheritance doesn't quite cut it. By using signals and events instead of direct inheritance, you can inject behaviours without hacky overloads. It requires a different method of thinking, but is not hard to use correctly. If a behaviour can have application across more than one thing. Make it generic, make it a component. Atom/mob/obj event? Give it a signal, and forward it's arguments with a `SendSignal()` call. Now every component that want's to can also know about this happening.
+
+### In the code
+
+#### Slippery things
+
+At the time of this writing, every object that is slippery overrides atom/Crossed does some checks, then slips the mob. Instead of all those Crossed overrides they could add a slippery component to all these objects. And have the checks in one proc that is run by the Crossed event
+
+#### Powercells
+
+A lot of objects have powercells. The `get_cell()` proc was added to give generic access to the cell var if it had one. This is just a specific use case of `GetComponent()`
+
+#### Radios
+
+The radio object as it is should not exist, given that more things use the _concept_ of radios rather than the object itself. The actual function of the radio can exist in a component which all the things that use it (Request consoles, actual radios, the SM shard) can add to themselves.
+
+#### Standos
+
+Stands have a lot of procs which mimic mob procs. Rather than inserting hooks for all these procs in overrides, the same can be accomplished with signals
+
+## API
+
+### Defines
+
+1. `COMPONENT_INCOMPATIBLE` Return this from `/datum/component/Initialize` or `datum/component/OnTransfer` to have the component be deleted if it's applied to an incorrect type. `parent` must not be modified if this is to be returned.
+
+### Vars
+
+1. `/datum/var/list/datum_components` (private)
+ * Lazy associated list of type -> component/list of components.
+1. `/datum/component/var/enabled` (protected, boolean)
+ * If the component is enabled. If not, it will not react to signals
+ * `FALSE` by default, set to `TRUE` when a signal is registered
+1. `/datum/component/var/dupe_mode` (protected, enum)
+ * How duplicate component types are handled when added to the datum.
+ * `COMPONENT_DUPE_HIGHLANDER` (default): Old component will be deleted, new component will first have `/datum/component/proc/InheritComponent(datum/component/old, FALSE)` on it
+ * `COMPONENT_DUPE_ALLOWED`: The components will be treated as separate, `GetComponent()` will return the first added
+ * `COMPONENT_DUPE_UNIQUE`: New component will be deleted, old component will first have `/datum/component/proc/InheritComponent(datum/component/new, TRUE)` on it
+ * `COMPONENT_DUPE_UNIQUE_PASSARGS`: New component will never exist and instead its initialization arguments will be passed on to the old component.
+1. `/datum/component/var/dupe_type` (protected, type)
+ * Definition of a duplicate component type
+ * `null` means exact match on `type` (default)
+ * Any other type means that and all subtypes
+1. `/datum/component/var/list/signal_procs` (private)
+ * Associated lazy list of signals -> `/datum/callback`s that will be run when the parent datum recieves that signal
+1. `/datum/component/var/datum/parent` (protected, read-only)
+ * The datum this component belongs to
+ * Never `null` in child procs
+
+### Procs
+
+1. `/datum/proc/GetComponent(component_type(type)) -> datum/component?` (public, final)
+ * Returns a reference to a component of component_type if it exists in the datum, null otherwise
+1. `/datum/proc/GetComponents(component_type(type)) -> list` (public, final)
+ * Returns a list of references to all components of component_type that exist in the datum
+1. `/datum/proc/GetExactComponent(component_type(type)) -> datum/component?` (public, final)
+ * Returns a reference to a component whose type MATCHES component_type if that component exists in the datum, null otherwise
+1. `GET_COMPONENT(varname, component_type)` OR `GET_COMPONENT_FROM(varname, component_type, src)`
+ * Shorthand for `var/component_type/varname = src.GetComponent(component_type)`
+1. `/datum/proc/AddComponent(component_type(type), ...) -> datum/component` (public, final)
+ * Creates an instance of `component_type` in the datum and passes `...` to its `Initialize()` call
+ * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum
+ * All components a datum owns are deleted with the datum
+ * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set
+ * If this tries to add an component to an incompatible type, the component will be deleted and the result will be `null`. This is very unperformant, try not to do it
+ * Properly handles duplicate situations based on the `dupe_mode` var
+1. `/datum/proc/LoadComponent(component_type(type), ...) -> datum/component` (public, final)
+ * Equivalent to calling `GetComponent(component_type)` where, if the result would be `null`, returns `AddComponent(component_type, ...)` instead
+1. `/datum/proc/ComponentActivated(datum/component/C)` (abstract, async)
+ * Called on a component's `parent` after a signal recieved causes it to activate. `src` is the parameter
+ * Will only be called if a component's callback returns `TRUE`
+1. `/datum/proc/TakeComponent(datum/component/C)` (public, final)
+ * Properly transfers ownership of a component from one datum to another
+ * Signals `COMSIG_COMPONENT_REMOVING` on the parent
+ * Called on the datum you want to own the component with another datum's component
+1. `/datum/proc/SendSignal(signal, ...)` (public, final)
+ * Call to send a signal to the components of the target datum
+ * Extra arguments are to be specified in the signal definition
+ * Returns a bitflag with signal specific information assembled from all activated components
+1. `/datum/component/New(datum/parent, ...)` (private, final)
+ * Runs internal setup for the component
+ * Extra arguments are passed to `Initialize()`
+1. `/datum/component/Initialize(...)` (abstract, no-sleep)
+ * Called by `New()` with the same argments excluding `parent`
+ * Component does not exist in `parent`'s `datum_components` list yet, although `parent` is set and may be used
+ * Signals will not be recieved while this function is running
+ * Component may be deleted after this function completes without being attached
+ * Do not call `qdel(src)` from this function
+1. `/datum/component/Destroy(force(bool), silent(bool))` (virtual, no-sleep)
+ * Sends the `COMSIG_COMPONENT_REMOVING` signal to the parent datum if the `parent` isn't being qdeleted
+ * Properly removes the component from `parent` and cleans up references
+ * Setting `force` makes it not check for and remove the component from the parent
+ * Setting `silent` deletes the component without sending a `COMSIG_COMPONENT_REMOVING` signal
+1. `/datum/component/proc/InheritComponent(datum/component/C, i_am_original(boolean))` (abstract, no-sleep)
+ * Called on a component when a component of the same type was added to the same parent
+ * See `/datum/component/var/dupe_mode`
+ * `C`'s type will always be the same of the called component
+1. `/datum/component/proc/AfterComponentActivated()` (abstract, async)
+ * Called on a component that was activated after it's `parent`'s `ComponentActivated()` is called
+1. `/datum/component/proc/OnTransfer(datum/new_parent)` (abstract, no-sleep)
+ * Called before `new_parent` is assigned to `parent` in `TakeComponent()`
+ * Allows the component to react to ownership transfers
+1. `/datum/component/proc/_RemoveFromParent()` (private, final)
+ * Clears `parent` and removes the component from it's component list
+1. `/datum/component/proc/_JoinParent` (private, final)
+ * Tries to add the component to it's `parent`s `datum_components` list
+1. `/datum/component/proc/RegisterSignal(signal(string/list of strings), proc_ref(type), override(boolean))` (protected, final) (Consider removing for performance gainz)
+ * If signal is a list it will be as if RegisterSignal was called for each of the entries with the same following arguments
+ * Makes a component listen for the specified `signal` on it's `parent` datum.
+ * When that signal is recieved `proc_ref` will be called on the component, along with associated arguments
+ * Example proc ref: `.proc/OnEvent`
+ * If a previous registration is overwritten by the call, a runtime occurs. Setting `override` to TRUE prevents this
+ * These callbacks run asyncronously
+ * Returning `TRUE` from these callbacks will trigger a `TRUE` return from the `SendSignal()` that initiated it
+
+### See/Define signals and their arguments in __DEFINES\components.dm
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
new file mode 100644
index 00000000000..0da932d1575
--- /dev/null
+++ b/code/datums/components/_component.dm
@@ -0,0 +1,264 @@
+/datum/component
+ var/enabled = FALSE
+ var/dupe_mode = COMPONENT_DUPE_HIGHLANDER
+ var/dupe_type
+ var/list/signal_procs
+ var/datum/parent
+
+/datum/component/New(datum/P, ...)
+ parent = P
+ var/list/arguments = args.Copy(2)
+ if(Initialize(arglist(arguments)) == COMPONENT_INCOMPATIBLE)
+ qdel(src, TRUE, TRUE)
+ CRASH("Incompatible [type] assigned to a [P]!")
+
+ _JoinParent(P)
+
+/datum/component/proc/_JoinParent()
+ var/datum/P = parent
+ //lazy init the parent's dc list
+ var/list/dc = P.datum_components
+ if(!dc)
+ P.datum_components = dc = list()
+
+ //set up the typecache
+ var/our_type = type
+ for(var/I in _GetInverseTypeList(our_type))
+ var/test = dc[I]
+ if(test) //already another component of this type here
+ var/list/components_of_type
+ if(!length(test))
+ components_of_type = list(test)
+ dc[I] = components_of_type
+ else
+ components_of_type = test
+ if(I == our_type) //exact match, take priority
+ var/inserted = FALSE
+ for(var/J in 1 to components_of_type.len)
+ var/datum/component/C = components_of_type[J]
+ if(C.type != our_type) //but not over other exact matches
+ components_of_type.Insert(J, I)
+ inserted = TRUE
+ break
+ if(!inserted)
+ components_of_type += src
+ else //indirect match, back of the line with ya
+ components_of_type += src
+ else //only component of this type, no list
+ dc[I] = src
+
+/datum/component/proc/Initialize(...)
+ return
+
+/datum/component/Destroy(force=FALSE, silent=FALSE)
+ enabled = FALSE
+ var/datum/P = parent
+ if(!force)
+ _RemoveFromParent()
+ if(!silent)
+ P.SendSignal(COMSIG_COMPONENT_REMOVING, src)
+ parent = null
+ LAZYCLEARLIST(signal_procs)
+ return ..()
+
+/datum/component/proc/_RemoveFromParent()
+ var/datum/P = parent
+ var/list/dc = P.datum_components
+ for(var/I in _GetInverseTypeList())
+ var/list/components_of_type = dc[I]
+ if(length(components_of_type)) //
+ var/list/subtracted = components_of_type - src
+ if(subtracted.len == 1) //only 1 guy left
+ dc[I] = subtracted[1] //make him special
+ else
+ dc[I] = subtracted
+ else //just us
+ dc -= I
+ if(!dc.len)
+ P.datum_components = null
+
+/datum/component/proc/RegisterSignal(sig_type_or_types, proc_or_callback, override = FALSE)
+ if(QDELETED(src))
+ return
+ var/list/procs = signal_procs
+ if(!procs)
+ procs = list()
+ signal_procs = procs
+
+ var/list/sig_types = islist(sig_type_or_types) ? sig_type_or_types : list(sig_type_or_types)
+ for(var/sig_type in sig_types)
+ if(!override)
+ . = procs[sig_type]
+ if(.)
+ stack_trace("[sig_type] overridden. Use override = TRUE to suppress this warning")
+
+ if(!istype(proc_or_callback, /datum/callback)) //if it wasnt a callback before, it is now
+ proc_or_callback = CALLBACK(src, proc_or_callback)
+ procs[sig_type] = proc_or_callback
+
+ enabled = TRUE
+
+/datum/component/proc/InheritComponent(datum/component/C, i_am_original)
+ return
+
+/datum/component/proc/OnTransfer(datum/new_parent)
+ return
+
+/datum/component/proc/_GetInverseTypeList(our_type = type)
+ #if DM_VERSION >= 513
+ #warning 512 is definitely stable now, remove the old code
+ #endif
+
+ #if DM_VERSION < 512
+ //remove this when we use 512 full time
+ set invisibility = 101
+ #endif
+ //we can do this one simple trick
+ var/current_type = parent_type
+ . = list(our_type, current_type)
+ //and since most components are root level + 1, this won't even have to run
+ while(current_type != /datum/component)
+ current_type = type2parent(current_type)
+ . += current_type
+
+/datum/proc/SendSignal(sigtype, ...)
+ var/list/comps = datum_components
+ if(!comps)
+ return NONE
+ var/list/arguments = args.Copy(2)
+ var/target = comps[/datum/component]
+ if(!length(target))
+ var/datum/component/C = target
+ if(!C.enabled)
+ return NONE
+ var/datum/callback/CB = C.signal_procs[sigtype]
+ if(!CB)
+ return NONE
+ return CB.InvokeAsync(arglist(arguments))
+ . = NONE
+ for(var/I in target)
+ var/datum/component/C = I
+ if(!C.enabled)
+ continue
+ var/datum/callback/CB = C.signal_procs[sigtype]
+ if(!CB)
+ continue
+ . |= CB.InvokeAsync(arglist(arguments))
+
+/datum/proc/GetComponent(c_type)
+ var/list/dc = datum_components
+ if(!dc)
+ return null
+ . = dc[c_type]
+ if(length(.))
+ return .[1]
+
+/datum/proc/GetExactComponent(c_type)
+ var/list/dc = datum_components
+ if(!dc)
+ return null
+ var/datum/component/C = dc[c_type]
+ if(C)
+ if(length(C))
+ C = C[1]
+ if(C.type == c_type)
+ return C
+ return null
+
+/datum/proc/GetComponents(c_type)
+ var/list/dc = datum_components
+ if(!dc)
+ return null
+ . = dc[c_type]
+ if(!length(.))
+ return list(.)
+
+/datum/proc/AddComponent(new_type, ...)
+ var/datum/component/nt = new_type
+ var/dm = initial(nt.dupe_mode)
+ var/dt = initial(nt.dupe_type)
+
+ var/datum/component/old_comp
+ var/datum/component/new_comp
+
+ if(ispath(nt))
+ if(nt == /datum/component)
+ CRASH("[nt] attempted instantiation!")
+ if(!isnum(dm))
+ CRASH("[nt]: Invalid dupe_mode ([dm])!")
+ if(dt && !ispath(dt))
+ CRASH("[nt]: Invalid dupe_type ([dt])!")
+ else
+ new_comp = nt
+
+ args[1] = src
+
+ if(dm != COMPONENT_DUPE_ALLOWED)
+ if(!dt)
+ old_comp = GetExactComponent(nt)
+ else
+ old_comp = GetComponent(dt)
+ if(old_comp)
+ switch(dm)
+ if(COMPONENT_DUPE_UNIQUE)
+ if(!new_comp)
+ new_comp = new nt(arglist(args))
+ if(!QDELETED(new_comp))
+ old_comp.InheritComponent(new_comp, TRUE)
+ QDEL_NULL(new_comp)
+ if(COMPONENT_DUPE_HIGHLANDER)
+ if(!new_comp)
+ new_comp = new nt(arglist(args))
+ if(!QDELETED(new_comp))
+ new_comp.InheritComponent(old_comp, FALSE)
+ QDEL_NULL(old_comp)
+ if(COMPONENT_DUPE_UNIQUE_PASSARGS)
+ if(!new_comp)
+ var/list/arguments = args.Copy(2)
+ old_comp.InheritComponent(null, TRUE, arguments)
+ else
+ old_comp.InheritComponent(new_comp, TRUE)
+ else if(!new_comp)
+ new_comp = new nt(arglist(args)) // There's a valid dupe mode but there's no old component, act like normal
+ else if(!new_comp)
+ new_comp = new nt(arglist(args)) // Dupes are allowed, act like normal
+
+ if(!old_comp && !QDELETED(new_comp)) // Nothing related to duplicate components happened and the new component is healthy
+ SendSignal(COMSIG_COMPONENT_ADDED, new_comp)
+ return new_comp
+ return old_comp
+
+/datum/proc/LoadComponent(component_type, ...)
+ . = GetComponent(component_type)
+ if(!.)
+ return AddComponent(arglist(args))
+
+/datum/proc/TakeComponent(datum/component/C)
+ if(!C)
+ return
+ var/datum/helicopter = C.parent
+ if(helicopter == src)
+ //if we're taking to the same thing no need for anything
+ return
+ if(C.OnTransfer(src) == COMPONENT_INCOMPATIBLE)
+ qdel(C)
+ return
+ C._RemoveFromParent()
+ helicopter.SendSignal(COMSIG_COMPONENT_REMOVING, C)
+ C.parent = src
+ if(C == AddComponent(C))
+ C._JoinParent()
+
+/datum/proc/TransferComponents(datum/target)
+ var/list/dc = datum_components
+ if(!dc)
+ return
+ var/comps = dc[/datum/component]
+ if(islist(comps))
+ for(var/I in comps)
+ target.TakeComponent(I)
+ else
+ target.TakeComponent(comps)
+
+/datum/component/nano_host()
+ return parent
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
new file mode 100644
index 00000000000..f08181cb5f4
--- /dev/null
+++ b/code/datums/components/material_container.dm
@@ -0,0 +1,389 @@
+/*
+ This datum should be used for handling mineral contents of machines and whatever else is supposed to hold minerals and make use of them.
+
+ Variables:
+ amount - raw amount of the mineral this container is holding, calculated by the defined value MINERAL_MATERIAL_AMOUNT=2000.
+ max_amount - max raw amount of mineral this container can hold.
+ sheet_type - type of the mineral sheet the container handles, used for output.
+ parent - object that this container is being used by, used for output.
+ MAX_STACK_SIZE - size of a stack of mineral sheets. Constant.
+*/
+
+/datum/component/material_container
+ var/total_amount = 0
+ var/max_amount
+ var/sheet_type
+ var/list/materials
+ var/show_on_examine
+ var/list/allowed_typecache
+ var/last_inserted_id
+ var/precise_insertion = FALSE
+ var/datum/callback/precondition
+ var/datum/callback/after_insert
+
+/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition, datum/callback/_after_insert)
+ materials = list()
+ max_amount = max(0, max_amt)
+ show_on_examine = _show_on_examine
+ if(allowed_types)
+ allowed_typecache = typecacheof(allowed_types)
+ precondition = _precondition
+ after_insert = _after_insert
+
+ RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
+ RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/OnExamine)
+
+ var/list/possible_mats = list()
+ for(var/mat_type in subtypesof(/datum/material))
+ var/datum/material/MT = mat_type
+ possible_mats[initial(MT.id)] = mat_type
+ for(var/id in mat_list)
+ if(possible_mats[id])
+ var/mat_path = possible_mats[id]
+ materials[id] = new mat_path()
+
+/datum/component/material_container/proc/OnExamine(mob/user)
+ for(var/I in materials)
+ var/datum/material/M = materials[I]
+ var/amt = amount(M.id)
+ if(amt)
+ to_chat(user, "It has [amt] units of [lowertext(M.name)] stored.")
+
+/datum/component/material_container/proc/OnAttackBy(obj/item/I, mob/living/user)
+ var/list/tc = allowed_typecache
+ if(user.a_intent != INTENT_HELP)
+ return
+ if((I.flags_2 & (HOLOGRAM_2 | NO_MAT_REDEMPTION_2)) || (tc && !is_type_in_typecache(I, tc)))
+ to_chat(user, "[parent] won't accept [I]!")
+ return
+ . = COMPONENT_NO_AFTERATTACK
+ var/datum/callback/pc = precondition
+ if(pc && !pc.Invoke(user))
+ return
+ var/material_amount = get_item_material_amount(I)
+ if(!material_amount)
+ to_chat(user, "[I] does not contain sufficient amounts of metal or glass to be accepted by [parent].")
+ return
+ if(!has_space(material_amount))
+ to_chat(user, "[parent] is full. Please remove metal or glass from [parent] in order to insert more.")
+ return
+ user_insert(I, user)
+
+/datum/component/material_container/proc/user_insert(obj/item/I, mob/living/user)
+ set waitfor = FALSE
+ var/requested_amount
+ if(istype(I, /obj/item/stack) && precise_insertion)
+ var/atom/current_parent = parent
+ var/obj/item/stack/S = I
+ requested_amount = input(user, "How much do you want to insert?", "Inserting [S.singular_name]s") as num|null
+ if(isnull(requested_amount) || (requested_amount <= 0))
+ return
+ if(QDELETED(I) || QDELETED(user) || QDELETED(src) || parent != current_parent || user.incapacitated() || !in_range(current_parent, user) || user.l_hand != I && user.r_hand != I)
+ return
+ if(!user.drop_item())
+ to_chat(user, "[I] is stuck to you and cannot be placed into [parent].")
+ return
+ var/inserted = insert_item(I, stack_amt = requested_amount)
+ if(inserted)
+ if(istype(I, /obj/item/stack))
+ var/obj/item/stack/S = I
+ to_chat(user, "You insert [inserted] [S.singular_name][inserted>1 ? "s" : ""] into [parent].")
+ if(!QDELETED(I))
+ if(!user.put_in_hands(I))
+ stack_trace("Warning: User could not put object back in hand during material container insertion, line [__LINE__]! This can lead to issues.")
+ I.forceMove(user.loc)
+ else
+ to_chat(user, "You insert a material total of [inserted] into [parent].")
+ qdel(I)
+ if(after_insert)
+ after_insert.Invoke(I.type, last_inserted_id, inserted)
+ else
+ user.put_in_active_hand(I)
+
+//For inserting an amount of material
+/datum/component/material_container/proc/insert_amount(amt, id = null)
+ if(amt > 0 && has_space(amt))
+ var/total_amount_saved = total_amount
+ if(id)
+ var/datum/material/M = materials[id]
+ if(M)
+ M.amount += amt
+ total_amount += amt
+ else
+ for(var/i in materials)
+ var/datum/material/M = materials[i]
+ M.amount += amt
+ total_amount += amt
+ return (total_amount - total_amount_saved)
+ return FALSE
+
+/datum/component/material_container/proc/insert_stack(obj/item/stack/S, amt, multiplier = 1)
+ if(isnull(amt))
+ amt = S.amount
+
+ if(amt <= 0)
+ return FALSE
+
+ if(amt > S.amount)
+ amt = S.amount
+
+ var/material_amt = get_item_material_amount(S)
+ if(!material_amt)
+ return FALSE
+
+ amt = min(amt, round(((max_amount - total_amount) / material_amt)))
+ if(!amt)
+ return FALSE
+
+ last_inserted_id = insert_materials(S,amt * multiplier)
+ S.use(amt)
+ return amt
+
+/datum/component/material_container/proc/insert_item(obj/item/I, multiplier = 1, stack_amt)
+ if(!I)
+ return FALSE
+ if(istype(I, /obj/item/stack))
+ return insert_stack(I, stack_amt, multiplier)
+
+ var/material_amount = get_item_material_amount(I)
+ if(!material_amount || !has_space(material_amount))
+ return FALSE
+
+ last_inserted_id = insert_materials(I, multiplier)
+ return material_amount
+
+/datum/component/material_container/proc/insert_materials(obj/item/I, multiplier = 1) //for internal usage only
+ var/datum/material/M
+ var/primary_mat
+ var/max_mat_value = 0
+ for(var/MAT in materials)
+ M = materials[MAT]
+ M.amount += I.materials[MAT] * multiplier
+ total_amount += I.materials[MAT] * multiplier
+ if(I.materials[MAT] > max_mat_value)
+ primary_mat = MAT
+ return primary_mat
+
+//For consuming material
+//mats is a list of types of material to use and the corresponding amounts, example: list(MAT_METAL=100, MAT_GLASS=200)
+/datum/component/material_container/proc/use_amount(list/mats, multiplier=1)
+ if(!mats || !mats.len)
+ return FALSE
+
+ var/datum/material/M
+ for(var/MAT in materials)
+ M = materials[MAT]
+ if(M.amount < (mats[MAT] * multiplier))
+ return FALSE
+
+ var/total_amount_save = total_amount
+ for(var/MAT in materials)
+ M = materials[MAT]
+ M.amount -= mats[MAT] * multiplier
+ total_amount -= mats[MAT] * multiplier
+
+ return total_amount_save - total_amount
+
+
+/datum/component/material_container/proc/use_amount_type(amt, id)
+ var/datum/material/M = materials[id]
+ if(M)
+ if(M.amount >= amt)
+ M.amount -= amt
+ total_amount -= amt
+ return amt
+ return FALSE
+
+/datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, id)
+ if((amt==0)||(!T)||(!id))
+ return FALSE
+ if(amt<0)
+ return T.transer_amt_to(src, -amt, id)
+ var/datum/material/M = materials[id]
+
+ if(M)
+ var/tr = min(amt, M.amount,T.can_insert_amount(amt, id))
+ if(tr)
+ use_amount_type(tr, id)
+ T.insert_amount(tr, id)
+ return tr
+ return FALSE
+
+/datum/component/material_container/proc/can_insert_amount(amt, id)
+ if(amt && id)
+ var/datum/material/M = materials[id]
+ if(M)
+ if((total_amount + amt) <= max_amount)
+ return amt
+ else
+ return (max_amount-total_amount)
+
+/datum/component/material_container/proc/can_use_amount(amt, id, list/mats)
+ if(amt && id)
+ var/datum/material/M = materials[id]
+ if(M && M.amount >= amt)
+ return TRUE
+ else if(istype(mats))
+ for(var/M in mats)
+ if(materials[M] && (mats[M] <= materials[M]))
+ continue
+ else
+ return FALSE
+ return TRUE
+ return FALSE
+
+//For spawning mineral sheets; internal use only
+/datum/component/material_container/proc/retrieve(sheet_amt, datum/material/M, target = null)
+ if(!M.sheet_type)
+ return FALSE
+ if(sheet_amt > 0)
+ if(M.amount < (sheet_amt * MINERAL_MATERIAL_AMOUNT))
+ sheet_amt = round(M.amount / MINERAL_MATERIAL_AMOUNT)
+ var/count = 0
+ while(sheet_amt > MAX_STACK_SIZE)
+ new M.sheet_type(get_turf(parent), MAX_STACK_SIZE)
+ count += MAX_STACK_SIZE
+ use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id)
+ sheet_amt -= MAX_STACK_SIZE
+ if(round((sheet_amt * MINERAL_MATERIAL_AMOUNT) / MINERAL_MATERIAL_AMOUNT))
+ var/obj/item/stack/sheet/s = new M.sheet_type(get_turf(parent), sheet_amt)
+ if(target)
+ s.forceMove(target)
+ count += sheet_amt
+ use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.id)
+ return count
+ return FALSE
+
+/datum/component/material_container/proc/retrieve_sheets(sheet_amt, id, target = null)
+ if(materials[id])
+ return retrieve(sheet_amt, materials[id], target)
+ return FALSE
+
+/datum/component/material_container/proc/retrieve_amount(amt, id, target)
+ return retrieve_sheets(amount2sheet(amt), id, target)
+
+/datum/component/material_container/proc/retrieve_all(target = null)
+ var/result = 0
+ var/datum/material/M
+ for(var/MAT in materials)
+ M = materials[MAT]
+ result += retrieve_sheets(amount2sheet(M.amount), MAT, target)
+ return result
+
+/datum/component/material_container/proc/has_space(amt = 0)
+ return (total_amount + amt) <= max_amount
+
+/datum/component/material_container/proc/has_materials(list/mats, multiplier=1)
+ if(!mats || !mats.len)
+ return FALSE
+
+ var/datum/material/M
+ for(var/MAT in mats)
+ M = materials[MAT]
+ if(M.amount < (mats[MAT] * multiplier))
+ return FALSE
+ return TRUE
+
+/datum/component/material_container/proc/amount2sheet(amt)
+ if(amt >= MINERAL_MATERIAL_AMOUNT)
+ return round(amt / MINERAL_MATERIAL_AMOUNT)
+ return FALSE
+
+/datum/component/material_container/proc/sheet2amount(sheet_amt)
+ if(sheet_amt > 0)
+ return sheet_amt * MINERAL_MATERIAL_AMOUNT
+ return FALSE
+
+/datum/component/material_container/proc/amount(id)
+ var/datum/material/M = materials[id]
+ return M ? M.amount : 0
+
+//returns the amount of material relevant to this container;
+//if this container does not support glass, any glass in 'I' will not be taken into account
+/datum/component/material_container/proc/get_item_material_amount(obj/item/I)
+ if(!istype(I))
+ return FALSE
+ var/material_amount = 0
+ for(var/MAT in materials)
+ material_amount += I.materials[MAT]
+ return material_amount
+
+
+/datum/material
+ var/name
+ var/amount = 0
+ var/id = null
+ var/sheet_type = null
+ var/coin_type = null
+
+/datum/material/metal
+ name = "Metal"
+ id = MAT_METAL
+ sheet_type = /obj/item/stack/sheet/metal
+ coin_type = /obj/item/coin/iron
+
+/datum/material/glass
+ name = "Glass"
+ id = MAT_GLASS
+ sheet_type = /obj/item/stack/sheet/glass
+
+/datum/material/silver
+ name = "Silver"
+ id = MAT_SILVER
+ sheet_type = /obj/item/stack/sheet/mineral/silver
+ coin_type = /obj/item/coin/silver
+
+/datum/material/gold
+ name = "Gold"
+ id = MAT_GOLD
+ sheet_type = /obj/item/stack/sheet/mineral/gold
+ coin_type = /obj/item/coin/gold
+
+/datum/material/diamond
+ name = "Diamond"
+ id = MAT_DIAMOND
+ sheet_type = /obj/item/stack/sheet/mineral/diamond
+ coin_type = /obj/item/coin/diamond
+
+/datum/material/uranium
+ name = "Uranium"
+ id = MAT_URANIUM
+ sheet_type = /obj/item/stack/sheet/mineral/uranium
+ coin_type = /obj/item/coin/uranium
+
+/datum/material/plasma
+ name = "Solid Plasma"
+ id = MAT_PLASMA
+ sheet_type = /obj/item/stack/sheet/mineral/plasma
+ coin_type = /obj/item/coin/plasma
+
+/datum/material/bluespace
+ name = "Bluespace Mesh"
+ id = MAT_BLUESPACE
+ sheet_type = /obj/item/stack/sheet/bluespace_crystal
+
+/datum/material/bananium
+ name = "Bananium"
+ id = MAT_BANANIUM
+ sheet_type = /obj/item/stack/sheet/mineral/bananium
+ coin_type = /obj/item/coin/clown
+
+/datum/material/tranquillite
+ name = "Tranquillite"
+ id = MAT_TRANQUILLITE
+ sheet_type = /obj/item/stack/sheet/mineral/tranquillite
+ coin_type = /obj/item/coin/mime
+
+/datum/material/titanium
+ name = "Titanium"
+ id = MAT_TITANIUM
+ sheet_type = /obj/item/stack/sheet/mineral/titanium
+
+/datum/material/biomass
+ name = "Biomass"
+ id = MAT_BIOMASS
+
+/datum/material/plastic
+ name = "Plastic"
+ id = MAT_PLASTIC
+ sheet_type = /obj/item/stack/sheet/plastic
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 558f6407528..96c663fb703 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -468,137 +468,142 @@ var/record_id_num = 1001
var/icon/clothes_s = null
- switch(H.mind.assigned_role)
- if("Head of Personnel")
- clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if("Nanotrasen Representative")
- clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- if("Blueshield")
- clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
- if("Magistrate")
- clothes_s = new /icon('icons/mob/uniform.dmi', "really_black_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_OVERLAY)
- if("Bartender")
- clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Botanist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Chef")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Janitor")
- clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Librarian")
- clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Quartermaster")
- clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if("Cargo Technician")
- clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Shaft Miner")
- clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Lawyer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if("Chaplain")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Research Director")
- clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- if("Scientist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
- if("Chemist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
- if("Chief Medical Officer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
- if("Medical Doctor")
- clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- if("Geneticist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
- if("Virologist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
- if("Psychiatrist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "psych_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_UNDERLAY)
- if("Paramedic")
- clothes_s = new /icon('icons/mob/uniform.dmi', "paramedic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if("Captain")
- clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if("Head of Security")
- clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- if("Warden")
- clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- if("Detective")
- clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
- if("Security Pod Pilot")
- clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
- if("Brig Physician")
- clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
- if("Security Officer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- if("Chief Engineer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if("Station Engineer")
- clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if("Life Support Specialist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if("Mechanic")
- clothes_s = new /icon('icons/mob/uniform.dmi', "mechanic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if("Roboticist")
- clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- else if(H.mind.assigned_role in get_all_centcom_jobs())
- clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- else
- clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if(H.mind)
+ switch(H.mind.assigned_role)
+ if("Head of Personnel")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if("Nanotrasen Representative")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ if("Blueshield")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
+ if("Magistrate")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "really_black_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_OVERLAY)
+ if("Bartender")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Botanist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Chef")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Janitor")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Librarian")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Quartermaster")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if("Cargo Technician")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Shaft Miner")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Lawyer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if("Chaplain")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Research Director")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ if("Scientist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "toxinswhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+ if("Chemist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
+ if("Chief Medical Officer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
+ if("Medical Doctor")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ if("Geneticist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
+ if("Virologist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+ if("Psychiatrist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "psych_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_UNDERLAY)
+ if("Paramedic")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "paramedic_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if("Captain")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if("Head of Security")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ if("Warden")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ if("Detective")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+ if("Security Pod Pilot")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
+ if("Brig Physician")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
+ if("Security Officer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ if("Chief Engineer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ if("Station Engineer")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ if("Life Support Specialist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ if("Mechanic")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "mechanic_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ if("Roboticist")
+ clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ else if(H.mind.assigned_role in get_all_centcom_jobs())
+ clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ else
+ clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ else
+ clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+
preview_icon.Blend(face_s, ICON_OVERLAY) // Why do we do this twice
if(clothes_s)
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
new file mode 100644
index 00000000000..3e8c11cc1e8
--- /dev/null
+++ b/code/datums/datum.dm
@@ -0,0 +1,31 @@
+/datum
+ var/gc_destroyed //Time when this object was destroyed.
+ var/list/datum_components //for /datum/components
+ var/var_edited = FALSE //Warranty void if seal is broken
+
+ var/tmp/unique_datum_id = null
+
+#ifdef TESTING
+ var/running_find_references
+ var/last_find_references = 0
+#endif
+
+// Default implementation of clean-up code.
+// This should be overridden to remove all references pointing to the object being destroyed.
+// Return the appropriate QDEL_HINT; in most cases this is QDEL_HINT_QUEUE.
+/datum/proc/Destroy(force = FALSE, ...)
+ tag = null
+
+ var/list/dc = datum_components
+ if(dc)
+ var/all_components = dc[/datum/component]
+ if(length(all_components))
+ for(var/I in all_components)
+ var/datum/component/C = I
+ qdel(C, FALSE, TRUE)
+ else
+ var/datum/component/C = all_components
+ qdel(C, FALSE, TRUE)
+ dc.Cut()
+
+ return QDEL_HINT_QUEUE
\ No newline at end of file
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 120b36ae4dc..9526a3e671a 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -1,8 +1,5 @@
// reference: /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
-/datum
- var/var_edited = FALSE //Warranty void if seal is broken
-
/datum/proc/can_vv_get(var_name)
return TRUE
@@ -1263,7 +1260,7 @@
if(prompt != "Yes")
return
L.Cut(index, index+1)
- log_to_dd("### ListVarEdit by [src]: /list's contents: REMOVED=[html_encode("[variable]")]")
+ log_world("### ListVarEdit by [src]: /list's contents: REMOVED=[html_encode("[variable]")]")
log_admin("[key_name(src)] modified list's contents: REMOVED=[variable]")
message_admins("[key_name_admin(src)] modified list's contents: REMOVED=[variable]")
return TRUE
@@ -1284,7 +1281,7 @@
return TRUE
uniqueList_inplace(L)
- log_to_dd("### ListVarEdit by [src]: /list contents: CLEAR DUPES")
+ log_world("### ListVarEdit by [src]: /list contents: CLEAR DUPES")
log_admin("[key_name(src)] modified list's contents: CLEAR DUPES")
message_admins("[key_name_admin(src)] modified list's contents: CLEAR DUPES")
return TRUE
@@ -1296,7 +1293,7 @@
return TRUE
listclearnulls(L)
- log_to_dd("### ListVarEdit by [src]: /list contents: CLEAR NULLS")
+ log_world("### ListVarEdit by [src]: /list contents: CLEAR NULLS")
log_admin("[key_name(src)] modified list's contents: CLEAR NULLS")
message_admins("[key_name_admin(src)] modified list's contents: CLEAR NULLS")
return TRUE
@@ -1311,7 +1308,7 @@
return TRUE
L.len = value["value"]
- log_to_dd("### ListVarEdit by [src]: /list len: [L.len]")
+ log_world("### ListVarEdit by [src]: /list len: [L.len]")
log_admin("[key_name(src)] modified list's len: [L.len]")
message_admins("[key_name_admin(src)] modified list's len: [L.len]")
return TRUE
@@ -1323,7 +1320,7 @@
return TRUE
shuffle_inplace(L)
- log_to_dd("### ListVarEdit by [src]: /list contents: SHUFFLE")
+ log_world("### ListVarEdit by [src]: /list contents: SHUFFLE")
log_admin("[key_name(src)] modified list's contents: SHUFFLE")
message_admins("[key_name_admin(src)] modified list's contents: SHUFFLE")
return TRUE
diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm
index 86c2337c827..e39a592bc3b 100644
--- a/code/datums/diseases/_MobProcs.dm
+++ b/code/datums/diseases/_MobProcs.dm
@@ -88,7 +88,7 @@
switch(target_zone)
if(1)
- if(isobj(H.head) && !istype(H.head, /obj/item/weapon/paper))
+ if(isobj(H.head) && !istype(H.head, /obj/item/paper))
Cl = H.head
passed = prob((Cl.permeability_coefficient*100) - 1)
if(passed && isobj(H.wear_mask))
diff --git a/code/datums/diseases/kingstons.dm b/code/datums/diseases/kingstons.dm
new file mode 100644
index 00000000000..abad7dcf720
--- /dev/null
+++ b/code/datums/diseases/kingstons.dm
@@ -0,0 +1,95 @@
+/datum/disease/kingstons
+ name = "Kingstons Syndrome"
+ max_stages = 4
+ spread_text = "Airborne"
+ cure_text = "Milk"
+ cures = list("milk")
+ cure_chance = 50
+ agent = "Nya Virus"
+ viable_mobtypes = list(/mob/living/carbon/human)
+ permeability_mod = 0.75
+ desc = "If left untreated the subject will turn into a feline. In felines it has... OTHER... effects."
+ severity = DANGEROUS
+
+/datum/disease/kingstons/stage_act()
+ ..()
+ switch(stage)
+ if(1)
+ if(prob(10))
+ if(affected_mob.get_species() == "Tajaran")
+ to_chat(affected_mob, "You feel good.")
+ else
+ to_chat(affected_mob, "You feel like playing with string.")
+ if(2)
+ if(prob(10))
+ if(affected_mob.get_species() == "Tajaran")
+ to_chat(affected_mob, "Something in your throat itches.")
+ else
+ to_chat(affected_mob, "You NEED to find a mouse.")
+ if(3)
+ if(prob(10))
+ if(affected_mob.get_species() == "Tajaran")
+ to_chat(affected_mob, "You feel something in your throat!")
+ affected_mob.emote("cough")
+ else
+ affected_mob.say(pick(list("Mew", "Meow!", "Nya!~")))
+ if(4)
+ if(prob(5))
+ if(affected_mob.get_species() == "Tajaran")
+ affected_mob.visible_message("[affected_mob] coughs up a hairball!", \
+ "You cough up a hairball!")
+ affected_mob.Stun(5)
+ else
+ affected_mob.visible_message("[affected_mob]'s form contorts into something more feline!", \
+ "YOU TURN INTO A TAJARAN!")
+ var/mob/living/carbon/human/catface = affected_mob
+ catface.set_species("Tajaran")
+
+
+/datum/disease/kingstons/advanced
+ name = "Advanced Kingstons Syndrome"
+ spread_text = "Airborne"
+ cure_text = "Plasma"
+ cures = list("plasma")
+ cure_chance = 50
+ agent = "AMB45DR Bacteria"
+ viable_mobtypes = list(/mob/living/carbon/human)
+ permeability_mod = 0.75
+ desc = "If left untreated the subject will mutate to a different species."
+ severity = BIOHAZARD
+ var/list/virspecies = list("Human", "Tajaran", "Unathi", "Skrell", "Vulpkanin")//no karma races sorrys.
+ var/list/virsuffix = list("pox", "rot", "flu", "cough", "-gitis", "cold", "rash", "itch", "decay")
+ var/chosentype
+ var/chosensuff
+
+/datum/disease/kingstons/advanced/New()
+ chosentype = pick(virspecies)
+ chosensuff = pick(virsuffix)
+
+ name = "[chosentype] [chosensuff]"
+
+/datum/disease/kingstons/advanced/stage_act()
+ ..()
+ switch(stage)
+ if(1)
+ if(prob(10))
+ to_chat(affected_mob, "You feel awkward.")
+ if(2)
+ if(prob(10))
+ to_chat(affected_mob, "You itch.")
+ if(3)
+ if(prob(10))
+ to_chat(affected_mob, "Your skin starts to flake!")
+
+ if(4)
+ if(prob(5))
+ if(affected_mob.get_species() != chosentype)
+ affected_mob.visible_message("[affected_mob]'s skin splits and form contorts!", \
+ "Your body mutates into a [chosentype]!")
+ var/mob/living/carbon/human/twisted = affected_mob
+ twisted.set_species(chosentype)
+ else
+ affected_mob.visible_message("[affected_mob] scratches at thier skin!", \
+ "You scratch your skin to try not to itch!")
+ affected_mob.adjustBruteLoss(-5)
+ affected_mob.adjustStaminaLoss(5)
\ No newline at end of file
diff --git a/code/datums/diseases/lycancoughy.dm b/code/datums/diseases/lycancoughy.dm
new file mode 100644
index 00000000000..2c5a8752cbb
--- /dev/null
+++ b/code/datums/diseases/lycancoughy.dm
@@ -0,0 +1,45 @@
+/datum/disease/lycan
+ name = "Lycancoughy"
+ form = "Infection"
+ max_stages = 4
+ spread_text = "On contact"
+ spread_flags = CONTACT_GENERAL
+ cure_text = "Ethanol"
+ cures = list("ethanol")
+ agent = "Excess Snuggles"
+ viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
+ desc = "If left untreated subject will regurgitate... puppies."
+ severity = MEDIUM
+
+/datum/disease/lycan/stage_act()
+ ..()
+ switch(stage)
+ if(2) //also changes say, see say.dm
+ if(prob(5))
+ to_chat(affected_mob, "You itch.")
+ affected_mob.emote("cough")
+ if(3)
+ if(prob(10))
+ to_chat(affected_mob, "You hear faint barking.")
+ if(prob(5))
+ to_chat(affected_mob, "You crave meat.")
+ affected_mob.emote("cough")
+ if(prob(2))
+ to_chat(affected_mob, "Your stomach growls!")
+ if(4)
+ if(prob(10))
+ to_chat(affected_mob, "Your stomach barks?!")
+ if(prob(5))
+ affected_mob.visible_message("[affected_mob] howls!", \
+ "You howl!")
+ affected_mob.AdjustConfused(rand(6, 8))
+ if(prob(3))
+ var/list/puppytype = list(/mob/living/simple_animal/pet/corgi/puppy, /mob/living/simple_animal/pet/pug, /mob/living/simple_animal/pet/fox)
+ var/mob/living/puppypicked = pick(puppytype)
+ affected_mob.visible_message("[affected_mob] coughs up [initial(puppypicked.name)]!", \
+ "You cough up [initial(puppypicked.name)]?!")
+ affected_mob.emote("cough")
+ affected_mob.adjustBruteLoss(5)
+ new puppypicked(affected_mob.loc)
+ new puppypicked(affected_mob.loc)
+ return
diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm
index 2bf0ca308a8..f2f9e1371b1 100644
--- a/code/datums/diseases/pierrot_throat.dm
+++ b/code/datums/diseases/pierrot_throat.dm
@@ -26,3 +26,38 @@
if(4)
if(prob(5))
affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )
+
+
+/datum/disease/pierrot_throat/advanced
+ name = "Advanced Pierrot's Throat"
+ spread_text = "Airborne"
+ cure_text = "Banana products, especially banana bread."
+ cures = list("banana")
+ cure_chance = 75
+ agent = "H0NI<42.B4n4 Virus"
+ viable_mobtypes = list(/mob/living/carbon/human)
+ permeability_mod = 0.75
+ desc = "If left untreated the subject will probably drive others to insanity and go insane themselves."
+ severity = DANGEROUS
+
+/datum/disease/pierrot_throat/advanced/stage_act()
+ ..()
+ switch(stage)
+ if(1)
+ if(prob(10))
+ to_chat(affected_mob, "You feel very silly.")
+ if(prob(5))
+ to_chat(affected_mob, "You feel like making a joke.")
+ if(2)
+ if(prob(10))
+ to_chat(affected_mob, "You don't just start seeing rainbows... YOU ARE RAINBOWS!")
+ if(3)
+ if(prob(10))
+ to_chat(affected_mob, "Your thoughts are interrupted by a loud HONK!")
+ affected_mob << 'sound/items/AirHorn.ogg'
+ if(4)
+ if(prob(5))
+ affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )
+
+ if(!istype(affected_mob.wear_mask, /obj/item/clothing/mask/gas/virusclown_hat))
+ affected_mob.equip_to_slot(new /obj/item/clothing/mask/gas/virusclown_hat(src), slot_wear_mask)
\ No newline at end of file
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 221b41abbc4..5546efe537e 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -50,7 +50,7 @@
affected_mob.overlays.Cut()
affected_mob.invisibility = 101
for(var/obj/item/W in affected_mob)
- if(istype(W, /obj/item/weapon/implant))
+ if(istype(W, /obj/item/implant))
qdel(W)
continue
W.layer = initial(W.layer)
diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm
index c7b21e4fa2b..158324e72f1 100644
--- a/code/datums/diseases/wizarditis.dm
+++ b/code/datums/diseases/wizarditis.dm
@@ -78,9 +78,9 @@ STI KALY - blind
else
var/mob/living/carbon/H = affected_mob
if(prob(chance))
- if(!istype(H.r_hand, /obj/item/weapon/twohanded/staff))
+ if(!istype(H.r_hand, /obj/item/twohanded/staff))
H.drop_r_hand()
- H.put_in_r_hand( new /obj/item/weapon/twohanded/staff(H) )
+ H.put_in_r_hand( new /obj/item/twohanded/staff(H) )
return
return
diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm
index 04054c17632..127e7baa892 100644
--- a/code/datums/helper_datums/construction_datum.dm
+++ b/code/datums/helper_datums/construction_datum.dm
@@ -43,22 +43,22 @@
return 0
proc/custom_action(step, used_atom, user)
- if(istype(used_atom, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/W = used_atom
+ if(istype(used_atom, /obj/item/weldingtool))
+ var/obj/item/weldingtool/W = used_atom
if(W.remove_fuel(0, user))
playsound(holder, W.usesound, 50, 1)
else
return 0
- else if(istype(used_atom, /obj/item/weapon/wrench))
- var/obj/item/weapon/wrench/W = used_atom
+ else if(istype(used_atom, /obj/item/wrench))
+ var/obj/item/wrench/W = used_atom
playsound(holder, W.usesound, 50, 1)
- else if(istype(used_atom, /obj/item/weapon/screwdriver))
- var/obj/item/weapon/screwdriver/S = used_atom
+ else if(istype(used_atom, /obj/item/screwdriver))
+ var/obj/item/screwdriver/S = used_atom
playsound(holder, S.usesound, 50, 1)
- else if(istype(used_atom, /obj/item/weapon/wirecutters))
- var/obj/item/weapon/wirecutters/W = used_atom
+ else if(istype(used_atom, /obj/item/wirecutters))
+ var/obj/item/wirecutters/W = used_atom
playsound(holder, W.usesound, 50, 1)
else if(istype(used_atom, /obj/item/stack/cable_coil))
@@ -117,8 +117,8 @@
to_chat(user, "You don't have enough cable! You need at least [amount] coils.")
return 0
// WELDER
- if(istype(used_atom,/obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/welder=used_atom
+ if(istype(used_atom,/obj/item/weldingtool))
+ var/obj/item/weldingtool/welder=used_atom
if(!welder.isOn())
to_chat(user, "You tap the [src] with your unlit welder. [pick("Ding","Dong")].")
return 0
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 0e6b2cdc82b..72f5b6545c8 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -158,10 +158,10 @@
/datum/teleport/instant/science/setPrecision(aprecision)
..()
- if(istype(teleatom, /obj/item/weapon/storage/backpack/holding))
+ if(istype(teleatom, /obj/item/storage/backpack/holding))
precision = rand(1,100)
- var/list/bagholding = teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)
+ var/list/bagholding = teleatom.search_contents_for(/obj/item/storage/backpack/holding)
if(bagholding.len)
precision = max(rand(1,100)*bagholding.len,100)
if(istype(teleatom, /mob/living))
diff --git a/code/datums/material_container.dm b/code/datums/material_container.dm
deleted file mode 100644
index 8e31e8ae033..00000000000
--- a/code/datums/material_container.dm
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- This datum should be used for handling mineral contents of machines and whatever else is supposed to hold minerals and make use of them.
-
- Variables:
- amount - raw amount of the mineral this container is holding, calculated by the defined value MINERAL_MATERIAL_AMOUNT=2000.
- max_amount - max raw amount of mineral this container can hold.
- sheet_type - type of the mineral sheet the container handles, used for output.
- owner - object that this container is being used by, used for output.
- MAX_STACK_SIZE - size of a stack of mineral sheets. Constant.
-*/
-
-/datum/material_container
- var/total_amount = 0
- var/max_amount
- var/sheet_type
- var/obj/owner
- var/list/materials = list()
- //MAX_STACK_SIZE = 50
- //MINERAL_MATERIAL_AMOUNT = 2000
-
-/datum/material_container/New(obj/O, list/mat_list, max_amt = 0)
- owner = O
- max_amount = max(0, max_amt)
-
- if(mat_list[MAT_METAL])
- materials[MAT_METAL] = new /datum/material/metal()
- if(mat_list[MAT_GLASS])
- materials[MAT_GLASS] = new /datum/material/glass()
- if(mat_list[MAT_SILVER])
- materials[MAT_SILVER] = new /datum/material/silver()
- if(mat_list[MAT_GOLD])
- materials[MAT_GOLD] = new /datum/material/gold()
- if(mat_list[MAT_DIAMOND])
- materials[MAT_DIAMOND] = new /datum/material/diamond()
- if(mat_list[MAT_URANIUM])
- materials[MAT_URANIUM] = new /datum/material/uranium()
- if(mat_list[MAT_PLASMA])
- materials[MAT_PLASMA] = new /datum/material/plasma()
- if(mat_list[MAT_BANANIUM])
- materials[MAT_BANANIUM] = new /datum/material/bananium()
- if(mat_list[MAT_TRANQUILLITE])
- materials[MAT_TRANQUILLITE] = new /datum/material/tranquillite()
- if(mat_list[MAT_TITANIUM])
- materials[MAT_TITANIUM] = new /datum/material/titanium()
-
-/datum/material_container/Destroy()
- QDEL_LIST_ASSOC_VAL(materials)
- owner = null
- return ..()
-
-//For inserting an amount of material
-/datum/material_container/proc/insert_amount(amt, material_type = null)
- if(amt > 0 && has_space(amt))
- var/total_amount_saved = total_amount
- if(material_type)
- var/datum/material/M = materials[material_type]
- if(M)
- M.amount += amt
- total_amount += amt
- else
- for(var/datum/material/M in materials)
- M.amount += amt
- total_amount += amt
- return (total_amount - total_amount_saved)
- return 0
-
-/datum/material_container/proc/insert_stack(obj/item/stack/S, amt = 0)
- if(amt <= 0)
- return 0
- if(amt > S.amount)
- amt = S.amount
- var/material_amt = get_item_material_amount(S)
- if(!material_amt)
- return 0
-
- amt = min(amt, round(((max_amount - total_amount) / material_amt)))
- if(!amt)
- return 0
-
- insert_materials(S,amt)
- S.use(amt)
- return amt
-
-/datum/material_container/proc/insert_item(obj/item/I, multiplier = 1)
- if(!I)
- return 0
- if(istype(I,/obj/item/stack))
- var/obj/item/stack/S = I
- return insert_stack(I, S.amount)
-
- var/material_amount = get_item_material_amount(I)
- if(!material_amount || !has_space(material_amount))
- return 0
-
- insert_materials(I, multiplier)
- return material_amount
-
-/datum/material_container/proc/insert_materials(obj/item/I, multiplier = 1) //for internal usage only
- var/datum/material/M
- for(var/MAT in materials)
- M = materials[MAT]
- M.amount += I.materials[MAT] * multiplier
- total_amount += I.materials[MAT] * multiplier
-
-//For consuming material
-//mats is a list of types of material to use and the corresponding amounts, example: list(MAT_METAL=100, MAT_GLASS=200)
-/datum/material_container/proc/use_amount(list/mats, multiplier=1)
- if(!mats || !mats.len)
- return 0
-
- var/datum/material/M
- for(var/MAT in materials)
- M = materials[MAT]
- if(M.amount < (mats[MAT] * multiplier))
- return 0
-
- var/total_amount_save = total_amount
- for(var/MAT in materials)
- M = materials[MAT]
- M.amount -= mats[MAT] * multiplier
- total_amount -= mats[MAT] * multiplier
-
- return total_amount_save - total_amount
-
-
-/datum/material_container/proc/use_amount_type(amt, material_type)
- var/datum/material/M
- M = materials[material_type]
- if(M)
- if(M.amount >= amt)
- M.amount -= amt
- total_amount -= amt
- return amt
- return 0
-
-//For spawning mineral sheets; internal use only
-/datum/material_container/proc/retrieve(sheet_amt, datum/material/M)
- if(!M.sheet_type)
- return 0
- if(sheet_amt > 0)
- if(M.amount < (sheet_amt * MINERAL_MATERIAL_AMOUNT))
- sheet_amt = round(M.amount / MINERAL_MATERIAL_AMOUNT)
- var/count = 0
-
- while(sheet_amt > MAX_STACK_SIZE)
- new M.sheet_type(get_turf(owner), MAX_STACK_SIZE)
- count += MAX_STACK_SIZE
- use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.material_type)
- sheet_amt -= MAX_STACK_SIZE
-
- if(round(M.amount / MINERAL_MATERIAL_AMOUNT))
- new M.sheet_type(get_turf(owner), sheet_amt)
- count += sheet_amt
- use_amount_type(sheet_amt * MINERAL_MATERIAL_AMOUNT, M.material_type)
- return count
- return 0
-
-/datum/material_container/proc/retrieve_sheets(sheet_amt, material_type)
- if(materials[material_type])
- return retrieve(sheet_amt, materials[material_type])
- return 0
-
-/datum/material_container/proc/retrieve_amount(amt, material_type)
- return retrieve_sheets(amount2sheet(amt),material_type)
-
-/datum/material_container/proc/retrieve_all()
- var/result = 0
- var/datum/material/M
- for(var/MAT in materials)
- M = materials[MAT]
- result += retrieve_sheets(amount2sheet(M.amount), MAT)
- return result
-
-/datum/material_container/proc/has_space(amt = 0)
- return (total_amount + amt) <= max_amount
-
-/datum/material_container/proc/has_materials(list/mats, multiplier=1)
- if(!mats || !mats.len)
- return 0
-
- var/datum/material/M
- for(var/MAT in mats)
- M = materials[MAT]
- if(M.amount < (mats[MAT] * multiplier))
- return 0
- return 1
-
-/datum/material_container/proc/amount2sheet(amt)
- if(amt >= MINERAL_MATERIAL_AMOUNT)
- return round(amt / MINERAL_MATERIAL_AMOUNT)
- return 0
-
-/datum/material_container/proc/sheet2amount(sheet_amt)
- if(sheet_amt > 0)
- return sheet_amt * MINERAL_MATERIAL_AMOUNT
- return 0
-
-/datum/material_container/proc/amount(material_type)
- var/datum/material/M = materials[material_type]
- return M ? M.amount : 0
-
-//returns the amount of material relevant to this container;
-//if this container does not support glass, any glass in 'I' will not be taken into account
-/datum/material_container/proc/get_item_material_amount(obj/item/I)
- if(!istype(I))
- return 0
- var/material_amount = 0
- for(var/MAT in materials)
- material_amount += I.materials[MAT]
- return material_amount
-
-
-/datum/material
- var/amount = 0
- var/material_type = null
- var/sheet_type = null
-
-/datum/material/metal
-
-/datum/material/metal/New()
- ..()
- material_type = MAT_METAL
- sheet_type = /obj/item/stack/sheet/metal
-
-/datum/material/glass
-
-/datum/material/glass/New()
- ..()
- material_type = MAT_GLASS
- sheet_type = /obj/item/stack/sheet/glass
-
-/datum/material/silver
-
-/datum/material/silver/New()
- ..()
- material_type = MAT_SILVER
- sheet_type = /obj/item/stack/sheet/mineral/silver
-
-/datum/material/gold
-
-/datum/material/gold/New()
- ..()
- material_type = MAT_GOLD
- sheet_type = /obj/item/stack/sheet/mineral/gold
-
-/datum/material/diamond
-
-/datum/material/diamond/New()
- ..()
- material_type = MAT_DIAMOND
- sheet_type = /obj/item/stack/sheet/mineral/diamond
-
-/datum/material/uranium
-
-/datum/material/uranium/New()
- ..()
- material_type = MAT_URANIUM
- sheet_type = /obj/item/stack/sheet/mineral/uranium
-
-/datum/material/plasma
-
-/datum/material/plasma/New()
- ..()
- material_type = MAT_PLASMA
- sheet_type = /obj/item/stack/sheet/mineral/plasma
-
-/datum/material/bananium
-
-/datum/material/bananium/New()
- ..()
- material_type = MAT_BANANIUM
- sheet_type = /obj/item/stack/sheet/mineral/bananium
-
-/datum/material/tranquillite
-
-/datum/material/tranquillite/New()
- ..()
- material_type = MAT_TRANQUILLITE
- sheet_type = /obj/item/stack/sheet/mineral/tranquillite
-
-/datum/material/titanium
-
-/datum/material/titanium/New()
- ..()
- material_type = MAT_TITANIUM
- sheet_type = /obj/item/stack/sheet/mineral/titanium
-
-/datum/material/biomass
-
-/datum/material/biomass/New()
- ..()
- material_type = MAT_BIOMASS
\ No newline at end of file
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 76a13e22e26..5fee7994a83 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -175,7 +175,7 @@
text += "Flash: give" var/list/L = current.get_contents() - var/obj/item/device/flash/flash = locate() in L + var/obj/item/flash/flash = locate() in L if(flash) if(!flash.broken) text += "|take." @@ -419,7 +419,7 @@ ishuman(current) ) text = "Uplink: give" - var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink() + var/obj/item/uplink/hidden/suplink = find_syndicate_uplink() var/crystals if(suplink) crystals = suplink.uses @@ -658,14 +658,14 @@ switch(href_list["implant"]) if("remove") - for(var/obj/item/weapon/implant/mindshield/I in H.contents) + for(var/obj/item/implant/mindshield/I in H.contents) if(I && I.implanted) qdel(I) to_chat(H, "Your mindshield implant has been deactivated.") log_admin("[key_name(usr)] has deactivated [key_name(current)]'s mindshield implant") message_admins("[key_name_admin(usr)] has deactivated [key_name_admin(current)]'s mindshield implant") if("add") - var/obj/item/weapon/implant/mindshield/L = new/obj/item/weapon/implant/mindshield(H) + var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H) L.implant(H) log_admin("[key_name(usr)] has given [key_name(current)] a mindshield implant") @@ -762,7 +762,7 @@ if("takeflash") var/list/L = current.get_contents() - var/obj/item/device/flash/flash = locate() in L + var/obj/item/flash/flash = locate() in L if(!flash) to_chat(usr, "Deleting flash failed!") qdel(flash) @@ -771,7 +771,7 @@ if("repairflash") var/list/L = current.get_contents() - var/obj/item/device/flash/flash = locate() in L + var/obj/item/flash/flash = locate() in L if(!flash) to_chat(usr, "Repairing flash failed!") else @@ -781,7 +781,7 @@ if("reequip") var/list/L = current.get_contents() - var/obj/item/device/flash/flash = locate() in L + var/obj/item/flash/flash = locate() in L qdel(flash) take_uplink() var/fail = 0 @@ -805,14 +805,14 @@ if(!(src in ticker.mode.cult)) ticker.mode.add_cultist(src) special_role = SPECIAL_ROLE_CULTIST - to_chat(current, "You catch a glimpse of the Realm of [ticker.mode.cultdat.entity_name], [ticker.mode.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.mode.cultdat.entity_name].") - to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve [ticker.mode.cultdat.entity_title2] above all else. Bring It back.") + to_chat(current, "You catch a glimpse of the Realm of [ticker.cultdat.entity_name], [ticker.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.cultdat.entity_name].") + to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve [ticker.cultdat.entity_title2] above all else. Bring It back.") log_admin("[key_name(usr)] has culted [key_name(current)]") message_admins("[key_name_admin(usr)] has culted [key_name_admin(current)]") if("tome") var/mob/living/carbon/human/H = current if(istype(H)) - var/obj/item/weapon/tome/T = new(H) + var/obj/item/tome/T = new(H) var/list/slots = list ( "backpack" = slot_in_backpack, @@ -1183,7 +1183,7 @@ message_admins("[key_name_admin(usr)] has taken [key_name_admin(current)]'s uplink") if("crystals") if(usr.client.holder.rights & (R_SERVER|R_EVENT)) - var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink() + var/obj/item/uplink/hidden/suplink = find_syndicate_uplink() var/crystals if(suplink) crystals = suplink.uses @@ -1218,16 +1218,16 @@ // remove traitor uplinks var/list/L = current.get_contents() for(var/t in L) - if(istype(t, /obj/item/device/pda)) + if(istype(t, /obj/item/pda)) if(t:uplink) qdel(t:uplink) t:uplink = null - else if(istype(t, /obj/item/device/radio)) + else if(istype(t, /obj/item/radio)) if(t:traitorradio) qdel(t:traitorradio) t:traitorradio = null t:traitor_frequency = 0.0 - else if(istype(t, /obj/item/weapon/SWF_uplink) || istype(t, /obj/item/weapon/syndicate_uplink)) + else if(istype(t, /obj/item/SWF_uplink) || istype(t, /obj/item/syndicate_uplink)) if(t:origradio) - var/obj/item/device/radio/R = t:origradio + var/obj/item/radio/R = t:origradio R.loc = current.loc R.traitorradio = null R.traitor_frequency = 0.0 @@ -1251,7 +1251,7 @@ return null /datum/mind/proc/take_uplink() - var/obj/item/device/uplink/hidden/H = find_syndicate_uplink() + var/obj/item/uplink/hidden/H = find_syndicate_uplink() if(H) qdel(H) @@ -1317,7 +1317,7 @@ current.loc = pick(wizardstart) ticker.mode.equip_wizard(current) - for(var/obj/item/weapon/spellbook/S in current.contents) + for(var/obj/item/spellbook/S in current.contents) S.op = 0 ticker.mode.name_wizard(current) ticker.mode.forge_wizard_objectives(src) @@ -1330,20 +1330,20 @@ ticker.mode.cult += src ticker.mode.update_cult_icons_added(src) special_role = SPECIAL_ROLE_CULTIST - to_chat(current, "You catch a glimpse of the Realm of [ticker.mode.cultdat.entity_name], [ticker.mode.cultdat.entity_title2]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.mode.cultdat.entity_name].") + to_chat(current, "You catch a glimpse of the Realm of [ticker.cultdat.entity_name], [ticker.cultdat.entity_title2]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.cultdat.entity_name].") to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") var/datum/game_mode/cult/cult = ticker.mode if(GAMEMODE_IS_CULT) cult.memorize_cult_objectives(src) else - var/explanation = "Summon [ticker.mode.cultdat.entity_name] via the use of the appropriate rune. It will only work if nine cultists stand on and around it." + var/explanation = "Summon [ticker.cultdat.entity_name] via the use of the appropriate rune. It will only work if nine cultists stand on and around it." to_chat(current, "Objective #1: [explanation]") current.memory += "Objective #1: [explanation]
" var/mob/living/carbon/human/H = current if(istype(H)) - var/obj/item/weapon/tome/T = new(H) + var/obj/item/tome/T = new(H) var/list/slots = list ( "backpack" = slot_in_backpack, @@ -1380,7 +1380,7 @@ ticker.mode.greet_revolutionary(src,0) var/list/L = current.get_contents() - var/obj/item/device/flash/flash = locate() in L + var/obj/item/flash/flash = locate() in L qdel(flash) take_uplink() var/fail = 0 @@ -1537,7 +1537,7 @@ jumpsuit.color = team_color H.update_inv_w_uniform(0,0) - add_logs(missionary, current, "converted", addition = "for [convert_duration/600] minutes") + add_attack_logs(missionary, current, "Converted to a zealot for [convert_duration/600] minutes") addtimer(src, "remove_zealot", convert_duration, FALSE, jumpsuit) //deconverts after the timer expires return 1 @@ -1546,7 +1546,7 @@ if(!zealot_master) //if they aren't a zealot, we can't remove their zealot status, obviously. don't bother with the rest so we don't confuse them with the messages return ticker.mode.remove_traitor_mind(src) - add_logs(zealot_master, current, "lost control of", addition = "as their zealot master") + add_attack_logs(zealot_master, current, "Lost control of zealot") zealot_master = null if(jumpsuit) diff --git a/code/datums/mixed.dm b/code/datums/mixed.dm index 391b7090ad4..a40a9f9a34d 100644 --- a/code/datums/mixed.dm +++ b/code/datums/mixed.dm @@ -22,8 +22,15 @@ var/list/fields = list( ) /datum/data/record/Destroy() - ..() - return QDEL_HINT_HARDDEL_NOW + if(src in data_core.medical) + data_core.medical -= src + if(src in data_core.security) + data_core.security -= src + if(src in data_core.general) + data_core.general -= src + if(src in data_core.locked) + data_core.locked -= src + return ..() /datum/data/text name = "text" diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 9517ee09ef8..a4f6c44ce52 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -22,6 +22,8 @@ var/pda = null var/internals_slot = null //ID of slot containing a gas tank var/list/backpack_contents = list() // In the list(path=count,otherpath=count) format + var/list/implants = null + var/list/cybernetic_implants = null /datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -89,6 +91,13 @@ var/number = backpack_contents[path] for(var/i = 0, i < number, i++) equip_item(H, path, slot_in_backpack) + if(implants) + for(var/path in implants) + var/obj/item/implant/I = new path(H) + I.implant(H) + for(var/path in cybernetic_implants) + var/obj/item/organ/internal/O = new path(H) + O.insert(H) post_equip(H, visualsOnly) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 5212570223f..525880ee314 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -1,7 +1,14 @@ // Used for 'select equipment' // code/modules/admin/verbs/debug.dm 566 -/proc/apply_to_card(obj/item/weapon/card/id/I, mob/living/carbon/human/H, list/access = list(), rank, special_icon) +/datum/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(!visualsOnly) + H.mind.assigned_role = name + H.job = name + + +/proc/apply_to_card(obj/item/card/id/I, mob/living/carbon/human/H, list/access = list(), rank, special_icon) if(!istype(I) || !istype(H)) return 0 @@ -21,18 +28,18 @@ name = "Syndicate Agent" uniform = /obj/item/clothing/under/syndicate - back = /obj/item/weapon/storage/backpack - belt = /obj/item/weapon/storage/belt/utility/full/multitool + back = /obj/item/storage/backpack + belt = /obj/item/storage/belt/utility/full/multitool gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/combat - l_ear = /obj/item/device/radio/headset/syndicate - id = /obj/item/weapon/card/id/syndicate - r_pocket = /obj/item/device/radio/uplink + l_ear = /obj/item/radio/headset/syndicate + id = /obj/item/card/id/syndicate + r_pocket = /obj/item/radio/uplink backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/device/flashlight = 1, - /obj/item/weapon/card/emag = 1, - /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1 + /obj/item/storage/box/engineer = 1, + /obj/item/flashlight = 1, + /obj/item/card/emag = 1, + /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1 ) var/id_icon = "syndie" @@ -44,16 +51,16 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_syndicate_access(id_access), name, id_icon) - var/obj/item/device/radio/uplink/U = H.r_store + var/obj/item/radio/uplink/U = H.r_store if(istype(U)) U.hidden_uplink.uplink_owner = "[H.key]" U.hidden_uplink.uses = uplink_uses - var/obj/item/device/radio/R = H.l_ear + var/obj/item/radio/R = H.l_ear if(istype(R)) R.set_frequency(SYND_FREQ) @@ -64,12 +71,12 @@ glasses = /obj/item/clothing/glasses/hud/security/chameleon shoes = /obj/item/clothing/shoes/syndigaloshes r_pocket = null - pda = /obj/item/device/pda + pda = /obj/item/pda backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/device/flashlight = 1, - /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1 + /obj/item/storage/box/engineer = 1, + /obj/item/flashlight = 1, + /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1 ) /datum/outfit/admin/syndicate/infiltrator/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -79,34 +86,36 @@ if(H.gloves) H.gloves.name = "black gloves" - var/obj/item/weapon/implant/uplink/U = new /obj/item/weapon/implant/uplink(H) + var/obj/item/implant/uplink/U = new /obj/item/implant/uplink(H) U.implant(H) U.hidden_uplink.uses = uplink_uses - var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(H) + var/obj/item/implant/dust/D = new /obj/item/implant/dust(H) D.implant(H) /datum/outfit/admin/syndicate/operative name = "Syndicate Nuclear Operative" suit = /obj/item/clothing/suit/space/hardsuit/syndi - belt = /obj/item/weapon/storage/belt/military + belt = /obj/item/storage/belt/military head = /obj/item/clothing/head/helmet/space/hardsuit/syndi mask = /obj/item/clothing/mask/gas/syndicate - l_ear = /obj/item/device/radio/headset/syndicate/alt + l_ear = /obj/item/radio/headset/syndicate/alt glasses = /obj/item/clothing/glasses/night - l_pocket = /obj/item/weapon/pinpointer/advpinpointer - l_hand = /obj/item/weapon/tank/jetpack/oxygen/harness + shoes = /obj/item/clothing/shoes/magboots/syndie + l_pocket = /obj/item/pinpointer/advpinpointer + l_hand = /obj/item/tank/jetpack/oxygen/harness backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/reagent_containers/food/pill/initropidril = 1, - /obj/item/weapon/gun/projectile/automatic/pistol = 1, + /obj/item/storage/box/engineer = 1, + /obj/item/reagent_containers/food/pill/initropidril = 1, + /obj/item/gun/projectile/automatic/pistol = 1, /obj/item/ammo_box/magazine/m10mm = 1, - /obj/item/weapon/crowbar/red = 1, - /obj/item/weapon/grenade/plastic/c4 = 1, - /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1, - /obj/item/device/flashlight = 1, + /obj/item/crowbar/red = 1, + /obj/item/grenade/plastic/c4 = 1, + /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1, + /obj/item/flashlight = 1, + /obj/item/clothing/shoes/combat = 1 ) /datum/outfit/admin/syndicate/operative/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -114,7 +123,7 @@ if(visualsOnly) return - var/obj/item/weapon/implant/explosive/E = new(H) + var/obj/item/implant/explosive/E = new(H) E.implant(H) /datum/outfit/admin/syndicate/operative/freedom @@ -131,15 +140,21 @@ /datum/outfit/admin/syndicate/officer name = "Syndicate Officer" - belt = /obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo - l_ear = /obj/item/device/radio/headset/syndicate/alt - l_pocket = /obj/item/weapon/pinpointer/advpinpointer + head = /obj/item/clothing/head/beret + mask = /obj/item/clothing/mask/cigarette/cigar/havana + belt = /obj/item/gun/projectile/automatic/pistol/deagle/camo + l_ear = /obj/item/radio/headset/syndicate/alt + l_pocket = /obj/item/pinpointer/advpinpointer backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/reagent_containers/food/pill/initropidril = 1, - /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1, - /obj/item/ammo_box/magazine/m50 = 2) + /obj/item/storage/box/engineer = 1, + /obj/item/flashlight = 1, + /obj/item/reagent_containers/food/pill/initropidril = 1, + /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1, + /obj/item/ammo_box/magazine/m50 = 2, + /obj/item/clothing/shoes/magboots/syndie/advance = 1, + /obj/item/lighter/zippo/gonzofist = 1 + ) id_icon = "commander" id_access = "Syndicate Operative Leader" @@ -150,38 +165,27 @@ if(visualsOnly) return - var/obj/item/weapon/implant/uplink/U = new /obj/item/weapon/implant/uplink(H) + var/obj/item/implant/uplink/U = new /obj/item/implant/uplink(H) U.implant(H) - U.hidden_uplink.uses = 500//a measly 1000 TC along with the uplink in the pocket + U.hidden_uplink.uses = 500 - var/obj/item/weapon/implant/dust/D = new(H) + var/obj/item/implant/dust/D = new(H) D.implant(H) -/datum/outfit/admin/syndicate/bomber - name = "Syndicate Bomber" - - backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/device/flashlight = 1, - /obj/item/weapon/card/emag = 1, - /obj/item/device/radio/beacon/syndicate/bomb = 2, - /obj/item/device/syndicatedetonator = 1, - /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1 - ) /datum/outfit/admin/nt_vip name = "VIP Guest" uniform = /obj/item/clothing/under/suit_jacket/really_black - back = /obj/item/weapon/storage/backpack/satchel + back = /obj/item/storage/backpack/satchel gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/black head = /obj/item/clothing/head/that - l_ear = /obj/item/device/radio/headset/ert - id = /obj/item/weapon/card/id/centcom - pda = /obj/item/device/pda + l_ear = /obj/item/radio/headset/ert + id = /obj/item/card/id/centcom + pda = /obj/item/pda backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1 + /obj/item/storage/box/engineer = 1 ) /datum/outfit/admin/nt_vip/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -189,136 +193,31 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_centcom_access("VIP Guest"), "VIP Guest") -/datum/outfit/admin/nt_navy_officer - name = "NT Navy Officer" - - uniform = /obj/item/clothing/under/rank/centcom/officer - back = /obj/item/weapon/storage/backpack/satchel - belt = /obj/item/weapon/gun/energy/pulse/pistol - gloves = /obj/item/clothing/gloves/color/white - shoes = /obj/item/clothing/shoes/centcom - head = /obj/item/clothing/head/beret/centcom/officer - l_ear = /obj/item/device/radio/headset/centcom - glasses = /obj/item/clothing/glasses/hud/security/sunglasses - id = /obj/item/weapon/card/id/centcom - pda = /obj/item/device/pda/centcom - backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1 - ) - -/datum/outfit/admin/nt_navy_officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - var/obj/item/weapon/card/id/I = H.wear_id - if(istype(I)) - apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Officer"), "Nanotrasen Navy Officer") - - var/obj/item/weapon/implant/L = new /obj/item/weapon/implant/mindshield(H) - L.implant(H) - - -/datum/outfit/admin/nt_special_ops_officer - name = "NT Special Ops Officer" - - uniform = /obj/item/clothing/under/syndicate/combat - suit = /obj/item/clothing/suit/space/deathsquad/officer - back = /obj/item/weapon/storage/backpack/security - belt = /obj/item/weapon/gun/energy/pulse/pistol/m1911 - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/helmet/space/deathsquad/beret - mask = /obj/item/clothing/mask/cigarette/cigar/cohiba - l_ear = /obj/item/device/radio/headset/centcom - glasses = /obj/item/clothing/glasses/thermal/cyber - id = /obj/item/weapon/card/id/centcom - r_pocket = /obj/item/weapon/storage/box/matches - pda = /obj/item/device/pda/centcom - backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/tank/emergency_oxygen/double/full = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1, - /obj/item/weapon/twohanded/dualsaber/red = 1, - /obj/item/weapon/pinpointer/advpinpointer = 1, - /obj/item/weapon/reagent_containers/hypospray/combat/nanites = 1, - /obj/item/weapon/storage/box/zipties = 1, - /obj/item/clothing/shoes/magboots/advance = 1, - /obj/item/weapon/implanter/mindshield = 1, - ) - -/datum/outfit/admin/nt_special_ops_officer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - var/obj/item/weapon/card/id/I = H.wear_id - if(istype(I)) - apply_to_card(I, H, get_centcom_access("Special Operations Officer"), "Special Operations Officer") - -/datum/outfit/admin/nt_special_ops_formal - name = "NT Special Ops Formal" - - uniform = /obj/item/clothing/under/rank/centcom/captain - back = /obj/item/weapon/storage/backpack/satchel - belt = /obj/item/weapon/gun/energy/pulse/pistol/m1911 - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/helmet/space/deathsquad/beret - mask = /obj/item/clothing/mask/cigarette/cigar/cohiba - l_ear = /obj/item/device/radio/headset/centcom - glasses = /obj/item/clothing/glasses/thermal/cyber - id = /obj/item/weapon/card/id/centcom - r_pocket = /obj/item/weapon/storage/box/matches - pda = /obj/item/device/pda/centcom - backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/melee/classic_baton/telescopic = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1 - ) - -/datum/outfit/admin/nt_special_ops_formal/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - var/obj/item/device/pda/PDA = H.wear_pda - if(istype(PDA)) - PDA.owner = H.real_name - PDA.ownjob = "Special Operations Officer" - PDA.icon_state = "pda-syndi" - PDA.name = "PDA-[H.real_name] ([PDA.ownjob])" - PDA.desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition designed for military field work." - - var/obj/item/weapon/card/id/I = H.wear_id - if(istype(I)) - apply_to_card(I, H, get_centcom_access("Special Operations Officer"), "Special Operations Officer") /datum/outfit/admin/nt_navy_captain name = "NT Navy Captain" uniform = /obj/item/clothing/under/rank/centcom/captain - back = /obj/item/weapon/storage/backpack/satchel - belt = /obj/item/weapon/gun/energy/pulse/pistol + back = /obj/item/storage/backpack/satchel + belt = /obj/item/gun/energy/pulse/pistol gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/centcom head = /obj/item/clothing/head/beret/centcom/captain - l_ear = /obj/item/device/radio/headset/centcom + l_ear = /obj/item/radio/headset/centcom glasses = /obj/item/clothing/glasses/hud/security/sunglasses - id = /obj/item/weapon/card/id/centcom - pda = /obj/item/device/pda/centcom + id = /obj/item/card/id/centcom + pda = /obj/item/pda/centcom backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1 + /obj/item/storage/box/centcomofficer = 1, + /obj/item/implanter/death_alarm = 1 + ) + implants = list( + /obj/item/implant/mindshield, + /obj/item/implant/dust ) /datum/outfit/admin/nt_navy_captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -326,29 +225,29 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Captain"), "Nanotrasen Navy Captain") - var/obj/item/weapon/implant/L = new /obj/item/weapon/implant/mindshield(H) - L.implant(H) - /datum/outfit/admin/nt_diplomat name = "NT Diplomat" uniform = /obj/item/clothing/under/rank/centcom/diplomatic - back = /obj/item/weapon/storage/backpack/satchel + back = /obj/item/storage/backpack/satchel gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/centcom - l_ear = /obj/item/device/radio/headset/centcom - id = /obj/item/weapon/card/id/centcom - r_pocket = /obj/item/weapon/lighter/zippo/nt_rep - l_pocket = /obj/item/weapon/storage/fancy/cigarettes/dromedaryco - pda = /obj/item/device/pda/centcom + l_ear = /obj/item/radio/headset/centcom + id = /obj/item/card/id/centcom + r_pocket = /obj/item/lighter/zippo/nt_rep + l_pocket = /obj/item/storage/fancy/cigarettes/dromedaryco + pda = /obj/item/pda/centcom backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1, + /obj/item/storage/box/survival = 1, + /obj/item/implanter/death_alarm = 1, + ) + implants = list( + /obj/item/implant/mindshield, + /obj/item/implant/dust ) /datum/outfit/admin/nt_diplomat/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -356,10 +255,61 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_centcom_access("Nanotrasen Navy Representative"), "Nanotrasen Diplomat") + +/datum/outfit/admin/nt_undercover + name = "NT Undercover Operative" + // Disguised NT special forces, sent to quietly eliminate mutinous people in high positions (e.g: captain) + + uniform = /obj/item/clothing/under/chameleon + back = /obj/item/storage/backpack + belt = /obj/item/storage/belt/utility/full/multitool + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/syndigaloshes + l_ear = /obj/item/radio/headset/heads/captain + id = /obj/item/card/id/syndicate + pda = /obj/item/pda + backpack_contents = list( + /obj/item/storage/box/engineer = 1, + /obj/item/flashlight = 1, + /obj/item/gun/projectile/automatic/proto = 1, // NT saber SMG + /obj/item/suppressor = 1, // silencer for SMG + /obj/item/ammo_box/magazine/smgm9mm = 3, // SMG ammo + /obj/item/door_remote/omni = 1, + /obj/item/implanter/mindshield = 1, // not implanted by default, as that would make them suspicious + /obj/item/implanter/storage = 1 // do not auto-implant this, that causes a bug + ) + implants = list( + /obj/item/implant/dust + ) + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/eyes/hud/security, + /obj/item/organ/internal/cyberimp/eyes/xray, + /obj/item/organ/internal/cyberimp/brain/anti_drop, + /obj/item/organ/internal/cyberimp/brain/anti_stun, + /obj/item/organ/internal/cyberimp/chest/nutriment/plus + ) + +/datum/outfit/admin/nt_undercover/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + + var/obj/item/card/id/I = H.wear_id + if(istype(I)) + apply_to_card(I, H, get_all_accesses(), "Civilian") + I.icon_state = "deathsquad" + + + var/obj/item/radio/R = H.l_ear + if(istype(R)) + R.name = "radio headset" + R.icon_state = "headset" + + /datum/outfit/admin/death_commando name = "NT Death Commando" @@ -370,12 +320,12 @@ name = "Space Pirate" uniform = /obj/item/clothing/under/pirate - back = /obj/item/weapon/storage/backpack/satchel + back = /obj/item/storage/backpack/satchel shoes = /obj/item/clothing/shoes/brown - id = /obj/item/weapon/card/id - r_hand = /obj/item/weapon/melee/energy/sword/pirate + id = /obj/item/card/id + r_hand = /obj/item/melee/energy/sword/pirate backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1 + /obj/item/storage/box/survival = 1 ) /datum/outfit/admin/pirate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -383,7 +333,7 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_maint_tunnels), name) @@ -403,21 +353,21 @@ name = "Vox Raider" uniform = /obj/item/clothing/under/vox/vox_robes suit = /obj/item/clothing/suit/space/vox/carapace - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack gloves = /obj/item/clothing/gloves/color/yellow/vox shoes = /obj/item/clothing/shoes/magboots/vox head = /obj/item/clothing/head/helmet/space/vox/carapace mask = /obj/item/clothing/mask/gas/syndicate - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/thermal/monocle - id = /obj/item/weapon/card/id/syndicate/vox - l_pocket = /obj/item/weapon/melee/classic_baton/telescopic - r_pocket = /obj/item/weapon/tank/emergency_oxygen/vox + id = /obj/item/card/id/syndicate/vox + l_pocket = /obj/item/melee/classic_baton/telescopic + r_pocket = /obj/item/tank/emergency_oxygen/vox backpack_contents = list( - /obj/item/device/flashlight = 1, - /obj/item/weapon/restraints/handcuffs/cable/zipties = 1, - /obj/item/device/flash = 1, - /obj/item/weapon/gun/energy/noisecannon = 1 + /obj/item/flashlight = 1, + /obj/item/restraints/handcuffs/cable/zipties = 1, + /obj/item/flash = 1, + /obj/item/gun/energy/noisecannon = 1 ) /datum/outfit/admin/vox/equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -432,7 +382,7 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_all_accesses(), "Vox Armalis", "syndie") @@ -441,21 +391,21 @@ uniform = /obj/item/clothing/under/rank/clown suit = /obj/item/clothing/suit/hooded/chaplain_hoodie - back = /obj/item/weapon/storage/backpack - belt = /obj/item/weapon/storage/belt/utility/full/multitool + back = /obj/item/storage/backpack + belt = /obj/item/storage/belt/utility/full/multitool gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/clown_shoes mask = /obj/item/clothing/mask/gas/clown_hat - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/thermal/monocle - id = /obj/item/weapon/card/id - l_pocket = /obj/item/weapon/reagent_containers/food/snacks/grown/banana - r_pocket = /obj/item/weapon/bikehorn - r_hand = /obj/item/weapon/twohanded/fireaxe + id = /obj/item/card/id + l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana + r_pocket = /obj/item/bikehorn + r_hand = /obj/item/twohanded/fireaxe backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/device/flashlight = 1, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana = 1 + /obj/item/storage/box/survival = 1, + /obj/item/flashlight = 1, + /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana = 1 ) /datum/outfit/admin/tunnel_clown/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -463,7 +413,7 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_clown, access_theatre, access_maint_tunnels), "Tunnel Clown") @@ -472,27 +422,25 @@ uniform = /obj/item/clothing/under/mime suit = /obj/item/clothing/suit/suspenders - back = /obj/item/weapon/storage/backpack/mime - belt = /obj/item/weapon/storage/belt/utility/full/multitool + back = /obj/item/storage/backpack/mime + belt = /obj/item/storage/belt/utility/full/multitool gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/black head = /obj/item/clothing/head/beret mask = /obj/item/clothing/mask/gas/mime - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/thermal/monocle - id = /obj/item/weapon/card/id/syndicate - pda = /obj/item/device/pda/mime + id = /obj/item/card/id/syndicate + pda = /obj/item/pda/mime backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing = 1, - /obj/item/weapon/storage/box/syndie_kit/caneshotgun = 1, + /obj/item/storage/box/survival = 1, + /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 1, /obj/item/toy/crayon/mime = 1, - /obj/item/weapon/gun/projectile/automatic/pistol = 1, - /obj/item/weapon/suppressor = 1, + /obj/item/storage/box/syndie_kit/caneshotgun = 1, /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath = 2, - /obj/item/weapon/pen/sleepy = 1, - /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket = 1, - /obj/item/device/flashlight = 1 + /obj/item/radio/uplink = 1, + /obj/item/reagent_containers/food/snacks/syndidonkpocket = 1, + /obj/item/flashlight = 1 ) /datum/outfit/admin/mime_assassin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -506,13 +454,13 @@ if(visualsOnly) return - var/obj/item/device/pda/PDA = H.wear_pda + var/obj/item/pda/PDA = H.wear_pda if(istype(PDA)) PDA.owner = H.real_name PDA.ownjob = "Mime" PDA.name = "PDA-[H.real_name] ([PDA.ownjob])" - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_mime, access_theatre, access_maint_tunnels), "Mime") @@ -520,16 +468,16 @@ name = "Greytide" uniform = /obj/item/clothing/under/color/grey - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack shoes = /obj/item/clothing/shoes/brown mask = /obj/item/clothing/mask/gas - l_ear = /obj/item/device/radio/headset - id = /obj/item/weapon/card/id - l_hand = /obj/item/weapon/storage/toolbox/mechanical + l_ear = /obj/item/radio/headset + id = /obj/item/card/id + l_hand = /obj/item/storage/toolbox/mechanical r_hand = /obj/item/flag/grey backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/device/flashlight = 1 + /obj/item/storage/box/survival = 1, + /obj/item/flashlight = 1 ) /datum/outfit/admin/greytide/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -537,20 +485,20 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_maint_tunnels), "Greytide") /datum/outfit/admin/greytide/leader name = "Greytide Leader" - belt = /obj/item/weapon/storage/belt/utility/full/multitool + belt = /obj/item/storage/belt/utility/full/multitool gloves = /obj/item/clothing/gloves/color/yellow backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, + /obj/item/storage/box/survival = 1, /obj/item/clothing/head/welding = 1, - /obj/item/device/flashlight = 1 + /obj/item/flashlight = 1 ) /datum/outfit/admin/greytide/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -558,7 +506,7 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_maint_tunnels), "Greytide Leader") @@ -567,18 +515,18 @@ uniform = /obj/item/clothing/under/color/black suit = /obj/item/clothing/suit/xenos - back = /obj/item/weapon/storage/backpack/satchel - belt = /obj/item/weapon/storage/belt/utility/full/multitool + back = /obj/item/storage/backpack/satchel + belt = /obj/item/storage/belt/utility/full/multitool gloves = /obj/item/clothing/gloves/color/yellow shoes = /obj/item/clothing/shoes/black head = /obj/item/clothing/head/xenos glasses = /obj/item/clothing/glasses/thermal - l_pocket = /obj/item/weapon/tank/emergency_oxygen/double/full + l_pocket = /obj/item/tank/emergency_oxygen/double/full r_pocket = /obj/item/toy/toy_xeno backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, + /obj/item/storage/box/survival = 1, /obj/item/clothing/head/welding = 1, - /obj/item/device/flashlight = 1 + /obj/item/flashlight = 1 ) /datum/outfit/admin/greytide/xeno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -586,7 +534,7 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_maint_tunnels), "Legit Xenomorph") @@ -594,16 +542,16 @@ gloves = /obj/item/clothing/gloves/combat uniform = /obj/item/clothing/under/soviet - back = /obj/item/weapon/storage/backpack/satchel + back = /obj/item/storage/backpack/satchel head = /obj/item/clothing/head/ushanka - id = /obj/item/weapon/card/id + id = /obj/item/card/id /datum/outfit/admin/soviet/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_maint_tunnels), name) @@ -612,9 +560,9 @@ gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/black - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1 + /obj/item/storage/box/survival = 1 ) /datum/outfit/admin/soviet/soldier @@ -622,15 +570,15 @@ gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/combat - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/sunglasses backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/card/emag = 1, - /obj/item/device/flashlight = 1, - /obj/item/weapon/grenade/plastic/c4 = 2, - /obj/item/weapon/gun/projectile/revolver/mateba = 1, + /obj/item/storage/box/engineer = 1, + /obj/item/card/emag = 1, + /obj/item/flashlight = 1, + /obj/item/grenade/plastic/c4 = 2, + /obj/item/gun/projectile/revolver/mateba = 1, /obj/item/ammo_box/a357 = 3 ) @@ -643,7 +591,7 @@ shoes = /obj/item/clothing/shoes/combat head = /obj/item/clothing/head/hgpiratecap mask = null - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate r_ear = null glasses = /obj/item/clothing/glasses/thermal/eyepatch id = null @@ -655,8 +603,8 @@ pda = null backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1, - /obj/item/weapon/gun/projectile/revolver/mateba = 1, + /obj/item/storage/box/engineer = 1, + /obj/item/gun/projectile/revolver/mateba = 1, /obj/item/ammo_box/a357 = 3 ) @@ -664,18 +612,18 @@ name = "Solar Federation Representative" uniform = /obj/item/clothing/under/solgov/rep - back = /obj/item/weapon/storage/backpack/satchel + back = /obj/item/storage/backpack/satchel gloves = /obj/item/clothing/gloves/color/white shoes = /obj/item/clothing/shoes/centcom - l_ear = /obj/item/device/radio/headset - id = /obj/item/weapon/card/id/silver - r_pocket = /obj/item/weapon/lighter/zippo/blue - l_pocket = /obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold - pda = /obj/item/device/pda + l_ear = /obj/item/radio/headset + id = /obj/item/card/id/silver + r_pocket = /obj/item/lighter/zippo/blue + l_pocket = /obj/item/storage/fancy/cigarettes/cigpack_robustgold + pda = /obj/item/pda backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/weapon/implanter/dust = 1, - /obj/item/weapon/implanter/death_alarm = 1, + /obj/item/storage/box/survival = 1, + /obj/item/implanter/dust = 1, + /obj/item/implanter/death_alarm = 1, ) /datum/outfit/admin/solgov_rep/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -683,7 +631,7 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_centcom_access("VIP Guest"), "Solar Federation Representative") @@ -692,16 +640,18 @@ name = "Solar Federation Marine" uniform = /obj/item/clothing/under/solgov - back = /obj/item/weapon/storage/backpack/security + back = /obj/item/storage/backpack/security head = /obj/item/clothing/head/soft/solgov gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/combat - id = /obj/item/weapon/card/id - l_hand = /obj/item/weapon/gun/projectile/automatic/ar + id = /obj/item/card/id + l_hand = /obj/item/gun/projectile/automatic/ar backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/weapon/kitchen/knife/combat = 1, - /obj/item/ammo_box/magazine/m556 = 3) + /obj/item/storage/box/survival = 1, + /obj/item/kitchen/knife/combat = 1, + /obj/item/ammo_box/magazine/m556 = 3, + /obj/item/clothing/shoes/magboots = 1 + ) /datum/outfit/admin/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -709,7 +659,7 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_centcom_access("VIP Guest"), name) @@ -718,35 +668,37 @@ uniform = /obj/item/clothing/under/solgov/command head = /obj/item/clothing/head/soft/solgov/command - back = /obj/item/weapon/storage/backpack/satchel + back = /obj/item/storage/backpack/satchel l_hand = null - belt = /obj/item/weapon/gun/projectile/automatic/pistol/deagle + belt = /obj/item/gun/projectile/automatic/pistol/deagle backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/weapon/kitchen/knife/combat = 1, - /obj/item/weapon/melee/classic_baton/telescopic = 1, - /obj/item/ammo_box/magazine/m50 = 2) + /obj/item/storage/box/survival = 1, + /obj/item/kitchen/knife/combat = 1, + /obj/item/melee/classic_baton/telescopic = 1, + /obj/item/ammo_box/magazine/m50 = 2, + /obj/item/clothing/shoes/magboots/advance = 1 + ) /datum/outfit/admin/chrono name = "Chrono Legionnaire" uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/space/chronos - back = /obj/item/weapon/chrono_eraser + back = /obj/item/chrono_eraser gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat + shoes = /obj/item/clothing/shoes/magboots/advance head = /obj/item/clothing/head/helmet/space/chronos mask = /obj/item/clothing/mask/gas/syndicate glasses = /obj/item/clothing/glasses/night - id = /obj/item/weapon/card/id/syndicate - suit_store = /obj/item/weapon/tank/emergency_oxygen/double/full + id = /obj/item/card/id/syndicate + suit_store = /obj/item/tank/emergency_oxygen/double/full /datum/outfit/admin/chrono/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_all_accesses() + get_all_centcom_access(), name, "syndie") @@ -755,43 +707,44 @@ uniform = /obj/item/clothing/under/color/grey suit = /obj/item/clothing/suit/space - back = /obj/item/weapon/tank/jetpack/oxygen - shoes = /obj/item/clothing/shoes/black + back = /obj/item/tank/jetpack/oxygen + shoes = /obj/item/clothing/shoes/magboots head = /obj/item/clothing/head/helmet/space mask = /obj/item/clothing/mask/breath - l_ear = /obj/item/device/radio/headset - id = /obj/item/weapon/card/id + l_ear = /obj/item/radio/headset + id = /obj/item/card/id /datum/outfit/admin/spacegear/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return - if(istype(H.back, /obj/item/weapon/tank/jetpack)) - var/obj/item/weapon/tank/jetpack/J = H.back + if(istype(H.back, /obj/item/tank/jetpack)) + var/obj/item/tank/jetpack/J = H.back J.turn_on() J.toggle_internals(H) - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_all_accesses(), "Space Explorer") /datum/outfit/admin/hardsuit - back = /obj/item/weapon/tank/jetpack/oxygen + back = /obj/item/tank/jetpack/oxygen mask = /obj/item/clothing/mask/breath - id = /obj/item/weapon/card/id + shoes = /obj/item/clothing/shoes/magboots + id = /obj/item/card/id /datum/outfit/admin/hardsuit/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return - if(istype(H.back, /obj/item/weapon/tank/jetpack)) - var/obj/item/weapon/tank/jetpack/J = H.back + if(istype(H.back, /obj/item/tank/jetpack)) + var/obj/item/tank/jetpack/J = H.back J.turn_on() J.toggle_internals(H) - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_all_accesses(), "Hardsuit Tester") @@ -804,6 +757,7 @@ name = "CE Hardsuit" suit = /obj/item/clothing/suit/space/hardsuit/elite head = /obj/item/clothing/head/helmet/space/hardsuit/elite + shoes = /obj/item/clothing/shoes/magboots/advance /datum/outfit/admin/hardsuit/mining name = "Mining Hardsuit" @@ -814,11 +768,13 @@ name = "Syndi Hardsuit" suit = /obj/item/clothing/suit/space/hardsuit/syndi head = /obj/item/clothing/head/helmet/space/hardsuit/syndi + shoes = /obj/item/clothing/shoes/magboots/syndie /datum/outfit/admin/hardsuit/wizard name = "Wizard Hardsuit" suit = /obj/item/clothing/suit/space/hardsuit/wizard head = /obj/item/clothing/head/helmet/space/hardsuit/wizard + shoes = /obj/item/clothing/shoes/magboots /datum/outfit/admin/hardsuit/medical name = "Medical Hardsuit" @@ -835,9 +791,9 @@ suit = /obj/item/clothing/suit/armor/vest shoes = /obj/item/clothing/shoes/black head = /obj/item/clothing/head/helmet/thunderdome - r_pocket = /obj/item/weapon/grenade/smokebomb - l_hand = /obj/item/weapon/kitchen/knife - r_hand = /obj/item/weapon/gun/energy/pulse/destroyer + r_pocket = /obj/item/grenade/smokebomb + l_hand = /obj/item/kitchen/knife + r_hand = /obj/item/gun/energy/pulse/destroyer /datum/outfit/admin/tournament/red name = "Tournament Standard Red" @@ -856,7 +812,7 @@ head = /obj/item/clothing/head/det_hat glasses = /obj/item/clothing/glasses/thermal/monocle l_pocket = /obj/item/ammo_box/a357 - r_hand = /obj/item/weapon/gun/projectile/automatic/proto + r_hand = /obj/item/gun/projectile/automatic/proto /datum/outfit/admin/tournament_chef //Steven Seagal FTW name = "Tournament Chef" @@ -865,20 +821,20 @@ suit = /obj/item/clothing/suit/chef shoes = /obj/item/clothing/shoes/black head = /obj/item/clothing/head/chefhat - l_pocket = /obj/item/weapon/kitchen/knife - r_pocket = /obj/item/weapon/kitchen/knife - l_hand = /obj/item/weapon/kitchen/knife - r_hand = /obj/item/weapon/kitchen/rollingpin + l_pocket = /obj/item/kitchen/knife + r_pocket = /obj/item/kitchen/knife + l_hand = /obj/item/kitchen/knife + r_hand = /obj/item/kitchen/rollingpin /datum/outfit/admin/tournament_janitor name = "Tournament Janitor" uniform = /obj/item/clothing/under/rank/janitor - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack shoes = /obj/item/clothing/shoes/black - l_hand = /obj/item/weapon/reagent_containers/glass/bucket + l_hand = /obj/item/reagent_containers/glass/bucket backpack_contents = list( - /obj/item/weapon/grenade/chem_grenade/cleaner = 2, + /obj/item/grenade/chem_grenade/cleaner = 2, /obj/item/stack/tile/plasteel = 7 ) @@ -887,7 +843,7 @@ if(visualsOnly) return - var/obj/item/weapon/reagent_containers/R = H.l_hand + var/obj/item/reagent_containers/R = H.l_hand if(istype(R)) R.reagents.add_reagent("water", 70) @@ -895,26 +851,26 @@ name = "Survivor" uniform = /obj/item/clothing/under/overalls - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack gloves = /obj/item/clothing/gloves/color/latex shoes = /obj/item/clothing/shoes/white - l_ear = /obj/item/device/radio/headset - id = /obj/item/weapon/card/id + l_ear = /obj/item/radio/headset + id = /obj/item/card/id backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1 + /obj/item/storage/box/survival = 1 ) /datum/outfit/admin/survivor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() for(var/obj/item/I in H.contents) - if(!istype(I, /obj/item/weapon/implant)) + if(!istype(I, /obj/item/implant)) I.add_mob_blood(H) if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_maint_tunnels), "Survivor") @@ -923,33 +879,33 @@ uniform = /obj/item/clothing/under/overalls suit = /obj/item/clothing/suit/apron - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack gloves = /obj/item/clothing/gloves/color/latex shoes = /obj/item/clothing/shoes/white head = /obj/item/clothing/head/welding mask = /obj/item/clothing/mask/surgical - l_ear = /obj/item/device/radio/headset + l_ear = /obj/item/radio/headset glasses = /obj/item/clothing/glasses/thermal/monocle - id = /obj/item/weapon/card/id/syndicate - l_pocket = /obj/item/weapon/kitchen/knife - r_pocket = /obj/item/weapon/scalpel - r_hand = /obj/item/weapon/twohanded/fireaxe + id = /obj/item/card/id/syndicate + l_pocket = /obj/item/kitchen/knife + r_pocket = /obj/item/scalpel + r_hand = /obj/item/twohanded/fireaxe backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/device/flashlight = 1 + /obj/item/storage/box/survival = 1, + /obj/item/flashlight = 1 ) /datum/outfit/admin/masked_killer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() for(var/obj/item/I in H.contents) - if(!istype(I, /obj/item/weapon/implant)) + if(!istype(I, /obj/item/implant)) I.add_mob_blood(H) if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_maint_tunnels), "Masked Killer", "syndie") @@ -958,23 +914,23 @@ uniform = /obj/item/clothing/under/syndicate/combat suit = /obj/item/clothing/suit/space/hardsuit/singuloth - back = /obj/item/weapon/twohanded/knighthammer - belt = /obj/item/weapon/claymore/ceremonial + back = /obj/item/twohanded/knighthammer + belt = /obj/item/claymore/ceremonial gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/magboots head = /obj/item/clothing/head/helmet/space/hardsuit/singuloth mask = /obj/item/clothing/mask/breath - l_ear = /obj/item/device/radio/headset/ert + l_ear = /obj/item/radio/headset/ert glasses = /obj/item/clothing/glasses/meson/cyber - id = /obj/item/weapon/card/id - suit_store = /obj/item/weapon/tank/oxygen + id = /obj/item/card/id + suit_store = /obj/item/tank/oxygen /datum/outfit/admin/singuloth_knight/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_all_accesses(), "Singuloth Knight") @@ -983,18 +939,21 @@ uniform = /obj/item/clothing/under/suit_jacket suit = /obj/item/clothing/suit/wcoat - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/black - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/sunglasses - id = /obj/item/weapon/card/id/syndicate - l_pocket = /obj/item/weapon/melee/energy/sword/saber - l_hand = /obj/item/weapon/storage/secure/briefcase/reaper - pda = /obj/item/device/pda/heads + id = /obj/item/card/id/syndicate + l_pocket = /obj/item/melee/energy/sword/saber + l_hand = /obj/item/storage/secure/briefcase/reaper + pda = /obj/item/pda/heads backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/device/flashlight = 1 + /obj/item/storage/box/survival = 1, + /obj/item/flashlight = 1 + ) + implants = list( + /obj/item/implant/dust ) /datum/outfit/admin/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1002,16 +961,13 @@ if(visualsOnly) return - var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(H) - D.implant(H) - - var/obj/item/device/pda/PDA = H.wear_pda + var/obj/item/pda/PDA = H.wear_pda if(istype(PDA)) PDA.owner = H.real_name PDA.ownjob = "Reaper" PDA.name = "PDA-[H.real_name] ([PDA.ownjob])" - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_all_accesses(), "Reaper", "syndie") @@ -1019,22 +975,25 @@ name = "Spy" uniform = /obj/item/clothing/under/suit_jacket/really_black - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/black - l_ear = /obj/item/device/radio/headset/syndicate + l_ear = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/hud/security/chameleon - id = /obj/item/weapon/card/id/syndicate - l_pocket = /obj/item/weapon/melee/energy/sword/saber - r_pocket = /obj/item/weapon/pen/sleepy - pda = /obj/item/device/pda/heads + id = /obj/item/card/id/syndicate + l_pocket = /obj/item/melee/energy/sword/saber + r_pocket = /obj/item/pen/sleepy + pda = /obj/item/pda/heads backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/weapon/gun/projectile/automatic/pistol = 1, - /obj/item/weapon/suppressor = 1, - /obj/item/weapon/card/emag = 1, - /obj/item/device/flashlight = 1, - /obj/item/weapon/implanter/storage = 1 + /obj/item/storage/box/survival = 1, + /obj/item/gun/projectile/automatic/pistol = 1, + /obj/item/suppressor = 1, + /obj/item/card/emag = 1, + /obj/item/flashlight = 1, + /obj/item/implanter/storage = 1 // do not auto-implant this, that causes a bug + ) + implants = list( + /obj/item/implant/dust ) /datum/outfit/admin/spy/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1046,16 +1005,13 @@ if(istype(G)) G.name = "black gloves" - var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(H) - D.implant(H) - - var/obj/item/device/pda/PDA = H.wear_pda + var/obj/item/pda/PDA = H.wear_pda if(istype(PDA)) PDA.owner = H.real_name PDA.ownjob = "Spy" PDA.name = "PDA-[H.real_name] ([PDA.ownjob])" - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, list(access_maint_tunnels), "Spy", "syndie") @@ -1064,15 +1020,15 @@ uniform = /obj/item/clothing/under/color/black suit = /obj/item/clothing/suit/hooded/chaplain_hoodie - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/black - l_ear = /obj/item/device/radio/headset/syndicate - id = /obj/item/weapon/card/id/syndicate - l_hand = /obj/item/weapon/twohanded/dualsaber/red + l_ear = /obj/item/radio/headset/syndicate + id = /obj/item/card/id/syndicate + l_hand = /obj/item/twohanded/dualsaber/red backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/device/flashlight = 1, + /obj/item/storage/box/survival = 1, + /obj/item/flashlight = 1, ) /datum/outfit/admin/dark_lord/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1085,23 +1041,24 @@ C.name = "dark lord robes" C.hood.name = "dark lord hood" - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_all_accesses(), "Dark Lord", "syndie") + /datum/outfit/admin/wizard uniform = /obj/item/clothing/under/color/lightpurple suit = /obj/item/clothing/suit/wizrobe - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack shoes = /obj/item/clothing/shoes/sandal head = /obj/item/clothing/head/wizard - l_ear = /obj/item/device/radio/headset - id = /obj/item/weapon/card/id - r_pocket = /obj/item/weapon/teleportation_scroll - l_hand = /obj/item/weapon/twohanded/staff - r_hand = /obj/item/weapon/spellbook + l_ear = /obj/item/radio/headset + id = /obj/item/card/id + r_pocket = /obj/item/teleportation_scroll + l_hand = /obj/item/twohanded/staff + r_hand = /obj/item/spellbook backpack_contents = list( - /obj/item/weapon/storage/box/engineer = 1 + /obj/item/storage/box/engineer = 1 ) /datum/outfit/admin/wizard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -1109,7 +1066,7 @@ if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_all_accesses(), "Wizard") @@ -1130,38 +1087,69 @@ shoes = /obj/item/clothing/shoes/sandal/marisa head = /obj/item/clothing/head/wizard/marisa +/datum/outfit/admin/wizard/arch + name = "Arch Wizard" + + suit = /obj/item/clothing/suit/wizrobe/magusred + head = /obj/item/clothing/head/wizard/magus + belt = /obj/item/storage/belt/wands/full + l_hand = null + backpack_contents = list( + /obj/item/storage/box/engineer = 1, + /obj/item/clothing/suit/space/hardsuit/wizard = 1, + /obj/item/clothing/head/helmet/space/hardsuit/wizard = 1, + /obj/item/clothing/shoes/magboots = 1, + /obj/item/kitchen/knife/ritual = 1, + /obj/item/clothing/suit/wizrobe/red = 1, + /obj/item/clothing/head/wizard/red = 1 + ) + +/datum/outfit/admin/wizard/arch/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + var/obj/item/spellbook/B = H.r_hand + if(istype(B)) + B.owner = H // force-bind it so it can never be stolen, no matter what. + B.name = "Archwizard Spellbook" + B.uses = 50 + var/obj/item/card/id/I = H.wear_id + if(istype(I)) + apply_to_card(I, H, get_all_accesses(), "Arch Wizard") + /datum/outfit/admin/dark_priest name = "Dark Priest" uniform = /obj/item/clothing/under/color/black suit = /obj/item/clothing/suit/hooded/chaplain_hoodie - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack head = /obj/item/clothing/head/chaplain_hood gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/black - l_ear = /obj/item/device/radio/headset/syndicate - id = /obj/item/weapon/card/id/syndicate - r_hand = /obj/item/weapon/nullrod/armblade + l_ear = /obj/item/radio/headset/syndicate + id = /obj/item/card/id/syndicate + r_hand = /obj/item/nullrod/armblade backpack_contents = list( - /obj/item/weapon/storage/box/survival = 1, - /obj/item/device/flashlight = 1, + /obj/item/storage/box/survival = 1, + /obj/item/flashlight = 1, + ) + implants = list( + /obj/item/implant/dust ) /datum/outfit/admin/dark_priest/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return - var/obj/item/weapon/card/id/I = H.wear_id + var/obj/item/card/id/I = H.wear_id if(istype(I)) apply_to_card(I, H, get_all_accesses(), "Dark Priest", "syndie") - var/obj/item/weapon/nullrod/armblade/B = H.r_hand + var/obj/item/nullrod/armblade/B = H.r_hand if(istype(B)) B.force = 20 B.name = "blessing of the reaper" B.desc = "Sometimes, someone's just gotta die." - var/obj/item/device/radio/headset/R = H.l_ear + var/obj/item/radio/headset/R = H.l_ear if(istype(R)) R.flags |= NODROP - var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(H) - D.implant(H) \ No newline at end of file diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index e379de25209..83ca8f7f0ea 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -35,10 +35,10 @@ /datum/recipe var/list/reagents // example: = list("berryjuice" = 5) // do not list same reagent twice - var/list/items // example: =list(/obj/item/weapon/crowbar, /obj/item/weapon/welder) // place /foo/bar before /foo - var/result //example: = /obj/item/weapon/reagent_containers/food/snacks/donut + var/list/items // example: =list(/obj/item/crowbar, /obj/item/welder) // place /foo/bar before /foo + var/result //example: = /obj/item/reagent_containers/food/snacks/donut var/time = 100 // 1/10 part of second - var/byproduct // example: = /obj/item/weapon/kitchen/mould // byproduct to return, such as a mould or trash + var/byproduct // example: = /obj/item/kitchen/mould // byproduct to return, such as a mould or trash /datum/recipe/proc/check_reagents(datum/reagents/avail_reagents) //1=precisely, 0=insufficiently, -1=superfluous . = 1 diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 7afdc1b91d9..e44c331e556 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -218,7 +218,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin before_cast(targets) invocation() if(user && user.ckey) - user.create_attack_log("[user.real_name] ([user.ckey]) cast the spell [name].") + user.create_attack_log("[key_name(user)] cast the spell [name].") spawn(0) if(charge_type == "recharge" && recharge) start_recharge() diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index 7f9a02bc01a..5dd054f67ed 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -33,9 +33,9 @@ charged_item = M break for(var/obj/item in hand_items) - if(istype(item, /obj/item/weapon/spellbook)) - if(istype(item, /obj/item/weapon/spellbook/oneuse)) - var/obj/item/weapon/spellbook/oneuse/I = item + if(istype(item, /obj/item/spellbook)) + if(istype(item, /obj/item/spellbook/oneuse)) + var/obj/item/spellbook/oneuse/I = item if(prob(80)) L.visible_message("[I] catches fire!") qdel(I) @@ -47,21 +47,21 @@ to_chat(L, "Glowing red letters appear on the front cover...") to_chat(L, "[pick("NICE TRY BUT NO!","CLEVER BUT NOT CLEVER ENOUGH!", "SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!", "CUTE!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]") burnt_out = 1 - else if(istype(item, /obj/item/weapon/gun/magic)) - var/obj/item/weapon/gun/magic/I = item + else if(istype(item, /obj/item/gun/magic)) + var/obj/item/gun/magic/I = item if(prob(80) && !I.can_charge) I.max_charges-- if(I.max_charges <= 0) I.max_charges = 0 burnt_out = 1 I.charges = I.max_charges - if(istype(item,/obj/item/weapon/gun/magic/wand) && I.max_charges != 0) - var/obj/item/weapon/gun/magic/W = item + if(istype(item,/obj/item/gun/magic/wand) && I.max_charges != 0) + var/obj/item/gun/magic/W = item W.icon_state = initial(W.icon_state) charged_item = I break - else if(istype(item, /obj/item/weapon/stock_parts/cell/)) - var/obj/item/weapon/stock_parts/cell/C = item + else if(istype(item, /obj/item/stock_parts/cell/)) + var/obj/item/stock_parts/cell/C = item if(!C.self_recharge) if(prob(80)) C.maxcharge -= 200 @@ -74,8 +74,8 @@ else if(item.contents) var/obj/I = null for(I in item.contents) - if(istype(I, /obj/item/weapon/stock_parts/cell/)) - var/obj/item/weapon/stock_parts/cell/C = I + if(istype(I, /obj/item/stock_parts/cell/)) + var/obj/item/stock_parts/cell/C = I if(!C.self_recharge) if(prob(80)) C.maxcharge -= 200 diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm index a3b730cec77..09f98994f1e 100644 --- a/code/datums/spells/cluwne.dm +++ b/code/datums/spells/cluwne.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/targeted/touch/cluwne name = "Curse of the Cluwne" desc = "Turns the target into a fat and cursed monstrosity of a clown." - hand_path = /obj/item/weapon/melee/touch_attack/cluwne + hand_path = /obj/item/melee/touch_attack/cluwne school = "transmutation" diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index 16e449e0d20..10c06e5ce7b 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -60,7 +60,7 @@ invocation_type = "none" range = 0 - summon_type = list(/obj/item/device/soulstone) + summon_type = list(/obj/item/soulstone) /obj/effect/proc_holder/spell/aoe_turf/conjure/pylon name = "Cult Pylon" diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index d855f6a3092..43c3d3a61cd 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -54,7 +54,7 @@ target.setDir(holder.dir) sleep(jaunt_in_time) qdel(holder) - if(!qdeleted(target)) + if(!QDELETED(target)) if(mobloc.density) for(var/direction in alldirs) var/turf/T = get_step(mobloc, direction) diff --git a/code/datums/spells/fake_gib.dm b/code/datums/spells/fake_gib.dm index 23d2343e10e..6e2f31ea158 100644 --- a/code/datums/spells/fake_gib.dm +++ b/code/datums/spells/fake_gib.dm @@ -1,7 +1,7 @@ /obj/effect/proc_holder/spell/targeted/touch/fake_disintegrate name = "Disintegrate" desc = "This spell charges your hand with vile energy that can be used to violently explode victims." - hand_path = "/obj/item/weapon/melee/touch_attack/fake_disintegrate" + hand_path = "/obj/item/melee/touch_attack/fake_disintegrate" school = "evocation" charge_max = 600 diff --git a/code/datums/spells/infinite_guns.dm b/code/datums/spells/infinite_guns.dm index 10b8612c858..83cafb88666 100644 --- a/code/datums/spells/infinite_guns.dm +++ b/code/datums/spells/infinite_guns.dm @@ -18,5 +18,5 @@ C.drop_item() C.swap_hand() C.drop_item() - var/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/GUN = new + var/obj/item/gun/projectile/shotgun/boltaction/enchanted/GUN = new C.put_in_hands(GUN) diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index bda640f80a1..84c3a552c03 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -28,7 +28,7 @@ config.continuous_rounds = 0 return ..() -/obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets,mob/user = usr) +/obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets,mob/user = usr) if(!config.continuous_rounds) existence_stops_round_end = 1 config.continuous_rounds = 1 @@ -49,7 +49,7 @@ charge_counter = charge_max return - if(!marked_item || qdeleted(marked_item)) //Wait nevermind + if(!marked_item || QDELETED(marked_item)) //Wait nevermind to_chat(M, "Your phylactery is gone!") return diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index 7524e7f31d6..e99a9356312 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -76,7 +76,7 @@ var/obj/item/brain/B = new /obj/item/brain(target.loc) B.transfer_identity(C) C.death() - add_logs(target, C, "magically debrained", addition="INTENT: [uppertext(target.a_intent)]")*/ + add_attack_logs(target, C, "Magically debrained INTENT: [uppertext(target.a_intent)]")*/ if(C.stomach_contents && item_to_retrive in C.stomach_contents) C.stomach_contents -= item_to_retrive for(var/X in C.bodyparts) diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm index 44993cb69b2..d656bccac4a 100644 --- a/code/datums/spells/touch_attacks.dm +++ b/code/datums/spells/touch_attacks.dm @@ -1,6 +1,6 @@ /obj/effect/proc_holder/spell/targeted/touch - var/hand_path = /obj/item/weapon/melee/touch_attack - var/obj/item/weapon/melee/touch_attack/attached_hand = null + var/hand_path = /obj/item/melee/touch_attack + var/obj/item/melee/touch_attack/attached_hand = null invocation_type = "none" //you scream on connecting, not summoning include_user = 1 range = -1 @@ -47,7 +47,7 @@ /obj/effect/proc_holder/spell/targeted/touch/disintegrate name = "Disintegrate" desc = "This spell charges your hand with vile energy that can be used to violently explode victims." - hand_path = /obj/item/weapon/melee/touch_attack/disintegrate + hand_path = /obj/item/melee/touch_attack/disintegrate school = "evocation" charge_max = 600 @@ -59,7 +59,7 @@ /obj/effect/proc_holder/spell/targeted/touch/flesh_to_stone name = "Flesh to Stone" desc = "This spell charges your hand with the power to turn victims into inert statues for a long period of time." - hand_path = /obj/item/weapon/melee/touch_attack/fleshtostone + hand_path = /obj/item/melee/touch_attack/fleshtostone school = "transmutation" charge_max = 600 diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 15d78f37276..353d38a6932 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -83,11 +83,11 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /mob/living/simple_animal/bot/floorbot, /mob/living/simple_animal/bot/medbot, /mob/living/simple_animal/bot/medbot, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, + /obj/item/tank/air, + /obj/item/tank/air, + /obj/item/tank/air, + /obj/item/tank/air, + /obj/item/tank/air, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, @@ -103,9 +103,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine contains = list(/obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air) + /obj/item/tank/air, + /obj/item/tank/air, + /obj/item/tank/air) cost = 10 containername = "internals crate" @@ -115,12 +115,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, - /obj/item/device/flashlight, - /obj/item/device/flashlight, - /obj/item/weapon/tank/oxygen/red, - /obj/item/weapon/tank/oxygen/red, - /obj/item/weapon/extinguisher, - /obj/item/weapon/extinguisher, + /obj/item/flashlight, + /obj/item/flashlight, + /obj/item/tank/oxygen/red, + /obj/item/tank/oxygen/red, + /obj/item/extinguisher, + /obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/head/hardhat/red) cost = 10 @@ -129,7 +129,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/emergency/atmostank name = "Firefighting Watertank Crate" - contains = list(/obj/item/weapon/watertank/atmos) + contains = list(/obj/item/watertank/atmos) cost = 10 containertype = /obj/structure/closet/crate/secure containername = "firefighting watertank crate" @@ -137,10 +137,10 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/emergency/weedcontrol name = "Weed Control Crate" - contains = list(/obj/item/weapon/scythe, + contains = list(/obj/item/scythe, /obj/item/clothing/mask/gas, - /obj/item/weapon/grenade/chem_grenade/antiweed, - /obj/item/weapon/grenade/chem_grenade/antiweed) + /obj/item/grenade/chem_grenade/antiweed, + /obj/item/grenade/chem_grenade/antiweed) cost = 15 containertype = /obj/structure/closet/crate/secure/hydrosec containername = "weed control crate" @@ -149,12 +149,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/emergency/specialops name = "Special Ops Supplies" - contains = list(/obj/item/weapon/storage/box/emps, - /obj/item/weapon/grenade/smokebomb, - /obj/item/weapon/grenade/smokebomb, - /obj/item/weapon/grenade/smokebomb, - /obj/item/weapon/pen/sleepy, - /obj/item/weapon/grenade/chem_grenade/incendiary) + contains = list(/obj/item/storage/box/emps, + /obj/item/grenade/smokebomb, + /obj/item/grenade/smokebomb, + /obj/item/grenade/smokebomb, + /obj/item/pen/sleepy, + /obj/item/grenade/chem_grenade/incendiary) cost = 20 containertype = /obj/structure/closet/crate containername = "special ops crate" @@ -162,7 +162,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/emergency/syndicate name = "ERROR_NULL_ENTRY" - contains = list(/obj/item/weapon/storage/box/syndicate) + contains = list(/obj/item/storage/box/syndicate) cost = 140 containertype = /obj/structure/closet/crate containername = "crate" @@ -182,10 +182,10 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security/supplies name = "Security Supplies Crate" - contains = list(/obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/storage/box/teargas, - /obj/item/weapon/storage/box/flashes, - /obj/item/weapon/storage/box/handcuffs) + contains = list(/obj/item/storage/box/flashbangs, + /obj/item/storage/box/teargas, + /obj/item/storage/box/flashes, + /obj/item/storage/box/handcuffs) cost = 10 containername = "security supply crate" @@ -220,42 +220,42 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security/baton name = "Stun Batons Crate" - contains = list(/obj/item/weapon/melee/baton/loaded, - /obj/item/weapon/melee/baton/loaded, - /obj/item/weapon/melee/baton/loaded) + contains = list(/obj/item/melee/baton/loaded, + /obj/item/melee/baton/loaded, + /obj/item/melee/baton/loaded) cost = 10 containername = "stun baton crate" /datum/supply_packs/security/laser name = "Lasers Crate" - contains = list(/obj/item/weapon/gun/energy/laser, - /obj/item/weapon/gun/energy/laser, - /obj/item/weapon/gun/energy/laser) + contains = list(/obj/item/gun/energy/laser, + /obj/item/gun/energy/laser, + /obj/item/gun/energy/laser) cost = 15 containername = "laser crate" /datum/supply_packs/security/taser name = "Stun Guns Crate" - contains = list(/obj/item/weapon/gun/energy/gun/advtaser, - /obj/item/weapon/gun/energy/gun/advtaser, - /obj/item/weapon/gun/energy/gun/advtaser) + contains = list(/obj/item/gun/energy/gun/advtaser, + /obj/item/gun/energy/gun/advtaser, + /obj/item/gun/energy/gun/advtaser) cost = 15 containername = "stun gun crate" /datum/supply_packs/security/disabler name = "Disabler Crate" - contains = list(/obj/item/weapon/gun/energy/disabler, - /obj/item/weapon/gun/energy/disabler, - /obj/item/weapon/gun/energy/disabler) + contains = list(/obj/item/gun/energy/disabler, + /obj/item/gun/energy/disabler, + /obj/item/gun/energy/disabler) cost = 10 containername = "disabler crate" /datum/supply_packs/security/forensics name = "Forensics Crate" - contains = list(/obj/item/device/detective_scanner, - /obj/item/weapon/storage/box/evidence, - /obj/item/device/camera, - /obj/item/device/taperecorder, + contains = list(/obj/item/detective_scanner, + /obj/item/storage/box/evidence, + /obj/item/camera, + /obj/item/taperecorder, /obj/item/toy/crayon/white, /obj/item/clothing/head/det_hat) cost = 20 @@ -289,9 +289,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security/armory/riotshields name = "Riot Shields Crate" - contains = list(/obj/item/weapon/shield/riot, - /obj/item/weapon/shield/riot, - /obj/item/weapon/shield/riot) + contains = list(/obj/item/shield/riot, + /obj/item/shield/riot, + /obj/item/shield/riot) cost = 20 containername = "riot shields crate" @@ -317,12 +317,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/head/helmet/swat, /obj/item/clothing/suit/space/swat, /obj/item/clothing/suit/space/swat, - /obj/item/weapon/kitchen/knife/combat, - /obj/item/weapon/kitchen/knife/combat, + /obj/item/kitchen/knife/combat, + /obj/item/kitchen/knife/combat, /obj/item/clothing/mask/gas/sechailer/swat, /obj/item/clothing/mask/gas/sechailer/swat, - /obj/item/weapon/storage/belt/military/assault, - /obj/item/weapon/storage/belt/military/assault) + /obj/item/storage/belt/military/assault, + /obj/item/storage/belt/military/assault) cost = 60 containername = "assault armor crate" @@ -338,65 +338,74 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security/armory/ballistic name = "Riot Shotguns Crate" - contains = list(/obj/item/weapon/gun/projectile/shotgun/riot, - /obj/item/weapon/gun/projectile/shotgun/riot, - /obj/item/weapon/gun/projectile/shotgun/riot, - /obj/item/weapon/storage/belt/bandolier, - /obj/item/weapon/storage/belt/bandolier, - /obj/item/weapon/storage/belt/bandolier) + contains = list(/obj/item/gun/projectile/shotgun/riot, + /obj/item/gun/projectile/shotgun/riot, + /obj/item/gun/projectile/shotgun/riot, + /obj/item/storage/belt/bandolier, + /obj/item/storage/belt/bandolier, + /obj/item/storage/belt/bandolier) cost = 50 containername = "riot shotgun crate" /datum/supply_packs/security/armory/ballisticauto name = "Combat Shotguns Crate" - contains = list(/obj/item/weapon/gun/projectile/shotgun/automatic/combat, - /obj/item/weapon/gun/projectile/shotgun/automatic/combat, - /obj/item/weapon/gun/projectile/shotgun/automatic/combat, - /obj/item/weapon/storage/belt/bandolier, - /obj/item/weapon/storage/belt/bandolier, - /obj/item/weapon/storage/belt/bandolier) + contains = list(/obj/item/gun/projectile/shotgun/automatic/combat, + /obj/item/gun/projectile/shotgun/automatic/combat, + /obj/item/gun/projectile/shotgun/automatic/combat, + /obj/item/storage/belt/bandolier, + /obj/item/storage/belt/bandolier, + /obj/item/storage/belt/bandolier) cost = 80 containername = "combat shotgun crate" /datum/supply_packs/security/armory/buckshotammo name = "Buckshot Ammo Crate" contains = list(/obj/item/ammo_box/shotgun/buck, - /obj/item/weapon/storage/box/buck, - /obj/item/weapon/storage/box/buck, - /obj/item/weapon/storage/box/buck, - /obj/item/weapon/storage/box/buck, - /obj/item/weapon/storage/box/buck) + /obj/item/storage/box/buck, + /obj/item/storage/box/buck, + /obj/item/storage/box/buck, + /obj/item/storage/box/buck, + /obj/item/storage/box/buck) cost = 45 containername = "buckshot ammo crate" /datum/supply_packs/security/armory/slugammo name = "Slug Ammo Crate" contains = list(/obj/item/ammo_box/shotgun, - /obj/item/weapon/storage/box/slug, - /obj/item/weapon/storage/box/slug, - /obj/item/weapon/storage/box/slug, - /obj/item/weapon/storage/box/slug, - /obj/item/weapon/storage/box/slug) + /obj/item/storage/box/slug, + /obj/item/storage/box/slug, + /obj/item/storage/box/slug, + /obj/item/storage/box/slug, + /obj/item/storage/box/slug) cost = 45 containername = "slug ammo crate" /datum/supply_packs/security/armory/expenergy name = "Energy Guns Crate" - contains = list(/obj/item/weapon/gun/energy/gun, - /obj/item/weapon/gun/energy/gun) + contains = list(/obj/item/gun/energy/gun, + /obj/item/gun/energy/gun) cost = 25 containertype = /obj/structure/closet/crate/secure/plasma containername = "energy gun crate" +/datum/supply_packs/security/armory/epistol // costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person + name = "Energy Pistol Crate" + contains = list(/obj/item/gun/energy/gun/mini, + /obj/item/gun/energy/gun/mini, + /obj/item/gun/energy/gun/mini) + cost = 15 + containertype = /obj/structure/closet/crate/secure/plasma + containername = "energy gun crate" + /datum/supply_packs/security/armory/eweapons name = "Incendiary Weapons Crate" - contains = list(/obj/item/weapon/flamethrower/full, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/grenade/chem_grenade/incendiary, - /obj/item/weapon/grenade/chem_grenade/incendiary, - /obj/item/weapon/grenade/chem_grenade/incendiary) + contains = list(/obj/item/flamethrower/full, + /obj/item/tank/plasma, + /obj/item/tank/plasma, + /obj/item/tank/plasma, + /obj/item/grenade/chem_grenade/incendiary, + /obj/item/grenade/chem_grenade/incendiary, + /obj/item/grenade/chem_grenade/incendiary) cost = 15 // its a fecking flamethrower and some plasma, why the shit did this cost so much before!? containertype = /obj/structure/closet/crate/secure/plasma containername = "incendiary weapons crate" @@ -404,8 +413,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security/armory/wt550 name = "WT-550 Auto Rifle Crate" - contains = list(/obj/item/weapon/gun/projectile/automatic/wt550, - /obj/item/weapon/gun/projectile/automatic/wt550) + contains = list(/obj/item/gun/projectile/automatic/wt550, + /obj/item/gun/projectile/automatic/wt550) cost = 35 containername = "auto rifle crate" @@ -422,25 +431,25 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security/armory/mindshield name = "Mindshield Implants Crate" - contains = list (/obj/item/weapon/storage/lockbox/mindshield) + contains = list (/obj/item/storage/lockbox/mindshield) cost = 40 containername = "mindshield implant crate" /datum/supply_packs/security/armory/trackingimp name = "Tracking Implants Crate" - contains = list (/obj/item/weapon/storage/box/trackimp) + contains = list (/obj/item/storage/box/trackimp) cost = 20 containername = "tracking implant crate" /datum/supply_packs/security/armory/chemimp name = "Chemical Implants Crate" - contains = list (/obj/item/weapon/storage/box/chemimp) + contains = list (/obj/item/storage/box/chemimp) cost = 20 containername = "chemical implant crate" /datum/supply_packs/security/armory/exileimp name = "Exile Implants Crate" - contains = list (/obj/item/weapon/storage/box/exileimp) + contains = list (/obj/item/storage/box/exileimp) cost = 30 containername = "exile implant crate" @@ -487,12 +496,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/engineering/tools //the most robust crate name = "Toolbox Crate" - contains = list(/obj/item/weapon/storage/toolbox/electrical, - /obj/item/weapon/storage/toolbox/electrical, - /obj/item/weapon/storage/toolbox/electrical, - /obj/item/weapon/storage/toolbox/mechanical, - /obj/item/weapon/storage/toolbox/mechanical, - /obj/item/weapon/storage/toolbox/mechanical) + contains = list(/obj/item/storage/toolbox/electrical, + /obj/item/storage/toolbox/electrical, + /obj/item/storage/toolbox/electrical, + /obj/item/storage/toolbox/mechanical, + /obj/item/storage/toolbox/mechanical, + /obj/item/storage/toolbox/mechanical) cost = 10 containername = "electrical maintenance crate" @@ -507,18 +516,18 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/engineering/power name = "Power Cell Crate" - contains = list(/obj/item/weapon/stock_parts/cell/high, //Changed to an extra high powercell because normal cells are useless - /obj/item/weapon/stock_parts/cell/high, - /obj/item/weapon/stock_parts/cell/high) + contains = list(/obj/item/stock_parts/cell/high, //Changed to an extra high powercell because normal cells are useless + /obj/item/stock_parts/cell/high, + /obj/item/stock_parts/cell/high) cost = 10 containername = "electrical maintenance crate" containertype = /obj/structure/closet/crate/engineering/electrical /datum/supply_packs/engineering/engiequipment name = "Engineering Gear Crate" - contains = list(/obj/item/weapon/storage/belt/utility, - /obj/item/weapon/storage/belt/utility, - /obj/item/weapon/storage/belt/utility, + contains = list(/obj/item/storage/belt/utility, + /obj/item/storage/belt/utility, + /obj/item/storage/belt/utility, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, /obj/item/clothing/suit/storage/hazardvest, @@ -554,9 +563,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, // 21 Solar Assemblies. 1 Extra for the controller - /obj/item/weapon/circuitboard/solar_control, - /obj/item/weapon/tracker_electronics, - /obj/item/weapon/paper/solar) + /obj/item/circuitboard/solar_control, + /obj/item/tracker_electronics, + /obj/item/paper/solar) cost = 20 containername = "solar pack crate" containertype = /obj/structure/closet/crate/engineering/electrical @@ -640,9 +649,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/engineering/inflatable name = "Inflatable barriers Crate" - contains = list(/obj/item/weapon/storage/briefcase/inflatable, - /obj/item/weapon/storage/briefcase/inflatable, - /obj/item/weapon/storage/briefcase/inflatable) + contains = list(/obj/item/storage/briefcase/inflatable, + /obj/item/storage/briefcase/inflatable, + /obj/item/storage/briefcase/inflatable) cost = 20 containername = "inflatable barrier crate" @@ -675,7 +684,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/conveyor_construct, /obj/item/conveyor_construct, /obj/item/conveyor_switch_construct, - /obj/item/weapon/paper/conveyor) + /obj/item/paper/conveyor) cost = 15 containername = "conveyor assembly crate" @@ -692,90 +701,90 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/medical/supplies name = "Medical Supplies Crate" - contains = list(/obj/item/weapon/reagent_containers/glass/bottle/charcoal, - /obj/item/weapon/reagent_containers/glass/bottle/charcoal, - /obj/item/weapon/reagent_containers/glass/bottle/epinephrine, - /obj/item/weapon/reagent_containers/glass/bottle/epinephrine, - /obj/item/weapon/reagent_containers/glass/bottle/morphine, - /obj/item/weapon/reagent_containers/glass/bottle/morphine, - /obj/item/weapon/reagent_containers/glass/bottle/toxin, - /obj/item/weapon/reagent_containers/glass/bottle/toxin, - /obj/item/weapon/reagent_containers/glass/beaker/large, - /obj/item/weapon/reagent_containers/glass/beaker/large, + contains = list(/obj/item/reagent_containers/glass/bottle/charcoal, + /obj/item/reagent_containers/glass/bottle/charcoal, + /obj/item/reagent_containers/glass/bottle/epinephrine, + /obj/item/reagent_containers/glass/bottle/epinephrine, + /obj/item/reagent_containers/glass/bottle/morphine, + /obj/item/reagent_containers/glass/bottle/morphine, + /obj/item/reagent_containers/glass/bottle/toxin, + /obj/item/reagent_containers/glass/bottle/toxin, + /obj/item/reagent_containers/glass/beaker/large, + /obj/item/reagent_containers/glass/beaker/large, /obj/item/stack/medical/bruise_pack, - /obj/item/weapon/storage/box/beakers, - /obj/item/weapon/storage/box/syringes, - /obj/item/weapon/storage/box/bodybags) + /obj/item/storage/box/beakers, + /obj/item/storage/box/syringes, + /obj/item/storage/box/bodybags) cost = 20 containertype = /obj/structure/closet/crate/medical containername = "medical supplies crate" /datum/supply_packs/medical/firstaid name = "First Aid Kits Crate" - contains = list(/obj/item/weapon/storage/firstaid/regular, - /obj/item/weapon/storage/firstaid/regular, - /obj/item/weapon/storage/firstaid/regular, - /obj/item/weapon/storage/firstaid/regular) + contains = list(/obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/regular) cost = 10 containername = "first aid kits crate" /datum/supply_packs/medical/firstaidadv name = "Advanced First Aid Kits Crate" - contains = list(/obj/item/weapon/storage/firstaid/adv, - /obj/item/weapon/storage/firstaid/adv, - /obj/item/weapon/storage/firstaid/adv, - /obj/item/weapon/storage/firstaid/adv) + contains = list(/obj/item/storage/firstaid/adv, + /obj/item/storage/firstaid/adv, + /obj/item/storage/firstaid/adv, + /obj/item/storage/firstaid/adv) cost = 10 containername = "advanced first aid kits crate" /datum/supply_packs/medical/firstaibrute name = "Brute Treatment Kits Crate" - contains = list(/obj/item/weapon/storage/firstaid/brute, - /obj/item/weapon/storage/firstaid/brute, - /obj/item/weapon/storage/firstaid/brute) + contains = list(/obj/item/storage/firstaid/brute, + /obj/item/storage/firstaid/brute, + /obj/item/storage/firstaid/brute) cost = 10 containername = "brute first aid kits crate" /datum/supply_packs/medical/firstaidburns name = "Burns Treatment Kits Crate" - contains = list(/obj/item/weapon/storage/firstaid/fire, - /obj/item/weapon/storage/firstaid/fire, - /obj/item/weapon/storage/firstaid/fire) + contains = list(/obj/item/storage/firstaid/fire, + /obj/item/storage/firstaid/fire, + /obj/item/storage/firstaid/fire) cost = 10 containername = "fire first aid kits crate" /datum/supply_packs/medical/firstaidtoxins name = "Toxin Treatment Kits Crate" - contains = list(/obj/item/weapon/storage/firstaid/toxin, - /obj/item/weapon/storage/firstaid/toxin, - /obj/item/weapon/storage/firstaid/toxin) + contains = list(/obj/item/storage/firstaid/toxin, + /obj/item/storage/firstaid/toxin, + /obj/item/storage/firstaid/toxin) cost = 10 containername = "toxin first aid kits crate" /datum/supply_packs/medical/firstaidoxygen name = "Oxygen Treatment Kits Crate" - contains = list(/obj/item/weapon/storage/firstaid/o2, - /obj/item/weapon/storage/firstaid/o2, - /obj/item/weapon/storage/firstaid/o2) + contains = list(/obj/item/storage/firstaid/o2, + /obj/item/storage/firstaid/o2, + /obj/item/storage/firstaid/o2) cost = 10 containername = "oxygen first aid kits crate" /datum/supply_packs/medical/virus name = "Virus Crate" - contains = list(/obj/item/weapon/reagent_containers/glass/bottle/flu_virion, - /obj/item/weapon/reagent_containers/glass/bottle/cold, - /obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion, - /obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion, - /obj/item/weapon/reagent_containers/glass/bottle/fake_gbs, - /obj/item/weapon/reagent_containers/glass/bottle/magnitis, - /obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat, - /obj/item/weapon/reagent_containers/glass/bottle/brainrot, - /obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion, - /obj/item/weapon/reagent_containers/glass/bottle/anxiety, - /obj/item/weapon/reagent_containers/glass/bottle/beesease, - /obj/item/weapon/storage/box/syringes, - /obj/item/weapon/storage/box/beakers, - /obj/item/weapon/reagent_containers/glass/bottle/mutagen) + contains = list(/obj/item/reagent_containers/glass/bottle/flu_virion, + /obj/item/reagent_containers/glass/bottle/cold, + /obj/item/reagent_containers/glass/bottle/epiglottis_virion, + /obj/item/reagent_containers/glass/bottle/liver_enhance_virion, + /obj/item/reagent_containers/glass/bottle/fake_gbs, + /obj/item/reagent_containers/glass/bottle/magnitis, + /obj/item/reagent_containers/glass/bottle/pierrot_throat, + /obj/item/reagent_containers/glass/bottle/brainrot, + /obj/item/reagent_containers/glass/bottle/hullucigen_virion, + /obj/item/reagent_containers/glass/bottle/anxiety, + /obj/item/reagent_containers/glass/bottle/beesease, + /obj/item/storage/box/syringes, + /obj/item/storage/box/beakers, + /obj/item/reagent_containers/glass/bottle/mutagen) cost = 25 containertype = /obj/structure/closet/crate/secure/plasma containername = "virus crate" @@ -785,14 +794,14 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/medical/bloodpacks name = "Blood Pack Variety Crate" - contains = list(/obj/item/weapon/reagent_containers/blood/empty, - /obj/item/weapon/reagent_containers/blood/empty, - /obj/item/weapon/reagent_containers/blood/APlus, - /obj/item/weapon/reagent_containers/blood/AMinus, - /obj/item/weapon/reagent_containers/blood/BPlus, - /obj/item/weapon/reagent_containers/blood/BMinus, - /obj/item/weapon/reagent_containers/blood/OPlus, - /obj/item/weapon/reagent_containers/blood/OMinus) + contains = list(/obj/item/reagent_containers/blood/empty, + /obj/item/reagent_containers/blood/empty, + /obj/item/reagent_containers/blood/APlus, + /obj/item/reagent_containers/blood/AMinus, + /obj/item/reagent_containers/blood/BPlus, + /obj/item/reagent_containers/blood/BMinus, + /obj/item/reagent_containers/blood/OPlus, + /obj/item/reagent_containers/blood/OMinus) cost = 35 containertype = /obj/structure/closet/crate/freezer containername = "blood pack crate" @@ -807,17 +816,17 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/medical/surgery name = "Surgery Crate" - contains = list(/obj/item/weapon/cautery, - /obj/item/weapon/surgicaldrill, + contains = list(/obj/item/cautery, + /obj/item/surgicaldrill, /obj/item/clothing/mask/breath/medical, - /obj/item/weapon/tank/anesthetic, - /obj/item/weapon/FixOVein, - /obj/item/weapon/hemostat, - /obj/item/weapon/scalpel, - /obj/item/weapon/bonegel, - /obj/item/weapon/retractor, - /obj/item/weapon/bonesetter, - /obj/item/weapon/circular_saw) + /obj/item/tank/anesthetic, + /obj/item/FixOVein, + /obj/item/hemostat, + /obj/item/scalpel, + /obj/item/bonegel, + /obj/item/retractor, + /obj/item/bonesetter, + /obj/item/circular_saw) cost = 25 containertype = /obj/structure/closet/crate/secure containername = "surgery crate" @@ -836,13 +845,13 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/science/robotics name = "Robotics Assembly Crate" - contains = list(/obj/item/device/assembly/prox_sensor, - /obj/item/device/assembly/prox_sensor, - /obj/item/device/assembly/prox_sensor, - /obj/item/weapon/storage/toolbox/electrical, - /obj/item/weapon/storage/box/flashes, - /obj/item/weapon/stock_parts/cell/high, - /obj/item/weapon/stock_parts/cell/high) + contains = list(/obj/item/assembly/prox_sensor, + /obj/item/assembly/prox_sensor, + /obj/item/assembly/prox_sensor, + /obj/item/storage/toolbox/electrical, + /obj/item/storage/box/flashes, + /obj/item/stock_parts/cell/high, + /obj/item/stock_parts/cell/high) cost = 10 containertype = /obj/structure/closet/crate/secure/scisec containername = "robotics assembly crate" @@ -852,33 +861,33 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/science/robotics/mecha_ripley name = "Circuit Crate (Ripley APLU)" - contains = list(/obj/item/weapon/book/manual/ripley_build_and_repair, - /obj/item/weapon/circuitboard/mecha/ripley/main, //TEMPORARY due to lack of circuitboard printer - /obj/item/weapon/circuitboard/mecha/ripley/peripherals) //TEMPORARY due to lack of circuitboard printer + contains = list(/obj/item/book/manual/ripley_build_and_repair, + /obj/item/circuitboard/mecha/ripley/main, //TEMPORARY due to lack of circuitboard printer + /obj/item/circuitboard/mecha/ripley/peripherals) //TEMPORARY due to lack of circuitboard printer cost = 30 containername = "\improper APLU \"Ripley\" circuit crate" /datum/supply_packs/science/robotics/mecha_odysseus name = "Circuit Crate (Odysseus)" - contains = list(/obj/item/weapon/circuitboard/mecha/odysseus/peripherals, //TEMPORARY due to lack of circuitboard printer - /obj/item/weapon/circuitboard/mecha/odysseus/main) //TEMPORARY due to lack of circuitboard printer + contains = list(/obj/item/circuitboard/mecha/odysseus/peripherals, //TEMPORARY due to lack of circuitboard printer + /obj/item/circuitboard/mecha/odysseus/main) //TEMPORARY due to lack of circuitboard printer cost = 25 containername = "\improper \"Odysseus\" circuit crate" /datum/supply_packs/science/plasma name = "Plasma Assembly Crate" - contains = list(/obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, - /obj/item/device/assembly/igniter, - /obj/item/device/assembly/igniter, - /obj/item/device/assembly/igniter, - /obj/item/device/assembly/prox_sensor, - /obj/item/device/assembly/prox_sensor, - /obj/item/device/assembly/prox_sensor, - /obj/item/device/assembly/timer, - /obj/item/device/assembly/timer, - /obj/item/device/assembly/timer) + contains = list(/obj/item/tank/plasma, + /obj/item/tank/plasma, + /obj/item/tank/plasma, + /obj/item/assembly/igniter, + /obj/item/assembly/igniter, + /obj/item/assembly/igniter, + /obj/item/assembly/prox_sensor, + /obj/item/assembly/prox_sensor, + /obj/item/assembly/prox_sensor, + /obj/item/assembly/timer, + /obj/item/assembly/timer, + /obj/item/assembly/timer) cost = 10 containertype = /obj/structure/closet/crate/secure/plasma containername = "plasma assembly crate" @@ -899,8 +908,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/science/transfer_valves name = "Tank Transfer Valves Crate" - contains = list(/obj/item/device/transfer_valve, - /obj/item/device/transfer_valve) + contains = list(/obj/item/transfer_valve, + /obj/item/transfer_valve) cost = 60 containertype = /obj/structure/closet/crate/secure/scisec containername = "tank transfer valves crate" @@ -908,7 +917,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/science/prototype name = "Machine Prototype Crate" - contains = list(/obj/item/device/machineprototype) + contains = list(/obj/item/machineprototype) cost = 80 containertype = /obj/structure/closet/crate/secure/scisec containername = "machine prototype crate" @@ -926,20 +935,20 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/organic/food name = "Food Crate" - contains = list(/obj/item/weapon/reagent_containers/food/condiment/flour, - /obj/item/weapon/reagent_containers/food/condiment/rice, - /obj/item/weapon/reagent_containers/food/condiment/milk, - /obj/item/weapon/reagent_containers/food/condiment/soymilk, - /obj/item/weapon/reagent_containers/food/condiment/saltshaker, - /obj/item/weapon/reagent_containers/food/condiment/peppermill, - /obj/item/weapon/kitchen/rollingpin, - /obj/item/weapon/storage/fancy/egg_box, - /obj/item/weapon/reagent_containers/food/condiment/enzyme, - /obj/item/weapon/reagent_containers/food/condiment/sugar, - /obj/item/weapon/reagent_containers/food/snacks/meat/monkey, - /obj/item/weapon/reagent_containers/food/snacks/grown/banana, - /obj/item/weapon/reagent_containers/food/snacks/grown/banana, - /obj/item/weapon/reagent_containers/food/snacks/grown/banana) + contains = list(/obj/item/reagent_containers/food/condiment/flour, + /obj/item/reagent_containers/food/condiment/rice, + /obj/item/reagent_containers/food/condiment/milk, + /obj/item/reagent_containers/food/condiment/soymilk, + /obj/item/reagent_containers/food/condiment/saltshaker, + /obj/item/reagent_containers/food/condiment/peppermill, + /obj/item/kitchen/rollingpin, + /obj/item/storage/fancy/egg_box, + /obj/item/reagent_containers/food/condiment/enzyme, + /obj/item/reagent_containers/food/condiment/sugar, + /obj/item/reagent_containers/food/snacks/meat/monkey, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana) cost = 10 containername = "food crate" announce_beacons = list("Kitchen" = list("Kitchen")) @@ -956,50 +965,50 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/organic/monkey name = "Monkey Crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes) + contains = list (/obj/item/storage/box/monkeycubes) cost = 20 containername = "monkey crate" /datum/supply_packs/organic/farwa name = "Farwa Crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes) + contains = list (/obj/item/storage/box/monkeycubes/farwacubes) cost = 20 containername = "farwa crate" /datum/supply_packs/organic/wolpin name = "Wolpin Crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes) + contains = list (/obj/item/storage/box/monkeycubes/wolpincubes) cost = 20 containername = "wolpin crate" /datum/supply_packs/organic/skrell name = "Neaera Crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes) + contains = list (/obj/item/storage/box/monkeycubes/neaeracubes) cost = 20 containername = "neaera crate" /datum/supply_packs/organic/stok name = "Stok Crate" - contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes) + contains = list (/obj/item/storage/box/monkeycubes/stokcubes) cost = 20 containername = "stok crate" /datum/supply_packs/organic/party name = "Party Equipment Crate" - contains = list(/obj/item/weapon/storage/box/drinkingglasses, - /obj/item/weapon/reagent_containers/food/drinks/shaker, - /obj/item/weapon/reagent_containers/food/drinks/bottle/patron, - /obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager, - /obj/item/weapon/reagent_containers/food/drinks/cans/ale, - /obj/item/weapon/reagent_containers/food/drinks/cans/ale, - /obj/item/weapon/reagent_containers/food/drinks/cans/beer, - /obj/item/weapon/reagent_containers/food/drinks/cans/beer, - /obj/item/weapon/reagent_containers/food/drinks/cans/beer, - /obj/item/weapon/reagent_containers/food/drinks/cans/beer, - /obj/item/weapon/grenade/confetti, - /obj/item/weapon/grenade/confetti) + contains = list(/obj/item/storage/box/drinkingglasses, + /obj/item/reagent_containers/food/drinks/shaker, + /obj/item/reagent_containers/food/drinks/bottle/patron, + /obj/item/reagent_containers/food/drinks/bottle/goldschlager, + /obj/item/reagent_containers/food/drinks/cans/ale, + /obj/item/reagent_containers/food/drinks/cans/ale, + /obj/item/reagent_containers/food/drinks/cans/beer, + /obj/item/reagent_containers/food/drinks/cans/beer, + /obj/item/reagent_containers/food/drinks/cans/beer, + /obj/item/reagent_containers/food/drinks/cans/beer, + /obj/item/grenade/confetti, + /obj/item/grenade/confetti) cost = 20 containername = "party equipment" announce_beacons = list("Bar" = list("Bar")) @@ -1074,13 +1083,13 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/organic/hydroponics // -- Skie name = "Hydroponics Supply Crate" - contains = list(/obj/item/weapon/reagent_containers/spray/plantbgone, - /obj/item/weapon/reagent_containers/spray/plantbgone, - /obj/item/weapon/reagent_containers/glass/bottle/ammonia, - /obj/item/weapon/reagent_containers/glass/bottle/ammonia, - /obj/item/weapon/hatchet, - /obj/item/weapon/cultivator, - /obj/item/device/plant_analyzer, + contains = list(/obj/item/reagent_containers/spray/plantbgone, + /obj/item/reagent_containers/spray/plantbgone, + /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/hatchet, + /obj/item/cultivator, + /obj/item/plant_analyzer, /obj/item/clothing/gloves/botanic_leather, /obj/item/clothing/suit/apron) // Updated with new things cost = 15 @@ -1090,7 +1099,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/hydroponics/hydrotank name = "Hydroponics Watertank Crate" - contains = list(/obj/item/weapon/watertank) + contains = list(/obj/item/watertank) cost = 10 containertype = /obj/structure/closet/crate/secure containername = "hydroponics watertank crate" @@ -1160,7 +1169,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/organic/bottler name = "Brewing Buddy Bottler Unit" contains = list(/obj/machinery/bottler, - /obj/item/weapon/wrench) + /obj/item/wrench) cost = 35 containername = "bottler crate" @@ -1227,8 +1236,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/materials/plastic30 name = "30 Plastic Sheets Crate" contains = list(/obj/item/stack/sheet/plastic) - amount = 30 - cost = 25 + amount = 50 + cost = 10 containername = "plastic sheets crate" ////////////////////////////////////////////////////////////////////////////// @@ -1262,12 +1271,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/lasertag name = "Laser Tag Crate" - contains = list(/obj/item/weapon/gun/energy/laser/redtag, - /obj/item/weapon/gun/energy/laser/redtag, - /obj/item/weapon/gun/energy/laser/redtag, - /obj/item/weapon/gun/energy/laser/bluetag, - /obj/item/weapon/gun/energy/laser/bluetag, - /obj/item/weapon/gun/energy/laser/bluetag, + contains = list(/obj/item/gun/energy/laser/redtag, + /obj/item/gun/energy/laser/redtag, + /obj/item/gun/energy/laser/redtag, + /obj/item/gun/energy/laser/bluetag, + /obj/item/gun/energy/laser/bluetag, + /obj/item/gun/energy/laser/bluetag, /obj/item/clothing/suit/redtag, /obj/item/clothing/suit/redtag, /obj/item/clothing/suit/redtag, @@ -1281,10 +1290,10 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/religious_supplies name = "Religious Supplies Crate" - contains = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, - /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, - /obj/item/weapon/storage/bible/booze, - /obj/item/weapon/storage/bible/booze, + contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater, + /obj/item/reagent_containers/food/drinks/bottle/holywater, + /obj/item/storage/bible/booze, + /obj/item/storage/bible/booze, /obj/item/clothing/suit/hooded/chaplain_hoodie, /obj/item/clothing/suit/hooded/chaplain_hoodie) cost = 40 @@ -1296,51 +1305,51 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/paper name = "Bureaucracy Crate" contains = list(/obj/structure/filingcabinet/chestdrawer, - /obj/item/device/camera_film, - /obj/item/weapon/hand_labeler, + /obj/item/camera_film, + /obj/item/hand_labeler, /obj/item/stack/tape_roll, - /obj/item/weapon/paper_bin, - /obj/item/weapon/pen, - /obj/item/weapon/pen/blue, - /obj/item/weapon/pen/red, - /obj/item/weapon/stamp/denied, - /obj/item/weapon/stamp/granted, - /obj/item/weapon/folder/blue, - /obj/item/weapon/folder/red, - /obj/item/weapon/folder/yellow, - /obj/item/weapon/clipboard, - /obj/item/weapon/clipboard) + /obj/item/paper_bin, + /obj/item/pen, + /obj/item/pen/blue, + /obj/item/pen/red, + /obj/item/stamp/denied, + /obj/item/stamp/granted, + /obj/item/folder/blue, + /obj/item/folder/red, + /obj/item/folder/yellow, + /obj/item/clipboard, + /obj/item/clipboard) cost = 15 containername = "bureaucracy crate" /datum/supply_packs/misc/toner name = "Toner Cartridges Crate" - contains = list(/obj/item/device/toner, - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/device/toner, - /obj/item/device/toner) + contains = list(/obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner, + /obj/item/toner) cost = 10 containername = "toner cartridges crate" /datum/supply_packs/misc/artscrafts name = "Arts and Crafts Supplies Crate" - contains = list(/obj/item/weapon/storage/fancy/crayons, - /obj/item/device/camera, - /obj/item/device/camera_film, - /obj/item/device/camera_film, - /obj/item/weapon/storage/photo_album, + contains = list(/obj/item/storage/fancy/crayons, + /obj/item/camera, + /obj/item/camera_film, + /obj/item/camera_film, + /obj/item/storage/photo_album, /obj/item/stack/packageWrap, - /obj/item/weapon/reagent_containers/glass/paint/red, - /obj/item/weapon/reagent_containers/glass/paint/green, - /obj/item/weapon/reagent_containers/glass/paint/blue, - /obj/item/weapon/reagent_containers/glass/paint/yellow, - /obj/item/weapon/reagent_containers/glass/paint/violet, - /obj/item/weapon/reagent_containers/glass/paint/black, - /obj/item/weapon/reagent_containers/glass/paint/white, - /obj/item/weapon/reagent_containers/glass/paint/remover, - /obj/item/weapon/poster/random_official, + /obj/item/reagent_containers/glass/paint/red, + /obj/item/reagent_containers/glass/paint/green, + /obj/item/reagent_containers/glass/paint/blue, + /obj/item/reagent_containers/glass/paint/yellow, + /obj/item/reagent_containers/glass/paint/violet, + /obj/item/reagent_containers/glass/paint/black, + /obj/item/reagent_containers/glass/paint/white, + /obj/item/reagent_containers/glass/paint/remover, + /obj/item/poster/random_official, /obj/item/stack/wrapping_paper, /obj/item/stack/wrapping_paper, /obj/item/stack/wrapping_paper) @@ -1349,11 +1358,11 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/posters name = "Corporate Posters Crate" - contains = list(/obj/item/weapon/poster/random_official, - /obj/item/weapon/poster/random_official, - /obj/item/weapon/poster/random_official, - /obj/item/weapon/poster/random_official, - /obj/item/weapon/poster/random_official) + contains = list(/obj/item/poster/random_official, + /obj/item/poster/random_official, + /obj/item/poster/random_official, + /obj/item/poster/random_official, + /obj/item/poster/random_official) cost = 8 containername = "corporate posters crate" @@ -1361,19 +1370,19 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/janitor name = "Janitorial Supplies Crate" - contains = list(/obj/item/weapon/reagent_containers/glass/bucket, - /obj/item/weapon/reagent_containers/glass/bucket, - /obj/item/weapon/reagent_containers/glass/bucket, - /obj/item/weapon/mop, - /obj/item/weapon/caution, - /obj/item/weapon/caution, - /obj/item/weapon/caution, - /obj/item/weapon/storage/bag/trash, - /obj/item/weapon/reagent_containers/spray/cleaner, - /obj/item/weapon/reagent_containers/glass/rag, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner, - /obj/item/weapon/grenade/chem_grenade/cleaner) + contains = list(/obj/item/reagent_containers/glass/bucket, + /obj/item/reagent_containers/glass/bucket, + /obj/item/reagent_containers/glass/bucket, + /obj/item/mop, + /obj/item/caution, + /obj/item/caution, + /obj/item/caution, + /obj/item/storage/bag/trash, + /obj/item/reagent_containers/spray/cleaner, + /obj/item/reagent_containers/glass/rag, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner) cost = 10 containername = "janitorial supplies crate" announce_beacons = list("Janitor" = list("Janitorial")) @@ -1388,7 +1397,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/janitor/janitank name = "Janitor Watertank Backpack" - contains = list(/obj/item/weapon/watertank/janitor) + contains = list(/obj/item/watertank/janitor) cost = 10 containertype = /obj/structure/closet/crate/secure containername = "janitor watertank crate" @@ -1396,9 +1405,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/janitor/lightbulbs name = "Replacement Lights Crate" - contains = list(/obj/item/weapon/storage/box/lights/mixed, - /obj/item/weapon/storage/box/lights/mixed, - /obj/item/weapon/storage/box/lights/mixed) + contains = list(/obj/item/storage/box/lights/mixed, + /obj/item/storage/box/lights/mixed, + /obj/item/storage/box/lights/mixed) cost = 10 containername = "replacement lights crate" @@ -1412,20 +1421,20 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/costume name = "Standard Costume Crate" - contains = list(/obj/item/weapon/storage/backpack/clown, + contains = list(/obj/item/storage/backpack/clown, /obj/item/clothing/shoes/clown_shoes, /obj/item/clothing/mask/gas/clown_hat, /obj/item/clothing/under/rank/clown, - /obj/item/weapon/bikehorn, - /obj/item/weapon/storage/backpack/mime, + /obj/item/bikehorn, + /obj/item/storage/backpack/mime, /obj/item/clothing/under/mime, /obj/item/clothing/shoes/black, /obj/item/clothing/gloves/color/white, /obj/item/clothing/mask/gas/mime, /obj/item/clothing/head/beret, /obj/item/clothing/suit/suspenders, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing, - /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofbanana + /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, + /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana ) cost = 10 containertype = /obj/structure/closet/crate/secure @@ -1434,7 +1443,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/wizard name = "Wizard Costume Crate" - contains = list(/obj/item/weapon/twohanded/staff, + contains = list(/obj/item/twohanded/staff, /obj/item/clothing/suit/wizrobe/fake, /obj/item/clothing/shoes/sandal, /obj/item/clothing/head/wizard/fake) @@ -1454,8 +1463,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/under/mafia/white, /obj/item/clothing/under/mafia/sue, /obj/item/clothing/under/mafia/tan, - /obj/item/weapon/gun/projectile/shotgun/toy/tommygun, - /obj/item/weapon/gun/projectile/shotgun/toy/tommygun) + /obj/item/gun/projectile/shotgun/toy/tommygun, + /obj/item/gun/projectile/shotgun/toy/tommygun) cost = 15 containername = "mafia supply crate" @@ -1493,21 +1502,21 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/foamforce name = "Foam Force Crate" - contains = list(/obj/item/weapon/gun/projectile/shotgun/toy, - /obj/item/weapon/gun/projectile/shotgun/toy, - /obj/item/weapon/gun/projectile/shotgun/toy, - /obj/item/weapon/gun/projectile/shotgun/toy, - /obj/item/weapon/gun/projectile/shotgun/toy, - /obj/item/weapon/gun/projectile/shotgun/toy, - /obj/item/weapon/gun/projectile/shotgun/toy, - /obj/item/weapon/gun/projectile/shotgun/toy) + contains = list(/obj/item/gun/projectile/shotgun/toy, + /obj/item/gun/projectile/shotgun/toy, + /obj/item/gun/projectile/shotgun/toy, + /obj/item/gun/projectile/shotgun/toy, + /obj/item/gun/projectile/shotgun/toy, + /obj/item/gun/projectile/shotgun/toy, + /obj/item/gun/projectile/shotgun/toy, + /obj/item/gun/projectile/shotgun/toy) cost = 10 containername = "foam force crate" /datum/supply_packs/misc/foamforce/bonus name = "Foam Force Pistols Crate" - contains = list(/obj/item/weapon/gun/projectile/automatic/toy/pistol, - /obj/item/weapon/gun/projectile/automatic/toy/pistol, + contains = list(/obj/item/gun/projectile/automatic/toy/pistol, + /obj/item/gun/projectile/automatic/toy/pistol, /obj/item/ammo_box/magazine/toy/pistol, /obj/item/ammo_box/magazine/toy/pistol) cost = 40 @@ -1516,26 +1525,26 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/bigband name = "Big band instrument collection" - contains = list(/obj/item/device/instrument/violin, - /obj/item/device/instrument/guitar, - /obj/item/device/instrument/eguitar, - /obj/item/device/instrument/glockenspiel, - /obj/item/device/instrument/accordion, - /obj/item/device/instrument/saxophone, - /obj/item/device/instrument/trombone, - /obj/item/device/instrument/recorder, - /obj/item/device/instrument/harmonica, - /obj/item/device/instrument/xylophone, + contains = list(/obj/item/instrument/violin, + /obj/item/instrument/guitar, + /obj/item/instrument/eguitar, + /obj/item/instrument/glockenspiel, + /obj/item/instrument/accordion, + /obj/item/instrument/saxophone, + /obj/item/instrument/trombone, + /obj/item/instrument/recorder, + /obj/item/instrument/harmonica, + /obj/item/instrument/xylophone, /obj/structure/piano) cost = 50 containername = "Big band musical instruments collection" /datum/supply_packs/misc/randomised/contraband num_contained = 5 - contains = list(/obj/item/weapon/storage/pill_bottle/random_drug_bottle, - /obj/item/weapon/poster/random_contraband, - /obj/item/weapon/storage/fancy/cigarettes/dromedaryco, - /obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims) + contains = list(/obj/item/storage/pill_bottle/random_drug_bottle, + /obj/item/poster/random_contraband, + /obj/item/storage/fancy/cigarettes/dromedaryco, + /obj/item/storage/fancy/cigarettes/cigpack_shadyjims) name = "Contraband Crate" cost = 30 containername = "crate" //let's keep it subtle, eh? @@ -1569,7 +1578,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/under/suit_jacket/burgundy, /obj/item/clothing/under/suit_jacket/checkered, /obj/item/clothing/under/suit_jacket/tan, - /obj/item/weapon/lipstick/random) + /obj/item/lipstick/random) cost = 30 //Lots of very expensive items. You gotta pay up to look good! containername = "formal-wear crate" @@ -1584,26 +1593,26 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/under/color/blue/jersey, /obj/item/clothing/under/color/blue/jersey, /obj/item/clothing/under/color/blue/jersey, - /obj/item/weapon/beach_ball) + /obj/item/beach_ball) cost = 15 containername = "team jerseys crate" /datum/supply_packs/misc/polo //For space polo! Or horsehead Quiditch name = "Polo Supply Crate" // 6 brooms, 6 horse masks for the brooms, and 1 beach ball - contains = list(/obj/item/weapon/twohanded/staff/broom, - /obj/item/weapon/twohanded/staff/broom, - /obj/item/weapon/twohanded/staff/broom, - /obj/item/weapon/twohanded/staff/broom, - /obj/item/weapon/twohanded/staff/broom, - /obj/item/weapon/twohanded/staff/broom, + contains = list(/obj/item/twohanded/staff/broom, + /obj/item/twohanded/staff/broom, + /obj/item/twohanded/staff/broom, + /obj/item/twohanded/staff/broom, + /obj/item/twohanded/staff/broom, + /obj/item/twohanded/staff/broom, /obj/item/clothing/mask/horsehead, /obj/item/clothing/mask/horsehead, /obj/item/clothing/mask/horsehead, /obj/item/clothing/mask/horsehead, /obj/item/clothing/mask/horsehead, /obj/item/clothing/mask/horsehead, - /obj/item/weapon/beach_ball) + /obj/item/beach_ball) cost = 20 containername = "polo supply crate" @@ -1613,10 +1622,10 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine name = "Bluespace Artillery Parts" cost = 150 special = TRUE - contains = list(/obj/item/weapon/circuitboard/machine/bsa/front, - /obj/item/weapon/circuitboard/machine/bsa/middle, - /obj/item/weapon/circuitboard/machine/bsa/back, - /obj/item/weapon/circuitboard/computer/bsa_control + contains = list(/obj/item/circuitboard/machine/bsa/front, + /obj/item/circuitboard/machine/bsa/middle, + /obj/item/circuitboard/machine/bsa/back, + /obj/item/circuitboard/computer/bsa_control ) containername = "bluespace artillery parts crate" @@ -1625,7 +1634,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 120 special = TRUE contains = list( - /obj/item/weapon/circuitboard/machine/dna_vault + /obj/item/circuitboard/machine/dna_vault ) containername = "dna vault parts crate" @@ -1633,11 +1642,11 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine name = "DNA Vault Samplers" cost = 30 special = TRUE - contains = list(/obj/item/device/dna_probe, - /obj/item/device/dna_probe, - /obj/item/device/dna_probe, - /obj/item/device/dna_probe, - /obj/item/device/dna_probe + contains = list(/obj/item/dna_probe, + /obj/item/dna_probe, + /obj/item/dna_probe, + /obj/item/dna_probe, + /obj/item/dna_probe ) containername = "dna samplers crate" @@ -1659,7 +1668,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 50 special = TRUE contains = list( - /obj/item/weapon/circuitboard/computer/sat_control + /obj/item/circuitboard/computer/sat_control ) containername = "shield control board crate" @@ -1669,8 +1678,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine name = "Lavatory Crate" cost = 10 contains = list( - /obj/item/weapon/bathroom_parts, - /obj/item/weapon/bathroom_parts/urinal + /obj/item/bathroom_parts, + /obj/item/bathroom_parts/urinal ) containername = "lavatory crate" @@ -1678,7 +1687,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine name = "Hygiene Station Crate" cost = 10 contains = list( - /obj/item/weapon/bathroom_parts/sink, + /obj/item/bathroom_parts/sink, /obj/item/mounted/shower ) containername = "hygiene station crate" @@ -1693,73 +1702,73 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/vending/autodrobe name = "Autodrobe Supply Crate" - contains = list(/obj/item/weapon/vending_refill/autodrobe, - /obj/item/weapon/vending_refill/autodrobe) + contains = list(/obj/item/vending_refill/autodrobe, + /obj/item/vending_refill/autodrobe) cost = 15 containername = "autodrobe supply crate" /datum/supply_packs/vending/clothes name = "Clothing Supply Crate" - contains = list(/obj/item/weapon/vending_refill/suitdispenser, - /obj/item/weapon/vending_refill/shoedispenser, - /obj/item/weapon/vending_refill/hatdispenser, - /obj/item/weapon/vending_refill/clothing) + contains = list(/obj/item/vending_refill/suitdispenser, + /obj/item/vending_refill/shoedispenser, + /obj/item/vending_refill/hatdispenser, + /obj/item/vending_refill/clothing) cost = 15 containername = "clothing supply crate" /datum/supply_packs/vending/pets name = "Pet Supply Crate" - contains = list(/obj/item/weapon/vending_refill/crittercare, - /obj/item/weapon/vending_refill/crittercare, - /obj/item/weapon/vending_refill/crittercare) + contains = list(/obj/item/vending_refill/crittercare, + /obj/item/vending_refill/crittercare, + /obj/item/vending_refill/crittercare) cost = 15 containername = "pet supply crate" /datum/supply_packs/vending/bar name = "Bar Supply Crate" - contains = list(/obj/item/weapon/vending_refill/boozeomat, - /obj/item/weapon/vending_refill/boozeomat, - /obj/item/weapon/vending_refill/boozeomat) + contains = list(/obj/item/vending_refill/boozeomat, + /obj/item/vending_refill/boozeomat, + /obj/item/vending_refill/boozeomat) cost = 15 containername = "bar supply crate" announce_beacons = list("Bar" = list("Bar")) /datum/supply_packs/vending/coffee name = "Coffee Supply Crate" - contains = list(/obj/item/weapon/vending_refill/coffee, - /obj/item/weapon/vending_refill/coffee, - /obj/item/weapon/vending_refill/coffee) + contains = list(/obj/item/vending_refill/coffee, + /obj/item/vending_refill/coffee, + /obj/item/vending_refill/coffee) cost = 15 containername = "coffee supply crate" /datum/supply_packs/vending/snack name = "Snack Supply Crate" - contains = list(/obj/item/weapon/vending_refill/snack, - /obj/item/weapon/vending_refill/snack, - /obj/item/weapon/vending_refill/snack) + contains = list(/obj/item/vending_refill/snack, + /obj/item/vending_refill/snack, + /obj/item/vending_refill/snack) cost = 15 containername = "snacks supply crate" /datum/supply_packs/vending/chinese name = "Chinese Supply Crate" - contains = list(/obj/item/weapon/vending_refill/chinese, - /obj/item/weapon/vending_refill/chinese, - /obj/item/weapon/vending_refill/chinese) + contains = list(/obj/item/vending_refill/chinese, + /obj/item/vending_refill/chinese, + /obj/item/vending_refill/chinese) cost = 15 containername = "chinese supply crate" /datum/supply_packs/vending/cola name = "Softdrinks Supply Crate" - contains = list(/obj/item/weapon/vending_refill/cola, - /obj/item/weapon/vending_refill/cola, - /obj/item/weapon/vending_refill/cola) + contains = list(/obj/item/vending_refill/cola, + /obj/item/vending_refill/cola, + /obj/item/vending_refill/cola) cost = 15 containername = "softdrinks supply crate" /datum/supply_packs/vending/cigarette name = "Cigarette Supply Crate" - contains = list(/obj/item/weapon/vending_refill/cigarette, - /obj/item/weapon/vending_refill/cigarette, - /obj/item/weapon/vending_refill/cigarette) + contains = list(/obj/item/vending_refill/cigarette, + /obj/item/vending_refill/cigarette, + /obj/item/vending_refill/cigarette) cost = 15 containername = "cigarette supply crate" diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 0d4a871fc06..9a5bf86665c 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -56,7 +56,7 @@ var/list/uplink_items = list() var/surplus = 100 //Chance of being included in the surplus crate (when pick() selects it) var/hijack_only = FALSE //can this item be purchased only during hijackings? -/datum/uplink_item/proc/spawn_item(var/turf/loc, var/obj/item/device/uplink/U) +/datum/uplink_item/proc/spawn_item(var/turf/loc, var/obj/item/uplink/U) if(hijack_only) if(!(locate(/datum/objective/hijack) in usr.mind.objectives)) to_chat(usr, "The Syndicate lacks resources to provide you with this item.") @@ -74,7 +74,7 @@ var/list/uplink_items = list() desc = replacetext(initial(temp.desc), "\n", "
") return desc -/datum/uplink_item/proc/buy(var/obj/item/device/uplink/hidden/U, var/mob/user) +/datum/uplink_item/proc/buy(var/obj/item/uplink/hidden/U, var/mob/user) ..() if(!istype(U)) @@ -99,7 +99,7 @@ var/list/uplink_items = list() var/mob/living/carbon/human/A = user A.put_in_any_hand_if_possible(I) - if(istype(I,/obj/item/weapon/storage/box/) && I.contents.len>0) + if(istype(I,/obj/item/storage/box/) && I.contents.len>0) for(var/atom/o in I) U.purchase_log += "[bicon(o)]" else @@ -124,7 +124,7 @@ var/list/uplink_items = list() name = "Banana Grenade" desc = "A grenade that explodes into HONK! brand banana peels that are genetically modified to be extra slippery and extrude caustic acid when stepped on" reference = "BG" - item = /obj/item/weapon/grenade/clown_grenade + item = /obj/item/grenade/clown_grenade cost = 5 job = list("Clown") @@ -133,7 +133,7 @@ var/list/uplink_items = list() name = "Cane Shotgun + Assassination Darts" desc = "A specialized, one shell shotgun with a built-in cloaking device to mimic a cane. The shotgun is capable of hiding it's contents and the pin alongside being supressed. Comes with 6 special darts and a preloaded shrapnel round." reference = "MCS" - item = /obj/item/weapon/storage/box/syndie_kit/caneshotgun + item = /obj/item/storage/box/syndie_kit/caneshotgun cost = 10 job = list("Mime") @@ -142,7 +142,7 @@ var/list/uplink_items = list() name = "Chef Excellence's Special Sauce" desc = "A custom made sauce made from the toxin glands of 1000 space carp, if somebody ingests enough they'll be dead in 3 minutes or less guaranteed." reference = "CESS" - item = /obj/item/weapon/reagent_containers/food/condiment/syndisauce + item = /obj/item/reagent_containers/food/condiment/syndisauce cost = 2 job = list("Chef") @@ -150,7 +150,7 @@ var/list/uplink_items = list() name = "Meat Cleaver" desc = "A mean looking meat cleaver that does damage comparable to an Energy Sword but with the added benefit of chopping your victim into hunks of meat after they've died and the chance to stun when thrown." reference = "MC" - item = /obj/item/weapon/kitchen/knife/butcher/meatcleaver + item = /obj/item/kitchen/knife/butcher/meatcleaver cost = 10 job = list("Chef") @@ -158,7 +158,7 @@ var/list/uplink_items = list() name = "Syndicate Donk Pockets" desc = "A box of highly specialized Donk pockets with a number of regenerative and stimulating chemicals inside of them; the box comes equipped with a self-heating mechanism." reference = "SDP" - item = /obj/item/weapon/storage/box/syndidonkpockets + item = /obj/item/storage/box/syndidonkpockets cost = 2 job = list("Chef") @@ -176,7 +176,7 @@ var/list/uplink_items = list() name = "Missionary Starter Kit" desc = "A box containing a missionary staff, missionary robes, and bible. The robes and staff can be linked to allow you to convert victims at range for a short time to do your bidding. The bible is for bible stuff." reference = "MK" - item = /obj/item/weapon/storage/box/syndie_kit/missionary_set + item = /obj/item/storage/box/syndie_kit/missionary_set cost = 15 job = list("Chaplain") @@ -184,7 +184,7 @@ var/list/uplink_items = list() name = "Artistic Toolbox" desc = "An accursed toolbox that grants its followers extreme power at the cost of requiring repeated sacrifices to it. If sacrifices are not provided, it will turn on its follower." reference = "HGAT" - item = /obj/item/weapon/storage/toolbox/green/memetic + item = /obj/item/storage/toolbox/green/memetic cost = 20 job = list("Chaplain") surplus = 0 //No lucky chances from the crate; if you get this, this is ALL you're getting @@ -196,7 +196,7 @@ var/list/uplink_items = list() name = "Proximity Mine" desc = "An Anti-Personnel proximity mine cleverly disguised as a wet floor caution sign that is triggered by running past it, activate it to start the 15 second timer and activate again to disarm." reference = "PM" - item = /obj/item/weapon/caution/proximity_sign + item = /obj/item/caution/proximity_sign cost = 4 job = list("Janitor") surplus = 0 @@ -207,14 +207,14 @@ var/list/uplink_items = list() name = "Radiation Laser" desc = "A radiation laser concealed inside of a Health Analyser. After a moderate delay, causes temporary collapse and radiation. Has adjustable controls, but will not function as a regular health analyser, only appears like one. May not function correctly on radiation resistant humanoids!" reference = "RL" - item = /obj/item/device/rad_laser + item = /obj/item/rad_laser cost = 5 job = list("Chief Medical Officer", "Medical Doctor", "Geneticist", "Psychiatrist", "Chemist", "Paramedic", "Coroner", "Virologist") /datum/uplink_item/dangerous/cat_grenade name = "Feral Cat Delivery Grenade" desc = "The feral cat delivery grenade contains 8 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight." - item = /obj/item/weapon/grenade/spawnergrenade/feral_cats + item = /obj/item/grenade/spawnergrenade/feral_cats reference = "CCLG" cost = 4 job = list("Psychiatrist")//why? Becuase its funny that a person in charge of your mental wellbeing has a cat granade.. @@ -235,7 +235,7 @@ var/list/uplink_items = list() name = "Boozey Shotgun Shells" desc = "A box containing 6 shotgun shells that simulate the effects of extreme drunkenness on the target, more effective for each type of alcohol in the target's system." reference = "BSS" - item = /obj/item/weapon/storage/box/syndie_kit/boolets + item = /obj/item/storage/box/syndie_kit/boolets cost = 3 job = list("Bartender") @@ -245,7 +245,7 @@ var/list/uplink_items = list() name = "Safety Scissors" desc = "A pair of scissors that are anything but what their name implies; can easily cut right into someone's throat." reference = "CTS" - item = /obj/item/weapon/scissors/safety + item = /obj/item/scissors/safety cost = 5 job = list("Barber") @@ -255,7 +255,7 @@ var/list/uplink_items = list() name = "Briefcase Full of Bees" desc = "A seemingly innocent briefcase full of not-so-innocent Syndicate-bred bees. Inject the case with blood to train the bees to ignore the donor(s). It also wirelessly taps into station intercomms to broadcast a message of TERROR." reference = "BEE" - item = /obj/item/weapon/bee_briefcase + item = /obj/item/bee_briefcase cost = 10 job = list("Botanist") @@ -275,7 +275,7 @@ var/list/uplink_items = list() name = "Telegun" desc = "An extremely high-tech energy gun that utilizes bluespace technology to teleport away living targets. Select the target beacon on the telegun itself; projectiles will send targets to the beacon locked onto." reference = "TG" - item = /obj/item/weapon/gun/energy/telegun + item = /obj/item/gun/energy/telegun cost = 12 job = list("Research Director") @@ -284,7 +284,7 @@ var/list/uplink_items = list() name = "The E20" desc = "A seemingly innocent die, those who are not afraid to roll for attack will find it's effects quite explosive. Has a four second timer." reference = "ETW" - item = /obj/item/weapon/dice/d20/e20 + item = /obj/item/dice/d20/e20 cost = 3 job = list("Librarian") @@ -310,7 +310,7 @@ var/list/uplink_items = list() name = "Energized Fire Axe" desc = "A fire axe with a massive electrical charge built into it. It can release this charge on its first victim and will be rather plain after that." reference = "EFA" - item = /obj/item/weapon/twohanded/energizedfireaxe + item = /obj/item/twohanded/energizedfireaxe cost = 10 job = list("Life Support Specialist") @@ -320,7 +320,7 @@ var/list/uplink_items = list() name = "Stimulants" desc = "A highly illegal compound contained within a compact auto-injector; when injected it makes the user extremely resistant to incapacitation and greatly enhances the body's ability to repair itself." reference = "ST" - item = /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimulants + item = /obj/item/reagent_containers/hypospray/autoinjector/stimulants cost = 7 job = list("Scientist", "Research Director", "Geneticist", "Chief Medical Officer", "Medical Doctor", "Psychiatrist", "Chemist", "Paramedic", "Coroner", "Virologist") @@ -330,7 +330,7 @@ var/list/uplink_items = list() name = "Poison Bottle" desc = "The Syndicate will ship a bottle containing 40 units of a randomly selected poison. The poison can range from highly irritating to incredibly lethal." reference = "TPB" - item = /obj/item/weapon/reagent_containers/glass/bottle/traitor + item = /obj/item/reagent_containers/glass/bottle/traitor cost = 2 job = list("Research Director", "Chief Medical Officer", "Medical Doctor", "Psychiatrist", "Chemist", "Paramedic", "Virologist", "Bartender", "Chef") @@ -340,7 +340,7 @@ var/list/uplink_items = list() name = "Poison Pen" desc = "Cutting edge of deadly writing implements technology, this gadget will infuse any piece of paper with delayed contact poison." reference = "PP" - item = /obj/item/weapon/pen/poison + item = /obj/item/pen/poison cost = 2 excludefrom = list(/datum/game_mode/nuclear) job = list("Head of Personnel", "Quartermaster", "Cargo Technician") @@ -356,14 +356,14 @@ var/list/uplink_items = list() name = "FK-69 Pistol" reference = "SPI" desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible with suppressors." - item = /obj/item/weapon/gun/projectile/automatic/pistol + item = /obj/item/gun/projectile/automatic/pistol cost = 4 /datum/uplink_item/dangerous/revolver name = "Syndicate .357 Revolver" reference = "SR" desc = "A brutally simple syndicate revolver that fires .357 Magnum cartridges and has 7 chambers." - item = /obj/item/weapon/gun/projectile/revolver + item = /obj/item/gun/projectile/revolver cost = 13 surplus = 50 @@ -371,7 +371,7 @@ var/list/uplink_items = list() name = "C-20r Submachine Gun" reference = "SMG" desc = "A fully-loaded Scarborough Arms bullpup submachine gun that fires .45 rounds with a 20-round magazine and is compatible with suppressors." - item = /obj/item/weapon/gun/projectile/automatic/c20r + item = /obj/item/gun/projectile/automatic/c20r cost = 14 gamemodes = list(/datum/game_mode/nuclear) surplus = 40 @@ -380,7 +380,7 @@ var/list/uplink_items = list() name = "M-90gl Carbine" desc = "A fully-loaded three-round burst carbine that uses 30-round 5.56mm magazines with a togglable underslung 40mm grenade launcher." reference = "AR" - item = /obj/item/weapon/gun/projectile/automatic/m90 + item = /obj/item/gun/projectile/automatic/m90 cost = 18 gamemodes = list(/datum/game_mode/nuclear) surplus = 50 @@ -389,7 +389,7 @@ var/list/uplink_items = list() name = "L6 Squad Automatic Weapon" desc = "A fully-loaded Aussec Armory belt-fed machine gun. This deadly weapon has a massive 50-round magazine of devastating 7.62x51mm ammunition." reference = "LMG" - item = /obj/item/weapon/gun/projectile/automatic/l6_saw + item = /obj/item/gun/projectile/automatic/l6_saw cost = 40 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -398,7 +398,7 @@ var/list/uplink_items = list() name = "Sniper Rifle" desc = "Ranged fury, Syndicate style. guaranteed to cause shock and awe or your TC back!" reference = "SSR" - item = /obj/item/weapon/gun/projectile/automatic/sniper_rifle/syndicate + item = /obj/item/gun/projectile/automatic/sniper_rifle/syndicate cost = 16 surplus = 25 gamemodes = list(/datum/game_mode/nuclear) @@ -407,7 +407,7 @@ var/list/uplink_items = list() name = "Energy Crossbow" desc = "A miniature energy crossbow that is small enough both to fit into a pocket and to slip into a backpack unnoticed by observers. Fires bolts tipped with toxin, a poisonous substance that is the product of a living organism. Stuns enemies for a short period of time. Recharges automatically." reference = "EC" - item = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow + item = /obj/item/gun/energy/kinetic_accelerator/crossbow cost = 12 excludefrom = list(/datum/game_mode/nuclear) surplus = 50 @@ -416,7 +416,7 @@ var/list/uplink_items = list() name = "Flamethrower" desc = "A flamethrower, fuelled by a portion of highly flammable bio-toxins stolen previously from Nanotrasen stations. Make a statement by roasting the filth in their own greed. Use with caution." reference = "FT" - item = /obj/item/weapon/flamethrower/full/tank + item = /obj/item/flamethrower/full/tank cost = 8 gamemodes = list(/datum/game_mode/nuclear) surplus = 40 @@ -425,7 +425,7 @@ var/list/uplink_items = list() name = "Energy Sword" desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be pocketed when inactive. Activating it produces a loud, distinctive noise." reference = "ES" - item = /obj/item/weapon/melee/energy/sword/saber + item = /obj/item/melee/energy/sword/saber cost = 8 /datum/uplink_item/dangerous/powerfist @@ -435,28 +435,28 @@ var/list/uplink_items = list() Using a wrench on the piston valve will allow you to tweak the amount of gas used per punch to \ deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks." reference = "PF" - item = /obj/item/weapon/melee/powerfist + item = /obj/item/melee/powerfist cost = 8 /datum/uplink_item/dangerous/chainsaw name = "Chainsaw" desc = "A high powered chainsaw for cutting up ...you know...." reference = "CH" - item = /obj/item/weapon/twohanded/chainsaw + item = /obj/item/twohanded/chainsaw cost = 13 /datum/uplink_item/dangerous/batterer name = "Mind Batterer" desc = "A device that has a chance of knocking down people around you for a long amount of time. 50% chance per person. The user is unaffected. Has 5 charges." reference = "BTR" - item = /obj/item/device/batterer + item = /obj/item/batterer cost = 5 /datum/uplink_item/dangerous/manhacks name = "Viscerator Delivery Grenade" desc = "A unique grenade that deploys a swarm of viscerators upon activation, which will chase down and shred any non-operatives in the area." reference = "VDG" - item = /obj/item/weapon/grenade/spawnergrenade/manhacks + item = /obj/item/grenade/spawnergrenade/manhacks cost = 6 gamemodes = list(/datum/game_mode/nuclear) surplus = 35 @@ -465,7 +465,7 @@ var/list/uplink_items = list() name = "Box of Bioterror Syringes" desc = "A box full of preloaded syringes, containing various chemicals that seize up the victim's motor and broca system , making it impossible for them to move or speak while in their system." reference = "BTS" - item = /obj/item/weapon/storage/box/syndie_kit/bioterror + item = /obj/item/storage/box/syndie_kit/bioterror cost = 5 gamemodes = list(/datum/game_mode/nuclear) @@ -473,7 +473,7 @@ var/list/uplink_items = list() name = "Sarin Gas Grenades" desc = "A box of four (4) grenades filled with Sarin, a deadly neurotoxin. Use extreme caution when handling and be sure to vacate the premise after using; ensure communication is maintained with team to avoid accidental gassings." reference = "TGG" - item = /obj/item/weapon/storage/box/syndie_kit/sarin + item = /obj/item/storage/box/syndie_kit/sarin cost = 12 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -482,7 +482,7 @@ var/list/uplink_items = list() name = "Atmos Grenades" desc = "A box of two (2) grenades that wreak havoc with the atmosphere of the target area. Capable of engulfing a large area in lit plasma, or N2O. Deploy with extreme caution!" reference = "AGG" - item = /obj/item/weapon/storage/box/syndie_kit/atmosgasgrenades + item = /obj/item/storage/box/syndie_kit/atmosgasgrenades cost = 11 /datum/uplink_item/dangerous/emp @@ -490,14 +490,14 @@ var/list/uplink_items = list() desc = "A box that contains two EMP grenades and an EMP implant. Useful to disrupt communication, \ security's energy weapons, and silicon lifeforms when you're in a tight spot." reference = "EMPK" - item = /obj/item/weapon/storage/box/syndie_kit/emp + item = /obj/item/storage/box/syndie_kit/emp cost = 2 /datum/uplink_item/dangerous/syndicate_minibomb name = "Syndicate Minibomb" desc = "The minibomb is a grenade with a five-second fuse." reference = "SMB" - item = /obj/item/weapon/grenade/syndieminibomb + item = /obj/item/grenade/syndieminibomb cost = 6 /datum/uplink_item/dangerous/gygax @@ -523,7 +523,7 @@ var/list/uplink_items = list() name = "Syndicate Cyborg" desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel." reference = "SC" - item = /obj/item/weapon/antag_spawner/borg_tele + item = /obj/item/antag_spawner/borg_tele cost = 50 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -532,7 +532,7 @@ var/list/uplink_items = list() name = "Toy Submachine Gun" desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade rounds with a 20-round magazine." reference = "FSMG" - item = /obj/item/weapon/gun/projectile/automatic/c20r/toy + item = /obj/item/gun/projectile/automatic/c20r/toy cost = 5 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -541,7 +541,7 @@ var/list/uplink_items = list() name = "Toy Machine Gun" desc = "A fully-loaded Donksoft belt-fed machine gun. This weapon has a massive 50-round magazine of devastating riot grade darts, that can briefly incapacitate someone in just one volley." reference = "FLMG" - item = /obj/item/weapon/gun/projectile/automatic/l6_saw/toy + item = /obj/item/gun/projectile/automatic/l6_saw/toy cost = 10 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -558,14 +558,14 @@ var/list/uplink_items = list() //for refunding the syndieborg teleporter /datum/uplink_item/dangerous/syndieborg/spawn_item() - var/obj/item/weapon/antag_spawner/borg_tele/T = ..() + var/obj/item/antag_spawner/borg_tele/T = ..() if(istype(T)) T.TC_cost = cost /datum/uplink_item/dangerous/guardian name = "Holoparasites" desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an organic host as a home base and source of fuel." - item = /obj/item/weapon/storage/box/syndie_kit/guardian + item = /obj/item/storage/box/syndie_kit/guardian excludefrom = list(/datum/game_mode/nuclear) cost = 12 @@ -622,7 +622,7 @@ var/list/uplink_items = list() name = "Ammo Duffelbag - Shotgun Ammo Grab Bag" desc = "A duffelbag filled with Bulldog ammo to kit out an entire team, at a discounted price." reference = "SAGL" - item = /obj/item/weapon/storage/backpack/duffel/syndie/ammo/loaded + item = /obj/item/storage/backpack/duffel/syndie/ammo/loaded cost = 10 //bulk buyer's discount. Very useful if you're buying a mech and dont have TC left to buy people non-shotgun guns gamemodes = list(/datum/game_mode/nuclear) @@ -725,7 +725,7 @@ var/list/uplink_items = list() desc = "A length of fiber wire between two wooden handles, perfect for the discrete assassin. This weapon, when used on a target from behind \ will instantly put them in your grasp and silence them, as well as causing rapid suffocation. Does not work on those who do not need to breathe." reference = "GAR" - item = /obj/item/weapon/twohanded/garrote + item = /obj/item/twohanded/garrote cost = 10 /datum/uplink_item/stealthy_weapons/martialarts @@ -733,7 +733,7 @@ var/list/uplink_items = list() desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \ deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry." reference = "SCS" - item = /obj/item/weapon/sleeping_carp_scroll + item = /obj/item/sleeping_carp_scroll cost = 17 excludefrom = list(/datum/game_mode/nuclear) @@ -742,21 +742,21 @@ var/list/uplink_items = list() desc = "A box of shurikens and reinforced bolas from ancient Earth martial arts. They are highly effective \ throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs." reference = "STK" - item = /obj/item/weapon/storage/box/syndie_kit/throwing_weapons + item = /obj/item/storage/box/syndie_kit/throwing_weapons cost = 3 /datum/uplink_item/stealthy_weapons/edagger name = "Energy Dagger" desc = "A dagger made of energy that looks and functions as a pen when off." reference = "EDP" - item = /obj/item/weapon/pen/edagger + item = /obj/item/pen/edagger cost = 2 /datum/uplink_item/stealthy_weapons/sleepy_pen name = "Sleepy Pen" desc = "A syringe disguised as a functional pen. It's filled with a potent anaesthetic. \ The pen holds two doses of the mixture. The pen can be refilled." reference = "SP" - item = /obj/item/weapon/pen/sleepy + item = /obj/item/pen/sleepy cost = 8 excludefrom = list(/datum/game_mode/nuclear) @@ -764,7 +764,7 @@ var/list/uplink_items = list() name = "Toy Gun (with Stun Darts)" desc = "An innocent looking toy pistol designed to fire foam darts. Comes loaded with riot grade darts, to incapacitate a target." reference = "FSPI" - item = /obj/item/weapon/gun/projectile/automatic/toy/pistol/riot + item = /obj/item/gun/projectile/automatic/toy/pistol/riot cost = 3 surplus = 10 @@ -772,7 +772,7 @@ var/list/uplink_items = list() name = "Syndicate Soap" desc = "A sinister-looking surfactant used to clean blood stains to hide murders and prevent DNA analysis. You can also drop it underfoot to slip people." reference = "SOAP" - item = /obj/item/weapon/soap/syndie + item = /obj/item/soap/syndie cost = 1 surplus = 50 @@ -780,7 +780,7 @@ var/list/uplink_items = list() name = "Dart Pistol" desc = "A miniaturized version of a normal syringe gun. It is very quiet when fired and can fit into any space a small item can." reference = "DART" - item = /obj/item/weapon/gun/syringe/syndicate + item = /obj/item/gun/syringe/syndicate cost = 4 surplus = 50 excludefrom = list(/datum/game_mode/nuclear) @@ -789,7 +789,7 @@ var/list/uplink_items = list() name = "Rapid Syringe Gun" desc = "A rapid syringe gun able to hold six shot and fire them rapidly. Great together with the bioterror syringe" reference = "RSG" - item = /obj/item/weapon/gun/syringe/rapidsyringe + item = /obj/item/gun/syringe/rapidsyringe cost = 4 gamemodes = list(/datum/game_mode/nuclear) @@ -797,14 +797,14 @@ var/list/uplink_items = list() name = "Detomatix PDA Cartridge" desc = "When inserted into a personal digital assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer. It has a chance to detonate your PDA." reference = "DEPC" - item = /obj/item/weapon/cartridge/syndicate + item = /obj/item/cartridge/syndicate cost = 6 /datum/uplink_item/stealthy_weapons/silencer name = "Universal Suppressor" desc = "Fitted for use on any small caliber weapon with a threaded barrel, this suppressor will silence the shots of the weapon for increased stealth and superior ambushing capability." reference = "US" - item = /obj/item/weapon/suppressor + item = /obj/item/suppressor cost = 1 surplus = 10 @@ -812,7 +812,7 @@ var/list/uplink_items = list() name = "Pizza Bomb" desc = "A pizza box with a bomb taped inside of it. The timer needs to be set by opening the box; afterwards, opening the box again will trigger the detonation." reference = "PB" - item = /obj/item/device/pizza_bomb + item = /obj/item/pizza_bomb cost = 5 surplus = 8 @@ -854,7 +854,7 @@ var/list/uplink_items = list() desc = "A stamp that can be activated to imitate an official Nanotrasen Stamp. The disguised stamp will work exactly like the real stamp and will allow you to forge false documents to gain access or equipment; \ it can also be used in a washing machine to forge clothing." reference = "CHST" - item = /obj/item/weapon/stamp/chameleon + item = /obj/item/stamp/chameleon cost = 1 surplus = 35 @@ -874,11 +874,21 @@ var/list/uplink_items = list() gamemodes = list(/datum/game_mode/nuclear) excludefrom = list() +/datum/uplink_item/stealthy_tools/frame + name = "F.R.A.M.E. PDA Cartridge" + desc = "When inserted into a personal digital assistant, this cartridge gives you five PDA viruses which \ + when used cause the targeted PDA to become a new uplink with zero TCs, and immediately become unlocked. \ + You will receive the unlock code upon activating the virus, and the new uplink may be charged with \ + telecrystals normally." + reference = "FRAME" + item = /obj/item/cartridge/frame + cost = 4 + /datum/uplink_item/stealthy_tools/agent_card name = "Agent ID Card" desc = "Agent cards prevent artificial intelligences from tracking the wearer, and can copy access from other identification cards. The access is cumulative, so scanning one card does not erase the access gained from another." reference = "AIDC" - item = /obj/item/weapon/card/id/syndicate + item = /obj/item/card/id/syndicate cost = 2 /datum/uplink_item/stealthy_tools/voice_changer @@ -892,14 +902,14 @@ var/list/uplink_items = list() name = "Chameleon-Projector" desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't move the projector from their hand. The disguised user cannot run and projectiles pass over them." reference = "CP" - item = /obj/item/device/chameleon + item = /obj/item/chameleon cost = 7 /datum/uplink_item/stealthy_tools/camera_bug name = "Camera Bug" desc = "Enables you to view all cameras on the network and track a target. Bugging cameras allows you to disable them remotely." reference = "CB" - item = /obj/item/device/camera_bug + item = /obj/item/camera_bug cost = 1 surplus = 90 @@ -907,14 +917,14 @@ var/list/uplink_items = list() name = "DNA Scrambler" desc = "A syringe with one injection that randomizes appearance and name upon use. A cheaper but less versatile alternative to an agent card and voice changer." reference = "DNAS" - item = /obj/item/weapon/dnascrambler + item = /obj/item/dnascrambler cost = 4 /datum/uplink_item/stealthy_tools/smugglersatchel name = "Smuggler's Satchel" desc = "This satchel is thin enough to be hidden in the gap between plating and tiling, great for stashing your stolen goods. Comes with a crowbar and a floor tile inside." reference = "SMSA" - item = /obj/item/weapon/storage/backpack/satchel_flat + item = /obj/item/storage/backpack/satchel_flat cost = 2 surplus = 30 @@ -923,7 +933,7 @@ var/list/uplink_items = list() desc = "A small, self-charging, short-ranged EMP device disguised as a flashlight. \ Useful for disrupting headsets, cameras, and borgs during stealth operations." reference = "EMPL" - item = /obj/item/device/flashlight/emp + item = /obj/item/flashlight/emp cost = 2 surplus = 30 @@ -932,7 +942,7 @@ var/list/uplink_items = list() desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. This pack contains three as well as a \ spraycan for changing their appearances." reference = "ADCC" - item = /obj/item/weapon/storage/box/syndie_kit/cutouts + item = /obj/item/storage/box/syndie_kit/cutouts cost = 1 surplus = 20 @@ -946,35 +956,35 @@ var/list/uplink_items = list() name = "Cryptographic Sequencer" desc = "The cryptographic sequencer, also known as an emag, is a small card that unlocks hidden functions in electronic devices, subverts intended functions and characteristically breaks security mechanisms." reference = "EMAG" - item = /obj/item/weapon/card/emag + item = /obj/item/card/emag cost = 6 /datum/uplink_item/device_tools/toolbox name = "Fully Loaded Toolbox" desc = "The syndicate toolbox is a suspicious black and red. Aside from tools, it comes with insulated gloves and a multitool." reference = "FLTB" - item = /obj/item/weapon/storage/toolbox/syndicate + item = /obj/item/storage/toolbox/syndicate cost = 1 /datum/uplink_item/device_tools/surgerybag name = "Syndicate Surgery Duffelbag" desc = "The Syndicate surgery duffelbag is a toolkit containing all surgery tools, a straitjacket, and a muzzle." reference = "SSDB" - item = /obj/item/weapon/storage/backpack/duffel/syndie/surgery + item = /obj/item/storage/backpack/duffel/syndie/surgery cost = 4 /datum/uplink_item/device_tools/bonerepair name = "Prototype Bone Repair Kit" desc = "Stolen prototype bone repair nanites. Contains one nanocalcium autoinjector and guide." reference = "NCAI" - item = /obj/item/weapon/storage/box/syndie_kit/bonerepair + item = /obj/item/storage/box/syndie_kit/bonerepair cost = 6 /datum/uplink_item/device_tools/military_belt name = "Military Belt" desc = "A robust seven-slot red belt made for carrying a broad variety of weapons, ammunition and explosives" reference = "SBM" - item = /obj/item/weapon/storage/belt/military + item = /obj/item/storage/belt/military cost = 3 excludefrom = list(/datum/game_mode/nuclear) @@ -983,7 +993,7 @@ var/list/uplink_items = list() desc = "The syndicate medkit is a suspicious black and red. Included is a combat stimulant injector for rapid healing, a medical HUD for quick identification of injured comrades, \ and other medical supplies helpful for a medical field operative." reference = "SCMK" - item = /obj/item/weapon/storage/firstaid/tactical + item = /obj/item/storage/firstaid/tactical cost = 7 gamemodes = list(/datum/game_mode/nuclear) @@ -998,7 +1008,7 @@ var/list/uplink_items = list() fits inside bags, and has a weapon slot. Nanotrasen crewmembers are trained to report red space suit \ sightings, however." reference = "SS" - item = /obj/item/weapon/storage/box/syndie_kit/space + item = /obj/item/storage/box/syndie_kit/space cost = 4 /datum/uplink_item/suits/hardsuit @@ -1010,14 +1020,14 @@ var/list/uplink_items = list() Additionally the suit is collapsible, making it small enough to fit within a backpack. \ Nanotrasen crew who spot these suits are known to panic." reference = "BRHS" - item = /obj/item/weapon/storage/box/syndie_kit/hardsuit + item = /obj/item/storage/box/syndie_kit/hardsuit cost = 8 excludefrom = list(/datum/game_mode/nuclear) /datum/uplink_item/suits/hardsuit/elite name = "Elite Syndicate Hardsuit" desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate Hardsuit." - item = /obj/item/weapon/storage/box/syndie_kit/elite_hardsuit + item = /obj/item/storage/box/syndie_kit/elite_hardsuit cost = 8 reference = "ESHS" excludefrom = list() @@ -1026,7 +1036,7 @@ var/list/uplink_items = list() /datum/uplink_item/suits/hardsuit/shielded name = "Shielded Hardsuit" desc = "An advanced hardsuit with built in energy shielding. The shields will rapidly recharge when not under fire." - item = /obj/item/weapon/storage/box/syndie_kit/shielded_hardsuit + item = /obj/item/storage/box/syndie_kit/shielded_hardsuit cost = 30 reference = "SHS" excludefrom = list() @@ -1044,7 +1054,7 @@ var/list/uplink_items = list() name = "Binary Translator Key" desc = "A key, that when inserted into a radio headset, allows you to listen to and talk with artificial intelligences and cybernetic organisms in binary." reference = "BITK" - item = /obj/item/device/encryptionkey/binary + item = /obj/item/encryptionkey/binary cost = 5 surplus = 75 @@ -1052,7 +1062,7 @@ var/list/uplink_items = list() name = "Syndicate Encryption Key" desc = "A key, that when inserted into a radio headset, allows you to listen to all station department channels as well as talk on an encrypted Syndicate channel." reference = "SEK" - item = /obj/item/device/encryptionkey/syndicate + item = /obj/item/encryptionkey/syndicate cost = 2 //Nowhere near as useful as the Binary Key! surplus = 75 @@ -1060,7 +1070,7 @@ var/list/uplink_items = list() name = "Hacked AI Upload Module" desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. Be careful with their wording, as artificial intelligences may look for loopholes to exploit." reference = "HAI" - item = /obj/item/weapon/aiModule/syndicate + item = /obj/item/aiModule/syndicate cost = 12 /datum/uplink_item/device_tools/magboots @@ -1085,14 +1095,14 @@ var/list/uplink_items = list() name = "Composition C-4" desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls or connect an assembly to its wiring to make it remotely detonable. It has a modifiable timer with a minimum setting of 10 seconds." reference = "C4" - item = /obj/item/weapon/grenade/plastic/c4 + item = /obj/item/grenade/plastic/c4 cost = 1 /datum/uplink_item/device_tools/breaching_charge name = "Composition X-4" desc = "X-4 is a shaped charge designed to be safe to the user while causing maximum damage to the occupants of the room beach breached. It has a modifiable timer with a minimum setting of 10 seconds." reference = "X4" - item = /obj/item/weapon/grenade/plastic/x4 + item = /obj/item/grenade/plastic/x4 cost = 2 gamemodes = list(/datum/game_mode/nuclear) @@ -1100,7 +1110,7 @@ var/list/uplink_items = list() name = "Power Sink" desc = "When screwed to wiring attached to an electric grid, then activated, this large device places excessive load on the grid, causing a stationwide blackout. The sink cannot be carried because of its excessive size. Ordering this sends you a small beacon that will teleport the power sink to your location on activation." reference = "PS" - item = /obj/item/device/powersink + item = /obj/item/powersink cost = 10 /datum/uplink_item/device_tools/singularity_beacon @@ -1110,7 +1120,7 @@ var/list/uplink_items = list() in containment. Because of its size, it cannot be carried. Ordering this \ sends you a small beacon that will teleport the larger beacon to your location upon activation." reference = "SNGB" - item = /obj/item/device/radio/beacon/syndicate + item = /obj/item/radio/beacon/syndicate cost = 12 surplus = 0 @@ -1119,7 +1129,7 @@ var/list/uplink_items = list() desc = "The Syndicate Bomb has an adjustable timer with a minimum setting of 60 seconds. Ordering the bomb sends you a small beacon, which will teleport the explosive to your location when you activate it. \ You can wrench the bomb down to prevent removal. The crew may attempt to defuse the bomb." reference = "SB" - item = /obj/item/device/radio/beacon/syndicate/bomb + item = /obj/item/radio/beacon/syndicate/bomb cost = 11 /datum/uplink_item/device_tools/syndicate_detonator @@ -1127,7 +1137,7 @@ var/list/uplink_items = list() desc = "The Syndicate Detonator is a companion device to the Syndicate Bomb. Simply press the included button and an encrypted radio frequency will instruct all live syndicate bombs to detonate. \ Useful for when speed matters or you wish to synchronize multiple bomb blasts. Be sure to stand clear of the blast radius before using the detonator." reference = "SD" - item = /obj/item/device/syndicatedetonator + item = /obj/item/syndicatedetonator cost = 3 gamemodes = list(/datum/game_mode/nuclear) @@ -1135,14 +1145,14 @@ var/list/uplink_items = list() name = "Advanced Pinpointer" desc = "A pinpointer that tracks any specified coordinates, DNA string, high value item or the nuclear authentication disk." reference = "ADVP" - item = /obj/item/weapon/pinpointer/advpinpointer + item = /obj/item/pinpointer/advpinpointer cost = 4 /datum/uplink_item/device_tools/ai_detector name = "Artificial Intelligence Detector" // changed name in case newfriends thought it detected disguised ai's desc = "A functional multitool that turns red when it detects an artificial intelligence watching it or its holder. Knowing when an artificial intelligence is watching you is useful for knowing when to maintain cover." reference = "AID" - item = /obj/item/device/multitool/ai_detect + item = /obj/item/multitool/ai_detect cost = 1 /datum/uplink_item/device_tools/telecrystal @@ -1153,17 +1163,31 @@ var/list/uplink_items = list() cost = 1 surplus = 0 +/datum/uplink_item/device_tools/telecrystal/five + name = "5 Raw Telecrystals" + desc = "Five telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count." + reference = "RTCF" + item = /obj/item/stack/telecrystal/five + cost = 5 + +/datum/uplink_item/device_tools/telecrystal/twenty + name = "20 Raw Telecrystals" + desc = "Twenty telecrystals in their rawest and purest form; can be utilized on active uplinks to increase their telecrystal count." + reference = "RTCT" + item = /obj/item/stack/telecrystal/twenty + cost = 20 + /datum/uplink_item/device_tools/jammer name = "Radio Jammer" desc = "This device will disrupt any nearby outgoing radio communication when activated." reference = "RJ" - item = /obj/item/device/jammer + item = /obj/item/jammer cost = 5 /datum/uplink_item/device_tools/teleporter name = "Teleporter Circuit Board" desc = "A printed circuit board that completes the teleporter onboard the mothership. Advise you test fire the teleporter before entering it, as malfunctions can occur." - item = /obj/item/weapon/circuitboard/teleporter + item = /obj/item/circuitboard/teleporter reference = "TP" cost = 20 gamemodes = list(/datum/game_mode/nuclear) @@ -1172,7 +1196,7 @@ var/list/uplink_items = list() /datum/uplink_item/device_tools/assault_pod name = "Assault Pod Targetting Device" desc = "Use to select the landing zone of your assault pod." - item = /obj/item/device/assault_pod + item = /obj/item/assault_pod reference = "APT" cost = 25 gamemodes = list(/datum/game_mode/nuclear) @@ -1181,7 +1205,7 @@ var/list/uplink_items = list() /datum/uplink_item/device_tools/shield name = "Energy Shield" desc = "An incredibly useful personal shield projector, capable of reflecting energy projectiles and defending against other attacks." - item = /obj/item/weapon/shield/energy + item = /obj/item/shield/energy reference = "ESD" cost = 16 gamemodes = list(/datum/game_mode/nuclear) @@ -1190,7 +1214,7 @@ var/list/uplink_items = list() /datum/uplink_item/device_tools/medgun name = "Medbeam Gun" desc = "Medical Beam Gun, useful in prolonged firefights." - item = /obj/item/weapon/gun/medbeam + item = /obj/item/gun/medbeam reference = "MBG" cost = 15 gamemodes = list(/datum/game_mode/nuclear) @@ -1205,14 +1229,14 @@ var/list/uplink_items = list() name = "Freedom Implant" desc = "An implant injected into the body and later activated using a bodily gesture to attempt to slip restraints." reference = "FI" - item = /obj/item/weapon/implanter/freedom + item = /obj/item/implanter/freedom cost = 5 /datum/uplink_item/implants/uplink name = "Uplink Implant" desc = "An implant injected into the body, and later activated using a bodily gesture to open an uplink with 10 telecrystals. The ability for an agent to open an uplink after their possessions have been stripped from them makes this implant excellent for escaping confinement." reference = "UI" - item = /obj/item/weapon/implanter/uplink + item = /obj/item/implanter/uplink cost = 14 surplus = 0 @@ -1220,21 +1244,21 @@ var/list/uplink_items = list() name = "Storage Implant" desc = "An implant injected into the body, and later activated at the user's will. It will open a small subspace pocket capable of storing two items." reference = "ESI" - item = /obj/item/weapon/implanter/storage + item = /obj/item/implanter/storage cost = 8 /datum/uplink_item/implants/mindslave name = "Mindslave Implant" desc = "A box containing an implanter filled with a mindslave implant that when injected into another person makes them loyal to you and your cause, unless of course they're already implanted by someone else. Loyalty ends if the implant is no longer in their system." reference = "MI" - item = /obj/item/weapon/implanter/traitor + item = /obj/item/implanter/traitor cost = 10 /datum/uplink_item/implants/adrenal name = "Adrenal Implant" desc = "An implant injected into the body, and later activated using a bodily gesture to inject a chemical cocktail, which has a mild healing effect along with removing all stuns and increasing his speed." reference = "AI" - item = /obj/item/weapon/implanter/adrenalin + item = /obj/item/implanter/adrenalin cost = 8 /datum/uplink_item/implants/microbomb @@ -1242,7 +1266,7 @@ var/list/uplink_items = list() desc = "An implant injected into the body, and later activated either manually or automatically upon death. The more implants inside of you, the higher the explosive power. \ This will permanently destroy your body, however." reference = "MBI" - item = /obj/item/weapon/implanter/explosive + item = /obj/item/implanter/explosive cost = 2 gamemodes = list(/datum/game_mode/nuclear) @@ -1252,13 +1276,13 @@ var/list/uplink_items = list() surplus = 0 gamemodes = list(/datum/game_mode/nuclear) -/datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/device/uplink/U) +/datum/uplink_item/cyber_implants/spawn_item(turf/loc, obj/item/uplink/U) if(item) if(findtext(item, /obj/item/organ/internal/cyberimp)) U.uses -= max(cost, 0) U.used_TC += cost feedback_add_details("traitor_uplink_items_bought", name) //this one and the line before copypasted because snowflaek code - return new /obj/item/weapon/storage/box/cyber_implants(loc, item) + return new /obj/item/storage/box/cyber_implants(loc, item) else return ..() @@ -1296,7 +1320,7 @@ var/list/uplink_items = list() desc = "A random selection of cybernetic implants. Guaranteed 5 high quality implants. \ Comes with an automated implanting tool." reference = "CIB" - item = /obj/item/weapon/storage/box/cyber_implants/bundle + item = /obj/item/storage/box/cyber_implants/bundle cost = 40 // POINTLESS BADASSERY @@ -1309,14 +1333,14 @@ var/list/uplink_items = list() name = "Syndicate Smokes" desc = "Strong flavor, dense smoke, infused with omnizine." reference = "SYSM" - item = /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate + item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate cost = 2 /datum/uplink_item/badass/bundle name = "Syndicate Bundle" desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 20 telecrystals, but you do not know which specialisation you will receive." reference = "SYB" - item = /obj/item/weapon/storage/box/syndicate + item = /obj/item/storage/box/syndicate cost = 20 excludefrom = list(/datum/game_mode/nuclear) @@ -1335,7 +1359,7 @@ var/list/uplink_items = list() desc = "A secure briefcase containing 5000 space credits. Useful for bribing personnel, or purchasing goods and services at lucrative prices. \ The briefcase also feels a little heavier to hold; it has been manufactured to pack a little bit more of a punch if your client needs some convincing." reference = "CASH" - item = /obj/item/weapon/storage/secure/briefcase/syndie + item = /obj/item/storage/secure/briefcase/syndie cost = 1 /datum/uplink_item/badass/balloon @@ -1349,7 +1373,7 @@ var/list/uplink_items = list() name = "Macrobomb Implant" desc = "An implant injected into the body, and later activated either manually or automatically upon death. Upon death, releases a massive explosion that will wipe out everything nearby." reference = "HAB" - item = /obj/item/weapon/implanter/explosive_macro + item = /obj/item/implanter/explosive_macro cost = 20 gamemodes = list(/datum/game_mode/nuclear) @@ -1357,10 +1381,10 @@ var/list/uplink_items = list() name = "Random Item" desc = "Picking this choice will send you a random item from the list. Useful for when you cannot think of a strategy to finish your objectives with." reference = "RAIT" - item = /obj/item/weapon/storage/box/syndicate + item = /obj/item/storage/box/syndicate cost = 0 -/datum/uplink_item/badass/random/spawn_item(var/turf/loc, var/obj/item/device/uplink/U) +/datum/uplink_item/badass/random/spawn_item(var/turf/loc, var/obj/item/uplink/U) var/list/buyable_items = get_uplink_items() var/list/possible_items = list() @@ -1384,10 +1408,10 @@ var/list/uplink_items = list() desc = "A crate containing 50 telecrystals worth of random syndicate leftovers." reference = "SYSC" cost = 20 - item = /obj/item/weapon/storage/box/syndicate + item = /obj/item/storage/box/syndicate excludefrom = list(/datum/game_mode/nuclear) -/datum/uplink_item/badass/surplus_crate/spawn_item(turf/loc, obj/item/device/uplink/U) +/datum/uplink_item/badass/surplus_crate/spawn_item(turf/loc, obj/item/uplink/U) var/obj/structure/closet/crate/C = new(loc) var/list/temp_uplink_list = get_uplink_items() var/list/buyable_items = list() diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index db397d63d42..045923c7dcf 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -25,7 +25,7 @@ var/const/WIRE_EXPLODE = 1 ..() /datum/wires/explosive/gibtonite - holder_type = /obj/item/weapon/twohanded/required/gibtonite + holder_type = /obj/item/twohanded/required/gibtonite /datum/wires/explosive/gibtonite/CanUse(mob/L) return 1 @@ -34,5 +34,5 @@ var/const/WIRE_EXPLODE = 1 return /datum/wires/explosive/gibtonite/explode() - var/obj/item/weapon/twohanded/required/gibtonite/P = holder + var/obj/item/twohanded/required/gibtonite/P = holder P.GibtoniteReaction(null, 2) diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index ffbff381060..18a2ef73f65 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -1,5 +1,5 @@ /datum/wires/radio - holder_type = /obj/item/device/radio + holder_type = /obj/item/radio wire_count = 3 var/const/WIRE_SIGNAL = 1 @@ -18,13 +18,13 @@ var/const/WIRE_TRANSMIT = 4 return "Transmitter" /datum/wires/radio/CanUse(mob/living/L) - var/obj/item/device/radio/R = holder + var/obj/item/radio/R = holder if(R.b_stat) return 1 return 0 /datum/wires/radio/UpdatePulsed(index) - var/obj/item/device/radio/R = holder + var/obj/item/radio/R = holder switch(index) if(WIRE_SIGNAL) R.listening = !R.listening && !IsIndexCut(WIRE_RECEIVE) @@ -38,7 +38,7 @@ var/const/WIRE_TRANSMIT = 4 ..() /datum/wires/radio/UpdateCut(index, mended) - var/obj/item/device/radio/R = holder + var/obj/item/radio/R = holder switch(index) if(WIRE_SIGNAL) R.listening = mended && !IsIndexCut(WIRE_RECEIVE) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 2b86f1247f6..a201617682d 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -131,8 +131,8 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", /datum/wires/proc/can_see_wire_index(mob/user) if(user.can_admin_interact()) return TRUE - else if(istype(user.get_active_hand(), /obj/item/device/multitool)) - var/obj/item/device/multitool/M = user.get_active_hand() + else if(istype(user.get_active_hand(), /obj/item/multitool)) + var/obj/item/multitool/M = user.get_active_hand() if(M.shows_wire_information) return TRUE @@ -148,14 +148,14 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", holder.add_hiddenprint(L) switch(href_list["action"]) if("cut") // Toggles the cut/mend status - if(istype(I, /obj/item/weapon/wirecutters) || L.can_admin_interact()) + if(istype(I, /obj/item/wirecutters) || L.can_admin_interact()) if(istype(I)) playsound(holder, I.usesound, 20, 1) CutWireColour(colour) else to_chat(L, "You need wirecutters!") if("pulse") - if(istype(I, /obj/item/device/multitool) || L.can_admin_interact()) + if(istype(I, /obj/item/multitool) || L.can_admin_interact()) playsound(holder, 'sound/weapons/empty.ogg', 20, 1) PulseColour(colour) else @@ -166,7 +166,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", if(O) L.put_in_hands(O) else - if(istype(I, /obj/item/device/assembly/signaler)) + if(istype(I, /obj/item/assembly/signaler)) if(L.drop_item()) Attach(colour, I) else @@ -268,7 +268,7 @@ var/const/POWER = 8 return signallers[colour] return null -/datum/wires/proc/Attach(colour, obj/item/device/assembly/signaler/S) +/datum/wires/proc/Attach(colour, obj/item/assembly/signaler/S) if(colour && S) if(!IsAttached(colour)) signallers[colour] = S @@ -278,7 +278,7 @@ var/const/POWER = 8 /datum/wires/proc/Detach(colour) if(colour) - var/obj/item/device/assembly/signaler/S = GetAttached(colour) + var/obj/item/assembly/signaler/S = GetAttached(colour) if(S) signallers -= colour S.connected = null @@ -286,7 +286,7 @@ var/const/POWER = 8 return S -/datum/wires/proc/Pulse(obj/item/device/assembly/signaler/S) +/datum/wires/proc/Pulse(obj/item/assembly/signaler/S) for(var/colour in signallers) if(S == signallers[colour]) diff --git a/code/defines/procs/admin.dm b/code/defines/procs/admin.dm index 2bc6b59e1d0..0f2a2bd4393 100644 --- a/code/defines/procs/admin.dm +++ b/code/defines/procs/admin.dm @@ -1,9 +1,20 @@ -/proc/key_name(var/whom, var/include_link = null, var/include_name = 1, var/type = null) +// Always return "Something/(Something)", even if it's an error message. +/proc/key_name(whom, include_link = FALSE, type = null) + return key_name_helper(whom, TRUE, include_link, type) + +/proc/key_name_hidden(whom, include_link = FALSE, type = null) + return key_name_helper(whom, FALSE, include_link, type) + +/proc/key_name_helper(whom, include_name, include_link = FALSE, type = null) + if(include_link != FALSE && include_link != TRUE) + log_runtime(EXCEPTION("Key_name was called with an incorrect include_link [include_link]")) + var/mob/M var/client/C var/key - if(!whom) return "*null*" + if(!whom) + return "INVALID/(INVALID)" if(istype(whom, /client)) C = whom M = C.mob @@ -12,11 +23,19 @@ M = whom C = M.client key = M.key + else if(istype(whom, /datum/mind)) + var/datum/mind/D = whom + key = D.key + M = D.current + if(D.current) + C = D.current.client else if(istype(whom, /datum)) var/datum/D = whom - return "*invalid:[D.type]*" + return "INVALID/([D.type])" + else if(istext(whom)) + return "AUTOMATED/([whom])" else - return "*invalid*" + return "INVALID/(INVALID)" . = "" @@ -26,7 +45,7 @@ . += "" . += "Administrator" else - if(include_link) + if(include_link && C) . += "" . += key @@ -34,23 +53,27 @@ if(C) . += "" else . += " (DC)" else - . += "*no key*" + . += "INVALID" - if(include_name && M) - if(M.real_name) - . += "/([M.real_name])" - else if(M.name) - . += "/([M.name])" + if(include_name) + var/name = "INVALID" + if(M) + if(M.real_name) + name = M.real_name + else if(M.name) + name = M.name + + . += "/([name])" return . -/proc/key_name_admin(var/whom, var/include_name = 1) - var/message = "[key_name(whom, 1, include_name)](?)[isAntag(whom) ? "(A)" : ""][isLivingSSD(whom) ? "(SSD!)" : ""] ([admin_jump_link(whom)])" +/proc/key_name_admin(whom) + var/message = "[key_name(whom, 1)](?)[isAntag(whom) ? "(A)" : ""][isLivingSSD(whom) ? "(SSD!)" : ""] ([admin_jump_link(whom)])" return message -/proc/key_name_mentor(var/whom, var/include_name = 1) +/proc/key_name_mentor(whom) // Same as key_name_admin, but does not include (?) or (A) for antags. - var/message = "[key_name(whom, 1, include_name)] [isLivingSSD(whom) ? "(SSD!)" : ""] ([admin_jump_link(whom)])" + var/message = "[key_name(whom, 1)] [isLivingSSD(whom) ? "(SSD!)" : ""] ([admin_jump_link(whom)])" return message diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index f2655a32281..b6e3ecde8bd 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -85,7 +85,7 @@ if(!isnewplayer(M) && M.client) receivers |= M else - for(var/obj/item/device/radio/R in global_radios) + for(var/obj/item/radio/R in global_radios) receivers |= R.send_announcement() for(var/mob/M in receivers) if(!istype(M) || !M.client || M.stat || !M.can_hear()) @@ -169,9 +169,9 @@ /datum/announcement/proc/Log(message as text, message_title as text) if(log) - log_say("[key_name(usr)] has made \a [announcement_type]: [message_title] - [message] - [announcer]") + log_game("[key_name(usr)] has made \a [announcement_type]: [message_title] - [message] - [announcer]") message_admins("[key_name_admin(usr)] has made \a [announcement_type].", 1) -/proc/GetNameAndAssignmentFromId(var/obj/item/weapon/card/id/I) +/proc/GetNameAndAssignmentFromId(var/obj/item/card/id/I) // Format currently matches that of newscaster feeds: Registered Name (Assigned Rank) return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index b473b830e39..83880039a73 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -53,15 +53,15 @@ return cameras -/area/proc/atmosalert(danger_level, var/alarm_source) +/area/proc/atmosalert(danger_level, var/alarm_source, var/force = FALSE) if(danger_level == ATMOS_ALARM_NONE) atmosphere_alarm.clearAlarm(src, alarm_source) else atmosphere_alarm.triggerAlarm(src, alarm_source, severity = danger_level) - //Check all the alarms before lowering atmosalm. Raising is perfectly fine. + //Check all the alarms before lowering atmosalm. Raising is perfectly fine. If force = 1 we don't care. for(var/obj/machinery/alarm/AA in src) - if(!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.report_danger_level) + if(!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.report_danger_level && !force) danger_level = max(danger_level, AA.danger_level) if(danger_level != atmosalm) diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 9bcdf4f0283..9abe6c2bc92 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -60,72 +60,72 @@ var/global/max_secret_rooms = 6 if("organharvest") walltypes = list(/turf/simulated/wall/r_wall=2,/turf/simulated/wall=2,/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor,/turf/simulated/floor/engine) - treasureitems = list(/mob/living/simple_animal/bot/medbot/mysterious=1, /obj/item/weapon/circular_saw=1, /obj/structure/closet/critter/cat=2) + treasureitems = list(/mob/living/simple_animal/bot/medbot/mysterious=1, /obj/item/circular_saw=1, /obj/structure/closet/critter/cat=2) fluffitems = list(/obj/effect/decal/cleanable/blood=5,/obj/item/organ/internal/appendix=2,/obj/structure/closet/crate/freezer=2, - /obj/machinery/optable=1,/obj/item/weapon/scalpel=1,/obj/item/weapon/storage/firstaid/regular=3, - /obj/item/weapon/tank/anesthetic=1, /obj/item/weapon/surgical_drapes=2, /obj/item/device/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1) + /obj/machinery/optable=1,/obj/item/scalpel=1,/obj/item/storage/firstaid/regular=3, + /obj/item/tank/anesthetic=1, /obj/item/surgical_drapes=2, /obj/item/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1) if("cult") theme = "cult" walltypes = list(/turf/simulated/wall/cult=3,/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor/engine/cult) - treasureitems = list(/obj/item/device/soulstone=1, /obj/item/clothing/suit/space/cult=1, /obj/item/weapon/bedsheet/cult=2, + treasureitems = list(/obj/item/soulstone=1, /obj/item/clothing/suit/space/cult=1, /obj/item/bedsheet/cult=2, /obj/item/clothing/suit/hooded/cultrobes=2, /mob/living/simple_animal/hostile/creature=3) fluffitems = list(/obj/effect/gateway=1,/obj/effect/gibspawner=1,/obj/structure/cult/talisman=1,/obj/item/toy/crayon/red=2, - /obj/item/organ/internal/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/wood=2,/obj/item/weapon/reagent_containers/food/snacks/ectoplasm=3, + /obj/item/organ/internal/heart=2, /obj/effect/decal/cleanable/blood=4,/obj/structure/table/wood=2,/obj/item/reagent_containers/food/snacks/ectoplasm=3, /obj/item/clothing/head/helmet/space/cult=1, /obj/item/clothing/shoes/cult=1) if("wizden") theme = "wizden" walltypes = list(/turf/simulated/wall/mineral/plasma=3,/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor/wood) - treasureitems = list(/obj/item/weapon/veilrender/vealrender=2, /obj/item/weapon/spellbook/oneuse/blind=1,/obj/item/clothing/head/wizard/red=2, - /obj/item/weapon/spellbook/oneuse/forcewall=1, /obj/item/weapon/spellbook/oneuse/smoke=1, /obj/structure/constructshell = 1, /obj/item/toy/katana=3,/obj/item/voodoo=3) - fluffitems = list(/obj/structure/safe/floor=1,/obj/structure/dresser=1,/obj/item/weapon/storage/belt/soulstone=1,/obj/item/trash/candle=3, - /obj/item/weapon/dice=3,/obj/item/weapon/twohanded/staff=2,/obj/effect/decal/cleanable/dirt=3,/obj/item/weapon/coin/mythril=3) + treasureitems = list(/obj/item/veilrender/vealrender=2, /obj/item/spellbook/oneuse/blind=1,/obj/item/clothing/head/wizard/red=2, + /obj/item/spellbook/oneuse/forcewall=1, /obj/item/spellbook/oneuse/smoke=1, /obj/structure/constructshell = 1, /obj/item/toy/katana=3,/obj/item/voodoo=3) + fluffitems = list(/obj/structure/safe/floor=1,/obj/structure/dresser=1,/obj/item/storage/belt/soulstone=1,/obj/item/trash/candle=3, + /obj/item/dice=3,/obj/item/twohanded/staff=2,/obj/effect/decal/cleanable/dirt=3,/obj/item/coin/mythril=3) if("cavein") theme = "cavein" walltypes = list(/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor/plating/airless/asteroid, /turf/simulated/floor/beach/sand) - treasureitems = list(/obj/mecha/working/ripley/mining=1, /obj/item/weapon/pickaxe/drill/diamonddrill=2, - /obj/item/weapon/resonator/upgraded=1, /obj/item/weapon/pickaxe/drill/jackhammer=5) + treasureitems = list(/obj/mecha/working/ripley/mining=1, /obj/item/pickaxe/drill/diamonddrill=2, + /obj/item/resonator/upgraded=1, /obj/item/pickaxe/drill/jackhammer=5) fluffitems = list(/obj/effect/decal/cleanable/blood=3,/obj/effect/decal/remains/human=1,/obj/item/clothing/under/overalls=1, - /obj/item/weapon/reagent_containers/food/snacks/grown/chili=1,/obj/item/weapon/tank/oxygen/red=2) + /obj/item/reagent_containers/food/snacks/grown/chili=1,/obj/item/tank/oxygen/red=2) if("xenoden") theme = "xenoden" walltypes = list(/turf/simulated/mineral/random/high_chance=1) floortypes = list(/turf/simulated/floor/plating/airless/asteroid, /turf/simulated/floor/beach/sand) - treasureitems = list(/obj/item/clothing/mask/facehugger=1,/obj/item/stack/sheet/animalhide/xeno=2,/obj/item/clothing/suit/xenos=2,/obj/item/clothing/head/xenos=2,/obj/item/weapon/guardiancreator/biological/choose=1) + treasureitems = list(/obj/item/clothing/mask/facehugger=1,/obj/item/stack/sheet/animalhide/xeno=2,/obj/item/clothing/suit/xenos=2,/obj/item/clothing/head/xenos=2,/obj/item/guardiancreator/biological/choose=1) fluffitems = list(/obj/effect/decal/remains/human=1,/obj/effect/decal/cleanable/blood/xeno=5) if("hitech") theme = "hitech" walltypes = list(/turf/simulated/wall/r_wall=5,/turf/simulated/mineral/random=1) floortypes = list(/turf/simulated/floor/greengrid,/turf/simulated/floor/bluegrid) - treasureitems = list(/obj/item/weapon/stock_parts/cell/hyper=1, /obj/machinery/chem_dispenser/constructable=1,/obj/machinery/computer/telescience=1, /obj/machinery/r_n_d/protolathe=1, + treasureitems = list(/obj/item/stock_parts/cell/hyper=1, /obj/machinery/chem_dispenser/constructable=1,/obj/machinery/computer/telescience=1, /obj/machinery/r_n_d/protolathe=1, /obj/machinery/biogenerator=1) - fluffitems = list(/obj/structure/table/reinforced=2,/obj/item/weapon/stock_parts/scanning_module/phasic=3, - /obj/item/weapon/stock_parts/matter_bin/super=3,/obj/item/weapon/stock_parts/manipulator/pico=3, - /obj/item/weapon/stock_parts/capacitor/super=3,/obj/item/device/pda/clear=1, /obj/effect/decal/mecha_wreckage/phazon=1) + fluffitems = list(/obj/structure/table/reinforced=2,/obj/item/stock_parts/scanning_module/phasic=3, + /obj/item/stock_parts/matter_bin/super=3,/obj/item/stock_parts/manipulator/pico=3, + /obj/item/stock_parts/capacitor/super=3,/obj/item/pda/clear=1, /obj/effect/decal/mecha_wreckage/phazon=1) if("speakeasy") theme = "speakeasy" floortypes = list(/turf/simulated/floor,/turf/simulated/floor/wood) - treasureitems = list(/obj/item/weapon/melee/energy/sword/pirate=1,/obj/item/weapon/gun/projectile/revolver/doublebarrel=1,/obj/item/weapon/storage/backpack/satchel_flat=1, + treasureitems = list(/obj/item/melee/energy/sword/pirate=1,/obj/item/gun/projectile/revolver/doublebarrel=1,/obj/item/storage/backpack/satchel_flat=1, /obj/machinery/reagentgrinder=2, /obj/machinery/computer/security/wooden_tv=4, /obj/machinery/vending/coffee=3) fluffitems = list(/obj/structure/table/wood=2,/obj/structure/reagent_dispensers/beerkeg=1,/obj/item/stack/spacecash/c500=4, - /obj/item/weapon/reagent_containers/food/drinks/shaker=1,/obj/item/weapon/reagent_containers/food/drinks/bottle/wine=3, - /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey=3,/obj/item/clothing/shoes/laceup=2) + /obj/item/reagent_containers/food/drinks/shaker=1,/obj/item/reagent_containers/food/drinks/bottle/wine=3, + /obj/item/reagent_containers/food/drinks/bottle/whiskey=3,/obj/item/clothing/shoes/laceup=2) if("plantlab") theme = "plantlab" - treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/ambrosia/deus=2,/obj/item/seeds/tomato/blue/bluespace=2,/obj/item/seeds/tomato/blue=2, + treasureitems = list(/obj/item/gun/energy/floragun=1,/obj/item/seeds/ambrosia/deus=2,/obj/item/seeds/tomato/blue/bluespace=2,/obj/item/seeds/tomato/blue=2, /obj/item/seeds/coffee/robusta=2, /obj/item/seeds/tobacco/space=2) - fluffitems = list(/obj/item/weapon/twohanded/required/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics=1, - /obj/structure/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/charcoal=2, - /obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,/obj/item/weapon/reagent_containers/glass/bottle/ammonia=3) + fluffitems = list(/obj/item/twohanded/required/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics=1, + /obj/structure/glowshroom/single=2,/obj/item/reagent_containers/syringe/charcoal=2, + /obj/item/reagent_containers/glass/bottle/diethylamine=3,/obj/item/reagent_containers/glass/bottle/ammonia=3) /*if("poly") theme = "poly" @@ -133,8 +133,8 @@ var/global/max_secret_rooms = 6 y_size = 5 walltypes = list(/turf/simulated/wall/mineral/clown) floortypes= list(/turf/simulated/floor/engine) - treasureitems = list(/obj/item/weapon/spellbook=1,/obj/mecha/combat/marauder=1,/obj/machinery/wish_granter=1) - fluffitems = list(/obj/item/weapon/melee/energy/axe)*/ + treasureitems = list(/obj/item/spellbook=1,/obj/mecha/combat/marauder=1,/obj/machinery/wish_granter=1) + fluffitems = list(/obj/item/melee/energy/axe)*/ possiblethemes -= theme //once a theme is selected, it's out of the running! var/floor = pick(floortypes) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 33265ff8a49..d57199d5f91 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1,7 +1,8 @@ /atom layer = 2 var/level = 2 - var/flags = 0 + var/flags = NONE + var/flags_2 = NONE var/list/fingerprints var/list/fingerprintshidden var/fingerprintslast = null @@ -220,6 +221,8 @@ else to_chat(user, "Nothing.") + SendSignal(COMSIG_PARENT_EXAMINE, user) + return distance == -1 || (get_dist(src, user) <= distance) || isobserver(user) //observers do not have a range limit /atom/proc/relaymove() diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 6ca5047ac6c..3fdc402bb8a 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -144,7 +144,7 @@ if(throwing) throwing.hit_atom(A) . = 1 - if(!A || qdeleted(A)) + if(!A || QDELETED(A)) return A.Bumped(src) @@ -224,7 +224,7 @@ //called when src is thrown into hit_atom /atom/movable/proc/throw_impact(atom/hit_atom, throwingdatum) set waitfor = 0 - if(exists(hit_atom)) + if(!QDELETED(hit_atom)) return hit_atom.hitby(src) /atom/movable/hitby(atom/movable/AM, skipcatch, hitpush = 1, blocked) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 7b6ada9364b..a4faafcf91f 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -193,15 +193,15 @@ for(var/i in list(IMPTRACK_HUD, IMPMINDSHIELD_HUD, IMPCHEM_HUD)) holder = hud_list[i] holder.icon_state = null - for(var/obj/item/weapon/implant/I in src) + for(var/obj/item/implant/I in src) if(I.implanted) - if(istype(I,/obj/item/weapon/implant/tracking)) + if(istype(I,/obj/item/implant/tracking)) holder = hud_list[IMPTRACK_HUD] holder.icon_state = "hud_imp_tracking" - else if(istype(I,/obj/item/weapon/implant/mindshield)) + else if(istype(I,/obj/item/implant/mindshield)) holder = hud_list[IMPMINDSHIELD_HUD] holder.icon_state = "hud_imp_loyal" - else if(istype(I,/obj/item/weapon/implant/chem)) + else if(istype(I,/obj/item/implant/chem)) holder = hud_list[IMPCHEM_HUD] holder.icon_state = "hud_imp_chem" diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 391b8fa8ee8..99355320491 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -62,7 +62,7 @@ interact_offline = 1 var/locked = 0 var/mob/living/carbon/occupant = null - var/obj/item/weapon/reagent_containers/glass/beaker = null + var/obj/item/reagent_containers/glass/beaker = null var/opened = 0 var/damage_coeff var/scan_level @@ -71,11 +71,11 @@ /obj/machinery/dna_scannernew/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/clonescanner(null) - component_parts += new /obj/item/weapon/stock_parts/scanning_module(null) - component_parts += new /obj/item/weapon/stock_parts/manipulator(null) - component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) - component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/circuitboard/clonescanner(null) + component_parts += new /obj/item/stock_parts/scanning_module(null) + component_parts += new /obj/item/stock_parts/manipulator(null) + component_parts += new /obj/item/stock_parts/micro_laser(null) + component_parts += new /obj/item/stock_parts/console_screen(null) component_parts += new /obj/item/stack/cable_coil(null, 1) component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() @@ -83,11 +83,11 @@ /obj/machinery/dna_scannernew/upgraded/New() ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/clonescanner(null) - component_parts += new /obj/item/weapon/stock_parts/scanning_module/phasic(null) - component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(null) - component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null) - component_parts += new /obj/item/weapon/stock_parts/console_screen(null) + component_parts += new /obj/item/circuitboard/clonescanner(null) + component_parts += new /obj/item/stock_parts/scanning_module/phasic(null) + component_parts += new /obj/item/stock_parts/manipulator/pico(null) + component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) + component_parts += new /obj/item/stock_parts/console_screen(null) component_parts += new /obj/item/stack/cable_coil(null, 1) component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() @@ -96,11 +96,11 @@ scan_level = 0 damage_coeff = 0 precision_coeff = 0 - for(var/obj/item/weapon/stock_parts/scanning_module/P in component_parts) + for(var/obj/item/stock_parts/scanning_module/P in component_parts) scan_level += P.rating - for(var/obj/item/weapon/stock_parts/manipulator/P in component_parts) + for(var/obj/item/stock_parts/manipulator/P in component_parts) precision_coeff = P.rating - for(var/obj/item/weapon/stock_parts/micro_laser/P in component_parts) + for(var/obj/item/stock_parts/micro_laser/P in component_parts) damage_coeff = P.rating /obj/machinery/dna_scannernew/allow_drop() @@ -128,8 +128,8 @@ /obj/machinery/dna_scannernew/proc/eject_occupant() src.go_out() for(var/obj/O in src) - if(!istype(O,/obj/item/weapon/circuitboard/clonescanner) && \ - !istype(O,/obj/item/weapon/stock_parts) && \ + if(!istype(O,/obj/item/circuitboard/clonescanner) && \ + !istype(O,/obj/item/stock_parts) && \ !istype(O,/obj/item/stack/cable_coil) && \ O != beaker) O.forceMove(get_turf(src))//Ejects items that manage to get in there (exluding the components and beaker) @@ -202,8 +202,8 @@ if(user.pulling == L) user.stop_pulling() -/obj/machinery/dna_scannernew/attackby(var/obj/item/weapon/item as obj, var/mob/user as mob, params) - if(istype(item, /obj/item/weapon/screwdriver)) +/obj/machinery/dna_scannernew/attackby(var/obj/item/item as obj, var/mob/user as mob, params) + if(istype(item, /obj/item/screwdriver)) if(occupant) to_chat(user, "The maintenance panel is locked.") return @@ -212,13 +212,13 @@ if(exchange_parts(user, item)) return - if(istype(item, /obj/item/weapon/crowbar)) + if(istype(item, /obj/item/crowbar)) if(panel_open) for(var/obj/I in contents) // in case there is something in the scanner I.forceMove(src.loc) default_deconstruction_crowbar(item) return - else if(istype(item, /obj/item/weapon/reagent_containers/glass)) + else if(istype(item, /obj/item/reagent_containers/glass)) if(beaker) to_chat(user, "A beaker is already loaded into the machine.") return @@ -231,9 +231,9 @@ item.forceMove(src) user.visible_message("[user] adds \a [item] to \the [src]!", "You add \a [item] to \the [src]!") return - else if(!istype(item, /obj/item/weapon/grab)) + else if(!istype(item, /obj/item/grab)) return - var/obj/item/weapon/grab/G = item + var/obj/item/grab/G = item if(!ismob(G.affecting)) return if(src.occupant) @@ -343,7 +343,7 @@ icon_screen = "dna" icon_keyboard = "med_key" density = 1 - circuit = /obj/item/weapon/circuitboard/scan_consolenew + circuit = /obj/item/circuitboard/scan_consolenew var/selected_ui_block = 1.0 var/selected_ui_subblock = 1.0 var/selected_se_block = 1.0 @@ -356,7 +356,7 @@ var/irradiating = 0 var/injector_ready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete var/obj/machinery/dna_scannernew/connected = null - var/obj/item/weapon/disk/data/disk = null + var/obj/item/disk/data/disk = null var/selected_menu_key = null anchored = 1 use_power = 1 @@ -365,7 +365,7 @@ var/waiting_for_user_input=0 // Fix for #274 (Mash create block injector without answering dialog to make unlimited injectors) - N3X /obj/machinery/computer/scan_consolenew/attackby(obj/item/I as obj, mob/user as mob, params) - if(istype(I, /obj/item/weapon/disk/data)) //INSERT SOME diskS + if(istype(I, /obj/item/disk/data)) //INSERT SOME diskS if(!src.disk) user.drop_item() I.forceMove(src) @@ -415,7 +415,7 @@ arr += "[i]:[EncodeDNABlock(buffer[i])]" return arr -/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(var/obj/item/weapon/dnainjector/I, var/blk, var/datum/dna2/record/buffer) +/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(var/obj/item/dnainjector/I, var/blk, var/datum/dna2/record/buffer) var/pos = findtext(blk,":") if(!pos) return 0 var/id = text2num(copytext(blk,1,pos)) @@ -798,7 +798,7 @@ if(href_list["ejectBeaker"]) if(connected.beaker) - var/obj/item/weapon/reagent_containers/glass/B = connected.beaker + var/obj/item/reagent_containers/glass/B = connected.beaker B.forceMove(connected.loc) connected.beaker = null return 1 @@ -918,7 +918,7 @@ if(injector_ready && !waiting_for_user_input) var/success = 1 - var/obj/item/weapon/dnainjector/I = new /obj/item/weapon/dnainjector + var/obj/item/dnainjector/I = new /obj/item/dnainjector var/datum/dna2/record/buf = src.buffers[bufferId] buf = buf.copy() if(href_list["createBlockInjector"]) diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index c5c5b6a21a5..6fbc30883ca 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -166,13 +166,11 @@ if(H.internal) H.visible_message("[user] sprays a cloud of fine ice crystals, engulfing [H]!", "[user] sprays a cloud of fine ice crystals over your [H.head]'s visor.") - log_admin("[key_name(user)] has used cryokinesis on [key_name(C)] while wearing internals and a suit") - msg_admin_attack("[key_name_admin(user)] has cast cryokinesis on [key_name_admin(C)]") + add_attack_logs(user, C, "Cryokinesis") else H.visible_message("[user] sprays a cloud of fine ice crystals engulfing, [H]!", "[user] sprays a cloud of fine ice crystals cover your [H.head]'s visor and make it into your air vents!.") - log_admin("[key_name(user)] has used cryokinesis on [key_name(C)]") - msg_admin_attack("[key_name_admin(user)] has cast cryokinesis on [key_name_admin(C)]") + add_attack_logs(user, C, "Cryokinesis") H.bodytemperature = max(0, H.bodytemperature - 50) H.adjustFireLoss(5) if(!handle_suit) @@ -181,8 +179,8 @@ C.ExtinguishMob() C.visible_message("[user] sprays a cloud of fine ice crystals, engulfing [C]!") - log_admin("[key_name(user)] has used cryokinesis on [key_name(C)] without internals or a suit") - msg_admin_attack("[key_name_admin(user)] has cast cryokinesis on [key_name_admin(C)]") + log_attack(user, C, "Used cryokinesis on a victim without internals or a suit") + msg_admin_attack("[key_name_admin(user)] has cast cryokinesis on [key_name_admin(C)] (NO SUIT)") //playsound(user.loc, 'bamf.ogg', 50, 0) @@ -257,7 +255,7 @@ ) var/list/own_blacklist = list( /obj/item/organ, - /obj/item/weapon/implant + /obj/item/implant ) /obj/effect/proc_holder/spell/targeted/eat/proc/doHeal(var/mob/user) diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index 53f4a00f8d6..666cb057635 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -15,7 +15,7 @@ for(var/obj/item/W in H) if(istype(W,/obj/item/organ)) continue - if(istype(W,/obj/item/weapon/implant)) + if(istype(W,/obj/item/implant)) continue H.unEquip(W) @@ -54,7 +54,7 @@ continue if(istype(W,/obj/item/organ)) continue - if(istype(W,/obj/item/weapon/implant)) + if(istype(W,/obj/item/implant)) continue H.unEquip(W) H.regenerate_icons() diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm index 43a4a07955a..bfd75f486e0 100644 --- a/code/game/dna/genes/vg_powers.dm +++ b/code/game/dna/genes/vg_powers.dm @@ -233,7 +233,7 @@ say = pencode_to_html(say, usr, format = 0, fields = 0) for(var/mob/living/target in targets) - log_say("Project Mind: [key_name(user)]->[key_name(target)]: [say]") + log_say("(TPATH to [key_name(target)]) [say]", user) if(REMOTE_TALK in target.mutations) target.show_message("You hear [user.real_name]'s voice: [say]") else diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 0e33a68fabc..23fed691ec6 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -1,17 +1,17 @@ -/obj/item/weapon/antag_spawner +/obj/item/antag_spawner throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_TINY var/used = 0 -/obj/item/weapon/antag_spawner/proc/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/antag_spawner/proc/spawn_antag(var/client/C, var/turf/T, var/type = "") return -/obj/item/weapon/antag_spawner/proc/equip_antag(mob/target as mob) +/obj/item/antag_spawner/proc/equip_antag(mob/target as mob) return -/obj/item/weapon/antag_spawner/borg_tele +/obj/item/antag_spawner/borg_tele name = "syndicate cyborg teleporter" desc = "A single-use teleporter used to deploy a Syndicate Cyborg on the field." icon = 'icons/obj/device.dmi' @@ -21,7 +21,7 @@ var/borg_to_spawn var/list/possible_types = list("Assault", "Medical") -/obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user as mob) +/obj/item/antag_spawner/borg_tele/attack_self(mob/user as mob) if(used) to_chat(user, "[src] is out of power!") return @@ -48,7 +48,7 @@ to_chat(user, "Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded.") return -/obj/item/weapon/antag_spawner/borg_tele/spawn_antag(var/client/C, var/turf/T, var/type = "") +/obj/item/antag_spawner/borg_tele/spawn_antag(var/client/C, var/turf/T, var/type = "") if(!borg_to_spawn) //If there's no type at all, let it still be used but don't do anything used = 0 return @@ -67,7 +67,7 @@ R.mind.special_role = SPECIAL_ROLE_NUKEOPS R.faction = list("syndicate") -/obj/item/weapon/antag_spawner/slaughter_demon //Warning edgiest item in the game +/obj/item/antag_spawner/slaughter_demon //Warning edgiest item in the game name = "vial of blood" desc = "A magically infused bottle of blood, distilled from countless murder victims. Used in unholy rituals to attract horrifying creatures." icon = 'icons/obj/wizard.dmi' @@ -79,7 +79,7 @@ var/objective_verb = "Kill" var/mob/living/demon_type = /mob/living/simple_animal/slaughter -/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user as mob) +/obj/item/antag_spawner/slaughter_demon/attack_self(mob/user as mob) if(level_blocks_magic(user.z))//this is to make sure the wizard does NOT summon a demon from the Den.. to_chat(user, "You should probably wait until you reach the station.") return @@ -103,7 +103,7 @@ used = 0 to_chat(user, "The demons do not respond to your summon. Perhaps you should try again later.") -/obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(var/client/C, var/turf/T, var/type = "", mob/user as mob) +/obj/item/antag_spawner/slaughter_demon/spawn_antag(var/client/C, var/turf/T, var/type = "", mob/user as mob) var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T) var/mob/living/simple_animal/slaughter/S = new demon_type(holder) S.vialspawned = TRUE @@ -126,7 +126,7 @@ to_chat(S, "Objective #[2]: [KillDaCrew.explanation_text]") -/obj/item/weapon/antag_spawner/slaughter_demon/laughter +/obj/item/antag_spawner/slaughter_demon/laughter name = "vial of tickles" desc = "A magically infused bottle of clown love, distilled from \ countless hugging attacks. Used in funny rituals to attract \ diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index 6a7fa32c5c3..93fe05ffa10 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -91,7 +91,7 @@ if(player.current) // Remove mindshield-implanted mobs from the list if(ishuman(player.current)) var/mob/living/carbon/human/H = player.current - for(var/obj/item/weapon/implant/mindshield/I in H.contents) + for(var/obj/item/implant/mindshield/I in H.contents) if(I && I.implanted) possible_traitors -= player diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index f36e763a4a0..0bcd942b7a0 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -44,7 +44,7 @@ var/list/blob_nodes = list() infected_crew += blob blob.special_role = SPECIAL_ROLE_BLOB blob.restricted_roles = restricted_jobs - log_game("[blob.key] (ckey) has been selected as a Blob") + log_game("[key_name(blob)] has been selected as a Blob") possible_blobs -= blob if(!infected_crew.len) @@ -66,7 +66,7 @@ var/list/blob_nodes = list() return 0 infected_crew += blobmind blobmind.special_role = SPECIAL_ROLE_BLOB - log_game("[blob.key] (ckey) has been selected as a Blob") + log_game("[key_name(blob)] has been selected as a Blob") greet_blob(blobmind) to_chat(blob, "You feel very tired and bloated! You don't have long before you burst!") spawn(600) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 2af2a53a939..5da84fbc460 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -88,7 +88,7 @@ blob_talk(message) /mob/camera/blob/proc/blob_talk(message) - log_say("[key_name(src)] : [message]") + log_say("(BLOB) [message]", src) message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 0b82f067d0c..e53a74c8daa 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -147,7 +147,7 @@ ..() take_damage(power/400, BURN) -/obj/structure/blob/attackby(var/obj/item/weapon/W, var/mob/living/user, params) +/obj/structure/blob/attackby(var/obj/item/W, var/mob/living/user, params) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1) diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index 50b17dfa6ea..e9ae34d2cfa 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -15,7 +15,7 @@ to_chat(user, "We are already absorbing!") return - var/obj/item/weapon/grab/G = user.get_active_hand() + var/obj/item/grab/G = user.get_active_hand() if(!istype(G)) to_chat(user, "We must be grabbing a creature in our active hand to absorb them.") return @@ -28,7 +28,7 @@ /obj/effect/proc_holder/changeling/absorbDNA/sting_action(var/mob/user) var/datum/changeling/changeling = user.mind.changeling - var/obj/item/weapon/grab/G = user.get_active_hand() + var/obj/item/grab/G = user.get_active_hand() var/mob/living/carbon/human/target = G.affecting changeling.isabsorbing = 1 for(var/stage = 1, stage<=3, stage++) diff --git a/code/game/gamemodes/changeling/powers/lesserform.dm b/code/game/gamemodes/changeling/powers/lesserform.dm index 8ba1e53cb10..3d3b7f2bc07 100644 --- a/code/game/gamemodes/changeling/powers/lesserform.dm +++ b/code/game/gamemodes/changeling/powers/lesserform.dm @@ -26,7 +26,7 @@ changeling.geneticdamage = 30 to_chat(H, "Our genes cry out!") var/list/implants = list() //Try to preserve implants. - for(var/obj/item/weapon/implant/W in H) + for(var/obj/item/implant/W in H) implants += W H.monkeyize() changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/humanform(null) diff --git a/code/game/gamemodes/changeling/powers/linglink.dm b/code/game/gamemodes/changeling/powers/linglink.dm index 7c198f5e6af..4b59c255128 100644 --- a/code/game/gamemodes/changeling/powers/linglink.dm +++ b/code/game/gamemodes/changeling/powers/linglink.dm @@ -10,7 +10,7 @@ if(!..()) return var/datum/changeling/changeling = user.mind.changeling - var/obj/item/weapon/grab/G = user.get_active_hand() + var/obj/item/grab/G = user.get_active_hand() if(changeling.islinking) to_chat(user, "We have already formed a link with the victim!") @@ -36,7 +36,7 @@ /obj/effect/proc_holder/changeling/linglink/sting_action(mob/user) var/datum/changeling/changeling = user.mind.changeling - var/obj/item/weapon/grab/G = user.get_active_hand() + var/obj/item/grab/G = user.get_active_hand() var/mob/living/carbon/target = G.affecting changeling.islinking = 1 for(var/stage = 1, stage<=3, stage++) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index fc00cfff19c..4e084e8b720 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -116,16 +116,15 @@ genetic_damage = 10 req_human = 1 max_genetic_damage = 20 - weapon_type = /obj/item/weapon/melee/arm_blade + weapon_type = /obj/item/melee/arm_blade weapon_name_simple = "blade" -/obj/item/weapon/melee/arm_blade +/obj/item/melee/arm_blade name = "arm blade" desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter" - icon = 'icons/obj/weapons.dmi' icon_state = "arm_blade" item_state = "arm_blade" - flags = ABSTRACT | NODROP + flags = ABSTRACT | NODROP | DROPDEL w_class = WEIGHT_CLASS_HUGE sharp = 1 force = 25 @@ -133,16 +132,16 @@ throw_range = 0 throw_speed = 0 -/obj/item/weapon/melee/arm_blade/New() +/obj/item/melee/arm_blade/New() ..() if(ismob(loc)) loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!") -/obj/item/weapon/melee/arm_blade/dropped(mob/user) +/obj/item/melee/arm_blade/dropped(mob/user) user.visible_message("With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate the blade back into our body.", "You prepare to extend a tentacle.") -/obj/item/weapon/gun/magic/tentacle/dropped() - . = ..() - qdel(src) - -/obj/item/weapon/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) +/obj/item/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) to_chat(user, "The [name] is not ready yet.") -/obj/item/weapon/gun/magic/tentacle/suicide_act(mob/user) +/obj/item/gun/magic/tentacle/suicide_act(mob/user) user.visible_message("[user] coils [src] tightly around \his neck! It looks like \he's trying to commit suicide.") return (OXYLOSS) @@ -234,9 +228,9 @@ projectile_type = /obj/item/projectile/tentacle caliber = "tentacle" icon_state = "tentacle_end" - var/obj/item/weapon/gun/magic/tentacle/gun //the item that shot it + var/obj/item/gun/magic/tentacle/gun //the item that shot it -/obj/item/ammo_casing/magic/tentacle/New(obj/item/weapon/gun/magic/tentacle/tentacle_gun) +/obj/item/ammo_casing/magic/tentacle/New(obj/item/gun/magic/tentacle/tentacle_gun) gun = tentacle_gun ..() @@ -270,7 +264,7 @@ /mob/proc/tentacle_grab(mob/living/carbon/C) if(Adjacent(C)) - var/obj/item/weapon/grab/G = C.grabbedby(src,1) + var/obj/item/grab/G = C.grabbedby(src,1) if(istype(G)) G.state = GRAB_AGGRESSIVE //Instant aggressive grab @@ -360,7 +354,7 @@ req_human = 1 max_genetic_damage = 20 - weapon_type = /obj/item/weapon/shield/changeling + weapon_type = /obj/item/shield/changeling weapon_name_simple = "shield" /obj/effect/proc_holder/changeling/weapon/shield/sting_action(var/mob/user) @@ -368,31 +362,27 @@ if(!changeling) return - var/obj/item/weapon/shield/changeling/S = ..(user) + var/obj/item/shield/changeling/S = ..(user) if(!S) return S.remaining_uses = round(changeling.absorbedcount * 3) return 1 -/obj/item/weapon/shield/changeling +/obj/item/shield/changeling name = "shield-like mass" desc = "A mass of tough, boney tissue. You can still see the fingers as a twisted pattern in the shield." - flags = NODROP - icon = 'icons/obj/weapons.dmi' + flags = NODROP | DROPDEL icon_state = "ling_shield" block_chance = 50 var/remaining_uses //Set by the changeling ability. -/obj/item/weapon/shield/changeling/New() +/obj/item/shield/changeling/New() ..() if(ismob(loc)) loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!") -/obj/item/weapon/shield/changeling/dropped() - qdel(src) - -/obj/item/weapon/shield/changeling/hit_reaction() +/obj/item/shield/changeling/hit_reaction() if(remaining_uses < 1) if(ishuman(loc)) var/mob/living/carbon/human/H = loc @@ -429,8 +419,8 @@ name = "flesh mass" icon_state = "lingspacesuit" desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel." - flags = STOPSPRESSUREDMAGE | NODROP - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/tank/oxygen) + flags = STOPSPRESSUREDMAGE | NODROP | DROPDEL + allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/tank/oxygen) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all. /obj/item/clothing/suit/space/changeling/New() @@ -439,9 +429,6 @@ loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!") processing_objects += src -/obj/item/clothing/suit/space/changeling/dropped() - qdel(src) - /obj/item/clothing/suit/space/changeling/process() if(ishuman(loc)) var/mob/living/carbon/human/H = loc @@ -451,12 +438,9 @@ name = "flesh mass" icon_state = "lingspacehelmet" desc = "A covering of pressure and temperature-resistant organic tissue with a glass-like chitin front." - flags = BLOCKHAIR | STOPSPRESSUREDMAGE | NODROP + flags = BLOCKHAIR | STOPSPRESSUREDMAGE | NODROP | DROPDEL armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) -/obj/item/clothing/head/helmet/space/changeling/dropped() - qdel(src) - /***************************************\ |*****************ARMOR*****************| @@ -481,7 +465,7 @@ name = "chitinous mass" desc = "A tough, hard covering of black chitin." icon_state = "lingarmor" - flags = NODROP + flags = NODROP | DROPDEL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0) flags_inv = HIDEJUMPSUIT @@ -495,16 +479,10 @@ if(ismob(loc)) loc.visible_message("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!") -/obj/item/clothing/suit/armor/changeling/dropped() - qdel(src) - /obj/item/clothing/head/helmet/changeling name = "chitinous mass" desc = "A tough, hard covering of black chitin with transparent chitin in front." icon_state = "lingarmorhelmet" - flags = BLOCKHAIR | NODROP + flags = BLOCKHAIR | NODROP | DROPDEL armor = list(melee = 30, bullet = 30, laser = 40, energy = 20, bomb = 10, bio = 4, rad = 0) - flags_inv = HIDEEARS - -/obj/item/clothing/head/helmet/changeling/dropped() - qdel(src) + flags_inv = HIDEEARS \ No newline at end of file diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index cb67858bb2e..99eb634a2ff 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -9,7 +9,7 @@ /obj/effect/proc_holder/changeling/swap_form/can_sting(var/mob/living/carbon/user) if(!..()) return - var/obj/item/weapon/grab/G = user.get_active_hand() + var/obj/item/grab/G = user.get_active_hand() if(!istype(G) || (G.state < GRAB_AGGRESSIVE)) to_chat(user, "We must have an aggressive grab on creature in our active hand to do this!") return @@ -24,7 +24,7 @@ /obj/effect/proc_holder/changeling/swap_form/sting_action(var/mob/living/carbon/user) - var/obj/item/weapon/grab/G = user.get_active_hand() + var/obj/item/grab/G = user.get_active_hand() var/mob/living/carbon/human/target = G.affecting var/datum/changeling/changeling = user.mind.changeling diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index e972af4ce23..c344897c624 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -57,7 +57,7 @@ to_chat(user, "We stealthily sting [target.name].") if(target.mind && target.mind.changeling) to_chat(target, "You feel a tiny prick.") - add_logs(user, target, "unsuccessfully stung") + add_attack_logs(user, target, "Unsuccessful sting (changeling)") return 1 @@ -100,7 +100,7 @@ return TRUE /obj/effect/proc_holder/changeling/sting/transformation/sting_action(var/mob/user, var/mob/target) - add_logs(user, target, "stung", object="transformation sting", addition=" new identity is [selected_dna.real_name]") + add_attack_logs(user, target, "Transformation sting (changeling) (new identity is [selected_dna.real_name])") var/datum/dna/NewDNA = selected_dna if(issmall(target)) to_chat(user, "Our genes cry out as we sting [target.name]!") @@ -135,7 +135,7 @@ obj/effect/proc_holder/changeling/sting/extract_dna return user.mind.changeling.can_absorb_dna(user, target) /obj/effect/proc_holder/changeling/sting/extract_dna/sting_action(var/mob/user, var/mob/living/carbon/human/target) - add_logs(user, target, "stung", object="extraction sting") + add_attack_logs(user, target, "Extraction sting (changeling)") if(!(user.mind.changeling.has_dna(target.dna))) user.mind.changeling.absorb_dna(target, user) feedback_add_details("changeling_powers","ED") @@ -150,7 +150,7 @@ obj/effect/proc_holder/changeling/sting/mute dna_cost = 2 /obj/effect/proc_holder/changeling/sting/mute/sting_action(var/mob/user, var/mob/living/carbon/target) - add_logs(user, target, "stung", object="mute sting") + add_attack_logs(user, target, "Mute sting (changeling)") target.AdjustSilence(30) feedback_add_details("changeling_powers","MS") return 1 @@ -164,7 +164,7 @@ obj/effect/proc_holder/changeling/sting/blind dna_cost = 1 /obj/effect/proc_holder/changeling/sting/blind/sting_action(var/mob/living/user, var/mob/living/target) - add_logs(user, target, "stung", object="blind sting") + add_attack_logs(user, target, "Blind sting (changeling)") to_chat(target, "Your eyes burn horrifically!") target.BecomeNearsighted() target.EyeBlind(20) @@ -181,7 +181,7 @@ obj/effect/proc_holder/changeling/sting/LSD dna_cost = 1 /obj/effect/proc_holder/changeling/sting/LSD/sting_action(var/mob/user, var/mob/living/carbon/target) - add_logs(user, target, "stung", object="LSD sting") + add_attack_logs(user, target, "LSD sting (changeling)") spawn(rand(300,600)) if(target) target.Hallucinate(400) @@ -197,7 +197,7 @@ obj/effect/proc_holder/changeling/sting/cryo //Enable when mob cooling is fixed dna_cost = 2 /obj/effect/proc_holder/changeling/sting/cryo/sting_action(var/mob/user, var/mob/target) - add_logs(user, target, "stung", object="cryo sting") + add_attack_logs(user, target, "Cryo sting (changeling)") if(target.reagents) target.reagents.add_reagent("frostoil", 30) target.reagents.add_reagent("ice", 30) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 2ac7d46dfba..b12a50bce13 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -119,7 +119,7 @@ var/global/list/all_cults = list() var/datum/action/innate/cultcomm/C = new() C.Grant(cult_mind.current) update_cult_icons_added(cult_mind) - to_chat(cult_mind.current, "You catch a glimpse of the Realm of [ticker.mode.cultdat.entity_name], [ticker.mode.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.mode.cultdat.entity_name].") + to_chat(cult_mind.current, "You catch a glimpse of the Realm of [ticker.cultdat.entity_name], [ticker.cultdat.entity_title3]. You now see how flimsy the world is, you see that it should be open to the knowledge of [ticker.cultdat.entity_name].") first_phase() @@ -133,16 +133,16 @@ var/global/list/all_cults = list() if("survive") explanation = "Our knowledge must live on. Make sure at least [acolytes_needed] acolytes escape on the shuttle to spread their work on an another station." if("convert") - explanation = "We must increase our influence before we can summon [ticker.mode.cultdat.entity_name], Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." + explanation = "We must increase our influence before we can summon [ticker.cultdat.entity_name], Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." if("bloodspill") - explanation = "We must prepare this place for [ticker.mode.cultdat.entity_title1]'s coming. Spill blood and gibs over [spilltarget] floor tiles." + explanation = "We must prepare this place for [ticker.cultdat.entity_title1]'s coming. Spill blood and gibs over [spilltarget] floor tiles." if("sacrifice") if(sacrifice_target) explanation = "Sacrifice [sacrifice_target.current.real_name], the [sacrifice_target.assigned_role]. You will need the sacrifice rune and three acolytes to do so." else explanation = "Free objective." if("eldergod") - explanation = "Summon [ticker.mode.cultdat.entity_name] by invoking the 'Tear Reality' rune.The summoning can only be accomplished in [english_list(summon_spots)] - where the veil is weak enough for the ritual to begin." + explanation = "Summon [ticker.cultdat.entity_name] by invoking the 'Tear Reality' rune.The summoning can only be accomplished in [english_list(summon_spots)] - where the veil is weak enough for the ritual to begin." to_chat(cult_mind.current, "Objective #[obj_count]: [explanation]") cult_mind.memory += "Objective #[obj_count]: [explanation]
" @@ -156,7 +156,7 @@ var/global/list/all_cults = list() to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") mob.mutations.Remove(CLUMSY) - var/obj/item/weapon/paper/talisman/supply/T = new(mob) + var/obj/item/paper/talisman/supply/T = new(mob) var/list/slots = list ( "backpack" = slot_in_backpack, "left pocket" = slot_l_store, @@ -308,10 +308,10 @@ var/global/list/all_cults = list() feedback_add_details("cult_objective","cult_sacrifice|FAIL|GIBBED") if("eldergod") if(!eldergod) - explanation = "Summon [ticker.mode.cultdat.entity_name]. Success!" + explanation = "Summon [ticker.cultdat.entity_name]. Success!" feedback_add_details("cult_objective","cult_narsie|SUCCESS") else - explanation = "Summon [ticker.mode.cultdat.entity_name]. Fail." + explanation = "Summon [ticker.cultdat.entity_name]. Fail." feedback_add_details("cult_objective","cult_narsie|FAIL") if("slaughter") if(demons_summoned) @@ -339,10 +339,10 @@ var/global/list/all_cults = list() if("harvest") if(harvested > harvest_target) - explanation = "Offer [harvest_target] humans for [ticker.mode.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Success!" + explanation = "Offer [harvest_target] humans for [ticker.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Success!" feedback_add_details("cult_objective","cult_harvest|SUCCESS") else - explanation = "Offer [harvest_target] humans for [ticker.mode.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Fail!" + explanation = "Offer [harvest_target] humans for [ticker.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Fail!" feedback_add_details("cult_objective","cult_harvest|FAIL") if("hijack") diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index bfe25eba5d5..c854693c86e 100644 --- a/code/game/gamemodes/cult/cult_comms.dm +++ b/code/game/gamemodes/cult/cult_comms.dm @@ -36,4 +36,4 @@ else if(M in dead_mob_list) to_chat(M, " (F) [my_message] ") - log_say("[user.real_name]/[user.key] : [message]") \ No newline at end of file + log_say("(CULT) [message]") \ No newline at end of file diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 00592b7812d..2edbfca609f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/cultblade +/obj/item/melee/cultblade name = "Cult Blade" desc = "An arcane weapon wielded by the followers of a cult." icon_state = "cultblade" @@ -11,7 +11,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/weapon/melee/cultblade/attack(mob/living/target as mob, mob/living/carbon/human/user as mob) +/obj/item/melee/cultblade/attack(mob/living/target as mob, mob/living/carbon/human/user as mob) if(!iscultist(user)) user.Weaken(5) user.unEquip(src, 1) @@ -25,7 +25,7 @@ return ..() -/obj/item/weapon/melee/cultblade/pickup(mob/living/user) +/obj/item/melee/cultblade/pickup(mob/living/user) ..() if(!iscultist(user)) to_chat(user, "\"I wouldn't advise that.\"") @@ -36,7 +36,7 @@ to_chat(user, "You can't seem to hold the blade properly!") user.unEquip(src, 1) -/obj/item/weapon/melee/cultblade/dagger +/obj/item/melee/cultblade/dagger name = "sacrificial dagger" desc = "A strange dagger said to be used by sinister groups for \"preparing\" a corpse before sacrificing it to their dark gods." icon = 'icons/obj/wizard.dmi' @@ -46,14 +46,14 @@ throwforce = 25 embed_chance = 75 -/obj/item/weapon/melee/cultblade/dagger/attack(atom/target, mob/living/carbon/human/user) +/obj/item/melee/cultblade/dagger/attack(atom/target, mob/living/carbon/human/user) ..() if(ishuman(target)) var/mob/living/carbon/human/H = target if((H.stat != DEAD) && !(NO_BLOOD in H.species.species_traits)) H.bleed(50) -/obj/item/weapon/restraints/legcuffs/bola/cult +/obj/item/restraints/legcuffs/bola/cult name = "runed bola" desc = "A strong bola, bound with dark magic. Throw it to trip and slow your victim." icon = 'icons/obj/items.dmi' @@ -84,7 +84,7 @@ item_state = "cultrobes" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS hoodtype = /obj/item/clothing/head/culthood - allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) + allowed = list(/obj/item/tome,/obj/item/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50, energy = 20, bomb = 25, bio = 10, rad = 0) flags_inv = HIDEJUMPSUIT @@ -109,7 +109,7 @@ icon_state = "magusred" item_state = "magusred" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) + allowed = list(/obj/item/tome,/obj/item/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50, energy = 20, bomb = 25, bio = 10, rad = 0) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT @@ -126,7 +126,7 @@ item_state = "cult_armour" desc = "A bulky suit of armor, bristling with spikes. It looks space proof." w_class = WEIGHT_CLASS_NORMAL - allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank) + allowed = list(/obj/item/tome,/obj/item/melee/cultblade,/obj/item/tank) slowdown = 1 armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30) @@ -138,7 +138,7 @@ w_class = WEIGHT_CLASS_BULKY armor = list(melee = 50, bullet = 40, laser = 50, energy = 30, bomb = 50, bio = 30, rad = 30) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) + allowed = list(/obj/item/tome,/obj/item/melee/cultblade) var/current_charges = 3 hoodtype = /obj/item/clothing/head/cult_hoodie @@ -178,7 +178,7 @@ icon_state = "hardsuit-berserker" item_state = "hardsuit-berserker" flags_inv = HIDEJUMPSUIT - allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) + allowed = list(/obj/item/tome,/obj/item/melee/cultblade) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS armor = list(melee = -50, bullet = -50, laser = -100, energy = -50, bomb = -50, bio = -50, rad = -50) slowdown = -1 @@ -193,7 +193,7 @@ flags_cover = HEADCOVERSEYES armor = list(melee = -100, bullet = -100, laser = -100, energy = -100, bomb = -100, bio = -100, rad = -100) -/obj/item/weapon/whetstone/cult +/obj/item/whetstone/cult name = "eldritch whetstone" desc = "A block, empowered by dark magic. Sharp weapons will be enhanced when used on the stone." icon_state = "cult_sharpener" @@ -202,10 +202,10 @@ max = 40 prefix = "darkened" -/obj/item/weapon/whetstone/cult/update_icon() +/obj/item/whetstone/cult/update_icon() icon_state = "cult_sharpener[used ? "_used" : ""]" -/obj/item/weapon/reagent_containers/food/drinks/bottle/unholywater +/obj/item/reagent_containers/food/drinks/bottle/unholywater name = "flask of unholy water" desc = "Toxic to nonbelievers; this water renews and reinvigorates the faithful of a cult." icon_state = "holyflask" @@ -229,7 +229,7 @@ user.Weaken(5) user.EyeBlind(30) -/obj/item/device/shuttle_curse +/obj/item/shuttle_curse name = "cursed orb" desc = "You peer within this smokey orb and glimpse terrible fates befalling the escape shuttle." icon = 'icons/obj/projectiles.dmi' @@ -237,7 +237,7 @@ color = "#ff0000" var/global/curselimit = 0 -/obj/item/device/shuttle_curse/attack_self(mob/user) +/obj/item/shuttle_curse/attack_self(mob/user) if(!iscultist(user)) user.unEquip(src, 1) user.Weaken(5) @@ -271,28 +271,28 @@ command_announcement.Announce("[message]", "System Failure", 'sound/misc/notice1.ogg') curselimit++ -/obj/item/device/cult_shift +/obj/item/cult_shift name = "veil shifter" desc = "This relic teleports you forward a medium distance." icon = 'icons/obj/cult.dmi' icon_state ="shifter" var/uses = 4 -/obj/item/device/cult_shift/examine(mob/user) +/obj/item/cult_shift/examine(mob/user) . = ..() if(uses) to_chat(user, "It has [uses] uses remaining.") else to_chat(user, "It seems drained.") -/obj/item/device/cult_shift/proc/handle_teleport_grab(turf/T, mob/user) +/obj/item/cult_shift/proc/handle_teleport_grab(turf/T, mob/user) var/mob/living/carbon/C = user if(C.pulling) var/atom/movable/pulled = C.pulling pulled.forceMove(T) . = pulled -/obj/item/device/cult_shift/attack_self(mob/user) +/obj/item/cult_shift/attack_self(mob/user) if(!uses || !iscarbon(user)) to_chat(user, "\The [src] is dull and unmoving in your hands.") return @@ -358,35 +358,19 @@ desc = "A helmet designed by cultists. It glows menacingly with unearthly flames." armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) -/obj/item/weapon/melee/cultblade/ghost +/obj/item/melee/cultblade/ghost name = "eldritch sword" force = 15 - flags = NODROP - -/obj/item/weapon/melee/cultblade/ghost/dropped(mob/living/carbon/human/user) - ..() - qdel(src) + flags = NODROP | DROPDEL /obj/item/clothing/head/culthood/alt/ghost - flags = NODROP - -/obj/item/clothing/head/culthood/alt/ghost/dropped(mob/living/carbon/human/user) - ..() - qdel(src) + flags = NODROP | DROPDEL /obj/item/clothing/suit/cultrobes/alt/ghost - flags = NODROP - -/obj/item/clothing/suit/cultrobes/alt/ghost/dropped(mob/living/carbon/human/user) - ..() - qdel(src) + flags = NODROP | DROPDEL /obj/item/clothing/shoes/cult/ghost - flags = NODROP - -/obj/item/clothing/shoes/cult/ghost/dropped(mob/living/carbon/human/user) - ..() - qdel(src) + flags = NODROP | DROPDEL /datum/outfit/ghost_cultist name = "Cultist Ghost" @@ -395,4 +379,4 @@ suit = /obj/item/clothing/suit/cultrobes/alt/ghost shoes = /obj/item/clothing/shoes/cult/ghost head = /obj/item/clothing/head/culthood/alt/ghost - r_hand = /obj/item/weapon/melee/cultblade/ghost \ No newline at end of file + r_hand = /obj/item/melee/cultblade/ghost \ No newline at end of file diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm index d489387ad76..5ddc8ccdf98 100644 --- a/code/game/gamemodes/cult/cult_objectives.dm +++ b/code/game/gamemodes/cult/cult_objectives.dm @@ -19,10 +19,10 @@ switch(new_objective) if("convert") - explanation = "We must increase our influence before we can summon [ticker.mode.cultdat.entity_name], Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." + explanation = "We must increase our influence before we can summon [ticker.cultdat.entity_name], Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." if("bloodspill") spilltarget = 100 + rand(0,player_list.len * 3) - explanation = "We must prepare this place for [ticker.mode.cultdat.entity_title1]'s coming. Spill blood and gibs over [spilltarget] floor tiles." + explanation = "We must prepare this place for [ticker.cultdat.entity_title1]'s coming. Spill blood and gibs over [spilltarget] floor tiles." if("sacrifice") explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for their blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual." @@ -59,8 +59,8 @@ message_admins("The Cult has already completed [prenarsie_objectives] objectives! Nar-Sie objective unlocked.") log_admin("The Cult has already completed [prenarsie_objectives] objectives! Nar-Sie objective unlocked.") else - message_admins("There are less than 4 cultists! [ticker.mode.cultdat.entity_name] objective unlocked.") - log_admin("There are less than 4 cultists! [ticker.mode.cultdat.entity_name] objective unlocked.") + message_admins("There are less than 4 cultists! [ticker.cultdat.entity_name] objective unlocked.") + log_admin("There are less than 4 cultists! [ticker.cultdat.entity_name] objective unlocked.") gtfo_phase() if(!sacrificed.len && (new_objective != "sacrifice")) @@ -76,10 +76,10 @@ switch(new_objective) if("convert") - explanation = "We must increase our influence before we can summon [ticker.mode.cultdat.entity_name]. Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." + explanation = "We must increase our influence before we can summon [ticker.cultdat.entity_name]. Convert [convert_target] crew members. Take it slowly to avoid raising suspicions." if("bloodspill") spilltarget = 100 + rand(0,player_list.len * 3) - explanation = "We must prepare this place for [ticker.mode.cultdat.entity_title1]'s coming. Spread blood and gibs over [spilltarget] of the Station's floor tiles." + explanation = "We must prepare this place for [ticker.cultdat.entity_title1]'s coming. Spread blood and gibs over [spilltarget] of the Station's floor tiles." if("sacrifice") explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for their blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual." @@ -111,7 +111,7 @@ if(prob(40))//split the chance of this objectives += "eldergod" - explanation = "Summon [ticker.mode.cultdat.entity_name] on the Station via the use of the Tear Reality rune. The veil is weak enough in [english_list(summon_spots)] for the ritual to begin." + explanation = "Summon [ticker.cultdat.entity_name] on the Station via the use of the Tear Reality rune. The veil is weak enough in [english_list(summon_spots)] for the ritual to begin." else objectives += "slaughter" explanation = "Bring the Slaughter via the rune 'Bring forth the slaughter'. The veil is weak enough in [english_list(summon_spots)] for the ritual to begin." @@ -135,11 +135,11 @@ switch(last_objective) if("harvest") - explanation = "[ticker.mode.cultdat.entity_title1] hungers for their first meal of this never-ending day. Offer them [harvest_target] humans in sacrifice." + explanation = "[ticker.cultdat.entity_title1] hungers for their first meal of this never-ending day. Offer them [harvest_target] humans in sacrifice." if("hijack") - explanation = "[ticker.mode.cultdat.entity_name] wishes for their troops to start the assault on Centcom immediately. Hijack the escape shuttle and don't let a single non-cultist board it." + explanation = "[ticker.cultdat.entity_name] wishes for their troops to start the assault on Centcom immediately. Hijack the escape shuttle and don't let a single non-cultist board it." if("massacre") - explanation = "[ticker.mode.cultdat.entity_name] wants to watch you as you massacre the remaining humans on the station (until less than [massacre_target] humans are left alive)." + explanation = "[ticker.cultdat.entity_name] wants to watch you as you massacre the remaining humans on the station (until less than [massacre_target] humans are left alive)." for(var/datum/mind/cult_mind in cult) if(cult_mind) diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index e5f2ce5d4ef..d8d7d03b6c4 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -38,7 +38,7 @@ var/selection_prompt = "Choose your weapon, nerdwad" var/creation_delay = 2400 var/list/choosable_items = list( - "A coder forgot to set this" = /obj/item/weapon/grown/bananapeel + "A coder forgot to set this" = /obj/item/grown/bananapeel ) var/creation_message = "A dank smoke comes out, and you pass out. When you come to, you notice a %ITEM%!" @@ -58,7 +58,7 @@ to_chat(user, "You cannot seem to manipulate this structure with your bulky hands!") return - if(istype(I, /obj/item/weapon/tome) && iscultist(user)) + if(istype(I, /obj/item/tome) && iscultist(user)) anchored = !anchored to_chat(user, "You [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.") playsound(loc, 'sound/hallucinations/wail.ogg', 75, 1) @@ -98,7 +98,7 @@ return var/choice = input(user, selection_prompt, selection_title) as null|anything in choosable_items var/pickedtype = choosable_items[choice] - if(pickedtype && Adjacent(user) && src && !qdeleted(src) && !user.incapacitated() && cooldowntime <= world.time) + if(pickedtype && Adjacent(user) && src && !QDELETED(src) && !user.incapacitated() && cooldowntime <= world.time) cooldowntime = world.time + creation_delay var/obj/item/N = new pickedtype(get_turf(src)) to_chat(user, replacetext("[creation_message]", "%ITEM%", "[N]")) @@ -122,8 +122,8 @@ selection_prompt = "You study the rituals on the altar..." selection_title = "Altar" creation_message = "You kneel before the altar and your faith is rewarded with an %ITEM%!" - choosable_items = list("Eldritch Whetstone"= /obj/item/weapon/whetstone/cult, "Zealot's Blindfold" = /obj/item/clothing/glasses/night/cultblind, \ - "Flask of Unholy Water" = /obj/item/weapon/reagent_containers/food/drinks/bottle/unholywater, "Cultist Dagger" = /obj/item/weapon/melee/cultblade/dagger) + choosable_items = list("Eldritch Whetstone"= /obj/item/whetstone/cult, "Zealot's Blindfold" = /obj/item/clothing/glasses/night/cultblind, \ + "Flask of Unholy Water" = /obj/item/reagent_containers/food/drinks/bottle/unholywater, "Cultist Dagger" = /obj/item/melee/cultblade/dagger) /obj/structure/cult/functional/forge name = "daemon forge" @@ -137,12 +137,12 @@ selection_title = "Forge" creation_message = "You work the forge as dark knowledge guides your hands, creating %ITEM%!" choosable_items = list("Shielded Robe" = /obj/item/clothing/suit/hooded/cultrobes/cult_shield, "Flagellant's Robe" = /obj/item/clothing/suit/hooded/cultrobes/berserker, \ - "Cultist Hardsuit" = /obj/item/weapon/storage/box/cult) + "Cultist Hardsuit" = /obj/item/storage/box/cult) /obj/structure/cult/functional/forge/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I + if(istype(I, /obj/item/grab)) + var/obj/item/grab/G = I if(!iscarbon(G.affecting)) to_chat(user, "You may only dunk carbon-based creatures!") return 0 @@ -256,8 +256,8 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( selection_prompt = "You flip through the black pages of the archives..." selection_title = "Archives" creation_message = "You invoke the dark magic of the tomes creating %ITEM%!" - choosable_items = list("Supply Talisman" = /obj/item/weapon/paper/talisman/supply/weak, "Shuttle Curse" = /obj/item/device/shuttle_curse, \ - "Veil Shifter" = /obj/item/device/cult_shift) + choosable_items = list("Supply Talisman" = /obj/item/paper/talisman/supply/weak, "Shuttle Curse" = /obj/item/shuttle_curse, \ + "Veil Shifter" = /obj/item/cult_shift) /obj/effect/gateway name = "gateway" @@ -281,12 +281,12 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( //Armor kit -/obj/item/weapon/storage/box/cult +/obj/item/storage/box/cult name = "Dark Forge Cache" can_hold = list("/obj/item/clothing/suit/space/cult", "/obj/item/clothing/head/helmet/space/cult") max_w_class = WEIGHT_CLASS_NORMAL -/obj/item/weapon/storage/box/cult/New() +/obj/item/storage/box/cult/New() ..() new /obj/item/clothing/suit/space/cult(src) new /obj/item/clothing/head/helmet/space/cult(src) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 72535d9d1e5..19f9f57e9e7 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -17,7 +17,7 @@ else icon = get_rune_cult(invocation) -/obj/item/weapon/tome +/obj/item/tome name = "arcane tome" desc = "An old, dusty tome with frayed edges and a sinister-looking cover." icon_state ="tome" @@ -27,32 +27,32 @@ var/scribereduct = 0 var/canbypass = 0 //ADMINBUS -/obj/item/weapon/tome/accursed +/obj/item/tome/accursed name = "accursed tome" desc = "An arcane tome still empowered with a shadow of its former consecration." scribereduct = 30 //faster because it's made by corrupting a bible -/obj/item/weapon/tome/imbued //Admin-only tome, allows instant drawing of runes +/obj/item/tome/imbued //Admin-only tome, allows instant drawing of runes name = "imbued arcane tome" desc = "An arcane tome granted by the Geometer itself." scribereduct = 50 canbypass = 1 -/obj/item/weapon/tome/New() +/obj/item/tome/New() if(!ticker.mode) icon_state = "tome" else - icon_state = ticker.mode.cultdat.tome_icon + icon_state = ticker.cultdat.tome_icon ..() -/obj/item/weapon/tome/examine(mob/user) +/obj/item/tome/examine(mob/user) ..() if(iscultist(user) || user.stat == DEAD) - to_chat(user, "The scriptures of [ticker.mode.cultdat.entity_title3]. Allows the scribing of runes and access to the knowledge archives of the cult of [ticker.mode.cultdat.entity_name].") + to_chat(user, "The scriptures of [ticker.cultdat.entity_title3]. Allows the scribing of runes and access to the knowledge archives of the cult of [ticker.cultdat.entity_name].") to_chat(user, "Striking another cultist with it will purge holy water from them.") to_chat(user, "Striking a noncultist, however, will sear their flesh.") -/obj/item/weapon/tome/attack(mob/living/M, mob/living/user) +/obj/item/tome/attack(mob/living/M, mob/living/user) if(!istype(M)) return if(!iscultist(user)) @@ -63,7 +63,7 @@ var/holy2unholy = M.reagents.get_reagent_amount("holywater") M.reagents.del_reagent("holywater") M.reagents.add_reagent("unholywater",holy2unholy) - add_logs(user, M, "smacked", src, " removing the holy water from them") + add_attack_logs(user, M, "Hit with [src], removing the holy water from them") return M.take_organ_damage(0, 15) //Used to be a random between 5 and 20 playsound(M, 'sound/weapons/sear.ogg', 50, 1) @@ -71,15 +71,15 @@ "[user] strikes you with the tome, searing your flesh!") flick("tome_attack", src) user.do_attack_animation(M) - add_logs(user, M, "smacked", src) + add_attack_logs(user, M, "Hit with [src]") -/obj/item/weapon/tome/attack_self(mob/user) +/obj/item/tome/attack_self(mob/user) if(!iscultist(user)) to_chat(user, "[src] seems full of unintelligible shapes, scribbles, and notes. Is this some sort of joke?") return open_tome(user) -/obj/item/weapon/tome/proc/open_tome(mob/user) +/obj/item/tome/proc/open_tome(mob/user) var/choice = alert(user,"You open the tome...",,"Scribe Rune","More Information","Cancel") switch(choice) if("More Information") @@ -89,9 +89,9 @@ if("Cancel") return -/obj/item/weapon/tome/proc/read_tome(mob/user) +/obj/item/tome/proc/read_tome(mob/user) var/text = list() - text += "
" + text += "
" text += "A rune's name and effects can be revealed by examining the rune.<
" text += "Rite of Binding
This rune is one of the most important runes the cult has, being the only way to create new talismans. A blank sheet of paper must be on top of the rune. After \ @@ -102,7 +102,7 @@ text += "Rite of Enlightenment
This rune is critical to the success of the cult. It will allow you to convert normal crew members into cultists. \ To do this, simply place the crew member upon the rune and invoke it. This rune requires two invokers to use. If the target to be converted is mindshielded or a certain assignment, they will \ - be unable to be converted. People [ticker.mode.cultdat.entity_title3] wishes sacrificed will also be ineligible for conversion, and anyone with a shielding presence like the null rod will not be converted.
\ + be unable to be converted. People [ticker.cultdat.entity_title3] wishes sacrificed will also be ineligible for conversion, and anyone with a shielding presence like the null rod will not be converted.
\ Successful conversions will produce a tome for the new cultist.
" text += "Rite of Tribute
This rune is necessary to achieve your goals. Simply place any dead creature upon the rune and invoke it (this will not \ @@ -135,12 +135,12 @@ text += "Leeching
When invoked, this rune will transfer lifeforce from the victim to the invoker.
" - text += "Rite of Spectral Manifestation
This rune allows you to summon spirits as humanoid fighters. When invoked, a spirit above the rune will be brought to life as a human, wearing nothing, that seeks only to serve you and [ticker.mode.cultdat.entity_title3]. \ + text += "Rite of Spectral Manifestation
This rune allows you to summon spirits as humanoid fighters. When invoked, a spirit above the rune will be brought to life as a human, wearing nothing, that seeks only to serve you and [ticker.cultdat.entity_title3]. \ However, the spirit's link to reality is fragile - you must remain on top of the rune, and you will slowly take damage. Upon stepping off the rune, all summoned spirits will dissipate, dropping their items to the ground. You may manifest \ multiple spirits with one rune, but you will rapidly take damage in doing so.
" text += "Ritual of Dimensional Rending
This rune is necessary to achieve your goals. On attempting to scribe it, it will produce shields around you and alert everyone you are attempting to scribe it; it takes a very long time to scribe, \ - and does massive damage to the one attempting to scribe it.
Invoking it requires 9 invokers and the sacrifice of a specific crewmember, and once invoked, will summon [ticker.mode.cultdat.entity_title3], [ticker.mode.cultdat.entity_name]. \ + and does massive damage to the one attempting to scribe it.
Invoking it requires 9 invokers and the sacrifice of a specific crewmember, and once invoked, will summon [ticker.cultdat.entity_title3], [ticker.cultdat.entity_name]. \ This will complete your objectives.
" text += "Talisman of Teleportation
The talisman form of the Teleport rune will transport the invoker to a selected Teleport rune once.
" @@ -200,13 +200,13 @@ popup.open() return 1 -/obj/item/weapon/tome/proc/finale_runes_ok(mob/living/user, obj/effect/rune/rune_to_scribe) +/obj/item/tome/proc/finale_runes_ok(mob/living/user, obj/effect/rune/rune_to_scribe) var/datum/game_mode/cult/cult_mode = ticker.mode var/area/A = get_area(src) if(GAMEMODE_IS_CULT) if(!canbypass)//not an admin-tome, check things if(!cult_mode.narsie_condition_cleared) - to_chat(user, "There is still more to do before unleashing [cult_mode.cultdat.entity_name] power!") + to_chat(user, "There is still more to do before unleashing [ticker.cultdat.entity_name] power!") return 0 if(!cult_mode.eldergod) to_chat(user, "\"I am already here. There is no need to try to summon me now.\"") @@ -215,26 +215,26 @@ to_chat(user, "\"We are already here. There is no need to try to summon us now.\"") return 0 if(!((CULT_ELDERGOD in cult_mode.objectives) || (CULT_SLAUGHTER in cult_mode.objectives))) - to_chat(user, "[cult_mode.cultdat.entity_name]'s power does not wish to be unleashed!") + to_chat(user, "[ticker.cultdat.entity_name]'s power does not wish to be unleashed!") return 0 if(!(A in summon_spots)) - to_chat(user, "[cult_mode.cultdat.entity_name] can only be summoned where the veil is weak - in [english_list(summon_spots)]!") + to_chat(user, "[ticker.cultdat.entity_name] can only be summoned where the veil is weak - in [english_list(summon_spots)]!") return 0 - var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [cult_mode.cultdat.entity_name]!", "No") + var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [ticker.cultdat.entity_name]!", "No") if(confirm_final == "No" || confirm_final == null) to_chat(user, "You decide to prepare further before scribing the rune.") return 0 else return 1 else//the game mode is not cult..but we ARE a cultist...ALL ON THE ADMINBUS - var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [cult_mode.cultdat.entity_name]!", "No") + var/confirm_final = alert(user, "This is the FINAL step to summon your deities power, it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for [ticker.cultdat.entity_name]!", "No") if(confirm_final == "No" || confirm_final == null) to_chat(user, "You decide to prepare further before scribing the rune.") return 0 else return 1 -/obj/item/weapon/tome/proc/scribe_rune(mob/living/user) +/obj/item/tome/proc/scribe_rune(mob/living/user) var/turf/runeturf = get_turf(user) var/chosen_keyword var/obj/effect/rune/rune_to_scribe @@ -252,7 +252,7 @@ if(!possible_runes.len) return entered_rune_name = input(user, "Choose a rite to scribe.", "Sigils of Power") as null|anything in possible_runes - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated()) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return for(var/T in typesof(/obj/effect/rune)) var/obj/effect/rune/R = T @@ -271,7 +271,7 @@ if(locate(/obj/effect/rune) in runeturf) to_chat(user, "There is already a rune here.") return - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated()) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(ispath(rune_to_scribe, /obj/effect/rune/narsie) || ispath(rune_to_scribe, /obj/effect/rune/slaughter))//may need to change this - Fethas if(finale_runes_ok(user,rune_to_scribe)) @@ -294,22 +294,22 @@ var/mob/living/carbon/human/H = user var/dam_zone = pick("head", "chest", "groin", "l_arm", "l_hand", "r_arm", "r_hand", "l_leg", "l_foot", "r_leg", "r_foot") var/obj/item/organ/external/affecting = H.get_organ(ran_zone(dam_zone)) - user.visible_message("[user] cuts open their [affecting] and begins writing in their own blood!", "You slice open your [affecting] and begin drawing a sigil of [ticker.mode.cultdat.entity_title3].") + user.visible_message("[user] cuts open their [affecting] and begins writing in their own blood!", "You slice open your [affecting] and begin drawing a sigil of [ticker.cultdat.entity_title3].") user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE , affecting) if(!do_after(user, initial(rune_to_scribe.scribe_delay)-scribereduct, target = get_turf(user))) for(var/V in shields) var/obj/machinery/shield/S = V - if(S && !qdeleted(S)) + if(S && !QDELETED(S)) qdel(S) return if(locate(/obj/effect/rune) in runeturf) to_chat(user, "There is already a rune here.") return user.visible_message("[user] creates a strange circle in their own blood.", \ - "You finish drawing the arcane markings of [ticker.mode.cultdat.entity_title3].") + "You finish drawing the arcane markings of [ticker.cultdat.entity_title3].") for(var/V in shields) var/obj/machinery/shield/S = V - if(S && !qdeleted(S)) + if(S && !QDELETED(S)) qdel(S) var/obj/effect/rune/R = new rune_to_scribe(runeturf, chosen_keyword) R.blood_DNA = list() diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 9b94627d664..2bf4933e108 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -59,11 +59,11 @@ To draw a rune, use an arcane tome. to_chat(user, "Keyword: [keyword]") /obj/effect/rune/attackby(obj/I, mob/user, params) - if(istype(I, /obj/item/weapon/tome) && iscultist(user)) + if(istype(I, /obj/item/tome) && iscultist(user)) to_chat(user, "You carefully erase the [lowertext(cultist_name)] rune.") qdel(src) return - else if(istype(I, /obj/item/weapon/nullrod)) + else if(istype(I, /obj/item/nullrod)) if(iscultist(user))//cultist..what are doing..cultist..staph... user.drop_item() user.visible_message("[I] suddenly glows with white light, forcing [user] to drop it in pain!", \ @@ -194,11 +194,11 @@ structure_check() searches for nearby cultist structures required for the invoca ..() for(var/M in invokers) var/mob/living/L = M - to_chat(L, "You feel your life force draining. [ticker.mode.cultdat.entity_title3] is displeased.") + to_chat(L, "You feel your life force draining. [ticker.cultdat.entity_title3] is displeased.") qdel(src) /mob/proc/null_rod_check() //The null rod, if equipped, will protect the holder from the effects of most runes - var/obj/item/weapon/nullrod/N = locate() in src + var/obj/item/nullrod/N = locate() in src if(N) return N return 0 @@ -215,9 +215,9 @@ structure_check() searches for nearby cultist structures required for the invoca var/turf/T = get_turf(src) var/list/papers_on_rune = list() var/entered_talisman_name - var/obj/item/weapon/paper/talisman/talisman_type + var/obj/item/paper/talisman/talisman_type var/list/possible_talismans = list() - for(var/obj/item/weapon/paper/P in T) + for(var/obj/item/paper/P in T) if(!P.info) papers_on_rune.Add(P) if(!papers_on_rune.len) @@ -230,15 +230,15 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() log_game("Talisman Creation rune failed - already in use") return - var/obj/item/weapon/paper/paper_to_imbue = pick(papers_on_rune) - for(var/I in subtypesof(/obj/item/weapon/paper/talisman) - /obj/item/weapon/paper/talisman/malformed - /obj/item/weapon/paper/talisman/supply - /obj/item/weapon/paper/talisman/supply/weak) - var/obj/item/weapon/paper/talisman/J = I + var/obj/item/paper/paper_to_imbue = pick(papers_on_rune) + for(var/I in subtypesof(/obj/item/paper/talisman) - /obj/item/paper/talisman/malformed - /obj/item/paper/talisman/supply - /obj/item/paper/talisman/supply/weak) + var/obj/item/paper/talisman/J = I var/talisman_cult_name = initial(J.cultist_name) if(talisman_cult_name) possible_talismans[talisman_cult_name] = J //This is to allow the menu to let cultists select talismans by name entered_talisman_name = input(user, "Choose a talisman to imbue.", "Talisman Choices") as null|anything in possible_talismans talisman_type = possible_talismans[entered_talisman_name] - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || rune_in_use || !talisman_type) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || rune_in_use || !talisman_type) return ..() visible_message("Dark power begins to channel into the paper!.") @@ -303,7 +303,7 @@ var/list/teleport_runes = list() var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || !actual_selected_rune) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || !actual_selected_rune) fail_invoke() return @@ -370,11 +370,11 @@ var/list/teleport_runes = list() new_cultist.visible_message("[new_cultist] writhes in pain as the markings below them glow a bloody red!", \ "AAAAAAAAAAAAAA-") ticker.mode.add_cultist(new_cultist.mind, 1) - new /obj/item/weapon/tome(get_turf(src)) + new /obj/item/tome(get_turf(src)) new_cultist.mind.special_role = "Cultist" to_chat(new_cultist, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \ and something evil takes root.") - to_chat(new_cultist, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve [ticker.mode.cultdat.entity_title3] above all else. Bring it back.\ + to_chat(new_cultist, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve [ticker.cultdat.entity_title3] above all else. Bring it back.\ ") //Rite of Tribute: Sacrifices a crew member to Nar-Sie. Places them into a soul shard if they're in their body. @@ -388,7 +388,7 @@ var/list/teleport_runes = list() /obj/effect/rune/sacrifice/New() ..() - cultist_desc = "sacrifices a crew member to [ticker.mode.cultdat.entity_title3]. May place them into a soul shard if their spirit remains in their body." + cultist_desc = "sacrifices a crew member to [ticker.cultdat.entity_title3]. May place them into a soul shard if their spirit remains in their body." /obj/effect/rune/sacrifice/invoke(var/list/invokers) if(rune_in_use) @@ -406,7 +406,7 @@ var/list/teleport_runes = list() var/mob/offering if(possible_targets.len > 1) //If there's more than one target, allow choice offering = input(user, "Choose an offering to sacrifice.", "Unholy Tribute") as null|anything in possible_targets - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated()) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return else if(possible_targets.len) //Otherwise, if there's a target at all, pick the only one offering = possible_targets[possible_targets.len] @@ -455,7 +455,7 @@ var/list/teleport_runes = list() else to_chat(M, "\"I accept this meager sacrifice.\"") if(T.mind) - var/obj/item/device/soulstone/stone = new /obj/item/device/soulstone(get_turf(src)) + var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(src)) stone.invisibility = INVISIBILITY_MAXIMUM //so it's not picked up during transfer_soul() if(!stone.transfer_soul("VICTIM", T, usr)) //If it cannot be added qdel(stone) @@ -492,8 +492,8 @@ var/list/teleport_runes = list() /obj/effect/rune/narsie/New() ..() - cultist_name = "Summon [ticker.mode.cultdat.entity_name]" - cultist_desc = "tears apart dimensional barriers, calling forth [ticker.mode.cultdat.entity_title3]. Requires 9 invokers." + cultist_name = "Summon [ticker.cultdat.entity_name]" + cultist_desc = "tears apart dimensional barriers, calling forth [ticker.cultdat.entity_title3]. Requires 9 invokers." /obj/effect/rune/narsie/check_icon() @@ -519,7 +519,7 @@ var/list/teleport_runes = list() return if(!cult_mode.eldergod) for(var/M in invokers) - to_chat(M, "[ticker.mode.cultdat.entity_name] is already on this plane!") + to_chat(M, "[ticker.cultdat.entity_name] is already on this plane!") log_game("Summon god rune failed - already summoned") return //BEGIN THE SUMMONING @@ -535,16 +535,16 @@ var/list/teleport_runes = list() cult_mode.eldergod = 0 /obj/effect/rune/narsie/attackby(obj/I, mob/user, params) //Since the narsie rune takes a long time to make, add logging to removal. - if((istype(I, /obj/item/weapon/tome) && iscultist(user))) - user.visible_message("[user.name] begins erasing the [src]...", "You begin erasing the [src]...") + if((istype(I, /obj/item/tome) && iscultist(user))) + user.visible_message("[user] begins erasing the [src]...", "You begin erasing the [src]...") if(do_after(user, 50, target = src)) //Prevents accidental erasures. - log_game("Summon Narsie rune erased by [user.mind.key] (ckey) with a tome") + log_game("Summon Narsie rune erased by [key_name(user)] with a tome") message_admins("[key_name_admin(user)] erased a Narsie rune with a tome") ..() return else - if(istype(I, /obj/item/weapon/nullrod)) //Begone foul magiks. You cannot hinder me. - log_game("Summon Narsie rune erased by [user.mind.key] (ckey) using a null rod") + if(istype(I, /obj/item/nullrod)) //Begone foul magiks. You cannot hinder me. + log_game("Summon Narsie rune erased by [key_name(user)] using a null rod") message_admins("[key_name_admin(user)] erased a Narsie rune with a null rod") ..() return @@ -573,16 +573,16 @@ var/list/teleport_runes = list() return /obj/effect/rune/slaughter/attackby(obj/I, mob/user, params) //Since the narsie rune takes a long time to make, add logging to removal. - if((istype(I, /obj/item/weapon/tome) && iscultist(user))) + if((istype(I, /obj/item/tome) && iscultist(user))) user.visible_message("[user.name] begins erasing the [src]...", "You begin erasing the [src]...") if(do_after(user, 50, target = src)) //Prevents accidental erasures. - log_game("Summon demon rune erased by [user.mind.key] (ckey) with a tome") + log_game("Summon demon rune erased by [key_name(user)] with a tome") message_admins("[key_name_admin(user)] erased a demon rune with a tome") ..() return else - if(istype(I, /obj/item/weapon/nullrod)) //Begone foul magiks. You cannot hinder me. - log_game("Summon demon rune erased by [user.mind.key] (ckey) using a null rod") + if(istype(I, /obj/item/nullrod)) //Begone foul magiks. You cannot hinder me. + log_game("Summon demon rune erased by [key_name(user)] using a null rod") message_admins("[key_name_admin(user)] erased a demon rune with a null rod") ..() return @@ -594,12 +594,12 @@ var/list/teleport_runes = list() var/mob/living/user = invokers[1] var/datum/game_mode/cult/cult_mode = ticker.mode if(!(CULT_SLAUGHTER in cult_mode.objectives)) - message_admins("[usr.real_name]([user.ckey]) tried to summon demons when the objective was wrong") + message_admins("[key_name_admin(user)] tried to summon demons when the objective was wrong") burn_invokers(invokers) log_game("Summon Demons rune failed - improper objective") return if(!is_station_level(user.z)) - message_admins("[user.real_name]([user.ckey]) tried to summon demons off station") + message_admins("[key_name_admin(user)] tried to summon demons off station") burn_invokers(invokers) log_game("Summon demons rune failed - off station Z level") return @@ -654,7 +654,7 @@ var/list/teleport_runes = list() log_game("Raise Dead rune failed - no catalyst corpse") return mob_to_sacrifice = input(user, "Choose a corpse to sacrifice.", "Corpse to Sacrifice") as null|anything in potential_sacrifice_mobs - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || !mob_to_sacrifice || rune_in_use) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || !mob_to_sacrifice || rune_in_use) return for(var/mob/living/M in T.contents) if(M.stat == DEAD) @@ -664,7 +664,7 @@ var/list/teleport_runes = list() log_game("Raise Dead rune failed - no corpse to revive") return mob_to_revive = input(user, "Choose a corpse to revive.", "Corpse to Revive") as null|anything in potential_revive_mobs - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated() || rune_in_use || !mob_to_revive) + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated() || rune_in_use || !mob_to_revive) return if(!in_range(mob_to_sacrifice,src)) to_chat(user, "The sacrificial target has been moved!") @@ -857,8 +857,8 @@ var/list/teleport_runes = list() for(var/datum/mind/M in ticker.mode.cult) if(!(M.current in invokers) && M.current && M.current.stat != DEAD) cultists |= M.current - var/mob/living/cultist_to_summon = input(user, "Who do you wish to call to [src]?", "Followers of [ticker.mode.cultdat.entity_title3]") as null|anything in cultists - if(!Adjacent(user) || !src || qdeleted(src) || user.incapacitated()) + var/mob/living/cultist_to_summon = input(user, "Who do you wish to call to [src]?", "Followers of [ticker.cultdat.entity_title3]") as null|anything in cultists + if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated()) return if(!cultist_to_summon) to_chat(user, "You require a summoning target!") @@ -866,7 +866,7 @@ var/list/teleport_runes = list() log_game("Summon Cultist rune failed - no target") return if(!iscultist(cultist_to_summon)) - to_chat(user, "[cultist_to_summon] is not a follower of [ticker.mode.cultdat.entity_title3]!") + to_chat(user, "[cultist_to_summon] is not a follower of [ticker.cultdat.entity_title3]!") fail_invoke() log_game("Summon Cultist rune failed - no target") return @@ -913,7 +913,7 @@ var/list/teleport_runes = list() visible_message("[src] briefly bubbles before exploding!") for(var/mob/living/carbon/C in viewers(T)) if(!iscultist(C)) - var/obj/item/weapon/nullrod/N = C.null_rod_check() + var/obj/item/nullrod/N = C.null_rod_check() if(N) to_chat(C, "\The [N] suddenly burns hotly before returning to normal!") continue @@ -975,7 +975,7 @@ var/list/teleport_runes = list() /obj/effect/rune/manifest/New(loc) ..() - cultist_desc = "manifests a spirit as a servant of [ticker.mode.cultdat.entity_title3]. The invoker must not move from atop the rune, and will take damage for each summoned spirit." + cultist_desc = "manifests a spirit as a servant of [ticker.cultdat.entity_title3]. The invoker must not move from atop the rune, and will take damage for each summoned spirit." notify_ghosts("Manifest rune created in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src) @@ -1034,7 +1034,7 @@ var/list/teleport_runes = list() ticker.mode.add_cultist(new_human.mind, 0) summoned_guys |= new_human ghosts++ - to_chat(new_human, "You are a servant of [ticker.mode.cultdat.entity_title3]. You have been made semi-corporeal by the cult of [ticker.mode.cultdat.entity_name], and you are to serve them at all costs.") + to_chat(new_human, "You are a servant of [ticker.cultdat.entity_title3]. You have been made semi-corporeal by the cult of [ticker.cultdat.entity_name], and you are to serve them at all costs.") while(user in get_turf(src)) if(user.stat) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 9b0e2e9ab7e..e909a33410f 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/paper/talisman +/obj/item/paper/talisman icon_state = "paper_talisman" var/cultist_name = "talisman" var/cultist_desc = "A basic talisman. It serves no purpose." @@ -7,7 +7,7 @@ var/uses = 1 var/health_cost = 0 //The amount of health taken from the user when invoking the talisman -/obj/item/weapon/paper/talisman/examine(mob/user) +/obj/item/paper/talisman/examine(mob/user) if(iscultist(user) || user.stat == DEAD) to_chat(user, "Name: [cultist_name]") to_chat(user, "Effect: [cultist_desc]") @@ -15,7 +15,7 @@ else to_chat(user, "You see strange symbols on the paper. Are they supposed to mean something?") -/obj/item/weapon/paper/talisman/attack_self(mob/living/user) +/obj/item/paper/talisman/attack_self(mob/living/user) if(!iscultist(user)) to_chat(user, "You see strange symbols on the paper. Are they supposed to mean something?") return @@ -25,7 +25,7 @@ user.drop_item() qdel(src) -/obj/item/weapon/paper/talisman/proc/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/proc/invoke(mob/living/user, successfuluse = 1) . = successfuluse if(successfuluse) //if the calling whatever says we succeed, do the fancy stuff if(invocation) @@ -35,25 +35,25 @@ C.apply_damage(health_cost, BRUTE, pick("l_arm", "r_arm")) //Malformed Talisman: If something goes wrong. -/obj/item/weapon/paper/talisman/malformed +/obj/item/paper/talisman/malformed cultist_name = "malformed talisman" cultist_desc = "A talisman with gibberish scrawlings. No good can come from invoking this." invocation = "Ra'sha yoka!" -/obj/item/weapon/paper/talisman/malformed/invoke(mob/living/user, successfuluse = 1) - to_chat(user, "You feel a pain in your head. [ticker.mode.cultdat.entity_title3] is displeased.") +/obj/item/paper/talisman/malformed/invoke(mob/living/user, successfuluse = 1) + to_chat(user, "You feel a pain in your head. [ticker.cultdat.entity_title3] is displeased.") if(iscarbon(user)) var/mob/living/carbon/C = user C.apply_damage(10, BRUTE, "head") //Supply Talisman: Has a few unique effects. Granted only to starter cultists. -/obj/item/weapon/paper/talisman/supply +/obj/item/paper/talisman/supply cultist_name = "Supply Talisman" cultist_desc = "A multi-use talisman that can create various objects. Intended to increase the cult's strength early on." invocation = null uses = 3 -/obj/item/weapon/paper/talisman/supply/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/supply/invoke(mob/living/user, successfuluse = 1) var/dat = list() dat += "There are [uses] bloody runes on the parchment.
" dat += "Please choose the chant to be imbued into the fabric of reality.
" @@ -71,37 +71,37 @@ popup.open() return 0 -/obj/item/weapon/paper/talisman/supply/Topic(href, href_list) +/obj/item/paper/talisman/supply/Topic(href, href_list) if(src) if(usr.stat || usr.restrained() || !in_range(src, usr)) return if(href_list["rune"]) switch(href_list["rune"]) if("newtome") - var/obj/item/weapon/tome/T = new(usr) + var/obj/item/tome/T = new(usr) usr.put_in_hands(T) if("metal") - if(istype(src, /obj/item/weapon/paper/talisman/supply/weak)) + if(istype(src, /obj/item/paper/talisman/supply/weak)) usr.visible_message("Lesser supply talismans lack the strength to materialize runed metal!") return var/obj/item/stack/sheet/runed_metal/R = new(usr,5) usr.put_in_hands(R) if("teleport") - var/obj/item/weapon/paper/talisman/teleport/T = new(usr) + var/obj/item/paper/talisman/teleport/T = new(usr) usr.put_in_hands(T) if("emp") - var/obj/item/weapon/paper/talisman/emp/T = new(usr) + var/obj/item/paper/talisman/emp/T = new(usr) usr.put_in_hands(T) if("runestun") - var/obj/item/weapon/paper/talisman/stun/T = new(usr) + var/obj/item/paper/talisman/stun/T = new(usr) usr.put_in_hands(T) if("soulstone") - var/obj/item/device/soulstone/T = new(usr) + var/obj/item/soulstone/T = new(usr) usr.put_in_hands(T) if("construct") new /obj/structure/constructshell(get_turf(usr)) if("veiling") - var/obj/item/weapon/paper/talisman/true_sight/T = new(usr) + var/obj/item/paper/talisman/true_sight/T = new(usr) usr.put_in_hands(T) uses-- if(uses <= 0) @@ -111,17 +111,17 @@ visible_message("[src] crumbles to dust.") qdel(src) -/obj/item/weapon/paper/talisman/supply/weak +/obj/item/paper/talisman/supply/weak uses = 2 //Rite of Translocation: Same as rune -/obj/item/weapon/paper/talisman/teleport +/obj/item/paper/talisman/teleport cultist_name = "Talisman of Teleportation" cultist_desc = "A single-use talisman that will teleport a user to a random rune of the same keyword." invocation = "Sas'so c'arta forbici!" health_cost = 5 -/obj/item/weapon/paper/talisman/teleport/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/teleport/invoke(mob/living/user, successfuluse = 1) var/list/potential_runes = list() var/list/teleportnames = list() var/list/duplicaterunecount = list() @@ -148,7 +148,7 @@ var/input_rune_key = input(user, "Choose a rune to teleport to.", "Rune to Teleport to") as null|anything in potential_runes //we know what key they picked var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to? - if(!src || qdeleted(src) || !user || user.l_hand != src && user.r_hand != src || user.incapacitated() || !actual_selected_rune) + if(!src || QDELETED(src) || !user || user.l_hand != src && user.r_hand != src || user.incapacitated() || !actual_selected_rune) return ..(user, 0) user.visible_message("Dust flows from [user]'s hand, and they disappear in a flash of red light!", \ @@ -157,21 +157,21 @@ return ..() -/obj/item/weapon/paper/talisman/summon_tome +/obj/item/paper/talisman/summon_tome cultist_name = "Talisman of Tome Summoning" cultist_desc = "A one-use talisman that will call an untranslated tome from the archives of a cult." invocation = "N'ath reth sh'yro eth d'raggathnor!" health_cost = 1 -/obj/item/weapon/paper/talisman/summon_tome/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/summon_tome/invoke(mob/living/user, successfuluse = 1) . = ..() user.visible_message("[user]'s hand glows red for a moment.", \ "You speak the words of the talisman!") - new /obj/item/weapon/tome(get_turf(user)) + new /obj/item/tome(get_turf(user)) user.visible_message("A tome appears at [user]'s feet!", \ "An arcane tome materializes at your feet.") -/obj/item/weapon/paper/talisman/true_sight +/obj/item/paper/talisman/true_sight cultist_name = "Talisman of Veiling" cultist_desc = "A multi-use talisman that hides nearby runes. On its second use, will reveal nearby runes." invocation = "Kla'atu barada nikt'o!" @@ -179,7 +179,7 @@ uses = 2 var/revealing = FALSE //if it reveals or not -/obj/item/weapon/paper/talisman/true_sight/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/true_sight/invoke(mob/living/user, successfuluse = 1) . = ..() if(!revealing) user.visible_message("Thin grey dust falls from [user]'s hand!", \ @@ -195,12 +195,12 @@ R.talismanreveal() //Rite of False Truths: Same as rune -/obj/item/weapon/paper/talisman/make_runes_fake +/obj/item/paper/talisman/make_runes_fake cultist_name = "Talisman of Disguising" cultist_desc = "A talisman that will make nearby runes appear fake." invocation = "By'o nar'nar!" -/obj/item/weapon/paper/talisman/make_runes_fake/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/make_runes_fake/invoke(mob/living/user, successfuluse = 1) . = ..() user.visible_message("Dust flows from [user]s hand.", \ "You speak the words of the talisman, making nearby runes appear fake.") @@ -210,13 +210,13 @@ //Rite of Disruption: Weaker than rune -/obj/item/weapon/paper/talisman/emp +/obj/item/paper/talisman/emp cultist_name = "Talisman of Electromagnetic Pulse" cultist_desc = "A talisman that will cause a moderately-sized electromagnetic pulse." invocation = "Ta'gh fara'qha fel d'amar det!" health_cost = 5 -/obj/item/weapon/paper/talisman/emp/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/emp/invoke(mob/living/user, successfuluse = 1) . = ..() user.visible_message("[user]'s hand flashes a bright blue!", \ "You speak the words of the talisman, emitting an EMP blast.") @@ -224,13 +224,13 @@ //Rite of Disorientation: Stuns and inhibit speech on a single target for quite some time -/obj/item/weapon/paper/talisman/stun +/obj/item/paper/talisman/stun cultist_name = "Talisman of Stunning" cultist_desc = "A talisman that will stun and inhibit speech on a single target. To use, attack target directly." invocation = "Dream sign:Evil sealing talisman!" health_cost = 10 -/obj/item/weapon/paper/talisman/stun/invoke(mob/living/user, successfuluse = 0) +/obj/item/paper/talisman/stun/invoke(mob/living/user, successfuluse = 0) if(successfuluse) //if we're forced to be successful(we normally aren't) then do the normal stuff return ..() if(iscultist(user)) @@ -239,17 +239,17 @@ to_chat(user, "You see strange symbols on the paper. Are they supposed to mean something?") return 0 -/obj/item/weapon/paper/talisman/stun/attack(mob/living/target, mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/stun/attack(mob/living/target, mob/living/user, successfuluse = 1) if(iscultist(user)) invoke(user, 1) user.visible_message("[user] holds up [src], which explodes in a flash of red light!", \ "You stun [target] with the talisman!") - var/obj/item/weapon/nullrod/N = locate() in target + var/obj/item/nullrod/N = locate() in target if(N) target.visible_message("[target]'s holy weapon absorbs the talisman's light!", \ "Your holy weapon absorbs the blinding light!") else - add_logs(user, target, "stunned", addition="with a talisman") + add_attack_logs(user, target, "Stunned with a talisman") target.Weaken(10) target.Stun(10) target.flash_eyes(1,1) @@ -269,12 +269,12 @@ //Rite of Arming: Equips cultist armor on the user, where available -/obj/item/weapon/paper/talisman/armor +/obj/item/paper/talisman/armor cultist_name = "Talisman of Arming" cultist_desc = "A talisman that will equip the invoker with cultist equipment if there is a slot to equip it to." invocation = "N'ath reth sh'yro eth draggathnor!" -/obj/item/weapon/paper/talisman/armor/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/armor/invoke(mob/living/user, successfuluse = 1) . = ..() var/mob/living/carbon/human/H = user user.visible_message("Otherworldly armor suddenly appears on [user]!", \ @@ -284,12 +284,12 @@ H.equip_to_slot(new /obj/item/clothing/head/helmet/space/eva/plasmaman/cultist(H), slot_head) else H.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(user), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back) + H.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), slot_back) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(user), slot_shoes) - H.put_in_hands(new /obj/item/weapon/melee/cultblade(user)) - H.put_in_hands(new /obj/item/weapon/restraints/legcuffs/bola/cult(user)) + H.put_in_hands(new /obj/item/melee/cultblade(user)) + H.put_in_hands(new /obj/item/restraints/legcuffs/bola/cult(user)) -/obj/item/weapon/paper/talisman/armor/attack(mob/living/target, mob/living/user) +/obj/item/paper/talisman/armor/attack(mob/living/target, mob/living/user) if(iscultist(user) && iscultist(target)) user.drop_item() qdel(src) @@ -299,12 +299,12 @@ //Talisman of Horrors: Breaks the mind of the victim with nightmarish hallucinations -/obj/item/weapon/paper/talisman/horror +/obj/item/paper/talisman/horror cultist_name = "Talisman of Horrors" cultist_desc = "A talisman that will break the mind of the victim with nightmarish hallucinations." invocation = "Lo'Nab Na'Dm!" -/obj/item/weapon/paper/talisman/horror/attack(mob/living/target, mob/living/user) +/obj/item/paper/talisman/horror/attack(mob/living/target, mob/living/user) if(iscultist(user)) to_chat(user, "You disturb [target] with visions of the end!") if(iscarbon(target)) @@ -314,25 +314,25 @@ //Talisman of Fabrication: Creates a construct shell out of 25 metal sheets. -/obj/item/weapon/paper/talisman/construction +/obj/item/paper/talisman/construction cultist_name = "Talisman of Construction" cultist_desc = "Use this talisman on at least twenty-five metal sheets to create an empty construct shell or on plasteel to make runed metal" invocation = "Ethra p'ni dedol!" uses = 25 -/obj/item/weapon/paper/talisman/construction/attack_self(mob/living/user) +/obj/item/paper/talisman/construction/attack_self(mob/living/user) if(iscultist(user)) to_chat(user, "To use this talisman, place it upon a stack of metal sheets or plasteel sheets!.") else to_chat(user, "You see strange symbols on the paper. Are they supposed to mean something?") -/obj/item/weapon/paper/talisman/construction/attack(obj/M,mob/living/user) +/obj/item/paper/talisman/construction/attack(obj/M,mob/living/user) if(iscultist(user)) to_chat(user, "This talisman will only work on a stack of metal sheets or plasteel sheets!!") log_game("Construct talisman failed - not a valid target") -/obj/item/weapon/paper/talisman/construction/afterattack(obj/item/stack/sheet/target, mob/user, proximity_flag, click_parameters) +/obj/item/paper/talisman/construction/afterattack(obj/item/stack/sheet/target, mob/user, proximity_flag, click_parameters) ..() if(proximity_flag && iscultist(user)) if(istype(target, /obj/item/stack/sheet/metal)) @@ -358,13 +358,13 @@ to_chat(user, "The talisman must be used on metal or plasteel!") //Talisman of Shackling: Applies special cuffs directly from the talisman -/obj/item/weapon/paper/talisman/shackle +/obj/item/paper/talisman/shackle cultist_name = "Talisman of Shackling" cultist_desc = "Use this talisman on a victim to handcuff them with dark bindings." invocation = "In'totum Lig'abis!" uses = 4 -/obj/item/weapon/paper/talisman/shackle/invoke(mob/living/user, successfuluse = 0) +/obj/item/paper/talisman/shackle/invoke(mob/living/user, successfuluse = 0) if(successfuluse) //if we're forced to be successful(we normally aren't) then do the normal stuff return ..() if(iscultist(user)) @@ -373,7 +373,7 @@ to_chat(user, "You see strange symbols on the paper. Are they supposed to mean something?") return 0 -/obj/item/weapon/paper/talisman/shackle/attack(mob/living/carbon/target, mob/living/user) +/obj/item/paper/talisman/shackle/attack(mob/living/carbon/target, mob/living/user) if(iscultist(user) && istype(target)) if(target.stat == DEAD) user.visible_message("This talisman's magic does not affect the dead!") @@ -382,7 +382,7 @@ return ..() -/obj/item/weapon/paper/talisman/shackle/proc/CuffAttack(mob/living/carbon/C, mob/living/user) +/obj/item/paper/talisman/shackle/proc/CuffAttack(mob/living/carbon/C, mob/living/user) if(!C.handcuffed) invoke(user, 1) playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) @@ -390,10 +390,10 @@ "[user] begins shaping a dark magic around your wrists!") if(do_mob(user, C, 30)) if(!C.handcuffed) - C.handcuffed = new /obj/item/weapon/restraints/handcuffs/energy/cult/used(C) + C.handcuffed = new /obj/item/restraints/handcuffs/energy/cult/used(C) C.update_handcuffed() to_chat(user, "You shackle [C].") - add_logs(user, C, "handcuffed") + add_attack_logs(user, C, "Handcuffed (shackle talisman)") uses-- else to_chat(user, "[C] is already bound.") @@ -406,13 +406,17 @@ qdel(src) return -/obj/item/weapon/restraints/handcuffs/energy/cult //For the talisman of shackling +/obj/item/restraints/handcuffs/energy/cult //For the talisman of shackling name = "cult shackles" desc = "Shackles that bind the wrists with sinister magic." - trashtype = /obj/item/weapon/restraints/handcuffs/energy/used + trashtype = /obj/item/restraints/handcuffs/energy/used origin_tech = "materials=2;magnets=5" -/obj/item/weapon/restraints/handcuffs/energy/cult/used/dropped(mob/user) +/obj/item/restraints/handcuffs/energy/used + desc = "energy discharge" + flags = DROPDEL + +/obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user) user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \ "Your [src] shatters in a discharge of dark magic!") - qdel(src) + . = ..() \ No newline at end of file diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 42fb3105f18..4a2622c536d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -29,7 +29,6 @@ var/ert_disabled = 0 var/uplink_welcome = "Syndicate Uplink Console:" var/uplink_uses = 20 - var/datum/cult_info/cultdat //here instead of cult for adminbus purposes var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds) var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) @@ -108,8 +107,7 @@ tries_left = 5 //reset our tries since we found a new chump //make sure we have chumps before we try misinforming them. if we don't make a note of it. if(!chumps.len) - message_admins("Game mode failed to find ANY chumps. Possible causes: no one is opposed/skeptical, or FalseIncarnate can't code.") - log_admin("Game mode failed to find ANY chumps. Possible causes: no one is opposed/skeptical, or FalseIncarnate can't code.") + log_debug("Game mode failed to find ANY chumps. This is likely due to the server being in extreme low-pop with no one set to opposed or skeptical.") return 0 //we've got chumps! misinform them! for(var/mob/living/carbon/human/chump in chumps) @@ -136,8 +134,8 @@ break for(var/mob/M in player_list) if(M.mind) - var/obj/item/device/pda/P=null - for(var/obj/item/device/pda/check_pda in PDAs) + var/obj/item/pda/P=null + for(var/obj/item/pda/check_pda in PDAs) if(check_pda.owner==M.name) P=check_pda break @@ -164,7 +162,7 @@ T.purpose = "Payment" T.amount = pay T.date = current_date_string - T.time = worldtime2text() + T.time = station_time_timestamp() T.source_terminal = "\[CLASSIFIED\] Terminal #[rand(111,333)]" M.mind.initial_account.transaction_log.Add(T) msg += "You have been sent the $[pay], as agreed." @@ -281,10 +279,11 @@ // Get a list of all the people who want to be the antagonist for this round, except those with incompatible species for(var/mob/new_player/player in players) - if((role in player.client.prefs.be_special) && !(player.client.prefs.species in protected_species)) - player_draft_log += "[player.key] had [roletext] enabled, so we are drafting them." - candidates += player.mind - players -= player + if(!player.skip_antag) + if((role in player.client.prefs.be_special) && !(player.client.prefs.species in protected_species)) + player_draft_log += "[player.key] had [roletext] enabled, so we are drafting them." + candidates += player.mind + players -= player // If we don't have enough antags, draft people who voted for the round. if(candidates.len < recommended_enemies) @@ -374,7 +373,6 @@ /datum/game_mode/New() newscaster_announcements = pick(newscaster_standard_feeds) - cultdat = setupcult() ////////////////////////// //Reports player logouts// diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 6612f1e7192..8058ff6e5c9 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -20,6 +20,8 @@ var/round_start_time = 0 var/Bible_name // name of the bible var/Bible_deity_name + var/datum/cult_info/cultdat = null //here instead of cult for adminbus purposes + var/random_players = 0 // if set to nonzero, ALL players who latejoin or declare-ready join will have random appearances/genders var/list/syndicate_coalition = list() // list of traitor-compatible factions @@ -35,7 +37,8 @@ var/round_start_time = 0 var/obj/screen/cinematic = null //used for station explosion cinematic - var/round_end_announced = 0 // Spam Prevention. Announce round end only once. + var/round_end_announced = 0 // Spam Prevention. Announce round end only once.\ + /datum/controller/gameticker/proc/pregame() login_music = pick(\ @@ -70,6 +73,7 @@ var/round_start_time = 0 votetimer() /datum/controller/gameticker/proc/setup() + cultdat = setupcult() //Create and announce mode if(master_mode=="secret") src.hide_mode = 1 diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 341d674cab8..0693ca9b279 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -125,7 +125,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' limb.status &= ~ORGAN_ROBOT //Now apply cortical stack. - var/obj/item/weapon/implant/cortical/I = new(vox) + var/obj/item/implant/cortical/I = new(vox) I.implant(vox) cortical_stacks += I diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index e644af03f3c..57ce00c92af 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -37,7 +37,7 @@ doomsday_device = DOOM doomsday_device.start() verbs -= /mob/living/silicon/ai/proc/nuke_station - for(var/obj/item/weapon/pinpointer/point in pinpointer_list) + for(var/obj/item/pinpointer/point in pinpointer_list) for(var/mob/living/silicon/ai/A in ai_list) if((A.stat != DEAD) && A.nuking) point.the_disk = A //The pinpointer now tracks the AI core @@ -189,8 +189,8 @@ if(stat || malf_cooldown) return - for(var/obj/item/weapon/rcd/RCD in rcd_list) - if(!istype(RCD, /obj/item/weapon/rcd/borg)) //Ensures that cyborg RCDs are spared. + for(var/obj/item/rcd/RCD in rcd_list) + if(!istype(RCD, /obj/item/rcd/borg)) //Ensures that cyborg RCDs are spared. RCD.detonate_pulse() to_chat(src, "RCD detonation pulse emitted.") @@ -331,7 +331,7 @@ audible_message("You hear a loud electrical buzzing sound!") to_chat(src, "Reprogramming machine behaviour...") spawn(50) - if(M && !qdeleted(M)) + if(M && !QDELETED(M)) new /mob/living/simple_animal/hostile/mimic/copy/machine(get_turf(M), M, src, 1) else to_chat(src, "Out of uses.") diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index c014db18e34..0828d01e4f6 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -98,7 +98,7 @@ var/meteorsound = 'sound/effects/meteorimpact.ogg' var/z_original = 1 - var/meteordrop = /obj/item/weapon/ore/iron + var/meteordrop = /obj/item/ore/iron var/dropamt = 2 /obj/effect/meteor/Move() @@ -158,8 +158,8 @@ /obj/effect/meteor/ex_act() return -/obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/weapon/pickaxe)) +/obj/effect/meteor/attackby(obj/item/W as obj, mob/user as mob, params) + if(istype(W, /obj/item/pickaxe)) qdel(src) return ..() @@ -196,7 +196,7 @@ hits = 1 hitpwr = 3 meteorsound = 'sound/weapons/tap.ogg' - meteordrop = /obj/item/weapon/ore/glass + meteordrop = /obj/item/ore/glass //Medium-sized /obj/effect/meteor/medium @@ -226,7 +226,7 @@ hits = 5 heavy = 1 meteorsound = 'sound/effects/bamf.ogg' - meteordrop = /obj/item/weapon/ore/plasma + meteordrop = /obj/item/ore/plasma /obj/effect/meteor/flaming/meteor_effect() ..(heavy) @@ -237,7 +237,7 @@ name = "glowing meteor" icon_state = "glowing" heavy = 1 - meteordrop = /obj/item/weapon/ore/uranium + meteordrop = /obj/item/ore/uranium /obj/effect/meteor/irradiated/meteor_effect() @@ -256,7 +256,7 @@ hitpwr = 1 heavy = 1 meteorsound = 'sound/effects/bamf.ogg' - meteordrop = /obj/item/weapon/ore/plasma + meteordrop = /obj/item/ore/plasma /obj/effect/meteor/tunguska/meteor_effect() ..(heavy) @@ -276,7 +276,7 @@ hits = 1 hitpwr = 0 meteorsound = 'sound/effects/blobattack.ogg' - meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat + meteordrop = /obj/item/reagent_containers/food/snacks/meat var/meteorgibs = /obj/effect/gibspawner/generic /obj/effect/meteor/gore/make_debris() @@ -300,7 +300,7 @@ hits = 10 hitpwr = 1 meteorsound = 'sound/effects/blobattack.ogg' - meteordrop = /obj/item/weapon/reagent_containers/food/snacks/meat + meteordrop = /obj/item/reagent_containers/food/snacks/meat var/meteorgibs = /obj/effect/gibspawner/generic /obj/effect/meteor/goreops/make_debris() diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index e57df9b48ce..b54b18335ef 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -76,11 +76,11 @@ scientist.assigned_role = "MODE" scientist.special_role = SPECIAL_ROLE_ABDUCTOR_SCIENTIST - log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.") + log_game("[key_name(scientist)] has been selected as an abductor team [team_number] scientist.") agent.assigned_role = "MODE" agent.special_role = SPECIAL_ROLE_ABDUCTOR_AGENT - log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.") + log_game("[key_name(agent)] has been selected as an abductor team [team_number] agent.") abductors |= agent abductors |= scientist @@ -225,13 +225,13 @@ /datum/game_mode/abduction/proc/equip_common(mob/living/carbon/human/agent,team_number) var/radio_freq = SYND_FREQ - var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(agent) + var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt(agent) R.set_frequency(radio_freq) R.name = "alien headset" agent.equip_to_slot_or_del(R, slot_l_ear) agent.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(agent), slot_shoes) agent.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(agent), slot_w_uniform) //they're greys gettit - agent.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(agent), slot_back) + agent.equip_to_slot_or_del(new /obj/item/storage/backpack(agent), slot_back) /datum/game_mode/abduction/proc/get_team_console(team) var/obj/machinery/abductor/console/console @@ -251,11 +251,11 @@ console.vest = V V.flags |= NODROP agent.equip_to_slot_or_del(V, slot_wear_suit) - agent.equip_to_slot_or_del(new /obj/item/weapon/abductor_baton(agent), slot_in_backpack) - agent.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/alien(agent), slot_in_backpack) - agent.equip_to_slot_or_del(new /obj/item/device/abductor/silencer(agent), slot_in_backpack) + agent.equip_to_slot_or_del(new /obj/item/abductor_baton(agent), slot_in_backpack) + agent.equip_to_slot_or_del(new /obj/item/gun/energy/alien(agent), slot_in_backpack) + agent.equip_to_slot_or_del(new /obj/item/abductor/silencer(agent), slot_in_backpack) agent.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/abductor(agent), slot_head) - agent.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/military/abductor/full(agent), slot_belt) + agent.equip_to_slot_or_del(new /obj/item/storage/belt/military/abductor/full(agent), slot_belt) agent.update_icons() @@ -264,13 +264,13 @@ team_number = scientist.mind.abductor.team var/obj/machinery/abductor/console/console = get_team_console(team_number) - var/obj/item/device/abductor/gizmo/G = new /obj/item/device/abductor/gizmo(scientist) + var/obj/item/abductor/gizmo/G = new /obj/item/abductor/gizmo(scientist) if(console!=null) console.gizmo = G G.console = console scientist.equip_to_slot_or_del(G, slot_in_backpack) - var/obj/item/weapon/implant/abductor/beamplant = new /obj/item/weapon/implant/abductor(scientist) + var/obj/item/implant/abductor/beamplant = new /obj/item/implant/abductor(scientist) beamplant.implant(scientist) scientist.update_icons() diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index c8bc0e1e15e..0b1962b1717 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -109,18 +109,18 @@ if(combat_cooldown==initial(combat_cooldown)) processing_objects.Remove(src) -/obj/item/device/abductor/proc/AbductorCheck(user) +/obj/item/abductor/proc/AbductorCheck(user) if(isabductor(user)) return TRUE to_chat(user, "You can't figure how this works!") return FALSE -/obj/item/device/abductor/proc/ScientistCheck(user) +/obj/item/abductor/proc/ScientistCheck(user) var/mob/living/carbon/human/H = user if(H.mind && H.mind.abductor) return H.mind.abductor.scientist -/obj/item/device/abductor/gizmo +/obj/item/abductor/gizmo name = "science tool" desc = "A dual-mode tool for retrieving specimens and scanning appearances. Scanning can be done through cameras." icon = 'icons/obj/abductor.dmi' @@ -131,7 +131,7 @@ var/mob/living/marked = null var/obj/machinery/abductor/console/console -/obj/item/device/abductor/gizmo/attack_self(mob/user) +/obj/item/abductor/gizmo/attack_self(mob/user) if(!AbductorCheck(user)) return if(!ScientistCheck(user)) @@ -145,7 +145,7 @@ icon_state = "gizmo_scan" to_chat(user, "You switch the device to [mode==GIZMO_SCAN? "SCAN": "MARK"] MODE") -/obj/item/device/abductor/gizmo/attack(mob/living/M, mob/user) +/obj/item/abductor/gizmo/attack(mob/living/M, mob/user) if(!AbductorCheck(user)) return if(!ScientistCheck(user)) @@ -158,7 +158,7 @@ mark(M, user) -/obj/item/device/abductor/gizmo/afterattack(atom/target, mob/living/user, flag, params) +/obj/item/abductor/gizmo/afterattack(atom/target, mob/living/user, flag, params) if(flag) return if(!AbductorCheck(user)) @@ -172,13 +172,13 @@ if(GIZMO_MARK) mark(target, user) -/obj/item/device/abductor/gizmo/proc/scan(atom/target, mob/living/user) +/obj/item/abductor/gizmo/proc/scan(atom/target, mob/living/user) if(ishuman(target)) if(console!=null) console.AddSnapshot(target) to_chat(user, "You scan [target] and add them to the database.") -/obj/item/device/abductor/gizmo/proc/mark(atom/target, mob/living/user) +/obj/item/abductor/gizmo/proc/mark(atom/target, mob/living/user) if(marked == target) to_chat(user, "This specimen is already marked!") return @@ -191,7 +191,7 @@ else prepare(target,user) -/obj/item/device/abductor/gizmo/proc/prepare(atom/target, mob/living/user) +/obj/item/abductor/gizmo/proc/prepare(atom/target, mob/living/user) if(get_dist(target,user)>1) to_chat(user, "You need to be next to the specimen to prepare it for transport!") return @@ -201,7 +201,7 @@ to_chat(user, "You finish preparing [target] for transport.") -/obj/item/device/abductor/silencer +/obj/item/abductor/silencer name = "abductor silencer" desc = "A compact device used to shut down communications equipment." icon = 'icons/obj/abductor.dmi' @@ -209,19 +209,19 @@ item_state = "silencer" origin_tech = "materials=4;programming=7;abductor=3" -/obj/item/device/abductor/silencer/attack(mob/living/M, mob/user) +/obj/item/abductor/silencer/attack(mob/living/M, mob/user) if(!AbductorCheck(user)) return radio_off(M, user) -/obj/item/device/abductor/silencer/afterattack(atom/target, mob/living/user, flag, params) +/obj/item/abductor/silencer/afterattack(atom/target, mob/living/user, flag, params) if(flag) return if(!AbductorCheck(user)) return radio_off(target, user) -/obj/item/device/abductor/silencer/proc/radio_off(atom/target, mob/living/user) +/obj/item/abductor/silencer/proc/radio_off(atom/target, mob/living/user) if(!(user in (viewers(7,target)))) return @@ -234,17 +234,17 @@ to_chat(user, "You silence [M]'s radio devices.") radio_off_mob(M) -/obj/item/device/abductor/silencer/proc/radio_off_mob(mob/living/carbon/human/M) +/obj/item/abductor/silencer/proc/radio_off_mob(mob/living/carbon/human/M) var/list/all_items = M.GetAllContents() for(var/obj/I in all_items) - if(istype(I,/obj/item/device/radio/)) - var/obj/item/device/radio/r = I + if(istype(I,/obj/item/radio/)) + var/obj/item/radio/r = I r.listening = 0 - if(!istype(I,/obj/item/device/radio/headset)) + if(!istype(I,/obj/item/radio/headset)) r.broadcasting = 0 //goddamned headset hacks -/obj/item/weapon/gun/energy/alien +/obj/item/gun/energy/alien name = "alien pistol" desc = "A complicated gun that fires bursts of high-intensity radiation." ammo_type = list(/obj/item/ammo_casing/energy/declone) @@ -254,7 +254,7 @@ origin_tech = "combat=4;magnets=7;powerstorage=3;abductor=3" trigger_guard = TRIGGER_GUARD_ALLOW_ALL -/obj/item/weapon/paper/abductor +/obj/item/paper/abductor name = "Dissection Guide" icon_state = "alienpaper_words" info = {"Dissection for Dummies
@@ -278,10 +278,10 @@
Congratulations! You are now trained for invasive xenobiology research!"} -/obj/item/weapon/paper/abductor/update_icon() +/obj/item/paper/abductor/update_icon() return -/obj/item/weapon/paper/abductor/AltClick() +/obj/item/paper/abductor/AltClick() return #define BATON_STUN 0 @@ -290,7 +290,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} #define BATON_PROBE 3 #define BATON_MODES 4 -/obj/item/weapon/abductor_baton +/obj/item/abductor_baton name = "advanced baton" desc = "A quad-mode baton used for incapacitation and restraining of specimens." var/mode = BATON_STUN @@ -303,7 +303,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} w_class = WEIGHT_CLASS_NORMAL actions_types = list(/datum/action/item_action/toggle_mode) -/obj/item/weapon/abductor_baton/proc/toggle(mob/living/user=usr) +/obj/item/abductor_baton/proc/toggle(mob/living/user=usr) mode = (mode+1)%BATON_MODES var/txt switch(mode) @@ -322,7 +322,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} var/datum/action/A = X A.UpdateButtonIcon() -/obj/item/weapon/abductor_baton/update_icon() +/obj/item/abductor_baton/update_icon() switch(mode) if(BATON_STUN) icon_state = "wonderprodStun" @@ -337,7 +337,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} icon_state = "wonderprodProbe" item_state = "wonderprodProbe" -/obj/item/weapon/abductor_baton/attack(mob/target, mob/living/user) +/obj/item/abductor_baton/attack(mob/target, mob/living/user) if(!isabductor(user)) return @@ -368,14 +368,14 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(BATON_PROBE) ProbeAttack(L,user) -/obj/item/weapon/abductor_baton/attack_self(mob/living/user) +/obj/item/abductor_baton/attack_self(mob/living/user) toggle(user) if(ishuman(user)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() H.update_inv_r_hand() -/obj/item/weapon/abductor_baton/proc/StunAttack(mob/living/L,mob/living/user) +/obj/item/abductor_baton/proc/StunAttack(mob/living/L,mob/living/user) user.lastattacked = L L.lastattacker = user @@ -391,22 +391,22 @@ Congratulations! You are now trained for invasive xenobiology research!"} var/mob/living/carbon/human/H = L H.forcesay(hit_appends) - add_logs(user, L, "stunned") + add_attack_logs(user, L, "Stunned with [src]") -/obj/item/weapon/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) +/obj/item/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) if(L.stunned || L.sleeping) L.visible_message("[user] has induced sleep in [L] with [src]!", \ "You suddenly feel very drowsy!") playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) L.Sleeping(60) - add_logs(user, L, "put to sleep") + add_attack_logs(user, L, "Put to sleep with [src]") else L.AdjustDrowsy(1) to_chat(user, "Sleep inducement works fully only on stunned specimens! ") L.visible_message("[user] tried to induce sleep in [L] with [src]!", \ "You suddenly feel drowsy!") -/obj/item/weapon/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user) +/obj/item/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user) if(!iscarbon(L)) return var/mob/living/carbon/C = L @@ -416,14 +416,14 @@ Congratulations! You are now trained for invasive xenobiology research!"} "[user] begins shaping an energy field around your hands!") if(do_mob(user, C, 30)) if(!C.handcuffed) - C.handcuffed = new /obj/item/weapon/restraints/handcuffs/energy/used(C) + C.handcuffed = new /obj/item/restraints/handcuffs/energy/used(C) C.update_handcuffed() to_chat(user, "You handcuff [C].") - add_logs(user, C, "handcuffed") + add_attack_logs(user, C, "Handcuffed ([src])") else to_chat(user, "You fail to handcuff [C].") -/obj/item/weapon/abductor_baton/proc/ProbeAttack(mob/living/L,mob/living/user) +/obj/item/abductor_baton/proc/ProbeAttack(mob/living/L,mob/living/user) L.visible_message("[user] probes [L] with [src]!", \ "[user] probes you!") @@ -444,26 +444,27 @@ Congratulations! You are now trained for invasive xenobiology research!"} to_chat(user,"Probing result: [species]") to_chat(user, "[helptext]") -/obj/item/weapon/restraints/handcuffs/energy +/obj/item/restraints/handcuffs/energy name = "hard-light energy field" desc = "A hard-light field restraining the hands." icon_state = "cuff_white" // Needs sprite breakouttime = 450 - trashtype = /obj/item/weapon/restraints/handcuffs/energy/used + trashtype = /obj/item/restraints/handcuffs/energy/used origin_tech = "materials=4;magnets=5;abductor=2" -/obj/item/weapon/restraints/handcuffs/energy/used +/obj/item/restraints/handcuffs/energy/used desc = "energy discharge" + flags = DROPDEL -/obj/item/weapon/restraints/handcuffs/energy/used/dropped(mob/user) +/obj/item/restraints/handcuffs/energy/used/dropped(mob/user) user.visible_message("[user]'s [src] break in a discharge of energy!", \ "[user]'s [src] break in a discharge of energy!") var/datum/effect_system/spark_spread/S = new S.set_up(4,0,user.loc) S.start() - qdel(src) + . = ..() -/obj/item/weapon/abductor_baton/examine(mob/user) +/obj/item/abductor_baton/examine(mob/user) ..() switch(mode) if(BATON_STUN) @@ -476,42 +477,42 @@ Congratulations! You are now trained for invasive xenobiology research!"} to_chat(user, "The baton is in probing mode.") -/obj/item/weapon/scalpel/alien +/obj/item/scalpel/alien name = "alien scalpel" desc = "It's a gleaming sharp knife made out of silvery-green metal." icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/hemostat/alien +/obj/item/hemostat/alien name = "alien hemostat" desc = "You've never seen this before." icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/retractor/alien +/obj/item/retractor/alien name = "alien retractor" desc = "You're not sure if you want the veil pulled back." icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/circular_saw/alien +/obj/item/circular_saw/alien name = "alien saw" desc = "Do the aliens also lose this, and need to find an alien hatchet?" icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/surgicaldrill/alien +/obj/item/surgicaldrill/alien name = "alien drill" desc = "Maybe alien surgeons have finally found a use for the drill." icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/cautery/alien +/obj/item/cautery/alien name = "alien cautery" desc = "Why would bloodless aliens have a tool to stop bleeding? Unless..." icon = 'icons/obj/abductor.dmi' diff --git a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm index 64b77d3b374..328981b2ab5 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm @@ -15,7 +15,7 @@ return 0 var/mob/living/carbon/human/H = user // You must either: Be of the abductor species, or contain an abductor implant - if((H.get_species() == "Abductor" || (locate(/obj/item/weapon/implant/abductor) in H))) + if((H.get_species() == "Abductor" || (locate(/obj/item/implant/abductor) in H))) return 1 return 0 @@ -85,7 +85,7 @@ return FALSE var/mob/living/carbon/human/H = user // You must either: Be of the abductor species, or contain an abductor implant - if((H.get_species() == "Abductor" || (locate(/obj/item/weapon/implant/abductor) in H))) + if((H.get_species() == "Abductor" || (locate(/obj/item/implant/abductor) in H))) return TRUE return FALSE diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 29ca0a9a707..a5660f86883 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -170,7 +170,7 @@ /obj/item/organ/internal/heart/gland/egg/activate() to_chat(owner, "You lay an egg!") - var/obj/item/weapon/reagent_containers/food/snacks/egg/egg = new(owner.loc) + var/obj/item/reagent_containers/food/snacks/egg/egg = new(owner.loc) egg.reagents.add_reagent("sacid",20) egg.desc += " It smells bad." @@ -224,7 +224,7 @@ domutcheck(clone) for(var/obj/item/I in clone) - if(istype(I, /obj/item/weapon/implant)) + if(istype(I, /obj/item/implant)) continue if(istype(I, /obj/item/organ)) continue diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index 3a93f8abc75..b0b879a30ab 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -20,7 +20,7 @@ icon_state = "console" density = TRUE anchored = TRUE - var/obj/item/device/abductor/gizmo/gizmo + var/obj/item/abductor/gizmo/gizmo var/obj/item/clothing/suit/armor/abductor/vest/vest var/obj/machinery/abductor/experiment/experiment var/obj/machinery/abductor/pad/pad @@ -106,13 +106,13 @@ else if(href_list["dispense"]) switch(href_list["dispense"]) if("baton") - Dispense(/obj/item/weapon/abductor_baton,cost=2) + Dispense(/obj/item/abductor_baton,cost=2) if("helmet") Dispense(/obj/item/clothing/head/helmet/abductor) if("silencer") - Dispense(/obj/item/device/abductor/silencer) + Dispense(/obj/item/abductor/silencer) if("tool") - Dispense(/obj/item/device/abductor/gizmo) + Dispense(/obj/item/abductor/gizmo) if("vest") Dispense(/obj/item/clothing/suit/armor/abductor/vest) updateUsrDialog() @@ -176,8 +176,8 @@ disguises[entry.name] = entry /obj/machinery/abductor/console/attackby(obj/O, mob/user, params) - if(istype(O, /obj/item/device/abductor/gizmo)) - var/obj/item/device/abductor/gizmo/G = O + if(istype(O, /obj/item/abductor/gizmo)) + var/obj/item/abductor/gizmo/G = O to_chat(user, "You link the tool to the console.") gizmo = G G.console = src diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 2b6103632f5..9e07c9c04a9 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -59,7 +59,7 @@ popup.open() return -/obj/machinery/abductor/gland_dispenser/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/abductor/gland_dispenser/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/organ/internal/heart/gland)) if(!user.drop_item()) return diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 44b2a431c7b..588900bb3e8 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -180,9 +180,9 @@ H.uncuff() return -/obj/machinery/abductor/experiment/attackby(obj/item/weapon/G, mob/user) - if(istype(G, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/grabbed = G +/obj/machinery/abductor/experiment/attackby(obj/item/G, mob/user) + if(istype(G, /obj/item/grab)) + var/obj/item/grab/grabbed = G if(!ishuman(grabbed.affecting)) return if(isabductor(grabbed.affecting)) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index ba7f91e2c37..e9a830e7ed6 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -15,7 +15,7 @@ message = trim(sanitize(copytext(message, 1, MAX_MESSAGE_LEN))) if(!message) return - log_say("[key_name(src)] : [message]") + log_say(message, src) if(stat == DEAD) return say_dead(message) var/mob/living/simple_animal/borer/B = loc @@ -134,7 +134,7 @@ if(stat != CONSCIOUS) return var/be_borer = alert("Become a cortical borer? (Warning, You can no longer be cloned!)",,"Yes","No") - if(be_borer == "No" || !src || qdeleted(src)) + if(be_borer == "No" || !src || QDELETED(src)) return if(key) return @@ -175,11 +175,11 @@ if(!input) return - if(src && !qdeleted(src) && !qdeleted(host)) + if(src && !QDELETED(src) && !QDELETED(host)) var/say_string = (docile) ? "slurs" :"states" if(host) to_chat(host, "[truename] [say_string]: [input]") - log_say("Borer Communication: [key_name(src)] -> [key_name(host)] : [input]") + log_say("(BORER to [key_name(host)]) [input]", src) for(var/M in dead_mob_list) if(isobserver(M)) to_chat(M, "Borer Communication from [truename] ([ghost_follow_link(src, ghost=M)]): [input]") @@ -214,7 +214,7 @@ return to_chat(B, "[src] says: [input]") - log_say("Borer Communication: [key_name(src)] -> [key_name(B)] : [input]") + log_say("(BORER to [key_name(B)]) [input]", src) for(var/M in dead_mob_list) if(isobserver(M)) @@ -236,7 +236,7 @@ return to_chat(CB, "[B.truename] says: [input]") - log_say("Borer Communication: [key_name(B)] -> [key_name(CB)] : [input]") + log_say("(BORER to [key_name(CB)]) [input]", B) for(var/M in dead_mob_list) if(isobserver(M)) @@ -436,7 +436,7 @@ to_chat(src, "You squirt a measure of [R.name] from your reservoirs into [host]'s bloodstream.") host.reagents.add_reagent(C.chemname, C.quantity) chemicals -= C.chemuse - log_game("[src]/([src.ckey]) has injected [R.name] into their host [host]/([host.ckey])") + log_game("[key_name(src)] has injected [R.name] into their host [host]/([host.ckey])") // This is used because we use a static set of datums to determine what chems are available, // instead of a table or something. Thus, when we instance it, we can safely delete it @@ -538,7 +538,7 @@ /mob/living/simple_animal/borer/proc/let_go() - if(!host || !src || qdeleted(host) || qdeleted(src)) + if(!host || !src || QDELETED(host) || QDELETED(src)) return if(!leaving) return @@ -605,7 +605,7 @@ to_chat(src, "You begin delicately adjusting your connection to the host brain...") - if(qdeleted(src) || qdeleted(host)) + if(QDELETED(src) || QDELETED(host)) return bonding = TRUE @@ -625,8 +625,7 @@ to_chat(src, "You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.") to_chat(host, "You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.") var/borer_key = src.key - host.create_attack_log("[key_name(src)] has assumed control of [key_name(host)]") - msg_admin_attack("[key_name_admin(src)] has assumed control of [key_name_admin(host)]") + add_attack_logs(src, host, "Assumed control of (borer)") // host -> brain var/h2b_id = host.computer_id var/h2b_ip= host.lastKnownIP @@ -763,8 +762,7 @@ host.med_hud_set_status() if(host_brain) - host.create_attack_log("[host_brain.name] ([host_brain.ckey]) has taken control back from [name] ([host.ckey])") - msg_admin_attack("[host_brain.name] ([host_brain.ckey]) has taken control back from [name] ([host.ckey]) (JMP)") + add_attack_logs(host, src, "Took control back (borer)") // host -> self var/h2s_id = host.computer_id var/h2s_ip= host.lastKnownIP @@ -805,7 +803,7 @@ if(!candidate || !candidate.mob) return - if(!qdeleted(candidate) || !qdeleted(candidate.mob)) + if(!QDELETED(candidate) || !QDELETED(candidate.mob)) var/datum/mind/M = create_borer_mind(candidate.ckey) M.transfer_to(src) candidate.mob = src diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index be18793554f..03b7d2e1b56 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -1,5 +1,5 @@ ////Deactivated swarmer shell//// -/obj/item/device/unactivated_swarmer +/obj/item/unactivated_swarmer name = "unactivated swarmer" desc = "A currently unactivated swarmer. Swarmers can self activate at any time, it would be wise to immediately dispose of this." icon = 'icons/mob/swarmer.dmi' @@ -7,12 +7,12 @@ origin_tech = "bluespace=4;materials=4;programming=7" materials = list(MAT_METAL=100, MAT_GLASS=400) -/obj/item/device/unactivated_swarmer/New() +/obj/item/unactivated_swarmer/New() if(!crit_fail) notify_ghosts("An unactivated swarmer has been created in [get_area(src)]!", enter_link = "(Click to enter)", source = src, action = NOTIFY_ATTACK) ..() -/obj/item/device/unactivated_swarmer/Topic(href, href_list) +/obj/item/unactivated_swarmer/Topic(href, href_list) if(..()) return 1 if(href_list["ghostjoin"]) @@ -20,9 +20,9 @@ if(istype(ghost)) attack_ghost(ghost) -/obj/item/device/unactivated_swarmer/attackby(obj/item/weapon/W, mob/user, params) +/obj/item/unactivated_swarmer/attackby(obj/item/W, mob/user, params) ..() - if(istype(W, /obj/item/weapon/screwdriver) && !crit_fail) + if(istype(W, /obj/item/screwdriver) && !crit_fail) user.visible_message("[usr.name] deactivates [src].", "After some fiddling, you find a way to disable [src]'s power source.", "You hear clicking.") @@ -30,7 +30,7 @@ desc = "A shell of swarmer that was completely powered down. It can no longer activate itself." crit_fail = 1 -/obj/item/device/unactivated_swarmer/attack_ghost(mob/user as mob) +/obj/item/unactivated_swarmer/attack_ghost(mob/user as mob) if(crit_fail) to_chat(user, "This swarmer shell is completely depowered. You cannot activate it.") @@ -47,21 +47,21 @@ if(crit_fail)//in case it depowers while ghost is looking at yes/no to_chat(user, "This swarmer shell is completely depowered. You cannot activate it.") return - if(qdeleted(src)) + if(QDELETED(src)) to_chat(user, "Swarmer has been occupied by someone else.") return var/mob/living/simple_animal/hostile/swarmer/S = new /mob/living/simple_animal/hostile/swarmer(get_turf(loc)) S.key = user.key qdel(src) -/obj/item/device/unactivated_swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) +/obj/item/unactivated_swarmer/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) if(S.resources + 50 > S.max_resources) to_chat(S, "We have too many resources to reconsume this shell. Aborting.") else ..() S.resources += 49 //refund the whole thing -/obj/item/device/unactivated_swarmer/deactivated +/obj/item/unactivated_swarmer/deactivated name = "deactivated swarmer" desc = "A shell of swarmer that was completely powered down. It no longer can activate itself." crit_fail = 1 @@ -110,7 +110,7 @@ AIStatus = AI_OFF var/resources = 0 //Resource points, generated by consuming metal/glass var/max_resources = 100 - loot = list(/obj/effect/decal/cleanable/blood/gibs/robot, /obj/item/weapon/ore/bluespace_crystal/artificial) + loot = list(/obj/effect/decal/cleanable/blood/gibs/robot, /obj/item/ore/bluespace_crystal/artificial) deathmessage = "The swarmer explodes with a sharp pop!" del_on_death = 1 hud_possible = list(SPECIALROLE_HUD, DIAG_STAT_HUD, DIAG_HUD) @@ -192,7 +192,7 @@ /obj/item/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.Integrate(src) -/obj/item/weapon/gun/swarmer_act()//Stops you from eating the entire armory +/obj/item/gun/swarmer_act()//Stops you from eating the entire armory return /turf/simulated/floor/swarmer_act()//ex_act() on turf calls it on its contents, this is to prevent attacking mobs by DisIntegrate()'ing the floor @@ -297,7 +297,7 @@ /obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource to_chat(S, "This object does not contain enough materials to work with.") -/obj/item/weapon/circuitboard/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) +/obj/item/circuitboard/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This object does not contain enough materials to work with.") /obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) @@ -373,7 +373,7 @@ var/pressure = A.return_pressure() if((pressure > 20) && (pressure < 550))//Account for crushing pressure or vaccuums if(ishuman(target))//If we're getting rid of a human, slap some zipties on them to keep them away from us a little longer - var/obj/item/weapon/restraints/handcuffs/energy/used/Z = new /obj/item/weapon/restraints/handcuffs/energy/used(src) + var/obj/item/restraints/handcuffs/energy/used/Z = new /obj/item/restraints/handcuffs/energy/used(src) Z.apply_cuffs(target, src) do_teleport(target, F, 0) playsound(src,'sound/effects/sparks4.ogg',50,1) @@ -460,8 +460,8 @@ take_damage(Proj.damage) ..() -/obj/structure/swarmer/attackby(obj/item/weapon/I, mob/living/user, params) - if(istype(I, /obj/item/weapon)) +/obj/structure/swarmer/attackby(obj/item/I, mob/living/user, params) + if(istype(I, /obj/item)) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) take_damage(I.force) @@ -556,7 +556,7 @@ to_chat(src, "This is not a suitable location for replicating ourselves. We need more room.") return if(do_mob(src, src, 100)) - if(Fabricate(/obj/item/device/unactivated_swarmer, 50)) + if(Fabricate(/obj/item/unactivated_swarmer, 50)) playsound(loc,'sound/items/poster_being_created.ogg',50, 1, -1) /mob/living/simple_animal/hostile/swarmer/proc/RepairSelf() diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm index ba461fafb80..7a16ef17857 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm @@ -15,7 +15,7 @@ return 0 if(!the_gateway) return 0 - new /obj/item/device/unactivated_swarmer(get_turf(the_gateway)) + new /obj/item/unactivated_swarmer(get_turf(the_gateway)) /datum/event/spawn_swarmer/proc/find_swarmer() diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index b7aef130bc0..822bfc9ce29 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -26,7 +26,7 @@ melee_damage_lower = 15 melee_damage_upper = 15 AIStatus = AI_OFF - butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/ectoplasm = 1) + butcher_results = list(/obj/item/reagent_containers/food/snacks/ectoplasm = 1) var/summoned = FALSE var/cooldown = 0 var/damage_transfer = 1 //how much damage from each attack we transfer to the owner @@ -165,7 +165,7 @@ for(var/mob/M in mob_list) if(M == summoner) to_chat(M, "[src]: [input]") - log_say("Guardian Communication: [key_name(src)] -> [key_name(M)] : [input]") + log_say("(GUARDIAN to [key_name(M)]) [input]", src) else if(M in dead_mob_list) to_chat(M, "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") to_chat(src, "[src]: [input]") @@ -186,7 +186,7 @@ var/mob/living/simple_animal/hostile/guardian/G = M if(G.summoner == src) to_chat(G, "[src]: [input]") - log_say("Guardian Communication: [key_name(src)] -> [key_name(G)] : [input]") + log_say("(GUARDIAN to [key_name(G)]) [input]", src) else if(M in dead_mob_list) to_chat(M, "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") @@ -234,7 +234,7 @@ ////////Creation -/obj/item/weapon/guardiancreator +/obj/item/guardiancreator name = "deck of tarot cards" desc = "An enchanted deck of tarot cards, rumored to be a source of unimaginable power. " icon = 'icons/obj/toy.dmi' @@ -249,7 +249,7 @@ var/list/possible_guardians = list("Chaos", "Standard", "Ranged", "Support", "Explosive", "Assassin", "Lightning", "Charger", "Protector") var/random = TRUE -/obj/item/weapon/guardiancreator/attack_self(mob/living/user) +/obj/item/guardiancreator/attack_self(mob/living/user) for(var/mob/living/simple_animal/hostile/guardian/G in living_mob_list) if(G.summoner == user) to_chat(user, "You already have a [mob_name]!") @@ -273,7 +273,7 @@ used = FALSE -/obj/item/weapon/guardiancreator/proc/spawn_guardian(var/mob/living/user, var/key) +/obj/item/guardiancreator/proc/spawn_guardian(var/mob/living/user, var/key) var/gaurdiantype = "Standard" if(random) gaurdiantype = pick(possible_guardians) @@ -400,10 +400,10 @@ G.attacktext = "swarms" G.speak_emote = list("chitters") -/obj/item/weapon/guardiancreator/choose +/obj/item/guardiancreator/choose random = FALSE -/obj/item/weapon/guardiancreator/tech +/obj/item/guardiancreator/tech name = "holoparasite injector" desc = "It contains alien nanoswarm of unknown origin. Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, it requires an organic host as a home base and source of fuel." icon = 'icons/obj/hypo.dmi' @@ -415,10 +415,10 @@ failure_message = "...ERROR. BOOT SEQUENCE ABORTED. AI FAILED TO INTIALIZE. PLEASE CONTACT SUPPORT OR TRY AGAIN LATER." ling_failure = "The holoparasites recoil in horror. They want nothing to do with a creature like you." -/obj/item/weapon/guardiancreator/tech/choose +/obj/item/guardiancreator/tech/choose random = FALSE -/obj/item/weapon/guardiancreator/biological +/obj/item/guardiancreator/biological name = "scarab egg cluster" desc = "A parasitic species that will nest in the closest living creature upon birth. While not great for your health, they'll defend their new 'hive' to the death." icon = 'icons/obj/fish_items.dmi' @@ -429,11 +429,11 @@ used_message = "The cluster already hatched." failure_message = "...but soon settles again. Guess they weren't ready to hatch after all." -/obj/item/weapon/guardiancreator/biological/choose +/obj/item/guardiancreator/biological/choose random = FALSE -/obj/item/weapon/paper/guardian +/obj/item/paper/guardian name = "Holoparasite Guide" icon_state = "paper" info = {"A list of Holoparasite Types
@@ -450,15 +450,15 @@ Explosive: High damage resist and medium power attack. Can turn any object into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered.
"} -/obj/item/weapon/paper/guardian/update_icon() +/obj/item/paper/guardian/update_icon() return -/obj/item/weapon/storage/box/syndie_kit/guardian +/obj/item/storage/box/syndie_kit/guardian name = "holoparasite injector kit" -/obj/item/weapon/storage/box/syndie_kit/guardian/New() +/obj/item/storage/box/syndie_kit/guardian/New() ..() - new /obj/item/weapon/guardiancreator/tech/choose(src) - new /obj/item/weapon/paper/guardian(src) + new /obj/item/guardiancreator/tech/choose(src) + new /obj/item/paper/guardian(src) return diff --git a/code/game/gamemodes/miniantags/guardian/types/bomb.dm b/code/game/gamemodes/miniantags/guardian/types/bomb.dm index 6a4c74ff1a3..0503806b196 100644 --- a/code/game/gamemodes/miniantags/guardian/types/bomb.dm +++ b/code/game/gamemodes/miniantags/guardian/types/bomb.dm @@ -17,7 +17,7 @@ return if(istype(A, /obj/)) if(bomb_cooldown <= world.time && !stat) - var/obj/item/weapon/guardian_bomb/B = new /obj/item/weapon/guardian_bomb(get_turf(A)) + var/obj/item/guardian_bomb/B = new /obj/item/guardian_bomb(get_turf(A)) to_chat(src, "Success! Bomb on [A] armed!") if(summoner) to_chat(summoner, "Your guardian has primed [A] to explode!") @@ -27,14 +27,14 @@ else to_chat(src, "Your powers are on cooldown! You must wait 20 seconds between bombs.") -/obj/item/weapon/guardian_bomb +/obj/item/guardian_bomb name = "bomb" desc = "You shouldn't be seeing this!" var/obj/stored_obj var/mob/living/spawner -/obj/item/weapon/guardian_bomb/proc/disguise(var/obj/A) +/obj/item/guardian_bomb/proc/disguise(var/obj/A) A.forceMove(src) stored_obj = A anchored = A.anchored @@ -47,7 +47,7 @@ to_chat(spawner, "Failure! Your trap on [stored_obj] didn't catch anyone this time.") qdel(src) -/obj/item/weapon/guardian_bomb/proc/detonate(var/mob/living/user) +/obj/item/guardian_bomb/proc/detonate(var/mob/living/user) to_chat(user, "The [src] was boobytrapped!") if(istype(spawner, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = spawner @@ -62,15 +62,15 @@ user.ex_act(2) qdel(src) -/obj/item/weapon/guardian_bomb/attackby(mob/living/user) +/obj/item/guardian_bomb/attackby(mob/living/user) detonate(user) return -/obj/item/weapon/guardian_bomb/pickup(mob/living/user) +/obj/item/guardian_bomb/pickup(mob/living/user) detonate(user) return -/obj/item/weapon/guardian_bomb/examine(mob/user) +/obj/item/guardian_bomb/examine(mob/user) stored_obj.examine(user) if(get_dist(user,src) <= 2) to_chat(user, "Looks odd!") diff --git a/code/game/gamemodes/miniantags/guardian/types/lightning.dm b/code/game/gamemodes/miniantags/guardian/types/lightning.dm index ea11fc5cfdd..3aaeebbc513 100644 --- a/code/game/gamemodes/miniantags/guardian/types/lightning.dm +++ b/code/game/gamemodes/miniantags/guardian/types/lightning.dm @@ -53,12 +53,12 @@ removechains() /mob/living/simple_animal/hostile/guardian/beam/proc/cleardeletedchains() - if(summonerchain && qdeleted(summonerchain)) + if(summonerchain && QDELETED(summonerchain)) summonerchain = null if(enemychains.len) for(var/chain in enemychains) var/datum/cd = chain - if(!chain || qdeleted(cd)) + if(!chain || QDELETED(cd)) enemychains -= chain /mob/living/simple_animal/hostile/guardian/beam/proc/shockallchains() diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index def7f1fdd76..693dbffbabb 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -32,7 +32,7 @@ wander = 0 attacktext = "glomps" attack_sound = 'sound/effects/blobattack.ogg' - butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 2) + butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2) var/morphed = 0 var/atom/movable/form = null diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index caec78f3594..49380c57863 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -96,7 +96,7 @@ /mob/living/simple_animal/revenant/say(message) if(!message) return - log_say("[key_name(src)] : [message]") + log_say(message, src) var/rendered = "[src] says, \"[message]\"" for(var/mob/M in mob_list) if(istype(M, /mob/living/simple_animal/revenant)) @@ -184,7 +184,7 @@ sleep(0.1) alpha = i visible_message("[src]'s body breaks apart into a fine pile of blue dust.") - var/obj/item/weapon/ectoplasm/revenant/R = new (get_turf(src)) + var/obj/item/ectoplasm/revenant/R = new (get_turf(src)) var/reforming_essence = essence_regen_cap //retain the gained essence capacity R.essence = max(reforming_essence - 15 * perfectsouls, 75) //minus any perfect souls R.client_to_revive = src.client //If the essence reforms, the old revenant is put back in the body @@ -193,7 +193,7 @@ return /mob/living/simple_animal/revenant/attackby(obj/item/W, mob/living/user, params) - if(istype(W, /obj/item/weapon/nullrod)) + if(istype(W, /obj/item/nullrod)) visible_message("[src] violently flinches!", \ "As \the [W] passes through you, you feel your essence draining away!") adjustBruteLoss(25) //hella effective @@ -315,7 +315,7 @@ return 1 -/obj/item/weapon/ectoplasm/revenant +/obj/item/ectoplasm/revenant name = "glimmering residue" desc = "A pile of fine blue dust. Small tendrils of violet mist swirl around it." icon = 'icons/effects/effects.dmi' @@ -326,7 +326,7 @@ var/inert = 0 var/client/client_to_revive -/obj/item/weapon/ectoplasm/revenant/New() +/obj/item/ectoplasm/revenant/New() ..() reforming = 0 spawn(600) //1 minutes @@ -336,7 +336,7 @@ inert = 1 visible_message("[src] settles down and seems lifeless.") -/obj/item/weapon/ectoplasm/revenant/attack_self(mob/user) +/obj/item/ectoplasm/revenant/attack_self(mob/user) if(!reforming || inert) return ..() user.visible_message("[user] scatters [src] in all directions.", \ @@ -344,21 +344,21 @@ user.drop_item() qdel(src) -/obj/item/weapon/ectoplasm/revenant/throw_impact(atom/hit_atom) +/obj/item/ectoplasm/revenant/throw_impact(atom/hit_atom) ..() if(inert) return visible_message("[src] breaks into particles upon impact, which fade away to nothingness.") qdel(src) -/obj/item/weapon/ectoplasm/revenant/examine(mob/user) +/obj/item/ectoplasm/revenant/examine(mob/user) ..(user) if(inert) to_chat(user, "It seems inert.") else if(reforming) to_chat(user, "It is shifting and distorted. It would be wise to destroy this.") -/obj/item/weapon/ectoplasm/revenant/proc/reform() +/obj/item/ectoplasm/revenant/proc/reform() if(inert || !src) return var/key_of_revenant diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index f982d335fde..32d51b579c4 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -132,7 +132,7 @@ if(!msg) charge_counter = charge_max return - log_say("RevenantTransmit: [key_name(user)]->[key_name(M)] : [msg]") + log_say("(REVENANT to [key_name(M)]) [msg]", user) to_chat(user, "You transmit to [M]: [msg]") to_chat(M, "An alien voice resonates from all around... [msg]") diff --git a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm index a6b083d5b72..51f3d277598 100644 --- a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm +++ b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm @@ -9,8 +9,8 @@ if(C.l_hand || C.r_hand) to_chat(C, "You may not hold items while blood crawling!") return 0 - var/obj/item/weapon/bloodcrawl/B1 = new(C) - var/obj/item/weapon/bloodcrawl/B2 = new(C) + var/obj/item/bloodcrawl/B1 = new(C) + var/obj/item/bloodcrawl/B2 = new(C) B1.icon_state = "bloodhand_left" B2.icon_state = "bloodhand_right" C.put_in_hands(B1) @@ -96,7 +96,7 @@ notransform = 0 return 1 -/obj/item/weapon/bloodcrawl +/obj/item/bloodcrawl name = "blood crawl" desc = "You are unable to hold anything while in this form." icon = 'icons/effects/blood.dmi' @@ -136,7 +136,7 @@ if(iscarbon(src)) var/mob/living/carbon/C = src - for(var/obj/item/weapon/bloodcrawl/BC in C) + for(var/obj/item/bloodcrawl/BC in C) C.flags = null C.unEquip(BC) qdel(BC) diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 3c0523daa3c..42827d27f59 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -217,7 +217,7 @@ var/msg = stripped_input(usr, "What do you wish to tell [choice]?", null, "") if(!(msg)) return - log_say("Slaughter Demon Transmit: [key_name(usr)]->[key_name(choice)]: [msg]") + log_say("(SLAUGHTER to [key_name(choice)]) [msg]", usr) to_chat(usr, "You whisper to [choice]: [msg]") to_chat(choice, "Suddenly a strange, demonic voice resonates in your head... [msg]") for(var/mob/dead/observer/G in player_list) diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm index 43db22601af..5d625d5fdda 100644 --- a/code/game/gamemodes/nations/nations.dm +++ b/code/game/gamemodes/nations/nations.dm @@ -134,7 +134,7 @@ datum/game_mode/nations AI.add_inherent_law("Remain available to mediate all conflicts between the various nations when asked to.") AI.show_laws() for(var/mob/living/silicon/robot/R in AI.connected_robots) - var/obj/item/device/mmi/oldmmi = R.mmi + var/obj/item/mmi/oldmmi = R.mmi R.change_mob_type(/mob/living/silicon/robot/nations, null, null, 1, 1 ) R.lawsync() R.show_laws() diff --git a/code/game/gamemodes/nations/nationsprocs.dm b/code/game/gamemodes/nations/nationsprocs.dm index 85eb6643e37..55487a27da9 100644 --- a/code/game/gamemodes/nations/nationsprocs.dm +++ b/code/game/gamemodes/nations/nationsprocs.dm @@ -106,7 +106,7 @@ /datum/nations/proc/update_nation_id() for(var/mob/living/carbon/human/M in membership) - for(var/obj/item/weapon/card/id/I in M.contents) + for(var/obj/item/card/id/I in M.contents) if(I.registered_name == M.real_name) if(M == current_leader) I.name = "[I.registered_name]'s ID Card ([current_name] [leader_rank])" diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index b68736f90b8..b2f06a7913a 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -121,9 +121,9 @@ proc/issyndicate(mob/living/M as mob) else synd_mind.current.real_name = "[syndicate_name()] Operative #[agent_number]" - var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/weapon/card/id) + var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/card/id) if(foundIDs.len) - for(var/obj/item/weapon/card/id/ID in foundIDs) + for(var/obj/item/card/id/ID in foundIDs) ID.name = "[syndicate_name()] Operative ID card" ID.registered_name = synd_mind.current.real_name @@ -176,13 +176,13 @@ proc/issyndicate(mob/living/M as mob) to_chat(synd_mind.current, "If you feel you are not up to this task, give your ID to another operative.") to_chat(synd_mind.current, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.") - var/obj/item/device/nuclear_challenge/challenge = new /obj/item/device/nuclear_challenge + var/obj/item/nuclear_challenge/challenge = new /obj/item/nuclear_challenge synd_mind.current.equip_to_slot_or_del(challenge, slot_r_hand) - var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/weapon/card/id) + var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/card/id) if(foundIDs.len) - for(var/obj/item/weapon/card/id/ID in foundIDs) + for(var/obj/item/card/id/ID in foundIDs) ID.name = "[syndicate_name()] [leader_title] ID card" ID.registered_name = synd_mind.current.real_name ID.access += access_syndicate_leader @@ -192,10 +192,10 @@ proc/issyndicate(mob/living/M as mob) if(nuke_code) synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) to_chat(synd_mind.current, "The nuclear authorization code is: [nuke_code]") - var/obj/item/weapon/paper/P = new + var/obj/item/paper/P = new P.info = "The nuclear authorization code is: [nuke_code]" P.name = "nuclear bomb code" - var/obj/item/weapon/stamp/syndicate/stamp = new + var/obj/item/stamp/syndicate/stamp = new P.stamp(stamp) qdel(stamp) @@ -235,20 +235,20 @@ proc/issyndicate(mob/living/M as mob) /datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob) var/radio_freq = SYND_FREQ - var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate/alt(synd_mob) + var/obj/item/radio/R = new /obj/item/radio/headset/syndicate/alt(synd_mob) R.set_frequency(radio_freq) synd_mob.equip_to_slot_or_del(R, slot_l_ear) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(synd_mob), slot_w_uniform) synd_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(synd_mob), slot_shoes) synd_mob.equip_or_collect(new /obj/item/clothing/gloves/combat(synd_mob), slot_gloves) - synd_mob.equip_to_slot_or_del(new /obj/item/weapon/card/id/syndicate(synd_mob), slot_wear_id) - synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(synd_mob), slot_back) - synd_mob.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/pill/initropidril(synd_mob), slot_in_backpack) - synd_mob.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol(synd_mob), slot_belt) - synd_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(synd_mob.back), slot_in_backpack) + synd_mob.equip_to_slot_or_del(new /obj/item/card/id/syndicate(synd_mob), slot_wear_id) + synd_mob.equip_to_slot_or_del(new /obj/item/storage/backpack(synd_mob), slot_back) + synd_mob.equip_to_slot_or_del(new /obj/item/reagent_containers/food/pill/initropidril(synd_mob), slot_in_backpack) + synd_mob.equip_to_slot_or_del(new /obj/item/gun/projectile/automatic/pistol(synd_mob), slot_belt) + synd_mob.equip_to_slot_or_del(new /obj/item/storage/box/engineer(synd_mob.back), slot_in_backpack) - var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(synd_mob) + var/obj/item/radio/uplink/U = new /obj/item/radio/uplink(synd_mob) U.hidden_uplink.uplink_owner="[synd_mob.key]" U.hidden_uplink.uses = 20 synd_mob.equip_to_slot_or_del(U, slot_in_backpack) @@ -267,11 +267,11 @@ proc/issyndicate(mob/living/M as mob) switch(race) if("Vox" || "Vox Armalis") synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask) - synd_mob.equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(synd_mob), slot_l_hand) + synd_mob.equip_to_slot_or_del(new /obj/item/tank/nitrogen(synd_mob), slot_l_hand) synd_mob.internal = synd_mob.l_hand synd_mob.update_action_buttons_icon() - var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(synd_mob) + var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(synd_mob) E.implant(synd_mob) synd_mob.faction |= "syndicate" synd_mob.update_icons() @@ -295,7 +295,7 @@ proc/issyndicate(mob/living/M as mob) /datum/game_mode/nuclear/declare_completion() var/disk_rescued = 1 - for(var/obj/item/weapon/disk/nuclear/D in poi_list) + for(var/obj/item/disk/nuclear/D in poi_list) if(!D.onCentcom()) disk_rescued = 0 break @@ -377,7 +377,7 @@ proc/issyndicate(mob/living/M as mob) else text += "body destroyed" text += ")" - for(var/obj/item/device/uplink/H in world_uplinks) + for(var/obj/item/uplink/H in world_uplinks) if(H && H.uplink_owner && H.uplink_owner==syndicate.key) TC_uses += H.used_TC purchases += H.purchase_log @@ -480,7 +480,7 @@ proc/issyndicate(mob/living/M as mob) if(!C.client) continue crewcount++ - var/obj/item/weapon/disk/nuclear/N = locate() in world + var/obj/item/disk/nuclear/N = locate() in world if(istype(N)) var/atom/disk_loc = N.loc while(!isturf(disk_loc)) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 5d3c958de34..6bb181b4136 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -5,8 +5,9 @@ #define CHALLENGE_MIN_PLAYERS 50 #define CHALLENGE_SHUTTLE_DELAY 15000 //25 minutes, so the ops have at least 5 minutes before the shuttle is callable. -/obj/item/device/nuclear_challenge +/obj/item/nuclear_challenge name = "Declaration of War (Challenge Mode)" + icon = 'icons/obj/device.dmi' icon_state = "gangtool-red" item_state = "walkietalkie" desc = "Use to send a declaration of hostilities to the target, delaying your shuttle departure for 20 minutes while they prepare for your assault. \ @@ -14,7 +15,7 @@ Must be used within five minutes, or your benefactors will lose interest." var/declaring_war = FALSE -/obj/item/device/nuclear_challenge/attack_self(mob/living/user) +/obj/item/nuclear_challenge/attack_self(mob/living/user) if(!check_allowed(user)) return @@ -54,13 +55,13 @@ for(var/obj/machinery/computer/shuttle/syndicate/S in machines) S.challenge = TRUE - var/obj/item/device/radio/uplink/U = new /obj/item/device/radio/uplink(get_turf(user)) + var/obj/item/radio/uplink/U = new /obj/item/radio/uplink(get_turf(user)) U.hidden_uplink.uplink_owner= "[user.key]" U.hidden_uplink.uses = CHALLENGE_TELECRYSTALS + round((((player_list.len - CHALLENGE_MIN_PLAYERS)/CHALLENGE_SCALE_PLAYER) * CHALLENGE_SCALE_BONUS)) // No. of player - Min. Player to dec, divided by player per bonus, then multipled by TC per bonus. Rounded. config.shuttle_refuel_delay = CHALLENGE_SHUTTLE_DELAY qdel(src) -/obj/item/device/nuclear_challenge/proc/check_allowed(mob/living/user) +/obj/item/nuclear_challenge/proc/check_allowed(mob/living/user) if(declaring_war) to_chat(user, "You are already in the process of declaring war! Make your mind up.") return FALSE diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index e3e30f51a36..6b78a31dac0 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -15,7 +15,7 @@ var/bomb_set var/code = "" var/yes_code = 0 var/safety = 1 - var/obj/item/weapon/disk/nuclear/auth = null + var/obj/item/disk/nuclear/auth = null var/removal_stage = 0 // 0 is no removal, 1 is covers removed, 2 is covers open, 3 is sealant open, 4 is unwrenched, 5 is removed from bolts. var/lastentered var/is_syndicate = 0 @@ -49,8 +49,8 @@ var/bomb_set SSnanoui.update_uis(src) return -/obj/machinery/nuclearbomb/attackby(obj/item/weapon/O as obj, mob/user as mob, params) - if(istype(O, /obj/item/weapon/screwdriver)) +/obj/machinery/nuclearbomb/attackby(obj/item/O as obj, mob/user as mob, params) + if(istype(O, /obj/item/screwdriver)) add_fingerprint(user) if(auth) if(panel_open == 0) @@ -74,11 +74,11 @@ var/bomb_set flick("nuclearbombc", src) return - if(panel_open && (istype(O, /obj/item/device/multitool) || istype(O, /obj/item/weapon/wirecutters))) + if(panel_open && (istype(O, /obj/item/multitool) || istype(O, /obj/item/wirecutters))) return attack_hand(user) if(extended) - if(istype(O, /obj/item/weapon/disk/nuclear)) + if(istype(O, /obj/item/disk/nuclear)) usr.drop_item() O.loc = src auth = O @@ -88,8 +88,8 @@ var/bomb_set if(anchored) switch(removal_stage) if(0) - if(istype(O,/obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = O + if(istype(O,/obj/item/weldingtool)) + var/obj/item/weldingtool/WT = O if(!WT.isOn()) return if(WT.get_fuel() < 5) // uses up 5 fuel. to_chat(user, "You need more fuel to complete this task.") @@ -104,7 +104,7 @@ var/bomb_set return if(1) - if(istype(O,/obj/item/weapon/crowbar)) + if(istype(O,/obj/item/crowbar)) user.visible_message("[user] starts forcing open the bolt covers on [src].", "You start forcing open the anchoring bolt covers with [O]...") if(do_after(user,15, target = src)) @@ -114,9 +114,9 @@ var/bomb_set return if(2) - if(istype(O,/obj/item/weapon/weldingtool)) + if(istype(O,/obj/item/weldingtool)) - var/obj/item/weapon/weldingtool/WT = O + var/obj/item/weldingtool/WT = O if(!WT.isOn()) return if(WT.get_fuel() < 5) // uses up 5 fuel. to_chat(user, "You need more fuel to complete this task.") @@ -131,7 +131,7 @@ var/bomb_set return if(3) - if(istype(O,/obj/item/weapon/wrench)) + if(istype(O,/obj/item/wrench)) user.visible_message("[user] begins unwrenching the anchoring bolts on [src].", "You begin unwrenching the anchoring bolts...") @@ -142,7 +142,7 @@ var/bomb_set return if(4) - if(istype(O,/obj/item/weapon/crowbar)) + if(istype(O,/obj/item/crowbar)) user.visible_message("[user] begins lifting [src] off of the anchors.", "You begin lifting the device off the anchors...") @@ -247,7 +247,7 @@ var/bomb_set auth = null else var/obj/item/I = usr.get_active_hand() - if(istype(I, /obj/item/weapon/disk/nuclear)) + if(istype(I, /obj/item/disk/nuclear)) usr.drop_item() I.loc = src auth = I @@ -396,18 +396,18 @@ var/bomb_set //==========DAT FUKKEN DISK=============== -/obj/item/weapon/disk/nuclear +/obj/item/disk/nuclear name = "nuclear authentication disk" desc = "Better keep this safe." icon_state = "nucleardisk" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 30, bio = 0, rad = 0) -/obj/item/weapon/disk/nuclear/New() +/obj/item/disk/nuclear/New() ..() processing_objects.Add(src) poi_list |= src -/obj/item/weapon/disk/nuclear/process() +/obj/item/disk/nuclear/process() var/turf/disk_loc = get_turf(src) if(!is_secure_level(disk_loc.z)) var/holder = get(src, /mob) @@ -415,7 +415,7 @@ var/bomb_set to_chat(holder, "You can't help but feel that you just lost something back there...") qdel(src) -/obj/item/weapon/disk/nuclear/Destroy(force) +/obj/item/disk/nuclear/Destroy(force) var/turf/diskturf = get_turf(src) if(force) @@ -427,7 +427,7 @@ var/bomb_set if(blobstart.len > 0) poi_list.Remove(src) - var/obj/item/weapon/disk/nuclear/NEWDISK = new(pick(blobstart)) + var/obj/item/disk/nuclear/NEWDISK = new(pick(blobstart)) transfer_fingerprints_to(NEWDISK) message_admins("[src] has been destroyed at ([diskturf.x], [diskturf.y], [diskturf.z] - JMP). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z] - JMP).") log_game("[src] has been destroyed in ([diskturf.x], [diskturf.y], [diskturf.z]). Moving it to ([NEWDISK.x], [NEWDISK.y], [NEWDISK.z]).") diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index be46b970a37..37a2979ae74 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/pinpointer +/obj/item/pinpointer name = "pinpointer" icon = 'icons/obj/device.dmi' icon_state = "pinoff" @@ -9,7 +9,7 @@ throw_speed = 4 throw_range = 20 materials = list(MAT_METAL=500) - var/obj/item/weapon/disk/nuclear/the_disk = null + var/obj/item/disk/nuclear/the_disk = null var/active = 0 var/shows_nuke_timer = TRUE var/icon_off = "pinoff" @@ -19,17 +19,17 @@ var/icon_medium = "pinonmedium" var/icon_far = "pinonfar" -/obj/item/weapon/pinpointer/New() +/obj/item/pinpointer/New() ..() pinpointer_list += src -/obj/item/weapon/pinpointer/Destroy() +/obj/item/pinpointer/Destroy() pinpointer_list -= src active = 0 the_disk = null return ..() -/obj/item/weapon/pinpointer/attack_self() +/obj/item/pinpointer/attack_self() if(!active) active = 1 workdisk() @@ -39,11 +39,11 @@ icon_state = icon_off to_chat(usr, "You deactivate the pinpointer.") -/obj/item/weapon/pinpointer/proc/scandisk() +/obj/item/pinpointer/proc/scandisk() if(!the_disk) the_disk = locate() -/obj/item/weapon/pinpointer/proc/point_at(atom/target, spawnself = 1) +/obj/item/pinpointer/proc/point_at(atom/target, spawnself = 1) if(!active) return if(!target) @@ -70,13 +70,13 @@ spawn(5) .() -/obj/item/weapon/pinpointer/proc/workdisk() +/obj/item/pinpointer/proc/workdisk() scandisk() point_at(the_disk, 0) spawn(5) .() -/obj/item/weapon/pinpointer/examine(mob/user) +/obj/item/pinpointer/examine(mob/user) ..(user) if(!shows_nuke_timer) return @@ -85,14 +85,14 @@ if(bomb.timing) to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.timeleft]") -/obj/item/weapon/pinpointer/advpinpointer +/obj/item/pinpointer/advpinpointer name = "advanced pinpointer" desc = "A larger version of the normal pinpointer, this unit features a helpful quantum entanglement detection system to locate various objects that do not broadcast a locator signal." var/mode = 0 // Mode 0 locates disk, mode 1 locates coordinates. var/turf/location = null var/obj/target = null -/obj/item/weapon/pinpointer/advpinpointer/attack_self() +/obj/item/pinpointer/advpinpointer/attack_self() if(!active) active = 1 if(mode == 0) @@ -107,14 +107,14 @@ icon_state = icon_off to_chat(usr, "You deactivate the pinpointer.") -/obj/item/weapon/pinpointer/advpinpointer/workdisk() +/obj/item/pinpointer/advpinpointer/workdisk() if(mode == 0) scandisk() point_at(the_disk, 0) spawn(5) .() -/obj/item/weapon/pinpointer/advpinpointer/verb/toggle_mode() +/obj/item/pinpointer/advpinpointer/verb/toggle_mode() set category = "Object" set name = "Toggle Pinpointer Mode" set src in usr @@ -186,12 +186,12 @@ /////////////////////// //nuke op pinpointers// /////////////////////// -/obj/item/weapon/pinpointer/nukeop +/obj/item/pinpointer/nukeop var/mode = 0 //Mode 0 locates disk, mode 1 locates the shuttle var/obj/docking_port/mobile/home = null slot_flags = SLOT_BELT | SLOT_PDA -/obj/item/weapon/pinpointer/nukeop/attack_self(mob/user as mob) +/obj/item/pinpointer/nukeop/attack_self(mob/user as mob) if(!active) active = 1 if(!mode) @@ -205,7 +205,7 @@ icon_state = icon_off to_chat(user, "You deactivate the pinpointer.") -/obj/item/weapon/pinpointer/nukeop/workdisk() +/obj/item/pinpointer/nukeop/workdisk() if(!active) return if(mode) //Check in case the mode changes while operating worklocation() @@ -233,7 +233,7 @@ spawn(5) .() -/obj/item/weapon/pinpointer/nukeop/proc/worklocation() +/obj/item/pinpointer/nukeop/proc/worklocation() if(!active) return if(!mode) @@ -267,12 +267,12 @@ spawn(5) .() -/obj/item/weapon/pinpointer/operative +/obj/item/pinpointer/operative name = "operative pinpointer" desc = "A pinpointer that leads to the first Syndicate operative detected." var/mob/living/carbon/nearest_op = null -/obj/item/weapon/pinpointer/operative/attack_self() +/obj/item/pinpointer/operative/attack_self() if(!usr.mind || !(usr.mind in ticker.mode.syndicates)) to_chat(usr, "AUTHENTICATION FAILURE. ACCESS DENIED.") return 0 @@ -285,7 +285,7 @@ icon_state = icon_off to_chat(usr, "You deactivate the pinpointer.") -/obj/item/weapon/pinpointer/operative/proc/scan_for_ops() +/obj/item/pinpointer/operative/proc/scan_for_ops() if(active) nearest_op = null //Resets nearest_op every time it scans var/closest_distance = 1000 @@ -294,7 +294,7 @@ if(get_dist(M, get_turf(src)) < closest_distance) //Actually points toward the nearest op, instead of a random one like it used to nearest_op = M -/obj/item/weapon/pinpointer/operative/proc/workop() +/obj/item/pinpointer/operative/proc/workop() if(active) scan_for_ops() point_at(nearest_op, 0) @@ -303,7 +303,7 @@ else return 0 -/obj/item/weapon/pinpointer/operative/examine(mob/user) +/obj/item/pinpointer/operative/examine(mob/user) ..() if(active) if(nearest_op) @@ -311,7 +311,7 @@ else to_chat(user, "No operatives detected within scanning range.") -/obj/item/weapon/pinpointer/crew +/obj/item/pinpointer/crew name = "crew pinpointer" desc = "A handheld tracking device that points to crew suit sensors." shows_nuke_timer = FALSE @@ -323,7 +323,7 @@ icon_medium = "pinonmedium_crew" icon_far = "pinonfar_crew" -/obj/item/weapon/pinpointer/crew/proc/trackable(mob/living/carbon/human/H) +/obj/item/pinpointer/crew/proc/trackable(mob/living/carbon/human/H) var/turf/here = get_turf(src) if(istype(H.w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/U = H.w_uniform @@ -337,7 +337,7 @@ return FALSE -/obj/item/weapon/pinpointer/crew/attack_self(mob/living/user) +/obj/item/pinpointer/crew/attack_self(mob/living/user) if(active) active = FALSE icon_state = icon_off @@ -353,7 +353,7 @@ var/name = "Unknown" if(H.wear_id) - var/obj/item/weapon/card/id/I = H.wear_id.GetID() + var/obj/item/card/id/I = H.wear_id.GetID() name = I.registered_name while(name in name_counts) @@ -375,7 +375,7 @@ user.visible_message("[user] activates their pinpointer.", "You activate your pinpointer.") point_at(target) -/obj/item/weapon/pinpointer/crew/point_at(atom/target, spawnself = 1) +/obj/item/pinpointer/crew/point_at(atom/target, spawnself = 1) if(!active) return @@ -388,5 +388,5 @@ spawn(5) .() -/obj/item/weapon/pinpointer/crew/examine(mob/user) +/obj/item/pinpointer/crew/examine(mob/user) ..(user) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index ea796011e96..c9ad5ce69e4 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -571,19 +571,19 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu target_amount = 1 loot = "a nuclear bomb" if(5) - target = /obj/item/weapon/gun + target = /obj/item/gun target_amount = 6 loot = "six guns. Tasers and other non-lethal guns are acceptable" if(6) - target = /obj/item/weapon/gun/energy + target = /obj/item/gun/energy target_amount = 4 loot = "four energy guns" if(7) - target = /obj/item/weapon/gun/energy/laser + target = /obj/item/gun/energy/laser target_amount = 2 loot = "two laser guns" if(8) - target = /obj/item/weapon/gun/energy/ionrifle + target = /obj/item/gun/energy/ionrifle target_amount = 1 loot = "an ion gun" @@ -728,28 +728,28 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu var/itemname switch(rand(1,8)) if(1) - target = /obj/item/weapon/stock_parts/cell + target = /obj/item/stock_parts/cell target_amount = 10 target_rating = 3 itemname = "ten high-capacity power cells" if(2) - target = /obj/item/weapon/stock_parts/manipulator + target = /obj/item/stock_parts/manipulator target_amount = 20 itemname = "twenty micro manipulators" if(3) - target = /obj/item/weapon/stock_parts/matter_bin + target = /obj/item/stock_parts/matter_bin target_amount = 20 itemname = "twenty matter bins" if(4) - target = /obj/item/weapon/stock_parts/micro_laser + target = /obj/item/stock_parts/micro_laser target_amount = 15 itemname = "fifteen micro-lasers" if(5) - target = /obj/item/weapon/stock_parts/capacitor + target = /obj/item/stock_parts/capacitor target_amount = 15 itemname = "fifteen capacitors" if(6) - target = /obj/item/weapon/stock_parts/subspace/filter + target = /obj/item/stock_parts/subspace/filter target_amount = 4 itemname = "four hyperwave filters" if(7) @@ -757,7 +757,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu target_amount = 10 itemname = "ten solar panel assemblies" if(8) - target = /obj/item/device/flash + target = /obj/item/flash target_amount = 6 itemname = "six flashes" explanation_text = "We are running low on spare parts. Trade for [itemname]." diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 556b7f50e5b..4f500825065 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -68,7 +68,7 @@ update_rev_icons_removed(trotsky) for(var/datum/mind/rev_mind in head_revolutionaries) - log_game("[rev_mind.key] (ckey) has been selected as a head rev") + log_game("[key_name(rev_mind)] has been selected as a head rev") for(var/datum/mind/head_mind in heads) mark_for_death(rev_mind, head_mind) @@ -127,7 +127,7 @@ mob.mutations.Remove(CLUMSY) - var/obj/item/device/flash/T = new(mob) + var/obj/item/flash/T = new(mob) var/obj/item/toy/crayon/spraycan/R = new(mob) var/obj/item/clothing/glasses/hud/security/chameleon/C = new(mob) @@ -195,7 +195,7 @@ var/datum/mind/stalin = pick(promotable_revs) revolutionaries -= stalin head_revolutionaries += stalin - log_game("[stalin.key] (ckey) has been promoted to a head rev") + log_game("[key_name(stalin)] has been promoted to a head rev") equip_revolutionary(stalin.current) forge_revolutionary_objectives(stalin) greet_revolutionary(stalin) diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 4fbbdbf339f..35284594b46 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -90,7 +90,7 @@ datum/hSB P.back.layer = initial(P.back.layer) P.back.plane = initial(P.back.plane) P.back = null - P.back = new/obj/item/weapon/tank/jetpack(P) + P.back = new/obj/item/tank/jetpack(P) P.back.layer = 20 P.back.plane = HUD_PLANE P.internal = P.back @@ -126,13 +126,13 @@ datum/hSB //var/obj/hsb = new/obj/watertank //hsb.loc = usr.loc if("hsbtoolbox") - var/obj/item/weapon/storage/hsb = new/obj/item/weapon/storage/toolbox/mechanical - for(var/obj/item/device/radio/T in hsb) + var/obj/item/storage/hsb = new/obj/item/storage/toolbox/mechanical + for(var/obj/item/radio/T in hsb) qdel(T) - new/obj/item/weapon/crowbar (hsb) + new/obj/item/crowbar (hsb) hsb.loc = usr.loc if("hsbmedkit") - var/obj/item/weapon/storage/firstaid/hsb = new/obj/item/weapon/storage/firstaid/regular + var/obj/item/storage/firstaid/hsb = new/obj/item/storage/firstaid/regular hsb.loc = usr.loc if("hsbobj") if(!hsboxspawn) return @@ -140,17 +140,17 @@ datum/hSB var/list/selectable = list() for(var/O in typesof(/obj/item/)) //Note, these istypes don't work - if(istype(O, /obj/item/weapon/gun)) + if(istype(O, /obj/item/gun)) continue if(istype(O, /obj/item/assembly)) continue - if(istype(O, /obj/item/device/camera)) + if(istype(O, /obj/item/camera)) continue - if(istype(O, /obj/item/weapon/cloaking_device)) + if(istype(O, /obj/item/cloaking_device)) continue - if(istype(O, /obj/item/weapon/dummy)) + if(istype(O, /obj/item/dummy)) continue - if(istype(O, /obj/item/weapon/melee/energy/sword/saber)) + if(istype(O, /obj/item/melee/energy/sword/saber)) continue if(istype(O, /obj/structure)) continue diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index a39692e2ffa..d34ebba4aa2 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -73,7 +73,7 @@ // Check station's power levels for(var/obj/machinery/power/apc/A in apcs) if(!is_station_level(A.z)) continue - for(var/obj/item/weapon/stock_parts/cell/C in A.contents) + for(var/obj/item/stock_parts/cell/C in A.contents) if(C.charge < 2300) score_powerloss++ //200 charge leeway @@ -153,14 +153,14 @@ return 0 else . = 0 - for(var/obj/item/weapon/card/id/id in C.contents) + for(var/obj/item/card/id/id in C.contents) var/datum/money_account/A = get_money_account(id.associated_account_number) // has an account? if(A) . += A.money for(var/obj/item/stack/spacecash/cash in C.contents) . += cash.amount - for(var/obj/item/weapon/storage/S in C.contents) + for(var/obj/item/storage/S in C.contents) . += .(S, level + 1) /datum/game_mode/proc/get_scoreboard_stats() diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index 7c69b02eda1..00c6bc67ee2 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -151,12 +151,12 @@ ticker.syndicate_coalition.Add(S) /proc/setupcult() - var/static/picked_cult // Only needs to get picked once + var/static/datum/cult_info/picked_cult // Only needs to get picked once if(picked_cult) return picked_cult - var/random_cult = pick(all_cults) + var/random_cult = pick(typesof(/datum/cult_info)) picked_cult = new random_cult() if(!picked_cult) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 439d3cb237d..ed8603360fe 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -107,7 +107,7 @@ Made by Xhuis /datum/game_mode/shadowling/post_setup() for(var/datum/mind/shadow in shadows) - log_game("[shadow.key] (ckey) has been selected as a Shadowling.") + log_game("[key_name(shadow)] has been selected as a Shadowling.") sleep(10) to_chat(shadow.current, "
") to_chat(shadow.current, "You are a shadowling!") @@ -240,7 +240,7 @@ Made by Xhuis M.visible_message("[M] screams and contorts!", \ "THE LIGHT-- YOUR MIND-- BURNS--") spawn(30) - if(!M || qdeleted(M)) + if(!M || QDELETED(M)) return M.visible_message("[M] suddenly bloats and explodes!", \ "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA----") diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index e0a4052bd75..06f7bc9440c 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -55,20 +55,20 @@ charge_max = 150 //Short cooldown because people can just turn the lights back on clothes_req = 0 range = 5 - var/blacklisted_lights = list(/obj/item/device/flashlight/flare, /obj/item/device/flashlight/slime) + var/blacklisted_lights = list(/obj/item/flashlight/flare, /obj/item/flashlight/slime) action_icon_state = "veil" /obj/effect/proc_holder/spell/aoe_turf/veil/proc/extinguishItem(var/obj/item/I) //WARNING NOT SUFFICIENT TO EXTINGUISH AN ITEM HELD BY A MOB - if(istype(I, /obj/item/device/flashlight)) - var/obj/item/device/flashlight/F = I + if(istype(I, /obj/item/flashlight)) + var/obj/item/flashlight/F = I if(F.on) if(is_type_in_list(I, blacklisted_lights)) I.visible_message("[I] dims slightly before scattering the shadows around it.") return F.on = 0 F.update_brightness() - else if(istype(I, /obj/item/device/pda)) - var/obj/item/device/pda/P = I + else if(istype(I, /obj/item/pda)) + var/obj/item/pda/P = I var/datum/data/pda/utility/flashlight/FL = P.find_program(/datum/data/pda/utility/flashlight) if(FL && FL.fon) FL.start() @@ -82,10 +82,10 @@ if(P.on) P.toggle_light() P.visible_message("[P]'s light fades and turns off.") - else if(istype(I, /obj/item/weapon/gun)) - var/obj/item/weapon/gun/G = I + else if(istype(I, /obj/item/gun)) + var/obj/item/gun/G = I if(G.gun_light) - var/obj/item/device/flashlight/F = G.gun_light + var/obj/item/flashlight/F = G.gun_light if(F.on) G.toggle_gunlight() G.visible_message("[G]'s light fades and turns off.") @@ -320,7 +320,7 @@ sleep(100) //10 seconds - not spawn() so the enthralling takes longer to_chat(user, "The nanobots composing the mindshield implant have been rendered inert. Now to continue.") user.visible_message("[user] relaxes again.") - for(var/obj/item/weapon/implant/mindshield/L in target) + for(var/obj/item/implant/mindshield/L in target) if(L && L.implanted) qdel(L) to_chat(target, "Your mental protection implant unexpectedly falters, dims, dies.") @@ -469,7 +469,7 @@ target.visible_message("[target] suddenly bends over and coughs out a cloud of black smoke, which begins to spread rapidly!") to_chat(target, "You regurgitate a vast cloud of blinding smoke.") playsound(target, 'sound/effects/bamf.ogg', 50, 1) - var/obj/item/weapon/reagent_containers/glass/beaker/large/B = new /obj/item/weapon/reagent_containers/glass/beaker/large(target.loc) + var/obj/item/reagent_containers/glass/beaker/large/B = new /obj/item/reagent_containers/glass/beaker/large(target.loc) B.reagents.clear_reagents() //Just in case! B.icon_state = null //Invisible B.reagents.add_reagent("blindness_smoke", 10) diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index bc2a585f7b3..44e722abfca 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -28,29 +28,29 @@ /datum/theft_objective/antique_laser_gun name = "the captain's antique laser gun" - typepath = /obj/item/weapon/gun/energy/laser/captain + typepath = /obj/item/gun/energy/laser/captain protected_jobs = list("Captain") /datum/theft_objective/captains_jetpack name = "the captain's deluxe jetpack" - typepath = /obj/item/weapon/tank/jetpack/oxygen/captain + typepath = /obj/item/tank/jetpack/oxygen/captain protected_jobs = list("Captain") /datum/theft_objective/hoslaser name = "the head of security's recreated antique laser gun" - typepath = /obj/item/weapon/gun/energy/gun/hos + typepath = /obj/item/gun/energy/gun/hos protected_jobs = list("Head Of Security") /datum/theft_objective/hand_tele name = "a hand teleporter" - typepath = /obj/item/weapon/hand_tele + typepath = /obj/item/hand_tele protected_jobs = list("Captain", "Research Director") /datum/theft_objective/ai name = "a functional AI" - typepath = /obj/item/device/aicard + typepath = /obj/item/aicard -datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) +datum/theft_objective/ai/check_special_completion(var/obj/item/aicard/C) if(..()) for(var/mob/living/silicon/ai/A in C) if(istype(A, /mob/living/silicon/ai) && A.stat != 2) //See if any AI's are alive inside that card. @@ -59,7 +59,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) /datum/theft_objective/defib name = "a compact defibrillator" - typepath = /obj/item/weapon/defibrillator/compact + typepath = /obj/item/defibrillator/compact protected_jobs = list("Chief Medical Officer") /datum/theft_objective/magboots @@ -71,13 +71,13 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) name = "the station blueprints" typepath = /obj/item/areaeditor/blueprints protected_jobs = list("Chief Engineer") - altitems = list(/obj/item/weapon/photo) + altitems = list(/obj/item/photo) /datum/objective_item/steal/blueprints/check_special_completion(obj/item/I) if(istype(I, /obj/item/areaeditor/blueprints)) return 1 - if(istype(I, /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P = I + if(istype(I, /obj/item/photo)) + var/obj/item/photo/P = I if(P.blueprints) return 1 return 0 @@ -105,7 +105,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) /datum/theft_objective/nukedisc name = "the nuclear authentication disk" - typepath = /obj/item/weapon/disk/nuclear + typepath = /obj/item/disk/nuclear protected_jobs = list("Captain") /datum/theft_objective/reactive @@ -119,7 +119,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) /datum/theft_objective/hypospray name = "a hypospray" - typepath = /obj/item/weapon/reagent_containers/hypospray/CMO + typepath = /obj/item/reagent_containers/hypospray/CMO protected_jobs = list("Chief Medical Officer") /datum/theft_objective/ablative @@ -165,7 +165,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) /datum/theft_objective/number/plasma_gas name = "moles of plasma (full tank)" - typepath = /obj/item/weapon/tank + typepath = /obj/item/tank min=28 max=28 protected_jobs = list("Chief Engineer", "Station Engineer", "Scientist", "Research Director", "Life Support Specialist") diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 6cb2f8d6db6..ec8a1643c27 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -251,7 +251,7 @@ var/TC_uses = 0 var/uplink_true = 0 var/purchases = "" - for(var/obj/item/device/uplink/H in world_uplinks) + for(var/obj/item/uplink/H in world_uplinks) if(H && H.uplink_owner && H.uplink_owner==traitor.key) TC_uses += H.used_TC uplink_true=1 @@ -301,17 +301,17 @@ traitor_mob.mutations.Remove(CLUMSY) // find a radio! toolbox(es), backpack, belt, headset - var/obj/item/R = locate(/obj/item/device/pda) in traitor_mob.contents //Hide the uplink in a PDA if available, otherwise radio + var/obj/item/R = locate(/obj/item/pda) in traitor_mob.contents //Hide the uplink in a PDA if available, otherwise radio if(!R) - R = locate(/obj/item/device/radio) in traitor_mob.contents + R = locate(/obj/item/radio) in traitor_mob.contents if(!R) to_chat(traitor_mob, "Unfortunately, the Syndicate wasn't able to get you a radio.") . = 0 else - if(istype(R, /obj/item/device/radio)) + if(istype(R, /obj/item/radio)) // generate list of radio freqs - var/obj/item/device/radio/target_radio = R + var/obj/item/radio/target_radio = R var/freq = PUBLIC_LOW_FREQ var/list/freqlist = list() while(freq <= PUBLIC_HIGH_FREQ) @@ -322,20 +322,20 @@ freq += 1 freq = freqlist[rand(1, freqlist.len)] - var/obj/item/device/uplink/hidden/T = new(R) + var/obj/item/uplink/hidden/T = new(R) target_radio.hidden_uplink = T T.uplink_owner = "[traitor_mob.key]" target_radio.traitor_frequency = freq to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features.") traitor_mob.mind.store_memory("Radio Freq: [format_frequency(freq)] ([R.name] [T.loc]).") - else if(istype(R, /obj/item/device/pda)) + else if(istype(R, /obj/item/pda)) // generate a passcode if the uplink is hidden in a PDA var/pda_pass = "[rand(100,999)] [pick("Alpha","Bravo","Delta","Omega")]" - var/obj/item/device/uplink/hidden/T = new(R) + var/obj/item/uplink/hidden/T = new(R) R.hidden_uplink = T T.uplink_owner = "[traitor_mob.key]" - var/obj/item/device/pda/P = R + var/obj/item/pda/P = R P.lock_code = pda_pass to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features.") @@ -423,11 +423,11 @@ //Spawn and equip documents var/mob/living/carbon/human/mob = owner.current - var/obj/item/weapon/folder/syndicate/folder + var/obj/item/folder/syndicate/folder if(owner == exchange_red) - folder = new/obj/item/weapon/folder/syndicate/red(mob.locs) + folder = new/obj/item/folder/syndicate/red(mob.locs) else - folder = new/obj/item/weapon/folder/syndicate/blue(mob.locs) + folder = new/obj/item/folder/syndicate/blue(mob.locs) var/list/slots = list ( "backpack" = slot_in_backpack, diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 781d417929f..c2431f17318 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -279,9 +279,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha to_chat(owner, "[owner.wear_mask] prevents you from biting [H]!") draining = null return - owner.create_attack_log("Bit [H] ([H.ckey]) in the neck and draining their blood") - H.create_attack_log("Has been bit in the neck by [owner] ([owner.ckey])") - log_attack("[owner] ([owner.ckey]) bit [H] ([H.ckey]) in the neck") + add_attack_logs(owner, H, "vampirebit & is draining their blood.", FALSE) owner.visible_message("[owner] grabs [H]'s neck harshly and sinks in their fangs!", "You sink your fangs into [H] and begin to drain their blood.", "You hear a soft puncture and a wet sucking noise.") if(!iscarbon(owner)) H.LAssailant = null diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index c78cc55676f..e9a249d8412 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -300,11 +300,11 @@ /obj/effect/proc_holder/spell/vampire/targetted/enthrall/proc/can_enthrall(mob/living/user, mob/living/carbon/C) var/enthrall_safe = 0 - for(var/obj/item/weapon/implant/mindshield/L in C) + for(var/obj/item/implant/mindshield/L in C) if(L && L.implanted) enthrall_safe = 1 break - for(var/obj/item/weapon/implant/traitor/T in C) + for(var/obj/item/implant/traitor/T in C) if(T && T.implanted) enthrall_safe = 1 break @@ -347,7 +347,8 @@ H.mind.special_role = SPECIAL_ROLE_VAMPIRE_THRALL to_chat(H, "You have been Enthralled by [user]. Follow their every command.") to_chat(user, "You have successfully Enthralled [H]. If they refuse to do as you say just adminhelp.") - add_logs(user, H, "vampire-thralled") + add_attack_logs(user, H, "Vampire-thralled") + /obj/effect/proc_holder/spell/vampire/self/cloak name = "Cloak of Darkness" diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 482ac6f644e..2e99f0238c5 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -1,6 +1,6 @@ /////////Apprentice Contract////////// -/obj/item/weapon/contract +/obj/item/contract name = "contract" desc = "A magic contract previously signed by an apprentice. In exchange for instruction in the magical arts, they are bound to answer your call for aid." icon = 'icons/obj/wizard.dmi' @@ -11,7 +11,7 @@ var/used = 0 -/obj/item/weapon/contract/attack_self(mob/user as mob) +/obj/item/contract/attack_self(mob/user as mob) user.set_machine(src) var/dat if(used) @@ -34,7 +34,7 @@ return -/obj/item/weapon/contract/Topic(href, href_list) +/obj/item/contract/Topic(href, href_list) ..() var/mob/living/carbon/human/H = usr @@ -69,21 +69,21 @@ if("healing") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(null)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(null)) - M.equip_to_slot_or_del(new /obj/item/weapon/gun/magic/staff/healing(M), slot_r_hand) + M.equip_to_slot_or_del(new /obj/item/gun/magic/staff/healing(M), slot_r_hand) to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.") if("robeless") M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null)) to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.") - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack) - M.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll/apprentice(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/storage/backpack(M), slot_back) + M.equip_to_slot_or_del(new /obj/item/storage/box(M), slot_in_backpack) + M.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(M), slot_r_store) var/wizard_name_first = pick(wizard_first) var/wizard_name_second = pick(wizard_second) var/randomname = "[wizard_name_first] [wizard_name_second]" @@ -111,7 +111,7 @@ ///////////////////////////Veil Render////////////////////// -/obj/item/weapon/veilrender +/obj/item/veilrender name = "veil render" desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city." icon = 'icons/obj/wizard.dmi' @@ -127,7 +127,7 @@ var/activate_descriptor = "reality" var/rend_desc = "You should run now." -/obj/item/weapon/veilrender/attack_self(mob/user as mob) +/obj/item/veilrender/attack_self(mob/user as mob) if(charged) new /obj/effect/rend(get_turf(user), spawn_type, spawn_amt, rend_desc) charged = 0 @@ -165,13 +165,13 @@ qdel(src) /obj/effect/rend/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/nullrod)) + if(istype(I, /obj/item/nullrod)) user.visible_message("[user] seals \the [src] with \the [I].") qdel(src) return ..() -/obj/item/weapon/veilrender/vealrender +/obj/item/veilrender/vealrender name = "veal render" desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast farm." spawn_type = /mob/living/simple_animal/cow @@ -179,7 +179,7 @@ activate_descriptor = "hunger" rend_desc = "Reverberates with the sound of ten thousand moos." -/obj/item/weapon/veilrender/honkrender +/obj/item/veilrender/honkrender name = "honk render" desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast circus." spawn_type = /mob/living/simple_animal/hostile/retaliate/clown @@ -189,7 +189,7 @@ icon_state = "clownrender" -/obj/item/weapon/veilrender/crabrender +/obj/item/veilrender/crabrender name = "crab render" desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast aquarium." spawn_type = /mob/living/simple_animal/crab @@ -199,7 +199,7 @@ /////////////////////////////////////////Scrying/////////////////// -/obj/item/weapon/scrying +/obj/item/scrying name = "scrying orb" desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means." icon = 'icons/obj/projectiles.dmi' @@ -211,7 +211,7 @@ force = 15 hitsound = 'sound/items/welder2.ogg' -/obj/item/weapon/scrying/attack_self(mob/user as mob) +/obj/item/scrying/attack_self(mob/user as mob) to_chat(user, " You can see...everything!") visible_message("[user] stares into [src], their eyes glazing over.") user.ghostize(1) @@ -219,10 +219,9 @@ /////////////////////Multiverse Blade//////////////////// var/global/list/multiverse = list() -/obj/item/weapon/multisword +/obj/item/multisword name = "multiverse sword" desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side." - icon = 'icons/obj/weapons.dmi' icon_state = "energy_katana" item_state = "energy_katana" hitsound = 'sound/weapons/bladeslice.ogg' @@ -240,24 +239,24 @@ var/global/list/multiverse = list() var/evil = TRUE var/probability_evil = 30 //what's the probability this sword will be evil when activated? var/duplicate_self = 0 //Do we want the species randomized along with equipment should the user be duplicated in their entirety? - var/sword_type = /obj/item/weapon/multisword //type of sword to equip. + var/sword_type = /obj/item/multisword //type of sword to equip. -/obj/item/weapon/multisword/New() +/obj/item/multisword/New() ..() multiverse |= src -/obj/item/weapon/multisword/Destroy() +/obj/item/multisword/Destroy() multiverse.Remove(src) return ..() -/obj/item/weapon/multisword/attack(mob/living/M as mob, mob/living/user as mob) //to prevent accidental friendly fire or out and out grief. +/obj/item/multisword/attack(mob/living/M as mob, mob/living/user as mob) //to prevent accidental friendly fire or out and out grief. if(M.real_name == user.real_name) to_chat(user, "The [src] detects benevolent energies in your target and redirects your attack!") return ..() -/obj/item/weapon/multisword/attack_self(mob/user) +/obj/item/multisword/attack_self(mob/user) if(user.mind.special_role == SPECIAL_ROLE_WIZARD_APPRENTICE) to_chat(user, "You know better than to touch your teacher's stuff.") return @@ -295,7 +294,7 @@ var/global/list/multiverse = list() evil = FALSE else cooldown = world.time + cooldown_between_uses - for(var/obj/item/weapon/multisword/M in multiverse) + for(var/obj/item/multisword/M in multiverse) if(M.assigned == assigned) M.cooldown = cooldown @@ -311,7 +310,7 @@ var/global/list/multiverse = list() to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") -/obj/item/weapon/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) +/obj/item/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) if(duplicate_self) user.client.prefs.copy_to(M) @@ -357,9 +356,9 @@ var/global/list/multiverse = list() M.mind.special_role = SPECIAL_ROLE_MULTIVERSE log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] protect the station.") -/obj/item/weapon/multisword/proc/equip_copy(var/mob/living/carbon/human/M) +/obj/item/multisword/proc/equip_copy(var/mob/living/carbon/human/M) - var/obj/item/weapon/multisword/sword = new sword_type + var/obj/item/multisword/sword = new sword_type sword.assigned = assigned sword.faction = list("[assigned]") sword.evil = evil @@ -440,7 +439,7 @@ var/global/list/multiverse = list() M.equip_to_slot_or_del(new /obj/item/clothing/head/fedora(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/really_black(M), slot_w_uniform) M.equip_to_slot_or_del(sword, slot_r_hand) @@ -450,14 +449,14 @@ var/global/list/multiverse = list() M.equip_to_slot_or_del(new hat(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/under/roman(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/roman(M), slot_l_hand) + M.equip_to_slot_or_del(new /obj/item/shield/riot/roman(M), slot_l_hand) M.equip_to_slot_or_del(sword, slot_r_hand) if("wizard") M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/red(M), slot_head) M.equip_to_slot_or_del(sword, slot_r_hand) @@ -473,20 +472,20 @@ var/global/list/multiverse = list() M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M),slot_wear_mask) M.equip_to_slot_or_del(sword, slot_r_hand) if("assistant") M.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) M.equip_to_slot_or_del(sword, slot_r_hand) if("animu") M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl(M), slot_w_uniform) M.equip_to_slot_or_del(sword, slot_r_hand) @@ -494,22 +493,22 @@ var/global/list/multiverse = list() if("cultist") M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/cultrobes/alt(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(sword, slot_r_hand) if("highlander") M.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/head/beret(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(sword, slot_r_hand) if("clown") M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/bikehorn(M), slot_l_store) M.equip_to_slot_or_del(sword, slot_r_hand) if("killer") @@ -518,13 +517,13 @@ var/global/list/multiverse = list() M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/latex(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/knife(M), slot_l_store) - M.equip_to_slot_or_del(new /obj/item/weapon/scalpel(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/scalpel(M), slot_r_store) M.equip_to_slot_or_del(sword, slot_r_hand) for(var/obj/item/carried_item in M.contents) - if(!istype(carried_item, /obj/item/weapon/implant)) + if(!istype(carried_item, /obj/item/implant)) carried_item.add_mob_blood(M) if("pirate") @@ -532,14 +531,14 @@ var/global/list/multiverse = list() M.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(sword, slot_r_hand) if("soviet") M.equip_to_slot_or_del(new /obj/item/clothing/head/hgpiratecap(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/suit/hgpirate(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform) M.equip_to_slot_or_del(sword, slot_r_hand) @@ -549,7 +548,7 @@ var/global/list/multiverse = list() M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/suit/jacket/miljacket(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) @@ -558,7 +557,7 @@ var/global/list/multiverse = list() if("gladiator") M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/under/gladiator(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) + M.equip_to_slot_or_del(new /obj/item/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) M.equip_to_slot_or_del(sword, slot_r_hand) @@ -566,11 +565,11 @@ var/global/list/multiverse = list() else return - var/obj/item/weapon/card/id/W = new /obj/item/weapon/card/id + var/obj/item/card/id/W = new /obj/item/card/id if(duplicate_self) var/duplicated_access = usr.get_item_by_slot(slot_wear_id) - if(duplicated_access && istype(duplicated_access, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/duplicated_id = duplicated_access + if(duplicated_access && istype(duplicated_access, /obj/item/card/id)) + var/obj/item/card/id/duplicated_id = duplicated_access W.access = duplicated_id.access W.icon_state = duplicated_id.icon_state else @@ -592,10 +591,10 @@ var/global/list/multiverse = list() M.update_icons() -/obj/item/weapon/multisword/pure_evil +/obj/item/multisword/pure_evil probability_evil = 100 -/obj/item/weapon/multisword/pike //If We are to be used and spent, let it be for a noble purpose. +/obj/item/multisword/pike //If We are to be used and spent, let it be for a noble purpose. name = "phantom pike" desc = "A fishing pike that appears to be imbued with a peculiar energy." icon_state = "harpoon" @@ -603,12 +602,12 @@ var/global/list/multiverse = list() cooldown_between_uses = 200 //Half the time probability_evil = 100 duplicate_self = 1 - sword_type = /obj/item/weapon/multisword/pike + sword_type = /obj/item/multisword/pike /////////////////////////////////////////Necromantic Stone/////////////////// -/obj/item/device/necromantic_stone +/obj/item/necromantic_stone name = "necromantic stone" desc = "A shard capable of resurrecting humans as skeleton thralls." icon = 'icons/obj/wizard.dmi' @@ -620,10 +619,10 @@ var/global/list/multiverse = list() var/unlimited = 0 var/heresy = 0 -/obj/item/device/necromantic_stone/unlimited +/obj/item/necromantic_stone/unlimited unlimited = 1 -/obj/item/device/necromantic_stone/attack(mob/living/carbon/human/M as mob, mob/living/carbon/human/user as mob) +/obj/item/necromantic_stone/attack(mob/living/carbon/human/M as mob, mob/living/carbon/human/user as mob) if(!istype(M)) return ..() @@ -656,7 +655,7 @@ var/global/list/multiverse = list() to_chat(M, "They are your master now, assist them even if it costs you your new life!") desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" -/obj/item/device/necromantic_stone/proc/check_spooky() +/obj/item/necromantic_stone/proc/check_spooky() if(unlimited) //no point, the list isn't used. return for(var/X in spooky_scaries) @@ -671,7 +670,7 @@ var/global/list/multiverse = list() //Funny gimmick, skeletons always seem to wear roman/ancient armour //Voodoo Zombie Pirates added for paradise -/obj/item/device/necromantic_stone/proc/equip_skeleton(mob/living/carbon/human/H as mob) +/obj/item/necromantic_stone/proc/equip_skeleton(mob/living/carbon/human/H as mob) for(var/obj/item/I in H) H.unEquip(I) var/randomSpooky = "roman"//defualt @@ -683,37 +682,37 @@ var/global/list/multiverse = list() H.equip_to_slot_or_del(new hat(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/roman(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/claymore(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), slot_back) if("pirate") H.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), slot_glasses) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/roman(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/claymore(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) if("yand")//mine is an evil laugh H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl(H), slot_w_uniform) 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/katana(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/roman(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/katana(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), slot_back) if("clown") H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), slot_wear_mask) H.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(H), slot_l_store) - H.equip_to_slot_or_del(new /obj/item/weapon/claymore(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/roman(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/bikehorn(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/claymore(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), slot_back) -/obj/item/device/necromantic_stone/proc/spawnheresy(mob/living/carbon/human/H as mob) +/obj/item/necromantic_stone/proc/spawnheresy(mob/living/carbon/human/H as mob) H.set_species("Human") if(H.gender == MALE) H.change_gender(FEMALE) @@ -736,16 +735,16 @@ var/global/list/multiverse = list() H.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl(H), slot_w_uniform) 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/katana(H), slot_r_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/roman(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/katana(H), slot_r_hand) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), slot_back) if(!H.real_name || H.real_name == "unknown") H.real_name = "Neko-chan" else H.real_name = "[H.name]-chan" H.say("NYA!~") -/obj/item/device/necromantic_stone/nya +/obj/item/necromantic_stone/nya name = "nya-cromantic stone" desc = "A shard capable of resurrecting humans as creatures of Vile Heresy. Even the Wizard Federation fears it.." icon = 'icons/obj/wizard.dmi' @@ -783,7 +782,7 @@ var/global/list/multiverse = list() to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_sel.selecting)]!") target.Weaken(2) GiveHint(target) - else if(istype(I,/obj/item/weapon/bikehorn)) + else if(istype(I,/obj/item/bikehorn)) to_chat(target, "HONK") target << 'sound/items/AirHorn.ogg' target.AdjustEarDeaf(3) diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index 16f9adb8dd9..260f809334c 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -1,24 +1,23 @@ -/obj/item/weapon/melee/touch_attack +/obj/item/melee/touch_attack name = "\improper outstretched hand" desc = "High Five?" var/catchphrase = "High Five!" var/on_use_sound = null var/obj/effect/proc_holder/spell/targeted/touch/attached_spell - icon = 'icons/obj/weapons.dmi' icon_state = "syndballoon" item_state = null - flags = ABSTRACT | NODROP + flags = ABSTRACT | NODROP | DROPDEL w_class = WEIGHT_CLASS_HUGE force = 0 throwforce = 0 throw_range = 0 throw_speed = 0 -/obj/item/weapon/melee/touch_attack/New(var/spell) +/obj/item/melee/touch_attack/New(var/spell) attached_spell = spell ..() -/obj/item/weapon/melee/touch_attack/attack(mob/target, mob/living/carbon/user) +/obj/item/melee/touch_attack/attack(mob/target, mob/living/carbon/user) if(!iscarbon(user)) //Look ma, no hands return if(user.lying || user.handcuffed) @@ -26,18 +25,18 @@ return ..() -/obj/item/weapon/melee/touch_attack/afterattack(atom/target, mob/user, proximity) +/obj/item/melee/touch_attack/afterattack(atom/target, mob/user, proximity) user.say(catchphrase) playsound(get_turf(user), on_use_sound,50,1) attached_spell.attached_hand = null qdel(src) -/obj/item/weapon/melee/touch_attack/dropped() +/obj/item/melee/touch_attack/Destroy() if(attached_spell) attached_spell.attached_hand = null - qdel(src) + return ..() -/obj/item/weapon/melee/touch_attack/disintegrate +/obj/item/melee/touch_attack/disintegrate name = "disintegrating touch" desc = "This hand of mine glows with an awesome power!" catchphrase = "EI NATH!!" @@ -45,7 +44,7 @@ icon_state = "disintegrate" item_state = "disintegrate" -/obj/item/weapon/melee/touch_attack/disintegrate/afterattack(atom/target, mob/living/carbon/user, proximity) +/obj/item/melee/touch_attack/disintegrate/afterattack(atom/target, mob/living/carbon/user, proximity) if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //exploding after touching yourself would be bad return var/mob/M = target @@ -55,7 +54,7 @@ M.gib() ..() -/obj/item/weapon/melee/touch_attack/fleshtostone +/obj/item/melee/touch_attack/fleshtostone name = "petrifying touch" desc = "That's the bottom line, because flesh to stone said so!" catchphrase = "STAUN EI!!" @@ -63,7 +62,7 @@ icon_state = "fleshtostone" item_state = "fleshtostone" -/obj/item/weapon/melee/touch_attack/fleshtostone/afterattack(atom/target, mob/living/carbon/user, proximity) +/obj/item/melee/touch_attack/fleshtostone/afterattack(atom/target, mob/living/carbon/user, proximity) if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //getting hard after touching yourself would also be bad return if(user.lying || user.handcuffed) @@ -74,7 +73,7 @@ new /obj/structure/closet/statue(M.loc, M) ..() -/obj/item/weapon/melee/touch_attack/fake_disintegrate +/obj/item/melee/touch_attack/fake_disintegrate name = "toy plastic hand" desc = "This hand of mine glows with an awesome power! Ok, maybe just batteries." catchphrase = "EI NATH!!" @@ -82,7 +81,7 @@ icon_state = "disintegrate" item_state = "disintegrate" -/obj/item/weapon/melee/touch_attack/fake_disintegrate/afterattack(atom/target, mob/living/carbon/user, proximity) +/obj/item/melee/touch_attack/fake_disintegrate/afterattack(atom/target, mob/living/carbon/user, proximity) if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //not exploding after touching yourself would be bad return var/datum/effect_system/spark_spread/sparks = new @@ -91,7 +90,7 @@ playsound(target.loc, 'sound/goonstation/effects/gib.ogg', 50, 1) ..() -/obj/item/weapon/melee/touch_attack/cluwne +/obj/item/melee/touch_attack/cluwne name = "cluwne touch" desc = "It's time to start clowning around." catchphrase = "NWOLC EGNEVER" @@ -99,7 +98,7 @@ icon_state = "cluwnecurse" item_state = "cluwnecurse" -/obj/item/weapon/melee/touch_attack/cluwne/afterattack(atom/target, mob/living/carbon/user, proximity) +/obj/item/melee/touch_attack/cluwne/afterattack(atom/target, mob/living/carbon/user, proximity) if(!proximity || target == user || !ishuman(target) || !iscarbon(user) || user.lying || user.handcuffed) //clowning around after touching yourself would unsurprisingly, be bad return diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index c57b7d531c7..a75da0edb13 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -110,7 +110,7 @@ qdel(B.container) if(L) qdel(L) - for(var/obj/item/weapon/spellbook/B in A) + for(var/obj/item/spellbook/B in A) // No goodies for you qdel(B) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index b33caa4ef73..ef11a84881e 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -20,119 +20,119 @@ if(!summon_type) switch(randomizeguns) if("taser") - new /obj/item/weapon/gun/energy/gun/advtaser(get_turf(H)) + new /obj/item/gun/energy/gun/advtaser(get_turf(H)) if("egun") - new /obj/item/weapon/gun/energy/gun(get_turf(H)) + new /obj/item/gun/energy/gun(get_turf(H)) if("laser") - new /obj/item/weapon/gun/energy/laser(get_turf(H)) + new /obj/item/gun/energy/laser(get_turf(H)) if("revolver") - new /obj/item/weapon/gun/projectile/revolver(get_turf(H)) + new /obj/item/gun/projectile/revolver(get_turf(H)) if("detective") - new /obj/item/weapon/gun/projectile/revolver/detective(get_turf(H)) + new /obj/item/gun/projectile/revolver/detective(get_turf(H)) if("deagle") - new /obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo(get_turf(H)) + new /obj/item/gun/projectile/automatic/pistol/deagle/camo(get_turf(H)) if("gyrojet") - new /obj/item/weapon/gun/projectile/automatic/gyropistol(get_turf(H)) + new /obj/item/gun/projectile/automatic/gyropistol(get_turf(H)) if("pulse") - new /obj/item/weapon/gun/energy/pulse(get_turf(H)) + new /obj/item/gun/energy/pulse(get_turf(H)) if("suppressed") - new /obj/item/weapon/gun/projectile/automatic/pistol(get_turf(H)) - new /obj/item/weapon/suppressor(get_turf(H)) + new /obj/item/gun/projectile/automatic/pistol(get_turf(H)) + new /obj/item/suppressor(get_turf(H)) if("doublebarrel") - new /obj/item/weapon/gun/projectile/revolver/doublebarrel(get_turf(H)) + new /obj/item/gun/projectile/revolver/doublebarrel(get_turf(H)) if("shotgun") - new /obj/item/weapon/gun/projectile/shotgun(get_turf(H)) + new /obj/item/gun/projectile/shotgun(get_turf(H)) if("combatshotgun") - new /obj/item/weapon/gun/projectile/shotgun/automatic/combat(get_turf(H)) + new /obj/item/gun/projectile/shotgun/automatic/combat(get_turf(H)) if("arg") - new /obj/item/weapon/gun/projectile/automatic/ar(get_turf(H)) + new /obj/item/gun/projectile/automatic/ar(get_turf(H)) if("mateba") - new /obj/item/weapon/gun/projectile/revolver/mateba(get_turf(H)) + new /obj/item/gun/projectile/revolver/mateba(get_turf(H)) if("boltaction") - new /obj/item/weapon/gun/projectile/shotgun/boltaction(get_turf(H)) + new /obj/item/gun/projectile/shotgun/boltaction(get_turf(H)) if("uzi") - new /obj/item/weapon/gun/projectile/automatic/mini_uzi(get_turf(H)) + new /obj/item/gun/projectile/automatic/mini_uzi(get_turf(H)) if("cannon") - new /obj/item/weapon/gun/energy/lasercannon(get_turf(H)) + new /obj/item/gun/energy/lasercannon(get_turf(H)) if("crossbow") - new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large(get_turf(H)) + new /obj/item/gun/energy/kinetic_accelerator/crossbow/large(get_turf(H)) if("nuclear") - new /obj/item/weapon/gun/energy/gun/nuclear(get_turf(H)) + new /obj/item/gun/energy/gun/nuclear(get_turf(H)) if("sabr") - new /obj/item/weapon/gun/projectile/automatic/proto(get_turf(H)) + new /obj/item/gun/projectile/automatic/proto(get_turf(H)) if("bulldog") - new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(get_turf(H)) + new /obj/item/gun/projectile/automatic/shotgun/bulldog(get_turf(H)) if("c20r") - new /obj/item/weapon/gun/projectile/automatic/c20r(get_turf(H)) + new /obj/item/gun/projectile/automatic/c20r(get_turf(H)) if("saw") - new /obj/item/weapon/gun/projectile/automatic/l6_saw(get_turf(H)) + new /obj/item/gun/projectile/automatic/l6_saw(get_turf(H)) if("car") - new /obj/item/weapon/gun/projectile/automatic/m90(get_turf(H)) + new /obj/item/gun/projectile/automatic/m90(get_turf(H)) if("turret") - new /obj/item/weapon/gun/energy/gun/turret(get_turf(H)) + new /obj/item/gun/energy/gun/turret(get_turf(H)) if("pulsecarbine") - new /obj/item/weapon/gun/energy/pulse/carbine(get_turf(H)) + new /obj/item/gun/energy/pulse/carbine(get_turf(H)) if("decloner") - new /obj/item/weapon/gun/energy/decloner(get_turf(H)) + new /obj/item/gun/energy/decloner(get_turf(H)) if("mindflayer") - new /obj/item/weapon/gun/energy/mindflayer(get_turf(H)) + new /obj/item/gun/energy/mindflayer(get_turf(H)) if("kinetic") - new /obj/item/weapon/gun/energy/kinetic_accelerator(get_turf(H)) + new /obj/item/gun/energy/kinetic_accelerator(get_turf(H)) if("advplasmacutter") - new /obj/item/weapon/gun/energy/plasmacutter/adv(get_turf(H)) + new /obj/item/gun/energy/plasmacutter/adv(get_turf(H)) if("wormhole") - new /obj/item/weapon/gun/energy/wormhole_projector(get_turf(H)) + new /obj/item/gun/energy/wormhole_projector(get_turf(H)) if("wt550") - new /obj/item/weapon/gun/projectile/automatic/wt550(get_turf(H)) + new /obj/item/gun/projectile/automatic/wt550(get_turf(H)) if("grenadelauncher") - new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(get_turf(H)) + new /obj/item/gun/projectile/revolver/grenadelauncher(get_turf(H)) if("medibeam") - new /obj/item/weapon/gun/medbeam(get_turf(H)) + new /obj/item/gun/medbeam(get_turf(H)) playsound(get_turf(H), 'sound/magic/Summon_guns.ogg', 50, 1) else switch(randomizemagic) if("fireball") - new /obj/item/weapon/spellbook/oneuse/fireball(get_turf(H)) + new /obj/item/spellbook/oneuse/fireball(get_turf(H)) if("smoke") - new /obj/item/weapon/spellbook/oneuse/smoke(get_turf(H)) + new /obj/item/spellbook/oneuse/smoke(get_turf(H)) if("blind") - new /obj/item/weapon/spellbook/oneuse/blind(get_turf(H)) + new /obj/item/spellbook/oneuse/blind(get_turf(H)) if("mindswap") - new /obj/item/weapon/spellbook/oneuse/mindswap(get_turf(H)) + new /obj/item/spellbook/oneuse/mindswap(get_turf(H)) if("forcewall") - new /obj/item/weapon/spellbook/oneuse/forcewall(get_turf(H)) + new /obj/item/spellbook/oneuse/forcewall(get_turf(H)) if("knock") - new /obj/item/weapon/spellbook/oneuse/knock(get_turf(H)) + new /obj/item/spellbook/oneuse/knock(get_turf(H)) if("horsemask") - new /obj/item/weapon/spellbook/oneuse/horsemask(get_turf(H)) + new /obj/item/spellbook/oneuse/horsemask(get_turf(H)) if("charge") - new /obj/item/weapon/spellbook/oneuse/charge(get_turf(H)) + new /obj/item/spellbook/oneuse/charge(get_turf(H)) if("summonitem") - new /obj/item/weapon/spellbook/oneuse/summonitem(get_turf(H)) + new /obj/item/spellbook/oneuse/summonitem(get_turf(H)) if("wandnothing") - new /obj/item/weapon/gun/magic/wand(get_turf(H)) + new /obj/item/gun/magic/wand(get_turf(H)) if("wanddeath") - new /obj/item/weapon/gun/magic/wand/death(get_turf(H)) + new /obj/item/gun/magic/wand/death(get_turf(H)) if("wandresurrection") - new /obj/item/weapon/gun/magic/wand/resurrection(get_turf(H)) + new /obj/item/gun/magic/wand/resurrection(get_turf(H)) if("wandpolymorph") - new /obj/item/weapon/gun/magic/wand/polymorph(get_turf(H)) + new /obj/item/gun/magic/wand/polymorph(get_turf(H)) if("wandteleport") - new /obj/item/weapon/gun/magic/wand/teleport(get_turf(H)) + new /obj/item/gun/magic/wand/teleport(get_turf(H)) if("wanddoor") - new /obj/item/weapon/gun/magic/wand/door(get_turf(H)) + new /obj/item/gun/magic/wand/door(get_turf(H)) if("wandfireball") - new /obj/item/weapon/gun/magic/wand/fireball(get_turf(H)) + new /obj/item/gun/magic/wand/fireball(get_turf(H)) if("staffhealing") - new /obj/item/weapon/gun/magic/staff/healing(get_turf(H)) + new /obj/item/gun/magic/staff/healing(get_turf(H)) if("staffdoor") - new /obj/item/weapon/gun/magic/staff/door(get_turf(H)) + new /obj/item/gun/magic/staff/door(get_turf(H)) if("armor") new /obj/item/clothing/suit/space/hardsuit/wizard(get_turf(H)) new /obj/item/clothing/head/helmet/space/hardsuit/wizard(get_turf(H)) if("scrying") - new /obj/item/weapon/scrying(get_turf(H)) + new /obj/item/scrying(get_turf(H)) if(!(XRAY in H.mutations)) H.mutations.Add(XRAY) H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) @@ -145,17 +145,17 @@ magiclist -= "special" //only one super OP item per summoning max switch(randomizemagicspecial) if("staffchange") - new /obj/item/weapon/gun/magic/staff/change(get_turf(H)) + new /obj/item/gun/magic/staff/change(get_turf(H)) if("staffanimation") - new /obj/item/weapon/gun/magic/staff/animate(get_turf(H)) + new /obj/item/gun/magic/staff/animate(get_turf(H)) if("wandbelt") - new /obj/item/weapon/storage/belt/wands/full(get_turf(H)) + new /obj/item/storage/belt/wands/full(get_turf(H)) if("contract") - new /obj/item/weapon/contract(get_turf(H)) + new /obj/item/contract(get_turf(H)) if("staffchaos") - new /obj/item/weapon/gun/magic/staff/chaos(get_turf(H)) + new /obj/item/gun/magic/staff/chaos(get_turf(H)) if("necromantic") - new /obj/item/device/necromantic_stone(get_turf(H)) + new /obj/item/necromantic_stone(get_turf(H)) to_chat(H, "You suddenly feel lucky.") playsound(get_turf(H), 'sound/magic/Summon_Magic.ogg', 50, 1) diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index b2d18a9bc30..cb303a90932 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -1,4 +1,4 @@ -/obj/item/device/soulstone +/obj/item/soulstone name = "Soul Stone Shard" icon = 'icons/obj/wizard.dmi' icon_state = "soulstone" @@ -16,13 +16,13 @@ var/opt_in = FALSE // for tracking during the 'optional' bit -/obj/item/device/soulstone/proc/can_use(mob/living/user) +/obj/item/soulstone/proc/can_use(mob/living/user) if(iscultist(user) || iswizard(user) || usability) return TRUE return FALSE -/obj/item/device/soulstone/proc/was_used() +/obj/item/soulstone/proc/was_used() if(!reusable) spent = TRUE name = "dull [name]" @@ -30,22 +30,22 @@ the 'Soul Stone'. The shard lies still, dull and lifeless; \ whatever spark it once held long extinguished." -/obj/item/device/soulstone/anybody +/obj/item/soulstone/anybody usability = TRUE -/obj/item/device/soulstone/anybody/chaplain +/obj/item/soulstone/anybody/chaplain name = "mysterious old shard" reusable = FALSE optional = TRUE -/obj/item/device/soulstone/pickup(mob/living/user) +/obj/item/soulstone/pickup(mob/living/user) ..() if(!can_use(user)) to_chat(user, "An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.") user.Dizzy(120) //////////////////////////////Capturing//////////////////////////////////////////////////////// -/obj/item/device/soulstone/attack(mob/living/carbon/human/M as mob, mob/user as mob) +/obj/item/soulstone/attack(mob/living/carbon/human/M as mob, mob/user as mob) if(!can_use(user)) user.Paralyse(5) to_chat(user, "Your body is wracked with debilitating pain!") @@ -117,15 +117,12 @@ if(spent)//checking one more time against shenanigans return - M.create_attack_log("Has had their soul captured with [src.name] by [key_name(user)]") - user.create_attack_log("Used the [src.name] to capture the soul of [key_name(M)]") - log_attack("[key_name(user)] used the [src.name] to capture the soul of [key_name(M)]") - + add_attack_logs(user, M, "Stolestone'd with [name]") transfer_soul("VICTIM", M, user) return ///////////////////Options for using captured souls/////////////////////////////////////// -/obj/item/device/soulstone/attack_self(mob/user) +/obj/item/soulstone/attack_self(mob/user) if(!in_range(src, user)) return @@ -145,7 +142,7 @@ onclose(user, "aicard") return -/obj/item/device/soulstone/Topic(href, href_list) +/obj/item/soulstone/Topic(href, href_list) var/mob/U = usr if(!in_range(src, U) || U.machine != src || !can_use(usr)) U << browse(null, "window=aicard") @@ -193,8 +190,8 @@ to_chat(user, "A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow.") /obj/structure/constructshell/attackby(obj/item/O as obj, mob/user as mob, params) - if(istype(O, /obj/item/device/soulstone)) - var/obj/item/device/soulstone/SS = O + if(istype(O, /obj/item/soulstone)) + var/obj/item/soulstone/SS = O if(!SS.can_use(user)) to_chat(user, "An overwhelming feeling of dread comes over you as you attempt to place the soulstone into the shell. It would be wise to be rid of this quickly.") user.Dizzy(120) @@ -209,7 +206,7 @@ /obj/item/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob) switch(choice) if("FORCE") - var/obj/item/device/soulstone/C = src + var/obj/item/soulstone/C = src if(!iscarbon(target)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul return 0 if(contents.len) @@ -226,7 +223,7 @@ if("VICTIM") var/mob/living/carbon/human/T = target - var/obj/item/device/soulstone/C = src + var/obj/item/soulstone/C = src if(C.imprinted != "empty") to_chat(U, "Capture failed!: The soul stone has already been imprinted with [C.imprinted]'s mind!") else @@ -246,7 +243,7 @@ qdel(T) if("SHADE") var/mob/living/simple_animal/shade/T = target - var/obj/item/device/soulstone/C = src + var/obj/item/soulstone/C = src if(T.stat == DEAD) to_chat(U, "Capture failed!: The shade has already been banished!") else @@ -266,7 +263,7 @@ to_chat(U, "Capture successful!: [T.name]'s has been recaptured and stored within the soul stone.") if("CONSTRUCT") var/obj/structure/constructshell/T = target - var/obj/item/device/soulstone/C = src + var/obj/item/soulstone/C = src var/mob/living/simple_animal/shade/A = locate() in C if(A) var/construct_class = alert(U, "Please choose which type of construct you wish to create.",,"Juggernaut","Wraith","Artificer") @@ -342,7 +339,7 @@ to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") newstruct.cancel_camera() -/obj/item/device/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/U, vic = 0) +/obj/item/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/U, vic = 0) new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton T.invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( T.loc ) @@ -371,7 +368,7 @@ if(vic && U) to_chat(U, "Capture successful!: [T.real_name]'s soul has been ripped from their body and stored within the soul stone.") -/obj/item/device/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U) +/obj/item/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U) var/mob/dead/observer/chosen_ghost for(var/mob/dead/observer/ghost in player_list) //We put them back in their body diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index c97b3ac9445..9d7ddab9d71 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -14,11 +14,11 @@ /datum/spellbook_entry/proc/IsAvailible() // For config prefs / gamemode restrictions - these are round applied return 1 -/datum/spellbook_entry/proc/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) // Specific circumstances +/datum/spellbook_entry/proc/CanBuy(var/mob/living/carbon/human/user,var/obj/item/spellbook/book) // Specific circumstances if(book.uses
" return dat -/obj/item/weapon/spellbook/proc/wrap(var/content) +/obj/item/spellbook/proc/wrap(var/content) var/dat = "" dat +="