diff --git a/code/__defines/ZAS.dm b/code/__defines/ZAS.dm index 1760505f3a..ba2b4b73e7 100644 --- a/code/__defines/ZAS.dm +++ b/code/__defines/ZAS.dm @@ -9,5 +9,5 @@ // More complicated, conditional airflow should override CanZASPass(). #define ATMOS_PASS_YES 1 // Always blocks air and zones. #define ATMOS_PASS_NO 2 // Never blocks air or zones. -#define ATMOS_PASS_DENSITY 3 // Blocks air and zones if density = 1, allows both if density = 0 +#define ATMOS_PASS_DENSITY 3 // Blocks air and zones if density = TRUE, allows both if density = FALSE #define ATMOS_PASS_PROC 4 // Call CanZASPass() using c_airblock diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 1a2321f7de..62100370e1 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -65,7 +65,7 @@ .+=360 //Returns location. Returns null if no location was found. -/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = 0, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0) +/proc/get_teleport_loc(turf/location,mob/target,distance = 1, density = FALSE, errorx = 0, errory = 0, eoffsetx = 0, eoffsety = 0) /* Location where the teleport begins, target that will teleport, distance to go, density checking 0/1(yes/no). Random error in tile placement x, error in tile placement y, and block offset. diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 049db78c3a..16141343c6 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -151,8 +151,8 @@ var/const/tk_maxrange = 15 if(!focus) return var/obj/effect/overlay/O = new /obj/effect/overlay(locate(focus.x,focus.y,focus.z)) O.name = "sparkles" - O.anchored = 1 - O.density = 0 + O.anchored = TRUE + O.density = FALSE O.layer = FLY_LAYER O.set_dir(pick(GLOB.cardinal)) O.icon = 'icons/effects/effects.dmi' diff --git a/code/controllers/subsystems/airflow.dm b/code/controllers/subsystems/airflow.dm index 21ec24f7c7..7561ad8cca 100644 --- a/code/controllers/subsystems/airflow.dm +++ b/code/controllers/subsystems/airflow.dm @@ -5,7 +5,7 @@ TARGET.airflow_time = 0; \ TARGET.airflow_skip_speedcheck = FALSE; \ if (TARGET.airflow_od) { \ - TARGET.density = 0; \ + TARGET.density = FALSE; \ } // No point in making this a processing substem, it overrides fire() and handles its own processing list! @@ -54,7 +54,7 @@ SUBSYSTEM_DEF(airflow) if (target.airflow_speed > 7) if (target.airflow_time++ >= target.airflow_speed - 7) if (target.airflow_od) - target.density = 0 + target.density = FALSE target.airflow_skip_speedcheck = TRUE if (MC_TICK_CHECK) @@ -62,7 +62,7 @@ SUBSYSTEM_DEF(airflow) continue else if (target.airflow_od) - target.density = 0 + target.density = FALSE target.airflow_process_delay = max(1, 10 - (target.airflow_speed + 3)) target.airflow_skip_speedcheck = TRUE @@ -73,7 +73,7 @@ SUBSYSTEM_DEF(airflow) target.airflow_skip_speedcheck = FALSE if (target.airflow_od) - target.density = 1 + target.density = TRUE if (!target.airflow_dest || target.loc == target.airflow_dest) target.airflow_dest = locate(min(max(target.x + target.airflow_xo, 1), world.maxx), min(max(target.y + target.airflow_yo, 1), world.maxy), target.z) diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index 069911606e..4b47a77140 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/code/datums/supplypacks/hydroponics.dm @@ -153,6 +153,6 @@ cost = 50 containertype = /obj/structure/closet/crate/aether containername = "Hydroponics tray crate" - contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = 0} = 3) + contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = FALSE} = 3) access = access_hydroponics diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 28663e11fc..eff6fb84fd 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -77,7 +77,7 @@ /obj/item/weapon/folder/yellow, /obj/item/weapon/hand_labeler, /obj/item/weapon/tape_roll, - /obj/structure/filingcabinet/chestdrawer{anchored = 0}, + /obj/structure/filingcabinet/chestdrawer{anchored = FALSE}, /obj/item/weapon/paper_bin ) name = "Office supplies" diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 881dde134d..3622998eef 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -26,7 +26,7 @@ var/obj/item/organ/external/affecting = H.get_organ(zone) to_chat(user, "An inexplicable force rips through your [affecting.name], tearing the sword from your grasp!") //random amount of damage between half of the blade's force and the full force of the blade. - user.apply_damage(rand(force/2, force), BRUTE, zone, 0, sharp=1, edge=1) + user.apply_damage(rand(force/2, force), BRUTE, zone, 0, sharp = TRUE, edge = TRUE) user.Weaken(5) else if(!istype(user, /mob/living/simple_mob/construct)) to_chat(user, "An inexplicable force rips through you, tearing the sword from your grasp!") diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm index 58684bb2a2..9c3504924f 100644 --- a/code/game/gamemodes/cult/narsie.dm +++ b/code/game/gamemodes/cult/narsie.dm @@ -153,7 +153,7 @@ var/global/list/narsie_list = list() T.icon = 'icons/turf/walls.dmi' T.icon_state = "cult-narsie" T.opacity = 0 - T.density = 0 + T.density = FALSE set_light(1) /obj/singularity/narsie/large/consume(const/atom/A) //Has its own consume proc because it doesn't need energy and I don't want BoHs to explode it. --NEO diff --git a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm index aef330c144..a74867d990 100644 --- a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm +++ b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm @@ -16,7 +16,7 @@ /obj/singularity/narsie/large/exit/New() ..() - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) /obj/singularity/narsie/large/exit/update_icon() overlays = 0 @@ -50,7 +50,7 @@ var/turf/T = A var/dist = get_dist(T, src) if (dist <= consume_range && T.density) - T.density = 0 + T.density = FALSE for (var/atom/movable/AM in T.contents) if (AM == src) // This is the snowflake. diff --git a/code/game/gamemodes/events/black_hole.dm b/code/game/gamemodes/events/black_hole.dm index 96ab98acb1..b18310ed88 100644 --- a/code/game/gamemodes/events/black_hole.dm +++ b/code/game/gamemodes/events/black_hole.dm @@ -54,9 +54,9 @@ //MOVEMENT if( prob(50) ) - src.anchored = 0 + src.anchored = FALSE step(src,pick(alldirs)) - src.anchored = 1 + src.anchored = TRUE /obj/effect/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance) if(!isturf(loc)) //blackhole cannot be contained inside anything. Weird stuff might happen diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm index 7618708aad..eec695278f 100644 --- a/code/game/gamemodes/technomancer/devices/shield_armor.dm +++ b/code/game/gamemodes/technomancer/devices/shield_armor.dm @@ -58,8 +58,8 @@ if(istype(damage_source, /obj/item/projectile)) var/obj/item/projectile/P = damage_source - P.sharp = 0 - P.edge = 0 + P.sharp = FALSE + P.edge = FALSE P.embed_chance = 0 if(P.agony) var/agony_blocked = P.agony * (modified_block_percentage / 100) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 4fd1ba7942..783ee16225 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -172,7 +172,7 @@ update_flag src.destroyed = 1 playsound(src, 'sound/effects/spray.ogg', 10, 1, -3) - src.density = 0 + src.density = FALSE update_icon() if (src.holding) diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index 41ea09e214..d00efc79b6 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -132,7 +132,7 @@ return if(container) - var/response = tgui_alert(user, "What do you want to do?", list("Bioprinter Menu", "Print Limbs", "Cancel")) + var/response = tgui_alert(user, "What do you want to do?", "Bioprinter Menu", list("Print Limbs", "Cancel")) if(response == "Print Limbs") printing_menu(user) else diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm index 24c5da8d6c..2273defdea 100644 --- a/code/game/machinery/bomb_tester_vr.dm +++ b/code/game/machinery/bomb_tester_vr.dm @@ -309,7 +309,7 @@ simulation_results += "
Final Result: No detonation." /obj/machinery/bomb_tester/proc/canister_sim() - test_canister.anchored = 1 + test_canister.anchored = TRUE faketank.volume = tank1.air_contents.volume faketank.copy_from(tank1.air_contents) faketank_integrity = tank1.integrity @@ -346,7 +346,7 @@ update_use_power(USE_POWER_IDLE) update_icon() if(test_canister && test_canister.anchored && !test_canister.connected_port) - test_canister.anchored = 0 + test_canister.anchored = FALSE if(cancelled) return if(simulation_results == "Error") diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 367f2f8803..85f23cb1db 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -174,7 +174,7 @@ if(weld(W, user)) if(assembly) assembly.loc = src.loc - assembly.anchored = 1 + assembly.anchored = TRUE assembly.camera_name = c_tag assembly.camera_network = english_list(network, NETWORK_DEFAULT, ",", ",") assembly.update_icon() diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 930b354ea0..5f4ff28e05 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -17,7 +17,7 @@ playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) to_chat(user, "You wrench the frame into place.") - src.anchored = 1 + src.anchored = TRUE src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P @@ -35,7 +35,7 @@ playsound(src, P.usesound, 50, 1) if(do_after(user, 20 * P.toolspeed)) to_chat(user, "You unfasten the frame.") - src.anchored = 0 + src.anchored = FALSE src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 24a84b4f14..765f6de69b 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -71,7 +71,7 @@ GLOBAL_LIST_EMPTY(entertainment_screens) /obj/machinery/computer/security/telescreen/entertainment name = "entertainment monitor" - desc = "Damn, why do they never have anything interesting on these things?" + desc = "Damn, why do they never have anything interesting on these things? (Alt-click to toggle the display)" icon = 'icons/obj/entertainment_monitor.dmi' icon_state = "screen" icon_screen = null @@ -85,6 +85,8 @@ GLOBAL_LIST_EMPTY(entertainment_screens) var/obj/effect/overlay/vis/pinboard var/weakref/showing + var/enabled = TRUE // on or off + /obj/machinery/computer/security/telescreen/entertainment/Initialize() GLOB.entertainment_screens += src @@ -107,7 +109,7 @@ GLOBAL_LIST_EMPTY(entertainment_screens) radio.listening = TRUE radio.broadcasting = FALSE radio.set_frequency(ENT_FREQ) - radio.canhear_range = 7 // Same as default sight range. + radio.canhear_range = world.view // Same as default sight range. power_change() /obj/machinery/computer/security/telescreen/entertainment/Destroy() @@ -118,13 +120,29 @@ GLOBAL_LIST_EMPTY(entertainment_screens) qdel_null(radio) return ..() +/obj/machinery/computer/security/telescreen/entertainment/proc/toggle() + enabled = !enabled + if(!enabled) + stop_showing() + radio?.on = FALSE + else if(operable()) + radio?.on = TRUE + /obj/machinery/computer/security/telescreen/entertainment/Click(location, control, params) - attack_hand(usr) + var/list/modifiers = params2list(params) + if(modifiers["alt"]) + if(isliving(usr) && Adjacent(usr) && !usr.incapacitated()) + toggle() + visible_message("[usr] toggles [src] [enabled ? "on" : "off"].","You toggle [src] [enabled ? "on" : "off"].", runemessage = "click") + else + attack_hand(usr) /obj/machinery/computer/security/telescreen/entertainment/update_icon() return // NUH /obj/machinery/computer/security/telescreen/entertainment/proc/show_thing(atom/thing) + if(!enabled) + return if(showing) stop_showing() if(stat & NOPOWER) @@ -146,7 +164,7 @@ GLOBAL_LIST_EMPTY(entertainment_screens) if(stat & NOPOWER) radio?.on = FALSE stop_showing() - else + else if(enabled) radio?.on = TRUE /obj/machinery/computer/security/wooden_tv diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 5eae5e82d0..f37f0f6c97 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -75,7 +75,7 @@ A.circuit = M A.state = 3 A.icon_state = "3" - A.anchored = 1 + A.anchored = TRUE qdel(src) else to_chat(to_chat(user, "You disconnect the monitor.")) @@ -98,7 +98,7 @@ A.circuit = M A.state = 4 A.icon_state = "4" - A.anchored = 1 + A.anchored = TRUE qdel(src) else attack_hand(user) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 0d7474eb2f..04b5ce0fff 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1137,7 +1137,7 @@ About the new airlock wires panel: if (istype(da, /obj/structure/door_assembly/multi_tile)) da.set_dir(src.dir) - da.anchored = 1 + da.anchored = TRUE if(mineral) da.glass = mineral //else if(glass) diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 4fd60b20b2..36befb944e 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -86,7 +86,7 @@ src.operating = 1 playsound(src, open_sound, 100, 1) flick(icon_state_opening, src) - src.density = 0 + src.density = FALSE update_nearby_tiles() src.update_icon() src.set_opacity(0) @@ -106,7 +106,7 @@ playsound(src, close_sound, 100, 1) src.layer = closed_layer flick(icon_state_closing, src) - src.density = 1 + src.density = TRUE update_nearby_tiles() src.update_icon() if(src.istransparent) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index d138653261..d253a4dd68 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -157,7 +157,7 @@ /obj/machinery/door/CanZASPass(turf/T, is_zone) if(is_zone) return !block_air_zones // Block merging unless block_air_zones = 0 - return !density // Block airflow unless density = 0 + return !density // Block airflow unless density = FALSE /obj/machinery/door/proc/bumpopen(mob/user as mob) if(operating) return @@ -429,7 +429,7 @@ icon_state = "door0" set_opacity(0) sleep(3) - src.density = 0 + src.density = FALSE update_nearby_tiles() sleep(7) src.layer = open_layer @@ -454,7 +454,7 @@ close_door_at = 0 do_animate("closing") sleep(3) - src.density = 1 + src.density = TRUE explosion_resistance = initial(explosion_resistance) src.layer = closed_layer update_nearby_tiles() diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 754edb9f38..96609e02a5 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -288,8 +288,8 @@ new/obj/item/weapon/circuitboard/airalarm(src.loc) var/obj/structure/firedoor_assembly/FA = new/obj/structure/firedoor_assembly(src.loc) - FA.anchored = 1 - FA.density = 1 + FA.anchored = TRUE + FA.density = TRUE FA.wired = 1 FA.glass = glass FA.update_icon() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 6950be687a..9d54018e7d 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -50,7 +50,7 @@ if(operating == -1) ae.icon_state = "door_electronics_smoked" operating = 0 - src.density = 0 + src.density = FALSE playsound(src, "shatter", 70, 1) if(display_message) visible_message("[src] shatters!") @@ -228,7 +228,7 @@ if (src.base_state == "right" || src.base_state == "rightsecure") wa.facing = "r" wa.set_dir(src.dir) - wa.anchored = 1 + wa.anchored = TRUE wa.created_name = name wa.state = "02" wa.step = 2 diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm index 37558d96f0..70c97af29d 100644 --- a/code/game/machinery/gear_dispenser.dm +++ b/code/game/machinery/gear_dispenser.dm @@ -585,6 +585,80 @@ var/list/dispenser_presets = list() one_setting = /datum/gear_disp/voidsuit/aether special_frame = "frame_purple" +////////////////////////////// COMMONWEALTH SUIT DISPENSERS /////////////////////////// +/datum/gear_disp/voidsuit/com_mining + name = "Commonwealth mining voidsuit" + voidsuit_type = /obj/item/clothing/suit/space/void/mining/alt2 + voidhelmet_type = /obj/item/clothing/head/helmet/space/void/mining/alt2 + +/datum/gear_disp/voidsuit/com_riot + name = "Commonwealth crowd control voidsuit" + voidsuit_type = /obj/item/clothing/suit/space/void/security/riot/alt + voidhelmet_type = /obj/item/clothing/head/helmet/space/void/security/riot/alt + +/datum/gear_disp/voidsuit/com_pilot + name = "Commonwealth pilot voidsuit" + voidsuit_type = /obj/item/clothing/suit/space/void/pilot/alt2 + voidhelmet_type = /obj/item/clothing/head/helmet/space/void/pilot/alt2 + +/datum/gear_disp/voidsuit/com_medical + name = "Commonwealth medical voidsuit" + voidsuit_type = /obj/item/clothing/suit/space/void/medical/alt2 + voidhelmet_type = /obj/item/clothing/head/helmet/space/void/medical/alt2 + +/datum/gear_disp/voidsuit/com_explorer + name = "Commonwealth explorer voidsuit" + voidsuit_type = /obj/item/clothing/suit/space/void/exploration/alt2 + voidhelmet_type = /obj/item/clothing/head/helmet/space/void/exploration/alt2 + +/datum/gear_disp/voidsuit/com_engineering + name = "Commonwealth engineering voidsuit" + voidsuit_type = /obj/item/clothing/suit/space/void/engineering/alt2 + voidhelmet_type = /obj/item/clothing/head/helmet/space/void/engineering/alt2 + +/datum/gear_disp/voidsuit/com_atmos + name = "Commonwealth atmos voidsuit" + voidsuit_type = /obj/item/clothing/suit/space/void/atmos/alt2 + voidhelmet_type = /obj/item/clothing/head/helmet/space/void/atmos/alt2 + +/datum/gear_disp/voidsuit/com_command + name = "Commonwealth command voidsuit" + voidsuit_type = /obj/item/clothing/suit/space/void/captain/alt + voidhelmet_type = /obj/item/clothing/head/helmet/space/void/captain/alt + +/obj/machinery/gear_dispenser/suit/commonwealth + name = "\improper Commonwealth Voidsuit Dispenser" + desc = "An industrial U-Tak-It Dispenser unit designed to fetch surplus Commonwealth voidsuits." + icon_state = "suitdispenserMB" + dispenser_flags = GD_NOGREED|GD_UNLIMITED + dispenses = list( + /datum/gear_disp/voidsuit/com_mining, + /datum/gear_disp/voidsuit/com_riot, + /datum/gear_disp/voidsuit/com_pilot, + /datum/gear_disp/voidsuit/com_medical, + /datum/gear_disp/voidsuit/com_explorer, + /datum/gear_disp/voidsuit/com_engineering, + /datum/gear_disp/voidsuit/com_atmos, + /datum/gear_disp/voidsuit/com_command + ) + +/obj/machinery/gear_dispenser/suit_fancy/commonwealth + name = "\improper Commonwealth Voidsuit Dispenser" + desc = "A commercial U-Tak-It Dispenser unit designed to fetch surplus Commonwealth voidsuits." + dispenser_flags = GD_NOGREED|GD_UNLIMITED + one_setting = /datum/gear_disp/voidsuit/aether + special_frame = "frame_red" + dispenses = list( + /datum/gear_disp/voidsuit/com_mining, + /datum/gear_disp/voidsuit/com_riot, + /datum/gear_disp/voidsuit/com_pilot, + /datum/gear_disp/voidsuit/com_medical, + /datum/gear_disp/voidsuit/com_explorer, + /datum/gear_disp/voidsuit/com_engineering, + /datum/gear_disp/voidsuit/com_atmos, + /datum/gear_disp/voidsuit/com_command + ) + // Adminbuse /obj/machinery/gear_dispenser/vv_get_dropdown() . = ..() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index dd9fe7faa6..41851575af 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -119,7 +119,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ hologram.icon = A.holo_icon //hologram.mouse_opacity = 0//So you can't click on it. //VOREStation Removal hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them. - hologram.anchored = 1//So space wind cannot drag it. + hologram.anchored = TRUE//So space wind cannot drag it. hologram.name = "[A.name] (Hologram)"//If someone decides to right click. hologram.set_light(2) //hologram lighting hologram.color = color //painted holopad gives coloured holograms diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 40d348cb6f..2da7d5342a 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -176,7 +176,7 @@ Class Procs: pulse2.icon = 'icons/effects/effects.dmi' pulse2.icon_state = "empdisable" pulse2.name = "emp sparks" - pulse2.anchored = 1 + pulse2.anchored = TRUE pulse2.set_dir(pick(cardinal)) spawn(10) @@ -441,15 +441,15 @@ Class Procs: var/obj/structure/frame/A = new /obj/structure/frame(src.loc) var/obj/item/weapon/circuitboard/M = circuit A.circuit = M - A.anchored = 1 + A.anchored = TRUE A.frame_type = M.board_type if(A.frame_type.circuit) A.need_circuit = 0 if(A.frame_type.frame_class == FRAME_CLASS_ALARM || A.frame_type.frame_class == FRAME_CLASS_DISPLAY) - A.density = 0 + A.density = FALSE else - A.density = 1 + A.density = TRUE if(A.frame_type.frame_class == FRAME_CLASS_MACHINE) for(var/obj/D in component_parts) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 7f0ffc10b1..0b4d054858 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -124,7 +124,7 @@ "[user] unfastens \the [src].", \ "You have unfastened \the [src]. Now it can be pulled somewhere else.", \ "You hear ratchet.") - src.anchored = 0 + src.anchored = FALSE src.stat |= MAINT src.unwrenched = 1 if (usr.machine==src) @@ -137,7 +137,7 @@ "[user] fastens \the [src].", \ "You have fastened \the [src]. Now it can dispense pipes.", \ "You hear ratchet.") - src.anchored = 1 + src.anchored = TRUE src.stat &= ~MAINT src.unwrenched = 0 power_change() diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 8d11f99619..8c8b2fc6f7 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -28,7 +28,7 @@ id = "CentCom Relay" hide = 1 toggled = 1 - //anchored = 1 + //anchored = TRUE //use_power = 0 //idle_power_usage = 0 produces_heat = 0 diff --git a/code/game/mecha/equipment/tools/clamp.dm b/code/game/mecha/equipment/tools/clamp.dm index 70f46ee35f..1df39a4178 100644 --- a/code/game/mecha/equipment/tools/clamp.dm +++ b/code/game/mecha/equipment/tools/clamp.dm @@ -78,13 +78,13 @@ chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.") set_ready_state(FALSE) chassis.use_power(energy_drain) - O.anchored = 1 + O.anchored = TRUE var/T = chassis.loc if(do_after_cooldown(target)) if(T == chassis.loc && src == chassis.selected) cargo_holder.cargo += O O.loc = chassis - O.anchored = 0 + O.anchored = FALSE occupant_message("[target] succesfully loaded.") log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]") else @@ -139,13 +139,13 @@ chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.") set_ready_state(FALSE) chassis.use_power(energy_drain) - O.anchored = 1 + O.anchored = TRUE var/T = chassis.loc if(do_after_cooldown(target)) if(T == chassis.loc && src == chassis.selected) cargo_holder.cargo += O O.loc = chassis - O.anchored = 0 + O.anchored = FALSE chassis.occupant_message("[target] succesfully loaded.") chassis.log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]") else diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 62aa885d01..01175eb3b0 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -933,10 +933,10 @@ . = ..(obstacle) return if(istype(O, /obj/effect/portal)) //derpfix - src.anchored = 0 //I have no idea what this really fix. + src.anchored = FALSE //I have no idea what this really fix. O.Crossed(src) spawn(0)//countering portal teleport spawn(0), hurr - src.anchored = 1 + src.anchored = TRUE else if(O.anchored) obstacle.Bumped(src) else @@ -2688,7 +2688,7 @@ O.canmove = 1 O.name = AI.name O.real_name = AI.real_name - O.anchored = 1 + O.anchored = TRUE O.aiRestorePowerRoutine = 0 O.control_disabled = 1 // Can't control things remotely if you're stuck in a card! O.laws = AI.laws diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 467145309b..82a83e601e 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -91,7 +91,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/ripley(const_holder) const_holder.icon = 'icons/mecha/mech_construction.dmi' const_holder.icon_state = "ripley0" - const_holder.density = 1 + const_holder.density = TRUE const_holder.overlays.len = 0 spawn() qdel(src) @@ -303,7 +303,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/gygax(const_holder) const_holder.icon = 'icons/mecha/mech_construction.dmi' const_holder.icon_state = "gygax0" - const_holder.density = 1 + const_holder.density = TRUE spawn() qdel(src) return @@ -587,7 +587,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/serenity(const_holder) const_holder.icon = 'icons/mecha/mech_construction.dmi' const_holder.icon_state = "gygax0" - const_holder.density = 1 + const_holder.density = TRUE spawn() qdel(src) return @@ -873,7 +873,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/firefighter(const_holder) const_holder.icon = 'icons/mecha/mech_construction.dmi' const_holder.icon_state = "fireripley0" - const_holder.density = 1 + const_holder.density = TRUE spawn() qdel(src) return @@ -1097,7 +1097,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/durand(const_holder) const_holder.icon = 'icons/mecha/mech_construction.dmi' const_holder.icon_state = "durand0" - const_holder.density = 1 + const_holder.density = TRUE spawn() qdel(src) return @@ -1381,7 +1381,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/odysseus(const_holder) const_holder.icon = 'icons/mecha/mech_construction.dmi' const_holder.icon_state = "odysseus0" - const_holder.density = 1 + const_holder.density = TRUE spawn() qdel(src) return @@ -1594,7 +1594,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/phazon(const_holder) const_holder.icon = 'icons/mecha/mech_construction.dmi' const_holder.icon_state = "phazon0" - const_holder.density = 1 + const_holder.density = TRUE spawn() qdel(src) return @@ -1876,7 +1876,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/janus(const_holder) const_holder.icon = 'icons/mecha/mech_construction.dmi' const_holder.icon_state = "janus0" - const_holder.density = 1 + const_holder.density = TRUE spawn() qdel(src) return diff --git a/code/game/mecha/micro/mecha_construction_paths_vr.dm b/code/game/mecha/micro/mecha_construction_paths_vr.dm index 7019c64399..60d8d2d3b7 100644 --- a/code/game/mecha/micro/mecha_construction_paths_vr.dm +++ b/code/game/mecha/micro/mecha_construction_paths_vr.dm @@ -22,7 +22,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/polecat(const_holder) const_holder.icon = 'icons/mecha/mech_construction_vr.dmi' const_holder.icon_state = "polecat0" - const_holder.density = 1 + const_holder.density = TRUE const_holder.overlays.len = 0 spawn() qdel(src) @@ -303,7 +303,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/gopher(const_holder) const_holder.icon = 'icons/mecha/mech_construction_vr.dmi' const_holder.icon_state = "gopher0" - const_holder.density = 1 + const_holder.density = TRUE const_holder.overlays.len = 0 spawn() qdel(src) @@ -512,7 +512,7 @@ const_holder.construct = new /datum/construction/reversible/mecha/weasel(const_holder) const_holder.icon = 'icons/mecha/mech_construction_vr.dmi' const_holder.icon_state = "weasel0" - const_holder.density = 1 + const_holder.density = TRUE const_holder.overlays.len = 0 spawn() qdel(src) diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 3c5afc9715..fcec6803e4 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -19,7 +19,7 @@ pulse.icon = 'icons/effects/effects.dmi' pulse.icon_state = "emppulse" pulse.name = "emp pulse" - pulse.anchored = 1 + pulse.anchored = TRUE spawn(20) qdel(pulse) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 16d70eaa79..8202fe102e 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -153,7 +153,7 @@ A.pixel_y = pixel_y A.circuit = M A.set_dir(dir) - A.anchored = 1 + A.anchored = TRUE A.state = 2 A.update_icon() M.deconstruct(src) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 21efc13f37..bf132c7cf9 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -14,7 +14,7 @@ for(var/obj/structure/target_stake/T in view(3,src)) if(T.pinned_target == src) T.pinned_target = null - T.density = 1 + T.density = TRUE break ..() // delete target @@ -51,7 +51,7 @@ if(stake) if(stake.pinned_target) - stake.density = 1 + stake.density = TRUE density = FALSE layer = OBJ_LAYER diff --git a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm index 2bdd52bfa9..13680cadbe 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm @@ -8,209 +8,269 @@ initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n") /obj/item/weapon/card/id/generic + name = "Generic ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-silhouette", "clip") //Central /obj/item/weapon/card/id/centcom + name = "Central Command ID" initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-white", "stripe-gold") /obj/item/weapon/card/id/centcom/vip + name = "VIP ID" initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold", "stripe-gold") //ERT /obj/item/weapon/card/id/centcom/ERT + name = "Emergency Responder ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-red", "stripe-red") /obj/item/weapon/card/id/centcom/ERT/medic + name = "Emergency Medical Responder ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-medblu", "stripe-medblu") /obj/item/weapon/card/id/centcom/ERT/commander + name = "Emergency Response Commander ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold", "stripe-gold") /obj/item/weapon/card/id/centcom/ERT/engineer + name = "Emergency Engineering Responder ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-orange", "stripe-orange") /obj/item/weapon/card/id/centcom/ERT/janitor + name = "Emergency Cleanup Responder ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-purple", "stripe-purple") //Silver /obj/item/weapon/card/id/silver + name = "Silver ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n") /obj/item/weapon/card/id/silver/secretary + name = "Secretary's ID" initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n") /obj/item/weapon/card/id/silver/hop + name = "Head of Personnel ID" initial_sprite_stack = list("base-stamp-silver", "top-blue", "stamp-n", "pips-gold") //Gold /obj/item/weapon/card/id/gold + name = "Gold ID" initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n") /obj/item/weapon/card/id/gold/captain + name = "Captain's ID" initial_sprite_stack = list("base-stamp-gold", "top-blue", "stamp-n", "pips-gold") /obj/item/weapon/card/id/gold/captain/spare + name = "Spare ID" initial_sprite_stack = list("base-stamp-gold", "top-gold", "stamp-n") //Medical /obj/item/weapon/card/id/medical + name = "Medical ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n") /obj/item/weapon/card/id/medical/chemist + name = "Chemist's ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-orange") /obj/item/weapon/card/id/medical/geneticist + name = "Geneticist's ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-purple") /obj/item/weapon/card/id/medical/psych + name = "Psychologist's ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-brown") /obj/item/weapon/card/id/medical/virologist + name = "Virologist's ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-green") /obj/item/weapon/card/id/medical/emt + name = "Emergency Medical Technician's ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue") /obj/item/weapon/card/id/medical/head + name = "Chief Medical Officer's ID" initial_sprite_stack = list("base-stamp-silver", "top-medblu", "stamp-n", "pips-gold") //Security /obj/item/weapon/card/id/security + name = "Security ID" initial_sprite_stack = list("base-stamp", "top-red", "stamp-n") /obj/item/weapon/card/id/security/detective + name = "Detective's ID" initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-brown") /obj/item/weapon/card/id/security/warden + name = "Warden's ID" initial_sprite_stack = list("base-stamp", "top-red", "stamp-n", "stripe-white") /obj/item/weapon/card/id/security/head + name = "Head of Security's ID" initial_sprite_stack = list("base-stamp-silver", "top-red", "stamp-n", "pips-gold") //Engineering /obj/item/weapon/card/id/engineering + name = "Engineering ID" initial_sprite_stack = list("base-stamp", "top-orange", "stamp-n") /obj/item/weapon/card/id/engineering/atmos + name = "Atmospherics ID" initial_sprite_stack = list("base-stamp", "top-orange", "stripe-medblu", "stamp-n") /obj/item/weapon/card/id/engineering/head + name = "Chief Engineer's ID" initial_sprite_stack = list("base-stamp-silver", "top-orange", "stamp-n", "pips-gold") //Science /obj/item/weapon/card/id/science + name = "Science ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n") /obj/item/weapon/card/id/science/roboticist + name = "Roboticist's ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-brown") /obj/item/weapon/card/id/science/xenobiologist + name = "Xenobiologist's ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-orange") /obj/item/weapon/card/id/science/xenobotanist + name = "Xenobotanist's ID" initial_sprite_stack = list("base-stamp", "top-purple", "stamp-n", "stripe-green") /obj/item/weapon/card/id/science/head + name = "Research Director's ID" initial_sprite_stack = list("base-stamp-silver", "top-purple", "stamp-n", "pips-gold") //Cargo /obj/item/weapon/card/id/cargo + name = "Cargo ID" initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n") /obj/item/weapon/card/id/cargo/miner + name = "Miner's ID" initial_sprite_stack = list("base-stamp", "top-brown", "stamp-n", "stripe-purple") /obj/item/weapon/card/id/cargo/head + name = "Quartermaster's ID" initial_sprite_stack = list("base-stamp-silver", "top-brown", "stamp-n", "pips-white") //Civilian /obj/item/weapon/card/id/civilian + name = "Civilian ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n") /obj/item/weapon/card/id/civilian/chaplain + name = "Chaplain's ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-cross", "stripe-white") /obj/item/weapon/card/id/civilian/journalist + name = "Journalist's ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red") /obj/item/weapon/card/id/civilian/pilot + name = "Pilot's ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-olive") /obj/item/weapon/card/id/civilian/entertainer - initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown") + name = "Entertainer's ID" + initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown") /obj/item/weapon/card/id/civilian/clown + name = "Clown's ID" initial_sprite_stack = list("base-stamp", "top-rainbow", "stamp-n") /obj/item/weapon/card/id/civilian/mime + name = "Mime's ID" initial_sprite_stack = list("base-stamp", "top-white", "stamp-n", "stripe-black") /obj/item/weapon/card/id/civilian/internal_affairs + name = "Internal Affairs ID" initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "stripe-black") //Service /obj/item/weapon/card/id/civilian/service + name = "Service ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n") /obj/item/weapon/card/id/civilian/service/botanist + name = "Botanist's ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-darkgreen") /obj/item/weapon/card/id/civilian/service/bartender + name = "Bartender's ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-black") /obj/item/weapon/card/id/civilian/service/chef + name = "Chef's ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-white") /obj/item/weapon/card/id/civilian/service/janitor + name = "Janitor's ID" initial_sprite_stack = list("base-stamp", "top-green", "stamp-n", "stripe-purple") //Exploration /obj/item/weapon/card/id/exploration + name = "Exploration ID" initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n") /obj/item/weapon/card/id/exploration/fm + name = "Field Medic's ID" initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n", "stripe-medblu") /obj/item/weapon/card/id/exploration/head + name = "Pathfinder's ID" initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white") //Talon /obj/item/weapon/card/id/talon + name = "Talon ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette") /obj/item/weapon/card/id/talon/doctor + name = "Talon Medical ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-medblu", "stripe-medblu") /obj/item/weapon/card/id/talon/engineer + name = "Talon Engineering ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-orange", "stripe-orange") /obj/item/weapon/card/id/talon/officer + name = "Talon Security ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-red", "stripe-red") /obj/item/weapon/card/id/talon/pilot + name = "Talon Pilot ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-purple", "stripe-purple") /obj/item/weapon/card/id/talon/captain + name = "Talon Captain ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-gold", "stripe-gold") //Antags /obj/item/weapon/card/id/syndicate + name = "Syndicate ID" initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s") /obj/item/weapon/card/id/syndicate/officer + name = "Syndicate Officer ID" initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s", "pips-gold", "stripe-gold") \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 253e93ff71..9b66918be0 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -17,7 +17,7 @@ if(L && (ishuman(L) || L.isMonkey() || iscorgi(L))) if(L.buckled) L.buckled = 0 - L.anchored = 0 + L.anchored = FALSE if(L.client) L.client.perspective = EYE_PERSPECTIVE L.client.eye = src diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index c7e6ffd693..fc1ae0ef59 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -37,7 +37,7 @@ /obj/structure/displaycase/proc/healthcheck() if (src.health <= 0) if (!( src.destroyed )) - src.density = 0 + src.density = FALSE src.destroyed = 1 new /obj/item/weapon/material/shard( src.loc ) playsound(src, "shatter", 70, 1) diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 31249e7b43..0e29fed20b 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -25,7 +25,7 @@ if(istype(W, /obj/item/target)) density = FALSE - W.density = 1 + W.density = TRUE user.remove_from_mob(W) W.loc = loc W.layer = ABOVE_JUNK_LAYER @@ -37,7 +37,7 @@ // taking pinned targets off! if(pinned_target) density = TRUE - pinned_target.density = 0 + pinned_target.density = FALSE pinned_target.layer = OBJ_LAYER pinned_target.loc = user.loc diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 287e311559..0677c6a09d 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -113,7 +113,7 @@ if(do_after(user, 40 * W.toolspeed)) if(!src) return to_chat(user,"You've secured the windoor assembly!") - src.anchored = 1 + src.anchored = TRUE step = 0 //Unwrenching an unsecure assembly un-anchors it. Step 4 undone @@ -124,7 +124,7 @@ if(do_after(user, 40 * W.toolspeed)) if(!src) return to_chat(user,"You've unsecured the windoor assembly!") - src.anchored = 0 + src.anchored = FALSE step = null //Adding cable to the assembly. Step 5 complete. @@ -212,7 +212,7 @@ windoor.icon_state = "rightsecureopen" windoor.base_state = "rightsecure" windoor.set_dir(src.dir) - windoor.density = 0 + windoor.density = FALSE if(created_name) windoor.name = created_name spawn(0) @@ -234,7 +234,7 @@ windoor.icon_state = "rightopen" windoor.base_state = "right" windoor.set_dir(src.dir) - windoor.density = 0 + windoor.density = FALSE if(created_name) windoor.name = created_name spawn(0) diff --git a/code/game/objects/stumble_into_vr.dm b/code/game/objects/stumble_into_vr.dm index d282648303..610afea550 100644 --- a/code/game/objects/stumble_into_vr.dm +++ b/code/game/objects/stumble_into_vr.dm @@ -41,7 +41,7 @@ /obj/structure/kitchenspike/stumble_into(mob/living/M) playsound(src, "sound/weapons/pierce.ogg", 25, 1, -1) visible_message("[M] [pick("ran", "slammed")] into the spikes on \the [src]!") - M.apply_damage(15, BRUTE, sharp=1) + M.apply_damage(15, BRUTE, sharp = TRUE) M.Weaken(5) M.stop_flying() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 56c9fbec8d..be1605e0a9 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -267,8 +267,8 @@ O.desc = "Looks hot." O.icon = 'icons/effects/fire.dmi' O.icon_state = "2" - O.anchored = 1 - O.density = 1 + O.anchored = TRUE + O.density = TRUE O.plane = ABOVE_PLANE if(girder_material.integrity >= 150 && !girder_material.is_brittle()) //Strong girders will remain in place when a wall is melted. diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 8b7aa49087..8b0baa5967 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -518,7 +518,7 @@ if(istype(M.loc.loc,/area/engineering/engine_room)) if(istype(M,/obj/machinery/power/rad_collector)) var/obj/machinery/power/rad_collector/Rad = M - Rad.anchored = 1 + Rad.anchored = TRUE Rad.connect_to_network() var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad) diff --git a/code/modules/artifice/deadringer.dm b/code/modules/artifice/deadringer.dm index b5edd57784..b10c05c942 100644 --- a/code/modules/artifice/deadringer.dm +++ b/code/modules/artifice/deadringer.dm @@ -104,60 +104,60 @@ temp = corpse.get_equipped_item(slot_w_uniform) var/obj/item/clothing/c_type = H.get_equipped_item(slot_w_uniform) temp.disguise(c_type.type) - temp.canremove = 0 + temp.canremove = FALSE if(H.get_equipped_item(slot_wear_suit)) corpse.equip_to_slot_or_del(new /obj/item/clothing/suit/chameleon/changeling(corpse), slot_wear_suit) temp = corpse.get_equipped_item(slot_wear_suit) var/obj/item/clothing/c_type = H.get_equipped_item(slot_wear_suit) temp.disguise(c_type.type) - temp.canremove = 0 + temp.canremove = FALSE if(H.get_equipped_item(slot_shoes)) corpse.equip_to_slot_or_del(new /obj/item/clothing/shoes/chameleon/changeling(corpse), slot_shoes) temp = corpse.get_equipped_item(slot_shoes) var/obj/item/clothing/c_type = H.get_equipped_item(slot_shoes) temp.disguise(c_type.type) - temp.canremove = 0 + temp.canremove = FALSE if(H.get_equipped_item(slot_gloves)) corpse.equip_to_slot_or_del(new /obj/item/clothing/gloves/chameleon/changeling(corpse), slot_gloves) temp = corpse.get_equipped_item(slot_gloves) var/obj/item/clothing/c_type = H.get_equipped_item(slot_gloves) temp.disguise(c_type.type) - temp.canremove = 0 + temp.canremove = FALSE if(H.get_equipped_item(slot_l_ear)) temp = H.get_equipped_item(slot_l_ear) corpse.equip_to_slot_or_del(new temp.type(corpse), slot_l_ear) temp = corpse.get_equipped_item(slot_l_ear) - temp.canremove = 0 + temp.canremove = FALSE if(H.get_equipped_item(slot_glasses)) corpse.equip_to_slot_or_del(new /obj/item/clothing/glasses/chameleon/changeling(corpse), slot_glasses) temp = corpse.get_equipped_item(slot_glasses) var/obj/item/clothing/c_type = H.get_equipped_item(slot_glasses) temp.disguise(c_type.type) - temp.canremove = 0 + temp.canremove = FALSE if(H.get_equipped_item(slot_wear_mask)) corpse.equip_to_slot_or_del(new /obj/item/clothing/mask/chameleon/changeling(corpse), slot_wear_mask) temp = corpse.get_equipped_item(slot_wear_mask) var/obj/item/clothing/c_type = H.get_equipped_item(slot_wear_mask) temp.disguise(c_type.type) - temp.canremove = 0 + temp.canremove = FALSE if(H.get_equipped_item(slot_head)) corpse.equip_to_slot_or_del(new /obj/item/clothing/head/chameleon/changeling(corpse), slot_head) temp = corpse.get_equipped_item(slot_head) var/obj/item/clothing/c_type = H.get_equipped_item(slot_head) temp.disguise(c_type.type) - temp.canremove = 0 + temp.canremove = FALSE if(H.get_equipped_item(slot_belt)) corpse.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/chameleon/changeling(corpse), slot_belt) temp = corpse.get_equipped_item(slot_belt) var/obj/item/clothing/c_type = H.get_equipped_item(slot_belt) temp.disguise(c_type.type) - temp.canremove = 0 + temp.canremove = FALSE if(H.get_equipped_item(slot_back)) corpse.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/chameleon/changeling(corpse), slot_back) temp = corpse.get_equipped_item(slot_back) var/obj/item/clothing/c_type = H.get_equipped_item(slot_back) temp.disguise(c_type.type) - temp.canremove = 0 + temp.canremove = FALSE corpse.identifying_gender = H.identifying_gender corpse.flavor_texts = H.flavor_texts.Copy() corpse.real_name = H.real_name diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index b619ee9f22..af697777f9 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -65,11 +65,11 @@ for(var/i = 1 to limit) var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(current_spot) I.master = src - I.density = 1 + I.density = TRUE I.set_dir(dir) if(!step(I, I.dir)) //Try to take a step in that direction return //Couldn't, oh well, we hit a wall or something. Beam should qdel itself in it's Bump(). - I.density = 0 + I.density = FALSE i_beams |= I I.visible = visible diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 681f10e7e4..9e7de66c34 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -243,40 +243,48 @@ display_name = "cloak, head of security" path = /obj/item/clothing/accessory/poncho/roles/cloak/hos allowed_roles = list("Head of Security") + cost = 1 /datum/gear/suit/roles/cloak_cmo display_name = "cloak, chief medical officer" path = /obj/item/clothing/accessory/poncho/roles/cloak/cmo allowed_roles = list("Chief Medical Officer") + cost = 1 /datum/gear/suit/roles/cloak_ce display_name = "cloak, chief engineer" path = /obj/item/clothing/accessory/poncho/roles/cloak/ce allowed_roles = list("Chief Engineer") + cost = 1 /datum/gear/suit/roles/cloak_rd display_name = "cloak, research director" path = /obj/item/clothing/accessory/poncho/roles/cloak/rd allowed_roles = list("Research Director") + cost = 1 /datum/gear/suit/roles/cloak_qm display_name = "cloak, quartermaster" path = /obj/item/clothing/accessory/poncho/roles/cloak/qm allowed_roles = list("Quartermaster") + cost = 1 /datum/gear/suit/roles/cloak_captain display_name = "cloak, site manager" path = /obj/item/clothing/accessory/poncho/roles/cloak/captain allowed_roles = list("Site Manager") + cost = 1 /datum/gear/suit/roles/cloak_hop display_name = "cloak, head of personnel" path = /obj/item/clothing/accessory/poncho/roles/cloak/hop allowed_roles = list("Head of Personnel") + cost = 1 /datum/gear/suit/cloak_custom //A colorable cloak display_name = "cloak, colorable" path = /obj/item/clothing/accessory/poncho/roles/cloak/custom + cost = 1 /datum/gear/suit/cloak_custom/New() ..() diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index a9216e2497..a749d6824d 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -143,7 +143,7 @@ for(var/obj/item/piece in list(gloves,helmet,boots,chest)) if(!istype(piece)) continue - piece.canremove = 0 + piece.canremove = FALSE piece.name = "[suit_type] [initial(piece.name)]" piece.desc = "It seems to be part of a [src.name]." piece.icon_state = "[suit_state]" @@ -611,7 +611,7 @@ wearer.update_inv_back() return -/obj/item/weapon/rig/proc/check_suit_access(var/mob/living/carbon/human/user) +/obj/item/weapon/rig/proc/check_suit_access(var/mob/living/carbon/human/user, var/do_message = TRUE) if(!security_check_enabled) return 1 @@ -624,11 +624,13 @@ if(user.back != src && user.belt != src) return 0 else if(!src.allowed(user)) - to_chat(user, "Unauthorized user. Access denied.") + if(do_message) + to_chat(user, "Unauthorized user. Access denied.") return 0 else if(!ai_override_enabled) - to_chat(user, "Synthetic access disabled. Please consult hardware provider.") + if(do_message) + to_chat(user, "Synthetic access disabled. Please consult hardware provider.") return 0 return 1 @@ -712,11 +714,11 @@ if(use_obj && check_slot == use_obj) to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") playsound(src, 'sound/machines/rig/rigservo.ogg', 10, FALSE) - use_obj.canremove = 1 + use_obj.canremove = TRUE holder.drop_from_inventory(use_obj) use_obj.forceMove(get_turf(src)) use_obj.dropped() - use_obj.canremove = 0 + use_obj.canremove = FALSE use_obj.forceMove(src) else if (deploy_mode != ONLY_RETRACT) diff --git a/code/modules/clothing/spacesuits/rig/rig_tgui.dm b/code/modules/clothing/spacesuits/rig/rig_tgui.dm index 7f34fe11b8..0a493264e5 100644 --- a/code/modules/clothing/spacesuits/rig/rig_tgui.dm +++ b/code/modules/clothing/spacesuits/rig/rig_tgui.dm @@ -30,7 +30,7 @@ */ /obj/item/weapon/rig/tgui_status(mob/user, datum/tgui_state/state) . = ..() - if(!check_suit_access(user)) + if(!check_suit_access(user, FALSE)) // don't send a message to the user, this is a UI thing // Forces the UI to never go interactive, // but doesn't interfere with state saying to close. . = min(., STATUS_UPDATE) diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 3d2c6b24d5..d6c96404e6 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -97,28 +97,28 @@ if(boots) if (H.equip_to_slot_if_possible(boots, slot_shoes)) - boots.canremove = 0 + boots.canremove = FALSE if(helmet) if(H.head) to_chat(M, "You are unable to deploy your suit's helmet as \the [H.head] is in the way.") else if (H.equip_to_slot_if_possible(helmet, slot_head)) to_chat(M, "Your suit's helmet deploys with a hiss.") - helmet.canremove = 0 + helmet.canremove = FALSE if(tank) if(H.s_store) //In case someone finds a way. to_chat(M, "Alarmingly, the valve on your suit's installed tank fails to engage.") else if (H.equip_to_slot_if_possible(tank, slot_s_store)) to_chat(M, "The valve on your suit's installed tank safely engages.") - tank.canremove = 0 + tank.canremove = FALSE if(cooler) if(H.s_store) //Ditto to_chat(M, "Alarmingly, the cooling unit installed into your suit fails to deploy.") else if (H.equip_to_slot_if_possible(cooler, slot_s_store)) to_chat(M, "Your suit's cooling unit deploys.") - cooler.canremove = 0 + cooler.canremove = FALSE /obj/item/clothing/suit/space/void/dropped() ..() @@ -126,7 +126,7 @@ var/mob/living/carbon/human/H if(helmet) - helmet.canremove = 1 + helmet.canremove = TRUE H = helmet.loc if(istype(H)) if(helmet && H.head == helmet) @@ -134,7 +134,7 @@ helmet.forceMove(src) if(boots) - boots.canremove = 1 + boots.canremove = TRUE H = boots.loc if(istype(H)) if(boots && H.shoes == boots) @@ -142,11 +142,11 @@ boots.forceMove(src) if(tank) - tank.canremove = 1 + tank.canremove = TRUE tank.forceMove(src) if(cooler) - cooler.canremove = 1 + cooler.canremove = TRUE cooler.forceMove(src) /obj/item/clothing/suit/space/void/proc/attach_helmet(var/obj/item/clothing/head/helmet/space/void/helm) @@ -188,7 +188,7 @@ if(H.head == helmet) to_chat(H, "You retract your suit helmet.") - helmet.canremove = 1 + helmet.canremove = TRUE H.drop_from_inventory(helmet) helmet.forceMove(src) else @@ -197,7 +197,7 @@ return if(H.equip_to_slot_if_possible(helmet, slot_head)) helmet.pickup(H) - helmet.canremove = 0 + helmet.canremove = FALSE to_chat(H, "You deploy your suit helmet, sealing you off from the world.") if(helmet.light_system == STATIC_LIGHT) @@ -229,7 +229,7 @@ removing = cooler cooler = null to_chat(H, "You press the emergency release, ejecting \the [removing] from your suit.") - removing.canremove = 1 + removing.canremove = TRUE H.drop_from_inventory(removing) /obj/item/clothing/suit/space/void/attackby(obj/item/W as obj, mob/user as mob) diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 8db25be17b..d04a5c5295 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -3,10 +3,11 @@ #define LOC_CHAPEL 2 #define LOC_LIBRARY 3 #define LOC_HYDRO 4 -#define LOC_VAULT 5 -#define LOC_CONSTR 6 -#define LOC_TECH 7 -#define LOC_GARDEN 8 +#define LOC_CONSTR 5 +#define LOC_TECH 6 +#define LOC_GARDEN 7 +#define LOC_STEMNGR 8 +#define LOC_RESEARCH 9 #define VERM_MICE 0 #define VERM_LIZARDS 1 @@ -22,7 +23,7 @@ /datum/event/infestation/start() - location = rand(0,8) + location = rand(0,10) var/list/turf/simulated/floor/turfs = list() var/spawn_area_type switch(location) @@ -41,9 +42,6 @@ if(LOC_HYDRO) spawn_area_type = /area/hydroponics locstring = "hydroponics" - if(LOC_VAULT) - spawn_area_type = /area/security/nuke_storage - locstring = "the vault" if(LOC_CONSTR) spawn_area_type = /area/construction locstring = "the construction area" @@ -53,6 +51,12 @@ if(LOC_GARDEN) spawn_area_type = /area/hydroponics/garden locstring = "the public garden" + if(LOC_STEMNGR) + spawn_area_type = /area/crew_quarters/captain + locstring = "the site manager's office" + if(LOC_RESEARCH) + spawn_area_type = /area/rnd/research + locstring = "the research division" for(var/areapath in typesof(spawn_area_type)) var/area/A = locate(areapath) @@ -106,9 +110,10 @@ #undef LOC_CHAPEL #undef LOC_LIBRARY #undef LOC_HYDRO -#undef LOC_VAULT #undef LOC_TECH #undef LOC_GARDEN +#undef LOC_STEMNGR +#undef LOC_RESEARCH #undef VERM_MICE #undef VERM_LIZARDS diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 3a783060f1..96d3bbcabc 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -256,7 +256,7 @@ return /obj/machinery/door/window/holowindoor/shatter(var/display_message = 1) - src.density = 0 + src.density = FALSE playsound(src, "shatter", 70, 1) if(display_message) visible_message("[src] fades away as it shatters!") diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 9672897c62..c99f50fbc9 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -140,7 +140,7 @@ if(affecting) to_chat(target, "\The [fruit]'s thorns pierce your [affecting.name] greedily!") - target.apply_damage(damage, BRUTE, target_limb, blocked, soaked, "Thorns", sharp=1, edge=has_edge) + target.apply_damage(damage, BRUTE, target_limb, blocked, soaked, "Thorns", sharp = TRUE, edge=has_edge) else to_chat(target, "\The [fruit]'s thorns pierce your flesh greedily!") target.adjustBruteLoss(damage) @@ -149,7 +149,7 @@ has_edge = prob(get_trait(TRAIT_POTENCY)/5) if(affecting) to_chat(target, "\The [fruit]'s thorns dig deeply into your [affecting.name]!") - target.apply_damage(damage, BRUTE, target_limb, blocked, "Thorns", sharp=1, edge=has_edge) + target.apply_damage(damage, BRUTE, target_limb, blocked, "Thorns", sharp = TRUE, edge=has_edge) else to_chat(target, "\The [fruit]'s thorns dig deeply into your flesh!") target.adjustBruteLoss(damage) diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm index db94bebd0d..5f2b432c09 100644 --- a/code/modules/hydroponics/spreading/spreading_growth.dm +++ b/code/modules/hydroponics/spreading/spreading_growth.dm @@ -122,9 +122,9 @@ return //move out to the destination - child.anchored = 0 + child.anchored = FALSE step_to(child, target_turf) - child.anchored = 1 + child.anchored = TRUE child.update_icon() //see if anything is there diff --git a/code/modules/looking_glass/lg_turfs.dm b/code/modules/looking_glass/lg_turfs.dm index 189790335d..ad38f640c0 100644 --- a/code/modules/looking_glass/lg_turfs.dm +++ b/code/modules/looking_glass/lg_turfs.dm @@ -59,7 +59,7 @@ M.Translate(new_x, new_y) MA.opacity = 1 if(!optional) - MA.density = 1 + MA.density = TRUE MA.icon_state = "origin_active" MA.plane = PLANE_LOOKINGGLASS @@ -76,7 +76,7 @@ sleep(3 SECONDS) var/mutable_appearance/MA = new (src) MA.opacity = 0 - MA.density = 0 + MA.density = FALSE MA.icon_state = "origin_switching" MA.plane = initial(plane) MA.layer = initial(layer) diff --git a/code/modules/maps/reader.dm b/code/modules/maps/reader.dm index daf34508f5..def68bbbcb 100644 --- a/code/modules/maps/reader.dm +++ b/code/modules/maps/reader.dm @@ -297,7 +297,7 @@ var/global/dmm_suite/preloader/_preloader = null //simulates the DM multiple turfs on one tile underlaying /dmm_suite/proc/add_underlying_turf(var/turf/placed,var/turf/underturf, var/list/turfs_underlays) if(underturf.density) - placed.density = 1 + placed.density = TRUE if(underturf.opacity) placed.opacity = 1 placed.underlays += turfs_underlays diff --git a/code/modules/materials/sheets/metals/rods.dm b/code/modules/materials/sheets/metals/rods.dm index 318ec68626..9ebd0fd92f 100644 --- a/code/modules/materials/sheets/metals/rods.dm +++ b/code/modules/materials/sheets/metals/rods.dm @@ -84,7 +84,7 @@ var/global/list/datum/stack_recipe/rods_recipes = list( \ for(var/obj/structure/grille/G in usr.loc) if (G.destroyed) G.health = 10 - G.density = 1 + G.density = TRUE G.destroyed = 0 G.icon_state = "grille" use(1) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index c03e588d78..e8593efb5d 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -214,7 +214,7 @@ var/obj/item/stack/flag/newflag = new src.type(T) newflag.amount = 1 newflag.upright = 1 - newflag.anchored = 1 + newflag.anchored = TRUE newflag.name = newflag.singular_name newflag.icon_state = "[newflag.base_state]_open" newflag.visible_message("[user] plants [newflag] firmly in the ground.") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index e5a3e26d72..e6f525c650 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -60,6 +60,7 @@ for(var/organ in organs) qdel(organ) QDEL_NULL(nif) //VOREStation Add + worn_clothing.Cut() return ..() /mob/living/carbon/human/Stat() diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index e024b5bd7e..a3554a262f 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -358,7 +358,7 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t //Damages ONE external organ, organ gets randomly selected from damagable ones. //It automatically updates damage overlays if necesary //It automatically updates health status -/mob/living/carbon/human/take_organ_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0) +/mob/living/carbon/human/take_organ_damage(var/brute, var/burn, var/sharp = FALSE, var/edge = FALSE) var/list/obj/item/organ/external/parts = get_damageable_organs() if(!parts.len) return var/obj/item/organ/external/picked = pick(parts) @@ -391,7 +391,7 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t if(update) UpdateDamageIcon() // damage MANY external organs, in random order -/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = 0, var/edge = 0, var/used_weapon = null) +/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = FALSE, var/edge = FALSE, var/used_weapon = null) if(status_flags & GODMODE) return //godmode var/list/obj/item/organ/external/parts = get_damageable_organs() var/update = 0 @@ -448,7 +448,7 @@ This function restores all organs. return organs_by_name[zone] */ -/mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null) +/mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/sharp = FALSE, var/edge = FALSE, var/obj/used_weapon = null) if(Debug2) to_world_log("## DEBUG: human/apply_damage() was called on [src], with [damage] damage, an armor value of [blocked], and a soak value of [soaked].") diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index c68ee21401..153d56be43 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -486,7 +486,7 @@ emp_act if(T) src.loc = T visible_message("[src] is pinned to the wall by [O]!","You are pinned to the wall by [O]!") - src.anchored = 1 + src.anchored = TRUE src.pinned += O // This does a prob check to catch the thing flying at you, with a minimum of 1% diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 7aa1dee24f..119d349105 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -193,6 +193,7 @@ This saves us from having to call add_fingerprint() any time something is put in s_store = null update_inv_s_store() else if (W == back) + worn_clothing -= back back = null update_inv_back() else if (W == handcuffed) @@ -304,6 +305,7 @@ This saves us from having to call add_fingerprint() any time something is put in if(slot_gloves) src.gloves = W W.equipped(src, slot) + worn_clothing += gloves update_inv_gloves() if(slot_head) src.head = W diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 8d2ca00ef5..a7def59625 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -130,10 +130,13 @@ . = 1 if(CE_SPEEDBOOST in chem_effects || is_jittery) // motor mouth + // Despite trying to url/html decode these, byond is just being bad and I dunno. + var/static/regex/speedboost_initial = new (@"&[a-z]{2,5};|&#\d{2};","g") + // Not herestring because bad vs code syntax highlight panics at apostrophe + var/static/regex/speedboost_main = new ("\[ ',!?.;\]","g") for(var/datum/multilingual_say_piece/S in message_data[1]) - S.message = replacetext(S.message," ","") - S.message = replacetext(S.message,",","") - S.message = replacetext(S.message,";","") + S.message = speedboost_initial.Replace(S.message, "") + S.message = speedboost_main.Replace(S.message, "") else . = ..(message_data) diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index 7194e4f1fc..ec058ac0d3 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -835,12 +835,12 @@ return if(!C.anchored && !C.pulledby) //Not currently anchored, and not pulled by anyone. - C.anchored = 1 //This is the only way to stop the inertial_drift. + C.anchored = TRUE //This is the only way to stop the inertial_drift. C.adjust_nutrition(-25) update_floating() to_chat(C, "You hover in place.") spawn(6) //.6 seconds. - C.anchored = 0 + C.anchored = FALSE else return diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 03fd22609b..4eaab77926 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -8,7 +8,7 @@ Returns standard 0 if fail */ -/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/used_weapon = null, var/sharp = 0, var/edge = 0, var/obj/used_weapon = null) +/mob/living/proc/apply_damage(var/damage = 0,var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/soaked = 0, var/used_weapon = null, var/sharp = FALSE, var/edge = FALSE, var/obj/used_weapon = null) if(Debug2) to_world_log("## DEBUG: apply_damage() was called on [src], with [damage] damage, and an armor value of [blocked].") if(!damage || (blocked >= 100)) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index e9a75d2ab5..09b8c151e6 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -321,7 +321,7 @@ if(T) src.loc = T visible_message("[src] is pinned to the wall by [O]!","You are pinned to the wall by [O]!") - src.anchored = 1 + src.anchored = TRUE src.pinned += O /mob/living/proc/embed(var/obj/O, var/def_zone=null) diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm index 5cb485a571..6abdaadde8 100644 --- a/code/modules/mob/living/silicon/decoy/decoy.dm +++ b/code/modules/mob/living/silicon/decoy/decoy.dm @@ -8,5 +8,5 @@ /mob/living/silicon/decoy/New() src.icon = 'icons/mob/AI.dmi' src.icon_state = "ai" - src.anchored = 1 + src.anchored = TRUE src.canmove = 0 \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm index 37731dd345..240cfb10e9 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm @@ -1,5 +1,5 @@ //Redefining some robot procs, since drones can't be repaired and really shouldn't take component damage. -/mob/living/silicon/robot/drone/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null) +/mob/living/silicon/robot/drone/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/used_weapon = null) bruteloss += brute fireloss += burn @@ -11,7 +11,7 @@ if(bruteloss<0) bruteloss = 0 if(fireloss<0) fireloss = 0 -/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/emp = 0) +/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/emp = 0) take_overall_damage(brute,burn) /mob/living/silicon/robot/drone/heal_organ_damage(var/brute, var/burn) diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index 3c7999be3c..0bad703cfa 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -62,7 +62,7 @@ var/datum/robot_component/picked = pick(parts) picked.heal_damage(brute,burn) -/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0, var/emp = 0) +/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/edge = FALSE, var/emp = 0) var/list/components = get_damageable_components() if(!components.len) return @@ -110,7 +110,7 @@ parts -= picked -/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null) +/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/used_weapon = null) if(status_flags & GODMODE) return //godmode var/list/datum/robot_component/parts = get_damageable_components() diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 6fca511bbf..310a211be7 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -61,7 +61,7 @@ var/global/list/robot_modules = list( R.choose_icon(R.module_sprites.len + 1, R.module_sprites) for(var/obj/item/I in modules) - I.canremove = 0 + I.canremove = FALSE /obj/item/weapon/robot_module/proc/Reset(var/mob/living/silicon/robot/R) remove_camera_networks(R) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index b023516090..a4bdd6c978 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -123,7 +123,7 @@ List of things solar grubs should be able to do: L.reagents.add_reagent(poison_type, poison_per_bite) /mob/living/simple_mob/vore/solargrub/death() - src.anchored = 0 + src.anchored = FALSE set_light(0) ..() @@ -160,6 +160,6 @@ List of things solar grubs should be able to do: "The deceptively severe heat trapped within the solargrub works in tandem with its inner muscles and your tingling, prickling stomach juice bath to weaken you!") /datum/ai_holder/simple_mob/retaliate/solargrub/react_to_attack(atom/movable/attacker) - holder.anchored = 0 + holder.anchored = FALSE holder.set_AI_busy(FALSE) ..() \ No newline at end of file diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 19f3d34417..f673e060ef 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -257,7 +257,7 @@ fabricated_laptop.battery_module.charge_to_full() fabricated_laptop.forceMove(src.loc) fabricated_laptop.screen_on = 0 - fabricated_laptop.anchored = 0 + fabricated_laptop.anchored = FALSE fabricated_laptop.update_icon() fabricated_laptop.update_verbs() fabricated_laptop = null diff --git a/code/modules/multiz/hoist.dm b/code/modules/multiz/hoist.dm index b319b3e1df..d8c064f56e 100644 --- a/code/modules/multiz/hoist.dm +++ b/code/modules/multiz/hoist.dm @@ -47,7 +47,7 @@ hoistee = AM if(ismob(AM)) source_hook.buckle_mob(AM) - AM.anchored = 1 // why isn't this being set by buckle_mob for silicons? + AM.anchored = TRUE // why isn't this being set by buckle_mob for silicons? source_hook.layer = AM.layer + 0.1 /obj/effect/hoist_hook/MouseDrop(atom/dest) @@ -128,7 +128,7 @@ if(ismob(hoistee)) source_hook.unbuckle_mob(hoistee) else - hoistee.anchored = 0 + hoistee.anchored = FALSE hoistee = null layer = NORMAL_LAYER diff --git a/code/modules/multiz/ladder_assembly_vr.dm b/code/modules/multiz/ladder_assembly_vr.dm index d167ecc3ab..49f765225a 100644 --- a/code/modules/multiz/ladder_assembly_vr.dm +++ b/code/modules/multiz/ladder_assembly_vr.dm @@ -29,14 +29,14 @@ user.visible_message("\The [user] secures \the [src]'s reinforcing bolts.", \ "You secure the reinforcing bolts.", \ "You hear a ratchet") - src.anchored = 1 + src.anchored = TRUE if(CONSTRUCTION_WRENCHED) state = CONSTRUCTION_UNANCHORED playsound(src, 'sound/items/Ratchet.ogg', 75, 1) user.visible_message("\The [user] unsecures \the [src]'s reinforcing bolts.", \ "You undo the reinforcing bolts.", \ "You hear a ratchet") - src.anchored = 0 + src.anchored = FALSE if(CONSTRUCTION_WELDED) to_chat(user, "\The [src] needs to be unwelded.") return diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 4b6d666709..1fb93aae85 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -327,7 +327,7 @@ // Things that prevent objects standing on them from falling into turf below /obj/structure/catwalk/CanFallThru(atom/movable/mover as mob|obj, turf/target as turf) if((target.z < z) && !hatch_open) - return FALSE // TODO - Technically should be density = 1 and flags |= ON_BORDER + return FALSE // TODO - Technically should be density = TRUE and flags |= ON_BORDER if(!isturf(mover.loc)) return FALSE // Only let loose floor items fall. No more snatching things off people's hands. else @@ -345,7 +345,7 @@ if(!isturf(mover.loc)) return FALSE // Only let loose floor items fall. No more snatching things off people's hands. else - return FALSE // TODO - Technically should be density = 1 and flags |= ON_BORDER + return FALSE // TODO - Technically should be density = TRUE and flags |= ON_BORDER // So you'll slam when falling onto a grille /obj/structure/lattice/CheckFall(var/atom/movable/falling_atom) diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 7a38c57010..8f3c3db009 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -146,14 +146,14 @@ user.visible_message("[user.name] secures the [src.name] to the floor.", \ "You secure the anchor bolts to the floor.", \ "You hear a ratchet.") - src.anchored = 1 + src.anchored = TRUE connect_to_network() else if(!linked_shielding.len > 0) playsound(src, W.usesound, 75, 1) user.visible_message("[user.name] unsecures the [src.name].", \ "You remove the anchor bolts.", \ "You hear a ratchet.") - src.anchored = 0 + src.anchored = FALSE disconnect_from_network() else to_chat(user, "Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!") diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index ae42d8c727..c5021ba960 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -36,10 +36,10 @@ /obj/machinery/power/smes/batteryrack/proc/add_parts() component_parts = list() component_parts += new /obj/item/weapon/circuitboard/batteryrack - component_parts += new /obj/item/weapon/stock_parts/capacitor/ // Capacitors: Maximal I/O - component_parts += new /obj/item/weapon/stock_parts/capacitor/ - component_parts += new /obj/item/weapon/stock_parts/capacitor/ - component_parts += new /obj/item/weapon/stock_parts/matter_bin/ // Matter Bin: Max. amount of cells. + component_parts += new /obj/item/weapon/stock_parts/capacitor // Capacitors: Maximal I/O + component_parts += new /obj/item/weapon/stock_parts/capacitor + component_parts += new /obj/item/weapon/stock_parts/capacitor + component_parts += new /obj/item/weapon/stock_parts/matter_bin // Matter Bin: Max. amount of cells. /obj/machinery/power/smes/batteryrack/RefreshParts() var/capacitor_efficiency = 0 @@ -61,6 +61,9 @@ internal_cells = null return ..() +/obj/machinery/power/smes/batteryrack/check_terminals() + return TRUE // we don't necessarily need terminals + /obj/machinery/power/smes/batteryrack/update_icon() cut_overlays() icon_update = 0 diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 02475594ab..61acc41293 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -158,14 +158,14 @@ user.visible_message("[user.name] secures [src] to the floor.", \ "You secure the external reinforcing bolts to the floor.", \ "You hear a ratchet.") - src.anchored = 1 + src.anchored = TRUE if(1) state = 0 playsound(src, W.usesound, 75, 1) user.visible_message("[user.name] unsecures [src] reinforcing bolts from the floor.", \ "You undo the external reinforcing bolts.", \ "You hear a ratchet.") - src.anchored = 0 + src.anchored = FALSE disconnect_from_network() if(2) to_chat(user, "\The [src] needs to be unwelded from the floor.") diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 9afad48445..ec29e08efa 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -111,14 +111,14 @@ field_generator power level display user.visible_message("[user.name] secures [src.name] to the floor.", \ "You secure the external reinforcing bolts to the floor.", \ "You hear ratchet") - src.anchored = 1 + src.anchored = TRUE if(1) state = 0 playsound(src, W.usesound, 75, 1) user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", \ "You undo the external reinforcing bolts.", \ "You hear ratchet") - src.anchored = 0 + src.anchored = FALSE if(2) to_chat(user, "The [src.name] needs to be unwelded from the floor.") return diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 8d96045cf3..bf005048ca 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -206,14 +206,14 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if(0) if(O.is_wrench()) playsound(src, O.usesound, 75, 1) - src.anchored = 1 + src.anchored = TRUE user.visible_message("[user.name] secures the [src.name] to the floor.", \ "You secure the external bolts.") temp_state++ if(1) if(O.is_wrench()) playsound(src, O.usesound, 75, 1) - src.anchored = 0 + src.anchored = FALSE user.visible_message("[user.name] detaches the [src.name] from the floor.", \ "You remove the external bolts.") temp_state-- @@ -340,14 +340,14 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if(0) if(O.is_wrench()) playsound(src, O.usesound, 75, 1) - src.anchored = 1 + src.anchored = TRUE user.visible_message("[user.name] secures the [src.name] to the floor.", \ "You secure the external bolts.") temp_state++ if(1) if(O.is_wrench()) playsound(src, O.usesound, 75, 1) - src.anchored = 0 + src.anchored = FALSE user.visible_message("[user.name] detaches the [src.name] from the floor.", \ "You remove the external bolts.") temp_state-- diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 3ddbb303e8..e62c08a99b 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -68,14 +68,8 @@ GLOBAL_LIST_EMPTY(smeses) /obj/machinery/power/smes/Initialize() . = ..() GLOB.smeses += src - for(var/d in GLOB.cardinal) - var/turf/T = get_step(src, d) - for(var/obj/machinery/power/terminal/term in T) - if(term && term.dir == turn(d, 180) && !term.master) - terminals |= term - term.master = src - term.connect_to_network() - if(!terminals.len) + add_nearby_terminals() + if(!check_terminals()) stat |= BROKEN return update_icon() @@ -91,6 +85,20 @@ GLOBAL_LIST_EMPTY(smeses) GLOB.smeses -= src return ..() +/obj/machinery/power/smes/proc/add_nearby_terminals() + for(var/d in GLOB.cardinal) + var/turf/T = get_step(src, d) + for(var/obj/machinery/power/terminal/term in T) + if(term && term.dir == turn(d, 180) && !term.master) + terminals |= term + term.master = src + term.connect_to_network() + +/obj/machinery/power/smes/proc/check_terminals() + if(!terminals.len) + return FALSE + return TRUE + /obj/machinery/power/smes/add_avail(var/amount) if(..(amount)) powernet.smes_newavail += amount diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index d15b9153ac..8a20c9e685 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -421,7 +421,7 @@ GLOBAL_LIST_EMPTY(solars_list) A.circuit = M A.state = 3 A.icon_state = "computer_3" - A.anchored = 1 + A.anchored = TRUE qdel(src) else to_chat(user, "You disconnect the monitor.") @@ -432,7 +432,7 @@ GLOBAL_LIST_EMPTY(solars_list) A.circuit = M A.state = 4 A.icon_state = "computer_4" - A.anchored = 1 + A.anchored = TRUE qdel(src) else src.attack_hand(user) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 712c4686ea..7aab41bc46 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -725,7 +725,7 @@ in_chamber.on_hit(M) if(in_chamber.damage_type != HALLOSS && !in_chamber.nodamage) log_and_message_admins("[key_name(user)] commited suicide using \a [src]") - user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1) + user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp = TRUE) user.death() else if(in_chamber.damage_type == HALLOSS) to_chat(user, "Ow...") diff --git a/code/modules/projectiles/guns/launcher/bows.dm b/code/modules/projectiles/guns/launcher/bows.dm index 3df5d1de49..7787ea027e 100644 --- a/code/modules/projectiles/guns/launcher/bows.dm +++ b/code/modules/projectiles/guns/launcher/bows.dm @@ -6,8 +6,8 @@ item_state = "bolt" throwforce = 8 w_class = ITEMSIZE_NORMAL - sharp = 1 - edge = 0 + sharp = TRUE + edge = FALSE /obj/item/weapon/arrow/energy name = "hardlight arrow" @@ -17,8 +17,8 @@ item_state = "bolt" throwforce = 10 w_class = ITEMSIZE_NORMAL - sharp = 0 - edge = 1 + sharp = FALSE + edge = TRUE /obj/item/weapon/arrow/energy/throw_impact(atom/hit_atom) . = ..() diff --git a/code/modules/projectiles/projectile/beams_vr.dm b/code/modules/projectiles/projectile/beams_vr.dm index a3a149502c..3f3e82071d 100644 --- a/code/modules/projectiles/projectile/beams_vr.dm +++ b/code/modules/projectiles/projectile/beams_vr.dm @@ -74,7 +74,7 @@ pulse.icon = 'icons/effects/effects.dmi' pulse.icon_state = "heal" pulse.name = "heal" - pulse.anchored = 1 + pulse.anchored = TRUE spawn(20) qdel(pulse) to_chat(target, "As the beam strikes you, your injuries close up!") diff --git a/code/modules/random_map/drop/droppod_doors.dm b/code/modules/random_map/drop/droppod_doors.dm index d69e049da6..c19aba40fd 100644 --- a/code/modules/random_map/drop/droppod_doors.dm +++ b/code/modules/random_map/drop/droppod_doors.dm @@ -73,7 +73,7 @@ icon_state = "ramptop" var/obj/structure/droppod_door/door_bottom = new(T) door_bottom.deployed = 1 - door_bottom.density = 0 + door_bottom.density = FALSE door_bottom.set_opacity(0) door_bottom.dir = src.dir door_bottom.icon_state = "rampbottom" \ No newline at end of file diff --git a/code/modules/reagents/machinery/dispenser/supply.dm b/code/modules/reagents/machinery/dispenser/supply.dm index 984d7786a8..ffbad53fab 100644 --- a/code/modules/reagents/machinery/dispenser/supply.dm +++ b/code/modules/reagents/machinery/dispenser/supply.dm @@ -1,7 +1,7 @@ /datum/supply_pack/chemistry_dispenser name = "Reagent dispenser" contains = list( - /obj/machinery/chemical_dispenser{anchored = 0} + /obj/machinery/chemical_dispenser{anchored = FALSE} ) cost = 25 containertype = /obj/structure/largecrate @@ -11,7 +11,7 @@ /datum/supply_pack/beer_dispenser name = "Booze dispenser" contains = list( - /obj/machinery/chemical_dispenser/bar_alc{anchored = 0} + /obj/machinery/chemical_dispenser/bar_alc{anchored = FALSE} ) cost = 25 containertype = /obj/structure/largecrate @@ -21,7 +21,7 @@ /datum/supply_pack/soda_dispenser name = "Soda dispenser" contains = list( - /obj/machinery/chemical_dispenser/bar_soft{anchored = 0} + /obj/machinery/chemical_dispenser/bar_soft{anchored = FALSE} ) cost = 25 containertype = /obj/structure/largecrate diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index e7fb317670..30ded7e14e 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -648,7 +648,7 @@ /datum/reagent/frostoil/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_DIONA) return - M.bodytemperature = max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 215) + M.bodytemperature = min(M.bodytemperature, max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 215)) if(prob(1)) M.emote("shiver") holder.remove_reagent("capsaicin", 5) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index b3be3111b4..da3e3c64de 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -85,8 +85,8 @@ var/obj/structure/disposalconstruct/C = new (src.loc) src.transfer_fingerprints_to(C) C.ptype = 6 // 6 = disposal unit - C.anchored = 1 - C.density = 1 + C.anchored = TRUE + C.density = TRUE C.update() qdel(src) return @@ -1018,8 +1018,8 @@ C.subtype = src.subtype src.transfer_fingerprints_to(C) C.set_dir(dir) - C.density = 0 - C.anchored = 1 + C.density = FALSE + C.anchored = TRUE C.update() qdel(src) @@ -1576,8 +1576,8 @@ src.transfer_fingerprints_to(C) C.ptype = 7 // 7 = outlet C.update() - C.anchored = 1 - C.density = 1 + C.anchored = TRUE + C.density = TRUE qdel(src) return else diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 8a5a199a6c..a8e23e83e8 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -455,8 +455,8 @@ var/obj/structure/disposalconstruct/C = new (src.loc) C.ptype = 8 // 8 = Delivery chute C.update() - C.anchored = 1 - C.density = 1 + C.anchored = TRUE + C.density = TRUE qdel(src) return diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 8bb68514fb..daeae94946 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -55,7 +55,7 @@ A.pixel_y = pixel_y A.set_dir(dir) A.circuit = M - A.anchored = 1 + A.anchored = TRUE for (var/obj/C in src) C.forceMove(loc) A.state = 3 diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index 2d4b7d6484..d03cd22c45 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -166,14 +166,14 @@ state = 1 playsound(src, W.usesound, 75, 1) to_chat(user, "You secure the external reinforcing bolts to the floor.") - src.anchored = 1 + src.anchored = TRUE return else if(state == 1) state = 0 playsound(src, W.usesound, 75, 1) to_chat(user, "You undo the external reinforcing bolts.") - src.anchored = 0 + src.anchored = FALSE return if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) diff --git a/code/modules/spells/aoe_turf/conjure/conjure.dm b/code/modules/spells/aoe_turf/conjure/conjure.dm index e9874ccc12..10c9948d52 100644 --- a/code/modules/spells/aoe_turf/conjure/conjure.dm +++ b/code/modules/spells/aoe_turf/conjure/conjure.dm @@ -53,8 +53,8 @@ How they spawn stuff is decided by behaviour vars, which are explained below summoned_object = new summoned_object_type(spawn_place) var/atom/movable/overlay/animation = new /atom/movable/overlay(spawn_place) animation.name = "conjure" - animation.density = 0 - animation.anchored = 1 + animation.density = FALSE + animation.anchored = TRUE animation.icon = 'icons/effects/effects.dmi' animation.plane = OBJ_PLANE animation.layer = ABOVE_JUNK_LAYER diff --git a/code/modules/spells/spell_code.dm b/code/modules/spells/spell_code.dm index 5ab0643450..6db671d1bb 100644 --- a/code/modules/spells/spell_code.dm +++ b/code/modules/spells/spell_code.dm @@ -146,8 +146,8 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now var/obj/effect/overlay/spell = new /obj/effect/overlay(location) spell.icon = overlay_icon spell.icon_state = overlay_icon_state - spell.anchored = 1 - spell.density = 0 + spell.anchored = TRUE + spell.density = FALSE spawn(overlay_lifespan) qdel(spell) return valid_targets diff --git a/code/modules/spells/spell_projectile.dm b/code/modules/spells/spell_projectile.dm index 01e7d163fa..924553f16f 100644 --- a/code/modules/spells/spell_projectile.dm +++ b/code/modules/spells/spell_projectile.dm @@ -30,7 +30,7 @@ trails += trail trail.icon = proj_trail_icon trail.icon_state = proj_trail_icon_state - trail.density = 0 + trail.density = FALSE spawn(proj_trail_lifespan) trails -= trail qdel(trail) diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm index 0c855626fc..eea8cc1a9a 100644 --- a/code/modules/spells/spellbook.dm +++ b/code/modules/spells/spellbook.dm @@ -407,7 +407,7 @@ if(istype(user, /mob/living/carbon/human)) to_chat(user, "HOR-SIE HAS RISEN") var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead - magichead.canremove = 0 //curses! + magichead.canremove = FALSE //curses! magichead.flags_inv = null //so you can still see their face magichead.voicechange = 1 //NEEEEIIGHH user.drop_from_inventory(user.wear_mask) diff --git a/code/modules/spells/targeted/equip/horsemask.dm b/code/modules/spells/targeted/equip/horsemask.dm index c52f75acee..462cca13ef 100644 --- a/code/modules/spells/targeted/equip/horsemask.dm +++ b/code/modules/spells/targeted/equip/horsemask.dm @@ -30,8 +30,8 @@ /spell/targeted/equip_item/horsemask/summon_item(var/new_type) var/obj/item/new_item = new new_type - new_item.canremove = 0 //curses! - new_item.unacidable = 1 + new_item.canremove = FALSE //curses! + new_item.unacidable = TRUE if(istype(new_item, /obj/item/clothing/mask/horsehead)) var/obj/item/clothing/mask/horsehead/magichead = new_item magichead.flags_inv = null //so you can still see their face diff --git a/code/modules/spells/targeted/ethereal_jaunt.dm b/code/modules/spells/targeted/ethereal_jaunt.dm index a5c98bc571..d300f6a912 100644 --- a/code/modules/spells/targeted/ethereal_jaunt.dm +++ b/code/modules/spells/targeted/ethereal_jaunt.dm @@ -23,8 +23,8 @@ var/obj/effect/dummy/spell_jaunt/holder = new /obj/effect/dummy/spell_jaunt( mobloc ) var/atom/movable/overlay/animation = new /atom/movable/overlay( mobloc ) animation.name = "water" - animation.density = 0 - animation.anchored = 1 + animation.density = FALSE + animation.anchored = TRUE animation.icon = 'icons/mob/mob.dmi' animation.plane = MOB_PLANE animation.layer = ABOVE_MOB_LAYER diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index b670497fc9..fc10ecfcca 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -116,7 +116,7 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message("[user]'s hand slips, tearing skin on [target]'s face with \the [tool]!", \ "Your hand slips, tearing skin on [target]'s face with \the [tool]!") - target.apply_damage(10, BRUTE, affected, sharp=1, sharp=1) + target.apply_damage(10, BRUTE, affected, sharp = TRUE, sharp = TRUE) /////////////////////////////////////////////////////////////// // Face Cauterizing Surgery diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index a5ccd15050..d26ea6c0c1 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -257,7 +257,7 @@ msg = "[user]'s hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!" self_msg = "Your hand slips, damaging several organs in [target]'s lower abdomen with \the [tool]!" user.visible_message(msg, self_msg) - target.apply_damage(12, BRUTE, affected, sharp=1) + target.apply_damage(12, BRUTE, affected, sharp = TRUE) /////////////////////////////////////////////////////////////// // Cauterize Surgery diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index ecbf191741..8a25be5b51 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -74,7 +74,7 @@ var/obj/item/organ/external/E = tool user.visible_message(" [user]'s hand slips, damaging [target]'s [E.amputation_point]!", \ " Your hand slips, damaging [target]'s [E.amputation_point]!") - target.apply_damage(10, BRUTE, null, sharp=1) + target.apply_damage(10, BRUTE, null, sharp = TRUE) /////////////////////////////////////////////////////////////// // Limb Connection Surgery @@ -113,7 +113,7 @@ var/obj/item/organ/external/E = tool user.visible_message(" [user]'s hand slips, damaging [target]'s [E.amputation_point]!", \ " Your hand slips, damaging [target]'s [E.amputation_point]!") - target.apply_damage(10, BRUTE, null, sharp=1) + target.apply_damage(10, BRUTE, null, sharp = TRUE) /////////////////////////////////////////////////////////////// // Robolimb Attachment Surgery @@ -164,4 +164,4 @@ /datum/surgery_step/limb/mechanize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) user.visible_message(" [user]'s hand slips, damaging [target]'s flesh!", \ " Your hand slips, damaging [target]'s flesh!") - target.apply_damage(10, BRUTE, null, sharp=1) + target.apply_damage(10, BRUTE, null, sharp = TRUE) diff --git a/code/modules/tgui/modules/agentcard.dm b/code/modules/tgui/modules/agentcard.dm index d61f8e3394..3046021436 100644 --- a/code/modules/tgui/modules/agentcard.dm +++ b/code/modules/tgui/modules/agentcard.dm @@ -58,6 +58,8 @@ if(choice && tgui_status(usr, state) == STATUS_INTERACTIVE) S.icon_state = choice.icon_state S.item_state = choice.item_state + S.sprite_stack = choice.sprite_stack + S.update_icon() to_chat(usr, "Appearance changed to [choice].") . = TRUE if("assignment") @@ -127,9 +129,13 @@ S.electronic_warfare = initial(S.electronic_warfare) S.fingerprint_hash = initial(S.fingerprint_hash) S.icon_state = initial(S.icon_state) + S.item_state = initial(S.item_state) + S.sprite_stack = S.initial_sprite_stack + S.front = null S.name = initial(S.name) S.registered_name = initial(S.registered_name) S.unset_registered_user() S.sex = initial(S.sex) + S.update_icon() to_chat(usr, "All information has been deleted from \the [src].") . = TRUE diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 856a32e310..dcb909a2f5 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -168,7 +168,7 @@ pulse2.icon = 'icons/effects/effects.dmi' pulse2.icon_state = "empdisable" pulse2.name = "emp sparks" - pulse2.anchored = 1 + pulse2.anchored = TRUE pulse2.set_dir(pick(cardinal)) spawn(10) @@ -317,7 +317,7 @@ C.forceMove(loc) C.set_dir(dir) - C.anchored = 1 + C.anchored = TRUE load = C @@ -367,7 +367,7 @@ load.forceMove(dest) load.set_dir(get_dir(loc, dest)) - load.anchored = 0 //we can only load non-anchored items, so it makes sense to set this to false + load.anchored = FALSE //we can only load non-anchored items, so it makes sense to set this to false load.pixel_x = initial(load.pixel_x) load.pixel_y = initial(load.pixel_y) load.layer = initial(load.layer) diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm index 7f0529805a..f9d1c92a64 100644 --- a/code/modules/vore/smoleworld/smoleworld_vr.dm +++ b/code/modules/vore/smoleworld/smoleworld_vr.dm @@ -357,7 +357,7 @@ // desc = "Lets burn rubber!" // icon = 'icons/vore/smoleworld_vr.dmi' // icon_state = "smolecarA" -// anchored = 0 +// anchored = FALSE // buckle_movable = 1 // var/carry_type = /obj/item/smolecar // diff --git a/code/modules/xenoarcheaology/effects/forcefield.dm b/code/modules/xenoarcheaology/effects/forcefield.dm index 028eff3a75..f4f1a3ab07 100644 --- a/code/modules/xenoarcheaology/effects/forcefield.dm +++ b/code/modules/xenoarcheaology/effects/forcefield.dm @@ -19,8 +19,8 @@ var/obj/effect/energy_field/E = new (locate(T.x,T.y,T.z)) created_field.Add(E) E.strength = 1 - E.density = 1 - E.anchored = 1 + E.density = TRUE + E.anchored = TRUE E.invisibility = 0 spawn(10) UpdateMove() @@ -41,8 +41,8 @@ //for now, just instantly respawn the fields when they get destroyed var/obj/effect/energy_field/E = new (locate(T.x,T.y,T)) created_field.Add(E) - E.anchored = 1 - E.density = 1 + E.anchored = TRUE + E.density = TRUE E.invisibility = 0 var/obj/effect/energy_field/E = created_field[1] diff --git a/code/modules/xenoarcheaology/finds/fossils.dm b/code/modules/xenoarcheaology/finds/fossils.dm index 89d83efa4e..5448db97f2 100644 --- a/code/modules/xenoarcheaology/finds/fossils.dm +++ b/code/modules/xenoarcheaology/finds/fossils.dm @@ -64,7 +64,7 @@ usr = user icon_state = "skel" src.bstate = 1 - src.density = 1 + src.density = TRUE src.name = "alien skeleton display" if(src.contents.Find(/obj/item/weapon/fossil/skull/horned)) src.desc = "A creature made of [src.contents.len-1] assorted bones and a horned skull. The plaque reads \'[plaque_contents]\'." diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm index 8c159e0ad0..44afa6ea2c 100644 --- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm +++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm @@ -72,7 +72,7 @@ if(A.being_used) artifact_in_use = 1 else - A.anchored = 1 + A.anchored = TRUE A.being_used = 1 if(artifact_in_use) @@ -113,7 +113,7 @@ if(scanned_object && istype(scanned_object, /obj/machinery/artifact)) var/obj/machinery/artifact/A = scanned_object - A.anchored = 0 + A.anchored = FALSE A.being_used = 0 scanned_object = null diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index b2bb4db83c..05aa87442d 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -85,7 +85,7 @@ if(harvesting < 0 && inserted_battery.battery_effect && inserted_battery.battery_effect.activated) inserted_battery.battery_effect.ToggleActivate() harvesting = 0 - cur_artifact.anchored = 0 + cur_artifact.anchored = FALSE cur_artifact.being_used = 0 cur_artifact = null atom_say("Energy harvesting interrupted.") @@ -196,7 +196,7 @@ if(source_effect) harvesting = 1 update_use_power(USE_POWER_ACTIVE) - cur_artifact.anchored = 1 + cur_artifact.anchored = TRUE cur_artifact.being_used = 1 icon_state = "incubator_on" atom_say("Beginning energy harvesting.") @@ -228,7 +228,7 @@ if(inserted_battery.stored_charge >= inserted_battery.capacity) update_use_power(USE_POWER_IDLE) harvesting = 0 - cur_artifact.anchored = 0 + cur_artifact.anchored = FALSE cur_artifact.being_used = 0 cur_artifact = null src.visible_message("[name] states, \"Battery is full.\"") diff --git a/icons/inventory/suit/mob_vr_akula.dmi b/icons/inventory/suit/mob_vr_akula.dmi index f248264064..3ab9c20220 100644 Binary files a/icons/inventory/suit/mob_vr_akula.dmi and b/icons/inventory/suit/mob_vr_akula.dmi differ diff --git a/icons/obj/suitdispenser.dmi b/icons/obj/suitdispenser.dmi index def549b9bb..fc21043ced 100644 Binary files a/icons/obj/suitdispenser.dmi and b/icons/obj/suitdispenser.dmi differ diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index f607526744..5c22d64451 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -10638,7 +10638,9 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/machinery/suspension_gen, +/obj/machinery/suspension_gen{ + req_access = list(301) + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/anomaly_storage) "Jf" = ( diff --git a/sound/vore/death1.ogg b/sound/vore/death1.ogg index 34f4e189f5..f3e8af5de6 100644 Binary files a/sound/vore/death1.ogg and b/sound/vore/death1.ogg differ diff --git a/sound/vore/death10.ogg b/sound/vore/death10.ogg index 92ce0fd9bd..57ba213f01 100644 Binary files a/sound/vore/death10.ogg and b/sound/vore/death10.ogg differ diff --git a/sound/vore/death2.ogg b/sound/vore/death2.ogg index 2476b0f08c..f2a8d1d733 100644 Binary files a/sound/vore/death2.ogg and b/sound/vore/death2.ogg differ diff --git a/sound/vore/death3.ogg b/sound/vore/death3.ogg index d8a666067d..f91c4d4853 100644 Binary files a/sound/vore/death3.ogg and b/sound/vore/death3.ogg differ diff --git a/sound/vore/death4.ogg b/sound/vore/death4.ogg index 4fce54da79..cf6b6323fb 100644 Binary files a/sound/vore/death4.ogg and b/sound/vore/death4.ogg differ diff --git a/sound/vore/death5.ogg b/sound/vore/death5.ogg index 371cf17155..54bfd15687 100644 Binary files a/sound/vore/death5.ogg and b/sound/vore/death5.ogg differ diff --git a/sound/vore/death6.ogg b/sound/vore/death6.ogg index 78fc1b0637..0634bfbe53 100644 Binary files a/sound/vore/death6.ogg and b/sound/vore/death6.ogg differ diff --git a/sound/vore/death7.ogg b/sound/vore/death7.ogg index 419a5bedd5..e7ce8c3ab7 100644 Binary files a/sound/vore/death7.ogg and b/sound/vore/death7.ogg differ diff --git a/sound/vore/death8.ogg b/sound/vore/death8.ogg index b15ab6a7d2..fef1422590 100644 Binary files a/sound/vore/death8.ogg and b/sound/vore/death8.ogg differ diff --git a/sound/vore/death9.ogg b/sound/vore/death9.ogg index 3709541d60..ec93107ff2 100644 Binary files a/sound/vore/death9.ogg and b/sound/vore/death9.ogg differ diff --git a/sound/vore/digest1.ogg b/sound/vore/digest1.ogg index 058ca78f7e..93c9f087cf 100644 Binary files a/sound/vore/digest1.ogg and b/sound/vore/digest1.ogg differ diff --git a/sound/vore/digest10.ogg b/sound/vore/digest10.ogg index 5db775ae29..63b65555bf 100644 Binary files a/sound/vore/digest10.ogg and b/sound/vore/digest10.ogg differ diff --git a/sound/vore/digest11.ogg b/sound/vore/digest11.ogg index d81ac72dea..1dadd6d5b2 100644 Binary files a/sound/vore/digest11.ogg and b/sound/vore/digest11.ogg differ diff --git a/sound/vore/digest12.ogg b/sound/vore/digest12.ogg index 6b44127cd8..11dec07c8b 100644 Binary files a/sound/vore/digest12.ogg and b/sound/vore/digest12.ogg differ diff --git a/sound/vore/digest2.ogg b/sound/vore/digest2.ogg index 0e8bef1db8..379777f81a 100644 Binary files a/sound/vore/digest2.ogg and b/sound/vore/digest2.ogg differ diff --git a/sound/vore/digest3.ogg b/sound/vore/digest3.ogg index 2077f31399..5c776e0071 100644 Binary files a/sound/vore/digest3.ogg and b/sound/vore/digest3.ogg differ diff --git a/sound/vore/digest4.ogg b/sound/vore/digest4.ogg index 27a786bc40..5fd26500c4 100644 Binary files a/sound/vore/digest4.ogg and b/sound/vore/digest4.ogg differ diff --git a/sound/vore/digest5.ogg b/sound/vore/digest5.ogg index 849c1335be..0d24c1c44b 100644 Binary files a/sound/vore/digest5.ogg and b/sound/vore/digest5.ogg differ diff --git a/sound/vore/digest6.ogg b/sound/vore/digest6.ogg index 5f0cc86eb1..4ab1e42a1e 100644 Binary files a/sound/vore/digest6.ogg and b/sound/vore/digest6.ogg differ diff --git a/sound/vore/digest7.ogg b/sound/vore/digest7.ogg index f224cc3fa3..66a50d4b1e 100644 Binary files a/sound/vore/digest7.ogg and b/sound/vore/digest7.ogg differ diff --git a/sound/vore/digest8.ogg b/sound/vore/digest8.ogg index 04b742bd49..2c3894ebf7 100644 Binary files a/sound/vore/digest8.ogg and b/sound/vore/digest8.ogg differ diff --git a/sound/vore/digest9.ogg b/sound/vore/digest9.ogg index 866c95b874..e69dbd4811 100644 Binary files a/sound/vore/digest9.ogg and b/sound/vore/digest9.ogg differ diff --git a/sound/vore/growl1.ogg b/sound/vore/growl1.ogg index 6a9cef8988..82b2d3165f 100644 Binary files a/sound/vore/growl1.ogg and b/sound/vore/growl1.ogg differ diff --git a/sound/vore/growl2.ogg b/sound/vore/growl2.ogg index 17a9a94559..59c6b169e6 100644 Binary files a/sound/vore/growl2.ogg and b/sound/vore/growl2.ogg differ diff --git a/sound/vore/growl3.ogg b/sound/vore/growl3.ogg index f5a2f75434..09d2461585 100644 Binary files a/sound/vore/growl3.ogg and b/sound/vore/growl3.ogg differ diff --git a/sound/vore/growl4.ogg b/sound/vore/growl4.ogg index 5fb3c2db79..a0215ab19e 100644 Binary files a/sound/vore/growl4.ogg and b/sound/vore/growl4.ogg differ diff --git a/sound/vore/growl5.ogg b/sound/vore/growl5.ogg index 95ba675a75..fb7c982d6b 100644 Binary files a/sound/vore/growl5.ogg and b/sound/vore/growl5.ogg differ diff --git a/sound/vore/gulp.ogg b/sound/vore/gulp.ogg index b463e7fb18..525e414e2e 100644 Binary files a/sound/vore/gulp.ogg and b/sound/vore/gulp.ogg differ diff --git a/sound/vore/insert.ogg b/sound/vore/insert.ogg index 0574733d4d..ac6b813acd 100644 Binary files a/sound/vore/insert.ogg and b/sound/vore/insert.ogg differ diff --git a/sound/vore/insertion1.ogg b/sound/vore/insertion1.ogg index a026591f07..ab66dba32d 100644 Binary files a/sound/vore/insertion1.ogg and b/sound/vore/insertion1.ogg differ diff --git a/sound/vore/insertion2.ogg b/sound/vore/insertion2.ogg index b682e3aaf8..ed9bc514eb 100644 Binary files a/sound/vore/insertion2.ogg and b/sound/vore/insertion2.ogg differ diff --git a/sound/vore/insertion3.ogg b/sound/vore/insertion3.ogg index 7dabf3f077..33e7891203 100644 Binary files a/sound/vore/insertion3.ogg and b/sound/vore/insertion3.ogg differ diff --git a/sound/vore/schlorp.ogg b/sound/vore/schlorp.ogg index c9cd5a3413..fa7942a5c2 100644 Binary files a/sound/vore/schlorp.ogg and b/sound/vore/schlorp.ogg differ diff --git a/sound/vore/squish1.ogg b/sound/vore/squish1.ogg index 8a87758048..dce949b375 100644 Binary files a/sound/vore/squish1.ogg and b/sound/vore/squish1.ogg differ diff --git a/sound/vore/squish2.ogg b/sound/vore/squish2.ogg index c8f96fc6e2..00d44f0dc8 100644 Binary files a/sound/vore/squish2.ogg and b/sound/vore/squish2.ogg differ diff --git a/sound/vore/squish3.ogg b/sound/vore/squish3.ogg index 60e364c80a..86c4c9a145 100644 Binary files a/sound/vore/squish3.ogg and b/sound/vore/squish3.ogg differ diff --git a/sound/vore/squish4.ogg b/sound/vore/squish4.ogg index e9bd8e7bf5..6e6e98b04f 100644 Binary files a/sound/vore/squish4.ogg and b/sound/vore/squish4.ogg differ diff --git a/sound/vore/stomach_loop.ogg b/sound/vore/stomach_loop.ogg index b9983b2ab6..4bf19edce9 100644 Binary files a/sound/vore/stomach_loop.ogg and b/sound/vore/stomach_loop.ogg differ diff --git a/sound/vore/sunesound/pred/death_01.ogg b/sound/vore/sunesound/pred/death_01.ogg index 231884ef54..0a0b4b4a94 100644 Binary files a/sound/vore/sunesound/pred/death_01.ogg and b/sound/vore/sunesound/pred/death_01.ogg differ diff --git a/sound/vore/sunesound/pred/death_02.ogg b/sound/vore/sunesound/pred/death_02.ogg index 5de3e4148c..3936d7905f 100644 Binary files a/sound/vore/sunesound/pred/death_02.ogg and b/sound/vore/sunesound/pred/death_02.ogg differ diff --git a/sound/vore/sunesound/pred/death_03.ogg b/sound/vore/sunesound/pred/death_03.ogg index 4ffa271af7..ee9dcae0c2 100644 Binary files a/sound/vore/sunesound/pred/death_03.ogg and b/sound/vore/sunesound/pred/death_03.ogg differ diff --git a/sound/vore/sunesound/pred/death_04.ogg b/sound/vore/sunesound/pred/death_04.ogg index a4c0e91be6..8300a3fb2d 100644 Binary files a/sound/vore/sunesound/pred/death_04.ogg and b/sound/vore/sunesound/pred/death_04.ogg differ diff --git a/sound/vore/sunesound/pred/death_05.ogg b/sound/vore/sunesound/pred/death_05.ogg index aeec557758..5f08e2d86d 100644 Binary files a/sound/vore/sunesound/pred/death_05.ogg and b/sound/vore/sunesound/pred/death_05.ogg differ diff --git a/sound/vore/sunesound/pred/death_06.ogg b/sound/vore/sunesound/pred/death_06.ogg index f5b077ebd4..cff66be4ab 100644 Binary files a/sound/vore/sunesound/pred/death_06.ogg and b/sound/vore/sunesound/pred/death_06.ogg differ diff --git a/sound/vore/sunesound/pred/death_07.ogg b/sound/vore/sunesound/pred/death_07.ogg index afaaab65bb..8396bdf922 100644 Binary files a/sound/vore/sunesound/pred/death_07.ogg and b/sound/vore/sunesound/pred/death_07.ogg differ diff --git a/sound/vore/sunesound/pred/death_08.ogg b/sound/vore/sunesound/pred/death_08.ogg index b1b8479ea8..3282e33ce8 100644 Binary files a/sound/vore/sunesound/pred/death_08.ogg and b/sound/vore/sunesound/pred/death_08.ogg differ diff --git a/sound/vore/sunesound/pred/death_09.ogg b/sound/vore/sunesound/pred/death_09.ogg index 1454deafad..f126dfbc14 100644 Binary files a/sound/vore/sunesound/pred/death_09.ogg and b/sound/vore/sunesound/pred/death_09.ogg differ diff --git a/sound/vore/sunesound/pred/death_10.ogg b/sound/vore/sunesound/pred/death_10.ogg index f0e23e1d54..bc1e49b631 100644 Binary files a/sound/vore/sunesound/pred/death_10.ogg and b/sound/vore/sunesound/pred/death_10.ogg differ diff --git a/sound/vore/sunesound/pred/death_11.ogg b/sound/vore/sunesound/pred/death_11.ogg index 43e80467e0..6918952ff9 100644 Binary files a/sound/vore/sunesound/pred/death_11.ogg and b/sound/vore/sunesound/pred/death_11.ogg differ diff --git a/sound/vore/sunesound/pred/death_12.ogg b/sound/vore/sunesound/pred/death_12.ogg index 5ec6029998..3a47352562 100644 Binary files a/sound/vore/sunesound/pred/death_12.ogg and b/sound/vore/sunesound/pred/death_12.ogg differ diff --git a/sound/vore/sunesound/pred/death_13.ogg b/sound/vore/sunesound/pred/death_13.ogg index 9073bac4f2..832685b2bd 100644 Binary files a/sound/vore/sunesound/pred/death_13.ogg and b/sound/vore/sunesound/pred/death_13.ogg differ diff --git a/sound/vore/sunesound/pred/digest_01.ogg b/sound/vore/sunesound/pred/digest_01.ogg index 20b6d1d43a..7efcf251a5 100644 Binary files a/sound/vore/sunesound/pred/digest_01.ogg and b/sound/vore/sunesound/pred/digest_01.ogg differ diff --git a/sound/vore/sunesound/pred/digest_02.ogg b/sound/vore/sunesound/pred/digest_02.ogg index 7fc41e2305..8e161264dd 100644 Binary files a/sound/vore/sunesound/pred/digest_02.ogg and b/sound/vore/sunesound/pred/digest_02.ogg differ diff --git a/sound/vore/sunesound/pred/digest_03.ogg b/sound/vore/sunesound/pred/digest_03.ogg index 98b032c7cb..af08552ad4 100644 Binary files a/sound/vore/sunesound/pred/digest_03.ogg and b/sound/vore/sunesound/pred/digest_03.ogg differ diff --git a/sound/vore/sunesound/pred/digest_04.ogg b/sound/vore/sunesound/pred/digest_04.ogg index ed494e813c..dc2b1d940b 100644 Binary files a/sound/vore/sunesound/pred/digest_04.ogg and b/sound/vore/sunesound/pred/digest_04.ogg differ diff --git a/sound/vore/sunesound/pred/digest_05.ogg b/sound/vore/sunesound/pred/digest_05.ogg index 53bb4814f7..39dc96b470 100644 Binary files a/sound/vore/sunesound/pred/digest_05.ogg and b/sound/vore/sunesound/pred/digest_05.ogg differ diff --git a/sound/vore/sunesound/pred/digest_06.ogg b/sound/vore/sunesound/pred/digest_06.ogg index 787c336282..23b664f10b 100644 Binary files a/sound/vore/sunesound/pred/digest_06.ogg and b/sound/vore/sunesound/pred/digest_06.ogg differ diff --git a/sound/vore/sunesound/pred/digest_07.ogg b/sound/vore/sunesound/pred/digest_07.ogg index f63d4c633a..ea5a5186bb 100644 Binary files a/sound/vore/sunesound/pred/digest_07.ogg and b/sound/vore/sunesound/pred/digest_07.ogg differ diff --git a/sound/vore/sunesound/pred/digest_08.ogg b/sound/vore/sunesound/pred/digest_08.ogg index dbbda3b517..cdf8584a8a 100644 Binary files a/sound/vore/sunesound/pred/digest_08.ogg and b/sound/vore/sunesound/pred/digest_08.ogg differ diff --git a/sound/vore/sunesound/pred/digest_09.ogg b/sound/vore/sunesound/pred/digest_09.ogg index 1877f1ca05..fce3c95a3a 100644 Binary files a/sound/vore/sunesound/pred/digest_09.ogg and b/sound/vore/sunesound/pred/digest_09.ogg differ diff --git a/sound/vore/sunesound/pred/digest_10.ogg b/sound/vore/sunesound/pred/digest_10.ogg index 3e22b8b2fb..cfc009b937 100644 Binary files a/sound/vore/sunesound/pred/digest_10.ogg and b/sound/vore/sunesound/pred/digest_10.ogg differ diff --git a/sound/vore/sunesound/pred/digest_11.ogg b/sound/vore/sunesound/pred/digest_11.ogg index 089d4ee7e4..511c20eb67 100644 Binary files a/sound/vore/sunesound/pred/digest_11.ogg and b/sound/vore/sunesound/pred/digest_11.ogg differ diff --git a/sound/vore/sunesound/pred/digest_12.ogg b/sound/vore/sunesound/pred/digest_12.ogg index 76a9134646..55c0d59014 100644 Binary files a/sound/vore/sunesound/pred/digest_12.ogg and b/sound/vore/sunesound/pred/digest_12.ogg differ diff --git a/sound/vore/sunesound/pred/digest_13.ogg b/sound/vore/sunesound/pred/digest_13.ogg index 12b1c6bb18..525b9fe701 100644 Binary files a/sound/vore/sunesound/pred/digest_13.ogg and b/sound/vore/sunesound/pred/digest_13.ogg differ diff --git a/sound/vore/sunesound/pred/digest_14.ogg b/sound/vore/sunesound/pred/digest_14.ogg index c68231585c..a7d908f7c0 100644 Binary files a/sound/vore/sunesound/pred/digest_14.ogg and b/sound/vore/sunesound/pred/digest_14.ogg differ diff --git a/sound/vore/sunesound/pred/digest_15.ogg b/sound/vore/sunesound/pred/digest_15.ogg index 32aecca35b..9fc0f2fda2 100644 Binary files a/sound/vore/sunesound/pred/digest_15.ogg and b/sound/vore/sunesound/pred/digest_15.ogg differ diff --git a/sound/vore/sunesound/pred/digest_16.ogg b/sound/vore/sunesound/pred/digest_16.ogg index d112913570..3d94aea22d 100644 Binary files a/sound/vore/sunesound/pred/digest_16.ogg and b/sound/vore/sunesound/pred/digest_16.ogg differ diff --git a/sound/vore/sunesound/pred/digest_17.ogg b/sound/vore/sunesound/pred/digest_17.ogg index d23c4c6ddc..227130aa82 100644 Binary files a/sound/vore/sunesound/pred/digest_17.ogg and b/sound/vore/sunesound/pred/digest_17.ogg differ diff --git a/sound/vore/sunesound/pred/digest_18.ogg b/sound/vore/sunesound/pred/digest_18.ogg index ae8ac9f74f..b9a3ba3a66 100644 Binary files a/sound/vore/sunesound/pred/digest_18.ogg and b/sound/vore/sunesound/pred/digest_18.ogg differ diff --git a/sound/vore/sunesound/pred/escape.ogg b/sound/vore/sunesound/pred/escape.ogg index fc093a5acf..1b81e70879 100644 Binary files a/sound/vore/sunesound/pred/escape.ogg and b/sound/vore/sunesound/pred/escape.ogg differ diff --git a/sound/vore/sunesound/pred/insertion_01.ogg b/sound/vore/sunesound/pred/insertion_01.ogg index 4ca8b6e425..6b1322c25e 100644 Binary files a/sound/vore/sunesound/pred/insertion_01.ogg and b/sound/vore/sunesound/pred/insertion_01.ogg differ diff --git a/sound/vore/sunesound/pred/insertion_02.ogg b/sound/vore/sunesound/pred/insertion_02.ogg index a23cfaf201..a1c18321b4 100644 Binary files a/sound/vore/sunesound/pred/insertion_02.ogg and b/sound/vore/sunesound/pred/insertion_02.ogg differ diff --git a/sound/vore/sunesound/pred/loop.ogg b/sound/vore/sunesound/pred/loop.ogg index 5f0994251a..6e019be553 100644 Binary files a/sound/vore/sunesound/pred/loop.ogg and b/sound/vore/sunesound/pred/loop.ogg differ diff --git a/sound/vore/sunesound/pred/schlorp.ogg b/sound/vore/sunesound/pred/schlorp.ogg index eefb9dd71e..25ceb45ae7 100644 Binary files a/sound/vore/sunesound/pred/schlorp.ogg and b/sound/vore/sunesound/pred/schlorp.ogg differ diff --git a/sound/vore/sunesound/pred/squish _02.ogg b/sound/vore/sunesound/pred/squish _02.ogg index 846f0a2ece..1585072df9 100644 Binary files a/sound/vore/sunesound/pred/squish _02.ogg and b/sound/vore/sunesound/pred/squish _02.ogg differ diff --git a/sound/vore/sunesound/pred/squish _03.ogg b/sound/vore/sunesound/pred/squish _03.ogg index 568aa81a3d..e54c1ffd63 100644 Binary files a/sound/vore/sunesound/pred/squish _03.ogg and b/sound/vore/sunesound/pred/squish _03.ogg differ diff --git a/sound/vore/sunesound/pred/squish_01.ogg b/sound/vore/sunesound/pred/squish_01.ogg index bc014b811d..48749ca32f 100644 Binary files a/sound/vore/sunesound/pred/squish_01.ogg and b/sound/vore/sunesound/pred/squish_01.ogg differ diff --git a/sound/vore/sunesound/pred/squish_02.ogg b/sound/vore/sunesound/pred/squish_02.ogg index 8d92bfd19e..b33e7bfc5f 100644 Binary files a/sound/vore/sunesound/pred/squish_02.ogg and b/sound/vore/sunesound/pred/squish_02.ogg differ diff --git a/sound/vore/sunesound/pred/squish_03.ogg b/sound/vore/sunesound/pred/squish_03.ogg index f62bf7ff60..72a816e1c7 100644 Binary files a/sound/vore/sunesound/pred/squish_03.ogg and b/sound/vore/sunesound/pred/squish_03.ogg differ diff --git a/sound/vore/sunesound/pred/squish_04.ogg b/sound/vore/sunesound/pred/squish_04.ogg index 47037d9a3a..e19b5de9c9 100644 Binary files a/sound/vore/sunesound/pred/squish_04.ogg and b/sound/vore/sunesound/pred/squish_04.ogg differ diff --git a/sound/vore/sunesound/pred/stomachmove.ogg b/sound/vore/sunesound/pred/stomachmove.ogg index 4e11cc03ed..225cf72267 100644 Binary files a/sound/vore/sunesound/pred/stomachmove.ogg and b/sound/vore/sunesound/pred/stomachmove.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_01.ogg b/sound/vore/sunesound/pred/struggle_01.ogg index 96c569b0f9..5142e4d7d9 100644 Binary files a/sound/vore/sunesound/pred/struggle_01.ogg and b/sound/vore/sunesound/pred/struggle_01.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_02.ogg b/sound/vore/sunesound/pred/struggle_02.ogg index 2f0d3324f1..7e26aeaf51 100644 Binary files a/sound/vore/sunesound/pred/struggle_02.ogg and b/sound/vore/sunesound/pred/struggle_02.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_03.ogg b/sound/vore/sunesound/pred/struggle_03.ogg index 9632817010..baf21d62cd 100644 Binary files a/sound/vore/sunesound/pred/struggle_03.ogg and b/sound/vore/sunesound/pred/struggle_03.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_04.ogg b/sound/vore/sunesound/pred/struggle_04.ogg index 7a30de3baf..133fa8519f 100644 Binary files a/sound/vore/sunesound/pred/struggle_04.ogg and b/sound/vore/sunesound/pred/struggle_04.ogg differ diff --git a/sound/vore/sunesound/pred/struggle_05.ogg b/sound/vore/sunesound/pred/struggle_05.ogg index 0bae93d50f..b5fdfd62cc 100644 Binary files a/sound/vore/sunesound/pred/struggle_05.ogg and b/sound/vore/sunesound/pred/struggle_05.ogg differ diff --git a/sound/vore/sunesound/pred/swallow_01.ogg b/sound/vore/sunesound/pred/swallow_01.ogg index 45a0008586..6a7ba5befb 100644 Binary files a/sound/vore/sunesound/pred/swallow_01.ogg and b/sound/vore/sunesound/pred/swallow_01.ogg differ diff --git a/sound/vore/sunesound/pred/swallow_02.ogg b/sound/vore/sunesound/pred/swallow_02.ogg index 8f9bcb2e84..29433e9c29 100644 Binary files a/sound/vore/sunesound/pred/swallow_02.ogg and b/sound/vore/sunesound/pred/swallow_02.ogg differ diff --git a/sound/vore/sunesound/pred/taurswallow.ogg b/sound/vore/sunesound/pred/taurswallow.ogg index c700f71803..6fedf3867b 100644 Binary files a/sound/vore/sunesound/pred/taurswallow.ogg and b/sound/vore/sunesound/pred/taurswallow.ogg differ diff --git a/sound/vore/sunesound/prey/death_01.ogg b/sound/vore/sunesound/prey/death_01.ogg index 539a873a7e..48468797d0 100644 Binary files a/sound/vore/sunesound/prey/death_01.ogg and b/sound/vore/sunesound/prey/death_01.ogg differ diff --git a/sound/vore/sunesound/prey/death_02.ogg b/sound/vore/sunesound/prey/death_02.ogg index 4dd1a285ea..35e62d0f37 100644 Binary files a/sound/vore/sunesound/prey/death_02.ogg and b/sound/vore/sunesound/prey/death_02.ogg differ diff --git a/sound/vore/sunesound/prey/death_03.ogg b/sound/vore/sunesound/prey/death_03.ogg index 30a3622c86..656ae47885 100644 Binary files a/sound/vore/sunesound/prey/death_03.ogg and b/sound/vore/sunesound/prey/death_03.ogg differ diff --git a/sound/vore/sunesound/prey/death_04.ogg b/sound/vore/sunesound/prey/death_04.ogg index ff983c2c31..b0f2f73b68 100644 Binary files a/sound/vore/sunesound/prey/death_04.ogg and b/sound/vore/sunesound/prey/death_04.ogg differ diff --git a/sound/vore/sunesound/prey/death_05.ogg b/sound/vore/sunesound/prey/death_05.ogg index 44b8603048..e32a201662 100644 Binary files a/sound/vore/sunesound/prey/death_05.ogg and b/sound/vore/sunesound/prey/death_05.ogg differ diff --git a/sound/vore/sunesound/prey/death_06.ogg b/sound/vore/sunesound/prey/death_06.ogg index 836a4fd18c..d36c78075c 100644 Binary files a/sound/vore/sunesound/prey/death_06.ogg and b/sound/vore/sunesound/prey/death_06.ogg differ diff --git a/sound/vore/sunesound/prey/death_07.ogg b/sound/vore/sunesound/prey/death_07.ogg index 2406fea727..d62d2e97dd 100644 Binary files a/sound/vore/sunesound/prey/death_07.ogg and b/sound/vore/sunesound/prey/death_07.ogg differ diff --git a/sound/vore/sunesound/prey/death_08.ogg b/sound/vore/sunesound/prey/death_08.ogg index 0d7627dfae..3811c743f4 100644 Binary files a/sound/vore/sunesound/prey/death_08.ogg and b/sound/vore/sunesound/prey/death_08.ogg differ diff --git a/sound/vore/sunesound/prey/death_09.ogg b/sound/vore/sunesound/prey/death_09.ogg index fa00a29d31..4833c19a96 100644 Binary files a/sound/vore/sunesound/prey/death_09.ogg and b/sound/vore/sunesound/prey/death_09.ogg differ diff --git a/sound/vore/sunesound/prey/death_10.ogg b/sound/vore/sunesound/prey/death_10.ogg index 738e7cf909..b51ee3895d 100644 Binary files a/sound/vore/sunesound/prey/death_10.ogg and b/sound/vore/sunesound/prey/death_10.ogg differ diff --git a/sound/vore/sunesound/prey/death_11.ogg b/sound/vore/sunesound/prey/death_11.ogg index bfd47945ae..75c0cdb664 100644 Binary files a/sound/vore/sunesound/prey/death_11.ogg and b/sound/vore/sunesound/prey/death_11.ogg differ diff --git a/sound/vore/sunesound/prey/death_12.ogg b/sound/vore/sunesound/prey/death_12.ogg index e6e800b2da..60626b0365 100644 Binary files a/sound/vore/sunesound/prey/death_12.ogg and b/sound/vore/sunesound/prey/death_12.ogg differ diff --git a/sound/vore/sunesound/prey/death_13.ogg b/sound/vore/sunesound/prey/death_13.ogg index c9b79887d7..7e414f34dc 100644 Binary files a/sound/vore/sunesound/prey/death_13.ogg and b/sound/vore/sunesound/prey/death_13.ogg differ diff --git a/sound/vore/sunesound/prey/digest_01.ogg b/sound/vore/sunesound/prey/digest_01.ogg index a1d13f7fb7..71b310850e 100644 Binary files a/sound/vore/sunesound/prey/digest_01.ogg and b/sound/vore/sunesound/prey/digest_01.ogg differ diff --git a/sound/vore/sunesound/prey/digest_02.ogg b/sound/vore/sunesound/prey/digest_02.ogg index 443d23c194..9676330dac 100644 Binary files a/sound/vore/sunesound/prey/digest_02.ogg and b/sound/vore/sunesound/prey/digest_02.ogg differ diff --git a/sound/vore/sunesound/prey/digest_03.ogg b/sound/vore/sunesound/prey/digest_03.ogg index eb798b66ff..abde08c549 100644 Binary files a/sound/vore/sunesound/prey/digest_03.ogg and b/sound/vore/sunesound/prey/digest_03.ogg differ diff --git a/sound/vore/sunesound/prey/digest_04.ogg b/sound/vore/sunesound/prey/digest_04.ogg index a2c2c3e1ac..746f5bc9b6 100644 Binary files a/sound/vore/sunesound/prey/digest_04.ogg and b/sound/vore/sunesound/prey/digest_04.ogg differ diff --git a/sound/vore/sunesound/prey/digest_05.ogg b/sound/vore/sunesound/prey/digest_05.ogg index 752a6d48f3..8033a65a7c 100644 Binary files a/sound/vore/sunesound/prey/digest_05.ogg and b/sound/vore/sunesound/prey/digest_05.ogg differ diff --git a/sound/vore/sunesound/prey/digest_06.ogg b/sound/vore/sunesound/prey/digest_06.ogg index f2e80b919f..3173eeaf1e 100644 Binary files a/sound/vore/sunesound/prey/digest_06.ogg and b/sound/vore/sunesound/prey/digest_06.ogg differ diff --git a/sound/vore/sunesound/prey/digest_07.ogg b/sound/vore/sunesound/prey/digest_07.ogg index 6a2ff70ff8..39e66dfda8 100644 Binary files a/sound/vore/sunesound/prey/digest_07.ogg and b/sound/vore/sunesound/prey/digest_07.ogg differ diff --git a/sound/vore/sunesound/prey/digest_08.ogg b/sound/vore/sunesound/prey/digest_08.ogg index 4e55f4671d..2b4ba324ab 100644 Binary files a/sound/vore/sunesound/prey/digest_08.ogg and b/sound/vore/sunesound/prey/digest_08.ogg differ diff --git a/sound/vore/sunesound/prey/digest_09.ogg b/sound/vore/sunesound/prey/digest_09.ogg index 452e6b4a2e..77ba32e548 100644 Binary files a/sound/vore/sunesound/prey/digest_09.ogg and b/sound/vore/sunesound/prey/digest_09.ogg differ diff --git a/sound/vore/sunesound/prey/digest_10.ogg b/sound/vore/sunesound/prey/digest_10.ogg index 4c5dc2e333..a7eca5daa8 100644 Binary files a/sound/vore/sunesound/prey/digest_10.ogg and b/sound/vore/sunesound/prey/digest_10.ogg differ diff --git a/sound/vore/sunesound/prey/digest_11.ogg b/sound/vore/sunesound/prey/digest_11.ogg index e94c0af656..0dc8c0da1b 100644 Binary files a/sound/vore/sunesound/prey/digest_11.ogg and b/sound/vore/sunesound/prey/digest_11.ogg differ diff --git a/sound/vore/sunesound/prey/digest_12.ogg b/sound/vore/sunesound/prey/digest_12.ogg index cb212fed1c..55337c961c 100644 Binary files a/sound/vore/sunesound/prey/digest_12.ogg and b/sound/vore/sunesound/prey/digest_12.ogg differ diff --git a/sound/vore/sunesound/prey/digest_13.ogg b/sound/vore/sunesound/prey/digest_13.ogg index 9fd292184e..17e7efc900 100644 Binary files a/sound/vore/sunesound/prey/digest_13.ogg and b/sound/vore/sunesound/prey/digest_13.ogg differ diff --git a/sound/vore/sunesound/prey/digest_14.ogg b/sound/vore/sunesound/prey/digest_14.ogg index 24279d4712..2412907f81 100644 Binary files a/sound/vore/sunesound/prey/digest_14.ogg and b/sound/vore/sunesound/prey/digest_14.ogg differ diff --git a/sound/vore/sunesound/prey/digest_15.ogg b/sound/vore/sunesound/prey/digest_15.ogg index 2bf555ba41..1815ef44ce 100644 Binary files a/sound/vore/sunesound/prey/digest_15.ogg and b/sound/vore/sunesound/prey/digest_15.ogg differ diff --git a/sound/vore/sunesound/prey/digest_16.ogg b/sound/vore/sunesound/prey/digest_16.ogg index 98edd6fb61..dbede86c5b 100644 Binary files a/sound/vore/sunesound/prey/digest_16.ogg and b/sound/vore/sunesound/prey/digest_16.ogg differ diff --git a/sound/vore/sunesound/prey/digest_17.ogg b/sound/vore/sunesound/prey/digest_17.ogg index 2ff5c173e1..9636ff9ed1 100644 Binary files a/sound/vore/sunesound/prey/digest_17.ogg and b/sound/vore/sunesound/prey/digest_17.ogg differ diff --git a/sound/vore/sunesound/prey/digest_18.ogg b/sound/vore/sunesound/prey/digest_18.ogg index 6a1ae78fb8..0fcd50a591 100644 Binary files a/sound/vore/sunesound/prey/digest_18.ogg and b/sound/vore/sunesound/prey/digest_18.ogg differ diff --git a/sound/vore/sunesound/prey/escape.ogg b/sound/vore/sunesound/prey/escape.ogg index 621997a56d..5a9ce779ab 100644 Binary files a/sound/vore/sunesound/prey/escape.ogg and b/sound/vore/sunesound/prey/escape.ogg differ diff --git a/sound/vore/sunesound/prey/insertion_01.ogg b/sound/vore/sunesound/prey/insertion_01.ogg index 5a3b942bb3..ec349f7e7b 100644 Binary files a/sound/vore/sunesound/prey/insertion_01.ogg and b/sound/vore/sunesound/prey/insertion_01.ogg differ diff --git a/sound/vore/sunesound/prey/insertion_02.ogg b/sound/vore/sunesound/prey/insertion_02.ogg index 2d35094522..852f3238f5 100644 Binary files a/sound/vore/sunesound/prey/insertion_02.ogg and b/sound/vore/sunesound/prey/insertion_02.ogg differ diff --git a/sound/vore/sunesound/prey/loop.ogg b/sound/vore/sunesound/prey/loop.ogg index 1584482d92..cd9141f340 100644 Binary files a/sound/vore/sunesound/prey/loop.ogg and b/sound/vore/sunesound/prey/loop.ogg differ diff --git a/sound/vore/sunesound/prey/schlorp.ogg b/sound/vore/sunesound/prey/schlorp.ogg index d1895ee26a..3741da63f7 100644 Binary files a/sound/vore/sunesound/prey/schlorp.ogg and b/sound/vore/sunesound/prey/schlorp.ogg differ diff --git a/sound/vore/sunesound/prey/squish_01.ogg b/sound/vore/sunesound/prey/squish_01.ogg index 2785a4a080..b8b99aa672 100644 Binary files a/sound/vore/sunesound/prey/squish_01.ogg and b/sound/vore/sunesound/prey/squish_01.ogg differ diff --git a/sound/vore/sunesound/prey/squish_02.ogg b/sound/vore/sunesound/prey/squish_02.ogg index f5671f7165..9aeffeaf90 100644 Binary files a/sound/vore/sunesound/prey/squish_02.ogg and b/sound/vore/sunesound/prey/squish_02.ogg differ diff --git a/sound/vore/sunesound/prey/squish_03.ogg b/sound/vore/sunesound/prey/squish_03.ogg index 1e8f2bb896..9f9162b1f4 100644 Binary files a/sound/vore/sunesound/prey/squish_03.ogg and b/sound/vore/sunesound/prey/squish_03.ogg differ diff --git a/sound/vore/sunesound/prey/squish_04.ogg b/sound/vore/sunesound/prey/squish_04.ogg index 2e618890a9..3a57623993 100644 Binary files a/sound/vore/sunesound/prey/squish_04.ogg and b/sound/vore/sunesound/prey/squish_04.ogg differ diff --git a/sound/vore/sunesound/prey/stomachmove.ogg b/sound/vore/sunesound/prey/stomachmove.ogg index e4e004b072..a120ee1712 100644 Binary files a/sound/vore/sunesound/prey/stomachmove.ogg and b/sound/vore/sunesound/prey/stomachmove.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_01.ogg b/sound/vore/sunesound/prey/struggle_01.ogg index de0f3ad8bd..9b99214bea 100644 Binary files a/sound/vore/sunesound/prey/struggle_01.ogg and b/sound/vore/sunesound/prey/struggle_01.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_02.ogg b/sound/vore/sunesound/prey/struggle_02.ogg index 2695ab0adf..549f272641 100644 Binary files a/sound/vore/sunesound/prey/struggle_02.ogg and b/sound/vore/sunesound/prey/struggle_02.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_03.ogg b/sound/vore/sunesound/prey/struggle_03.ogg index 17dd8bec8a..a5fac4fb5d 100644 Binary files a/sound/vore/sunesound/prey/struggle_03.ogg and b/sound/vore/sunesound/prey/struggle_03.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_04.ogg b/sound/vore/sunesound/prey/struggle_04.ogg index 8631853509..d037b80b1b 100644 Binary files a/sound/vore/sunesound/prey/struggle_04.ogg and b/sound/vore/sunesound/prey/struggle_04.ogg differ diff --git a/sound/vore/sunesound/prey/struggle_05.ogg b/sound/vore/sunesound/prey/struggle_05.ogg index 233addec0b..80a611a4f2 100644 Binary files a/sound/vore/sunesound/prey/struggle_05.ogg and b/sound/vore/sunesound/prey/struggle_05.ogg differ diff --git a/sound/vore/sunesound/prey/swallow_01.ogg b/sound/vore/sunesound/prey/swallow_01.ogg index 3da3fef66a..9453ad1100 100644 Binary files a/sound/vore/sunesound/prey/swallow_01.ogg and b/sound/vore/sunesound/prey/swallow_01.ogg differ diff --git a/sound/vore/sunesound/prey/swallow_02.ogg b/sound/vore/sunesound/prey/swallow_02.ogg index 30d9a4e44d..47b888ef4c 100644 Binary files a/sound/vore/sunesound/prey/swallow_02.ogg and b/sound/vore/sunesound/prey/swallow_02.ogg differ diff --git a/sound/vore/sunesound/prey/taurswallow.ogg b/sound/vore/sunesound/prey/taurswallow.ogg index f5b5706b36..f1ab123c1d 100644 Binary files a/sound/vore/sunesound/prey/taurswallow.ogg and b/sound/vore/sunesound/prey/taurswallow.ogg differ