Metal amount: [src.m_amount] / [max_m_amount] cm
3"
dat += "
Glass amount: [src.g_amount] / [max_g_amount] cm
3
"
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index f0de1465b63..fbc802df27f 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -504,10 +504,7 @@ Auto Patrol[]"},
A.current = U
A.yo = U.y - T.y
A.xo = U.x - T.x
- spawn( 0 )
- A.process()
- return
- return
+ A.fire()
/obj/machinery/bot/ed209/attack_alien(var/mob/living/carbon/alien/user as mob)
..()
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index 2def8716a50..01d94d68bab 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -60,16 +60,12 @@
#define REPLACE_TILE 5
#define TILE_EMAG 6
-#define KIWATA 1
-
/obj/machinery/bot/floorbot/New()
..()
updateicon()
var/datum/job/engineer/J = new/datum/job/engineer
botcard.access = J.get_access()
prev_access = botcard.access
- if(target == KIWATA)
- return
spawn(5)
add_to_beacons(bot_filter)
@@ -356,7 +352,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
else //If no special processing is needed, simply return the result.
result = scan_target
return result
-view
+
/obj/machinery/bot/floorbot/proc/repair(var/turf/target_turf)
if(istype(target_turf, /turf/space/))
diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm
index 24c115bc5ce..e80f0799943 100644
--- a/code/game/machinery/camera/motion.dm
+++ b/code/game/machinery/camera/motion.dm
@@ -49,7 +49,8 @@
/obj/machinery/camera/proc/triggerAlarm()
if (!detectTime) return 0
for (var/mob/living/silicon/aiPlayer in player_list)
- if (status) aiPlayer.triggerAlarm("Motion", src.loc.loc, src)
+ if (status)
+ aiPlayer.triggerAlarm("Motion", get_area(src), list(src), src)
detectTime = -1
return 1
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index b81d9261591..1cf5d5306be 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -168,24 +168,11 @@
//Here let's calculate their health so the pod doesn't immediately eject them!!!
H.updatehealth()
+ H.refresh_huds(clonemind.current)
clonemind.transfer_to(H)
H.ckey = ckey
H << "
Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?"
- // -- Mode/mind specific stuff goes here
-
- if((H.mind in ticker.mode.revolutionaries) || (H.mind in ticker.mode.head_revolutionaries))
- ticker.mode.update_all_rev_icons() //So the icon actually appears
- if((H.mind in ticker.mode.A_bosses) || ((H.mind in ticker.mode.A_gangsters) || (H.mind in ticker.mode.B_bosses)) || (H.mind in ticker.mode.B_gangsters))
- ticker.mode.update_all_gang_icons()
- if(H.mind in ticker.mode.syndicates)
- ticker.mode.update_all_synd_icons()
- if (H.mind in ticker.mode.cult)
- ticker.mode.add_cultist(src.occupant.mind)
- ticker.mode.update_all_cult_icons() //So the icon actually appears
-
- // -- End mode specific stuff
-
hardset_dna(H, ui, se, null, null, mrace, mcolor)
if(efficiency > 2)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 3372945212b..5fe0b91cc05 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -628,7 +628,8 @@ What a mess.*/
if("released")
active2.fields["criminal"] = "Discharged"
investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", "records")
-
+ for(var/mob/living/carbon/human/H in mob_list) //thanks for forcing me to do this, whoever wrote this shitty records system
+ H.sec_hud_set_security_status()
if ("Delete Record (Security) Execute")
investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records")
if (active2)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 62c86d3a5ad..e6b3179f5c4 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1033,8 +1033,6 @@ About the new airlock wires panel:
autoclose()
return
- crush()
-
if(forced < 2)
if(emagged)
return
@@ -1053,7 +1051,13 @@ About the new airlock wires panel:
killthis.ex_act(2)//Smashin windows
..()
-
+ if(locate(/mob/living) in get_turf(src))
+ if(!safe)
+ crush()
+ else
+ open()
+ return
+ return
/obj/machinery/door/airlock/New()
..()
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 8061ba7f4d2..f3bee16d85f 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -24,9 +24,10 @@
var/id = null // id of door it controls.
var/releasetime = 0 // when world.time reaches it - release the prisoneer
var/timelength = 0 // the length of time this door will be set for
- var/timing = 1 // boolean, true/1 timer is on, false/0 means it's not timing
+ var/timing = 0 // boolean, true/1 timer is on, false/0 means it's not timing
var/picture_state // icon_state of alert picture, if not displaying text/numbers
var/list/obj/machinery/targets = list()
+ var/obj/item/device/radio/Radio //needed to send messages to sec radio
maptext_height = 26
maptext_width = 32
@@ -34,6 +35,9 @@
/obj/machinery/door_timer/New()
..()
+ Radio = new/obj/item/device/radio(src)
+ Radio.listening = 0
+
pixel_x = ((src.dir & 3)? (0) : (src.dir == 4 ? 32 : -32))
pixel_y = ((src.dir & 3)? (src.dir ==1 ? 24 : -32) : (0))
@@ -64,7 +68,8 @@
if(stat & (NOPOWER|BROKEN)) return
if(timing)
if(world.time > src.releasetime)
- broadcast_hud_message("[src]'s timer has expired. Releasing prisoner.", src)
+ Radio.set_frequency(SEC_FREQ)
+ Radio.talk_into(src, "Timer has expired. Releasing prisoner.", SEC_FREQ)
src.timer_end() // open doors, reset timer, clear status screen
timing = 0
timeset(0)
diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm
index 9005a7fda49..cbccae2035c 100644
--- a/code/game/machinery/doors/checkForMultipleDoors.dm
+++ b/code/game/machinery/doors/checkForMultipleDoors.dm
@@ -2,7 +2,7 @@
if(!src.loc)
return 0
for(var/obj/machinery/door/D in src.loc)
- if(!istype(D, /obj/machinery/door/window) && D.density)
+ if(!istype(D, /obj/machinery/door/window) && D.density && D != src)
return 0
return 1
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 3b25be065e2..89a59b4d9af 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -234,10 +234,10 @@
operating = 1
do_animate("closing")
- src.density = 1
explosion_resistance = initial(explosion_resistance)
src.layer = 3.1
sleep(10)
+ src.density = 1
update_icon()
if(visible && !glass)
SetOpacity(1) //caaaaarn!
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 3695c80ef45..67e52d4199f 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -72,14 +72,14 @@
operating = 1
flick("closing", src)
- crush()
icon_state = "closed"
- density = 1
explosion_resistance = initial(explosion_resistance)
SetOpacity(1)
air_update_turf(1)
update_freelook_sight()
sleep(10)
+ crush()
+ density = 1
operating = 0
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 1980aa2ba63..5104069e662 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -115,6 +115,7 @@ Class Procs:
/obj/machinery/New()
..()
machines += src
+ auto_use_power()
/obj/machinery/Destroy()
machines.Remove(src)
@@ -260,8 +261,10 @@ Class Procs:
/obj/machinery/attack_paw(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/attack_hand(mob/user as mob)
- if(!interact_offline && stat & (NOPOWER|BROKEN|MAINT))
+/obj/machinery/attack_hand(mob/user as mob, var/check_power = 1)
+ if(check_power && stat & NOPOWER)
+ return 1
+ if(!interact_offline && stat & (BROKEN|MAINT))
return 1
if(user.lying || user.stat)
return 1
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 1cdf0df2779..42c627dbd0d 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -610,8 +610,7 @@
A.current = T
A.yo = U.y - T.y
A.xo = U.x - T.x
- spawn( 1 )
- A.process()
+ A.fire()
/obj/machinery/porta_turret/proc/setState(var/on, var/emagged)
if(controllock)
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 17cfec9e569..d6e177569c5 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -386,6 +386,7 @@
else
user << "
This station cant hold more information, try to use better parts."
if(default_deconstruction_screwdriver(user, "controller-o", "controller", W))
+ update_icon()
return
if(exchange_parts(user, W))
@@ -430,10 +431,9 @@
/obj/machinery/teleport/station/power_change()
..()
- if(stat & NOPOWER)
- update_icon()
- if(teleporter_hub)
- teleporter_hub.update_icon()
+ update_icon()
+ if(teleporter_hub)
+ teleporter_hub.update_icon()
/obj/machinery/teleport/station/update_icon()
if(panel_open)
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index 59b2387aeb4..3cb48b9984e 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -235,8 +235,7 @@
A.current = T
A.yo = U.y - T.y
A.xo = U.x - T.x
- spawn( 0 )
- A.process()
+ A.fire()
return
@@ -485,8 +484,7 @@
A.current = curloc
A.yo = targloc.y - curloc.y
A.xo = targloc.x - curloc.x
- spawn(0)
- A.process()
+ A.fire()
return
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index aa25b385202..71536af209e 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -208,24 +208,15 @@
/obj/machinery/vending/attack_hand(mob/user)
- if(stat & (BROKEN|NOPOWER))
- return
- user.set_machine(src)
-
- if(seconds_electrified != 0)
- if(shock(user, 100))
+ var/dat = ""
+ if(panel_open)
+ dat += wires()
+ if(product_slogans != "")
+ dat += "The speaker switch is [shut_up ? "off" : "on"].
Toggle"
+ else
+ if(stat & (BROKEN|NOPOWER))
return
- var/dat = ""
-
- if(premium.len > 0)
- dat += "
Coin slot: "
- if (coin)
- dat += "[coin]
Remove"
- else
- dat += "
No coin Remove"
-
- if(!panel_open)//Vending machines do not dispense items when they are unscrewed
dat += "
Select an item
"
dat += "
"
if(product_records.len == 0)
@@ -250,12 +241,16 @@
dat += ""
dat += ""
dat += "
"
-
- if(panel_open)
- dat += wires()
-
- if(product_slogans != "")
- dat += "The speaker switch is [shut_up ? "off" : "on"].
Toggle"
+ if(premium.len > 0)
+ dat += "
Coin slot: "
+ if (coin)
+ dat += "[coin]
Remove"
+ else
+ dat += "
No coin Remove"
+ user.set_machine(src)
+ if(seconds_electrified && !(stat & NOPOWER))
+ if(shock(user, 100))
+ return
//user << browse(dat, "window=vending")
//onclose(user, "")
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 4e9b8583277..22f43c9d934 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -22,7 +22,7 @@
/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(target=1)
sleep(equip_cooldown)
set_ready_state(1)
- if(target && chassis)
+ if(target && chassis && chassis.occupant)
return 1
return 0
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index d7a893a37b3..3d7a27852a7 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -27,7 +27,7 @@
A.current = curloc
A.yo = targloc.y - curloc.y
A.xo = targloc.x - curloc.x
- A.process()
+ A.fire()
chassis.log_message("Fired from [src.name], targeting [target].")
do_after_cooldown()
return 1
diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm
index 795ff390d64..fa7d79e6113 100644
--- a/code/game/mecha/medical/odysseus.dm
+++ b/code/game/mecha/medical/odysseus.dm
@@ -9,102 +9,25 @@
internal_damage_threshold = 35
deflect_chance = 15
step_energy_drain = 6
- var/obj/item/clothing/glasses/hud/health/mech/hud
-
-/obj/mecha/medical/odysseus/New()
- ..()
- hud = new /obj/item/clothing/glasses/hud/health/mech(src)
- return
+ var/builtin_hud_user = 0
/obj/mecha/medical/odysseus/moved_inside(var/mob/living/carbon/human/H as mob)
if(..())
- if(H.glasses)
- occupant_message("
[H.glasses] prevent you from using [src] [hud]")
+ if(H.glasses && istype(H.glasses, /obj/item/clothing/glasses/hud))
+ occupant_message("
Your [H.glasses] prevent you from using the built-in medical hud.")
else
- H.glasses = hud
+ var/datum/atom_hud/data/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED]
+ A.add_hud_to(H)
+ builtin_hud_user = 1
return 1
else
return 0
/obj/mecha/medical/odysseus/go_out()
- if(ishuman(occupant))
+ if(ishuman(occupant) && builtin_hud_user)
var/mob/living/carbon/human/H = occupant
- if(H.glasses == hud)
- H.glasses = null
+ var/datum/atom_hud/data/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED]
+ A.remove_hud_from(H)
..()
return
-/*
-/obj/mecha/medical/odysseus/verb/set_perspective()
- set name = "Set client perspective."
- set category = "Exosuit Interface"
- set src = usr.loc
- var/perspective = input("Select a perspective type.",
- "Client perspective",
- occupant.client.perspective) in list(MOB_PERSPECTIVE,EYE_PERSPECTIVE)
- world << "[perspective]"
- occupant.client.perspective = perspective
- return
-/obj/mecha/medical/odysseus/verb/toggle_eye()
- set name = "Toggle eye."
- set category = "Exosuit Interface"
- set src = usr.loc
- if(occupant.client.eye == occupant)
- occupant.client.eye = src
- else
- occupant.client.eye = occupant
- world << "[occupant.client.eye]"
- return
-*/
-
-//TODO - Check documentation for client.eye and client.perspective...
-/obj/item/clothing/glasses/hud/health/mech
- name = "integrated medical Hud"
-
-
-/obj/item/clothing/glasses/hud/health/mech/process_hud(var/mob/M)
-/*
- world<< "view(M)"
- for(var/mob/mob in view(M))
- world << "[mob]"
- world<< "view(M.client)"
- for(var/mob/mob in view(M.client))
- world << "[mob]"
- world<< "view(M.loc)"
- for(var/mob/mob in view(M.loc))
- world << "[mob]"
-*/
-
- if(!M || M.stat || !(M in view(M))) return
- if(!M.client) return
- var/client/C = M.client
- var/image/holder
- for(var/mob/living/carbon/human/patient in view(M.loc))
- if(M.see_invisible < patient.invisibility)
- continue
- var/foundVirus = 0
- for(var/datum/disease/D in patient.viruses)
- if(!(D.visibility_flags & HIDDEN_SCANNER))
- if(D.severity != NONTHREAT)
- foundVirus++
- //if(patient.virus2)
- // foundVirus++
-
- holder = patient.hud_list[HEALTH_HUD]
- if(patient.stat == 2)
- holder.icon_state = "hudhealth-100"
- C.images += holder
- else
- holder.icon_state = "hud[RoundHealth(patient.health)]"
- C.images += holder
-
- holder = patient.hud_list[STATUS_HUD]
- if(patient.stat == 2)
- holder.icon_state = "huddead"
- else if(patient.status_flags & XENO_HOST)
- holder.icon_state = "hudxeno"
- else if(foundVirus)
- holder.icon_state = "hudill"
- else
- holder.icon_state = "hudhealthy"
- C.images += holder
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 4b5a9a0675b..93330371318 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -205,9 +205,6 @@
/obj/item/proc/talk_into(mob/M as mob, text)
return
-/obj/item/proc/moved(mob/user as mob, old_loc as turf)
- return
-
/obj/item/proc/dropped(mob/user as mob)
..()
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 908449350cf..d10eec6fed3 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -57,7 +57,7 @@
. = ..()
var/area/A = get_area()
if(get_area_type() == AREA_STATION)
- . += "
According to the [src], you are now in \"[A.name]\".
"
+ . += "
According to the [src], you are now in \"[strip_html_properly(A.name)]\".
"
var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500)
popup.set_content(.)
popup.open()
@@ -82,7 +82,7 @@
. = ..()
var/area/A = get_area()
if(get_area_type() == AREA_STATION)
- . += "
According to the [src], you are now in \"[A.name]\".
"
+ . += "
According to the [src], you are now in \"[strip_html_properly(A.name)]\".
"
. += "
You may move an amendment to the drawing.
"
var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500)
popup.set_content(.)
@@ -262,4 +262,4 @@
if(BORDER_SPACE)
return ROOM_ERR_SPACE
found+=T
- return found
\ No newline at end of file
+ return found
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index f3d85bccb70..ae3fe04ec0e 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -173,19 +173,26 @@
if(!fuel || !on)
turn_off()
if(!fuel)
- src.icon_state = "[initial(icon_state)]-empty"
+ icon_state = "[initial(icon_state)]-empty"
processing_objects -= src
/obj/item/device/flashlight/flare/proc/turn_off()
on = 0
- src.force = initial(src.force)
- src.damtype = initial(src.damtype)
+ force = initial(src.force)
+ damtype = initial(src.damtype)
if(ismob(loc))
var/mob/U = loc
update_brightness(U)
else
update_brightness(null)
+/obj/item/device/flashlight/flare/update_brightness(var/mob/user = null)
+ ..()
+ if(on)
+ item_state = "[initial(item_state)]-on"
+ else
+ item_state = "[initial(item_state)]"
+
/obj/item/device/flashlight/flare/attack_self(mob/user)
// Usual checks
@@ -199,8 +206,8 @@
// All good, turn it on.
if(.)
user.visible_message("
[user] lights the [src].", "
You light the [src]!")
- src.force = on_damage
- src.damtype = "fire"
+ force = on_damage
+ damtype = "fire"
processing_objects += src
/obj/item/device/flashlight/flare/torch
@@ -209,7 +216,7 @@
w_class = 4
brightness_on = 7
icon_state = "torch"
- item_state = "torch_off"
+ item_state = "torch"
on_damage = 10
diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm
index 01a11fabe4c..7623d007026 100644
--- a/code/game/objects/items/latexballoon.dm
+++ b/code/game/objects/items/latexballoon.dm
@@ -11,19 +11,26 @@
var/state
var/datum/gas_mixture/air_contents = null
-/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank)
+/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank, mob/user as mob)
if (icon_state == "latexballon_bursted")
return
- src.air_contents = tank.remove_air_volume(3)
icon_state = "latexballon_blow"
item_state = "latexballon"
+ user.update_inv_r_hand()
+ user.update_inv_l_hand()
+ user << "
You blow up [src] with [tank]."
+ air_contents = tank.remove_air_volume(3)
/obj/item/latexballon/proc/burst()
- if (!air_contents)
+ if (!air_contents || icon_state != "latexballon_blow")
return
playsound(src, 'sound/weapons/Gunshot.ogg', 100, 1)
icon_state = "latexballon_bursted"
item_state = "lgloves"
+ if(istype(src.loc, /mob/living))
+ var/mob/living/user = src.loc
+ user.update_inv_r_hand()
+ user.update_inv_l_hand()
loc.assume_air(air_contents)
/obj/item/latexballon/ex_act(severity, specialty)
@@ -44,5 +51,9 @@
return
/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob)
- if (is_sharp(W))
- burst()
\ No newline at end of file
+ if(istype(W, /obj/item/weapon/tank))
+ var/obj/item/weapon/tank/T = W
+ blow(T, user)
+ return
+ if (is_sharp(W) || is_hot(W))
+ burst()
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 953d5e60487..6f025d6d44b 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -174,15 +174,23 @@ RCD
if(2)
if(istype(A, /turf/simulated/floor))
if(checkResource(10, user))
- user << "Building Airlock..."
- playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 50))
- if(!useResource(10, user)) return 0
- activate()
- var/obj/machinery/door/airlock/T = new airlock_type( A )
- T.autoclose = 1
- return 1
- return 0
+ if(!locate(/obj/machinery/door) in A)
+ user << "Building Airlock..."
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
+ if(do_after(user, 50))
+ if(!useResource(10, user)) return 0
+ activate()
+ var/obj/machinery/door/airlock/T = new airlock_type( A )
+ if(!T.checkForMultipleDoors())
+ qdel(T)
+ useResource(-10, user)
+ return 0
+ T.autoclose = 1
+ return 1
+ return 0
+ else
+ user << "There is another door here!"
+ return 0
return 0
if(3)
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 642f4a144ff..14a811e2e00 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -186,10 +186,16 @@
steam.attach(src)
steam.start()
- for(var/atom/A in view(affected_area, loc))
- if(A == src)
- continue
- reagents.reaction(A, 1, 10)
+ var/list/accessible = can_flood_from(loc, affected_area)
+ var/list/reactable = accessible
+ var/mycontents = GetAllContents()
+ for(var/turf/T in accessible)
+ for(var/atom/A in T.GetAllContents())
+ if(A in mycontents) continue
+ reactable |= A
+ var/fraction = (reagents.total_volume/reactable.len) - reagents.total_volume
+ for(var/atom/A in reactable)
+ reagents.reaction(A, TOUCH, fraction)
invisibility = INVISIBILITY_MAXIMUM //Why am i doing this?
spawn(50) //To make sure all reagents can work
@@ -199,6 +205,19 @@
for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
G.reagents.trans_to(src, G.reagents.total_volume)
+/obj/item/weapon/grenade/chem_grenade/proc/can_flood_from(myloc, maxrange)
+ var/list/reachable = list(myloc)
+ for(var/i=1; i<=maxrange; i++)
+ for(var/turf/T in (orange(i, myloc) - orange(i-1, myloc)))
+ if(T in reachable) continue
+ for(var/turf/NT in orange(1, T))
+ if(!(NT in reachable)) continue
+ if(!(get_dir(T,NT) in cardinal)) continue
+ if(!NT.CanAtmosPass(T)) continue
+ reachable |= T
+ break
+ return reachable
+
//Large chem grenades accept slime cores and use the appropriately.
/obj/item/weapon/grenade/chem_grenade/large
name = "large grenade"
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 8118a8f4412..f1503d019fb 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -112,7 +112,6 @@
name = "zipties"
desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
icon_state = "cuff_white"
- item_state = "coil_white"
breakouttime = 450 //Deciseconds = 45s
trashtype = /obj/item/weapon/restraints/handcuffs/cable/zipties/used
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 6932525dd09..af34671bef5 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -27,6 +27,9 @@
/obj/item/weapon/implant/proc/implanted(var/mob/source)
if(activated)
action_button_name = "Activate [src.name]"
+ if(istype(source, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = source
+ H.sec_hud_set_implants()
return 1
@@ -205,4 +208,4 @@
/obj/item/weapon/implant/emp/activate()
if (src.uses < 1) return 0
src.uses--
- empulse(imp_in, 3, 5)
\ No newline at end of file
+ empulse(imp_in, 3, 5)
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index 1e0873b4da9..b7ec18568ad 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -84,11 +84,12 @@
var/success = 0
while(tempL.len)
attempt = pick(tempL)
- success = user.Move(attempt)
- if(!success)
- tempL.Remove(attempt)
- else
+ user.Move(attempt)
+ if(get_turf(user) == attempt)
+ success = 1
break
+ else
+ tempL.Remove(attempt)
if(!success)
user.loc = pick(L)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index b4f5eb2052c..506455fb11d 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -11,6 +11,7 @@
w_class = 3.0
var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
+ var/list/is_seeing = new/list() //List of mobs which are currently seeing the contents of this item's storage
var/max_w_class = 2 //Max size of objects that this object can store (in effect only if can_hold isn't set)
var/max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
var/storage_slots = 7 //The number of storage slots in this container.
@@ -81,6 +82,7 @@
user.client.screen += closer
user.client.screen += contents
user.s_active = src
+ is_seeing |= user
/obj/item/weapon/storage/throw_at(atom/target, range, speed)
@@ -96,6 +98,17 @@
user.client.screen -= contents
if(user.s_active == src)
user.s_active = null
+ is_seeing -= user
+
+
+/obj/item/weapon/storage/proc/can_see_contents()
+ var/list/cansee = list()
+ for(var/mob/M in is_seeing)
+ if(M.s_active == src)
+ cansee |= M
+ else
+ is_seeing -= M
+ return cansee
/obj/item/weapon/storage/proc/close(mob/user)
@@ -103,13 +116,11 @@
user.s_active = null
-/obj/item/weapon/storage/proc/close_all() //returns 1 if any mobs actually got a close(M) call
- var/actually_closed = 0
- for(var/mob/M in range(1))
- if(M.s_active == src)
- close(M)
- actually_closed = 1
- return actually_closed
+/obj/item/weapon/storage/proc/close_all()
+ for(var/mob/M in can_see_contents())
+ close(M)
+ . = 1 //returns 1 if any mobs actually got a close(M) call
+
//This proc draws out the inventory and places the items on it. tx and ty are the upper left tile and mx, my are the bottm right.
//The numbers are calculated from the bottom-left The bottom-left slot being 1,1.
@@ -275,8 +286,8 @@
M.show_message("
[usr] puts [W] [preposition]to [src].", 1)
orient2hud(usr)
- if(usr.s_active)
- usr.s_active.show_to(usr)
+ for(var/mob/M in can_see_contents())
+ show_to(M)
update_icon()
return 1
@@ -289,10 +300,9 @@
var/obj/item/weapon/storage/fancy/F = src
F.update_icon(1)
- for(var/mob/M in range(1, loc))
- if(M.s_active == src)
- if(M.client)
- M.client.screen -= W
+ for(var/mob/M in can_see_contents())
+ if(M.client)
+ M.client.screen -= W
if(new_location)
if(ismob(loc))
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 6540268103c..3762fc84ed1 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -83,10 +83,6 @@
if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
atmosanalyzer_scan(air_contents, user)
- else if (istype(W,/obj/item/latexballon))
- var/obj/item/latexballon/LB = W
- LB.blow(src)
- src.add_fingerprint(user)
if(istype(W, /obj/item/device/assembly_holder))
bomb_assemble(W,user)
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index ddc0b48b116..9083dea39a1 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -129,7 +129,7 @@
/obj/structure/closet/wardrobe/yellow
name = "yellow wardrobe"
icon_state = "yellow"
- icon_closed = "yeloww"
+ icon_closed = "yellow"
/obj/structure/closet/wardrobe/yellow/New()
new /obj/item/clothing/under/color/yellow(src)
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 08010e7d521..c7ce5386cb2 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -461,17 +461,20 @@ obj/structure/door_assembly/New()
return
else if(istype(W, /obj/item/weapon/wrench) && !anchored )
- playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user.visible_message("
[user] secures the airlock assembly to the floor.", \
- "You start to secure the airlock assembly to the floor.", \
- "You hear wrenching")
+ if(!locate(/obj/machinery/door) in loc)
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+ user.visible_message("
[user] secures the airlock assembly to the floor.", \
+ "You start to secure the airlock assembly to the floor.", \
+ "You hear wrenching")
- if(do_after(user, 40))
- if( src.anchored )
- return
- user << "
You've secured the airlock assembly."
- src.name = "secured airlock assembly"
- src.anchored = 1
+ if(do_after(user, 40))
+ if( src.anchored )
+ return
+ user << "
You've secured the airlock assembly."
+ src.name = "secured airlock assembly"
+ src.anchored = 1
+ else
+ user << "There is another door here!"
else if(istype(W, /obj/item/weapon/wrench) && anchored )
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
@@ -599,7 +602,7 @@ obj/structure/door_assembly/New()
"You start finishing the airlock.")
if(do_after(user, 40))
- if(state == 2)
+ if(src.loc && state == 2)
user << "
You've finished the airlock."
var/obj/machinery/door/airlock/door
if(mineral == "glass")
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index ac9e59686ea..8e5d20cd8c4 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -267,6 +267,7 @@ obj/structure/windoor_assembly/Destroy()
src.electronics.loc = windoor
if(created_name)
windoor.name = created_name
+ qdel(src)
windoor.close()
@@ -286,12 +287,10 @@ obj/structure/windoor_assembly/Destroy()
src.electronics.loc = windoor
if(created_name)
windoor.name = created_name
+ qdel(src)
windoor.close()
- qdel(src)
-
-
else
..()
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index fad44cf131f..0f34cdffffe 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -17,17 +17,21 @@
name = "Commemorative Plaque"
icon_state = "plaque"
desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."
+ floor_tile = /obj/item/stack/tile/plasteel
/turf/simulated/floor/vault
icon_state = "rockvault"
+ floor_tile = /obj/item/stack/tile/plasteel
/turf/simulated/floor/bluegrid
icon = 'icons/turf/floors.dmi'
icon_state = "bcircuit"
+ floor_tile = /obj/item/stack/tile/plasteel
/turf/simulated/floor/greengrid
icon = 'icons/turf/floors.dmi'
icon_state = "gcircuit"
+ floor_tile = /obj/item/stack/tile/plasteel
/turf/simulated/shuttle
name = "shuttle"
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index ec3128f7e76..7a11314a50a 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -29,6 +29,9 @@
if(!C || !user)
return
if(istype(C, /obj/item/stack/rods))
+ if(broken || burnt)
+ user << "
Repair the plating first."
+ return
var/obj/item/stack/rods/R = C
if (R.get_amount() < 2)
user << "
You need two rods to make a reinforced floor."
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 4a5110e6016..8b9e6e3ccf6 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -302,8 +302,6 @@ client/proc/one_click_antag()
new_character.mind.make_Nuke(synd_spawn[spawnpos],nuke_code)
spawnpos++
- ticker.mode.update_all_synd_icons()
-
return 1
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 1dc4107d0a3..5c76dc8b1f1 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -51,6 +51,15 @@
/obj/item/device/assembly/proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
return "The trigger assembly looks broken!"
+
+/obj/item/device/assembly/proc/is_secured(mob/user)
+ if(!secured)
+ user << "
The [name] is unsecured!"
+ return 0
+ return 1
+
+
+
/obj/item/device/assembly/process_cooldown()
cooldown--
if(cooldown <= 0) return 0
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 5bcc194d824..33d72a05538 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -6,8 +6,6 @@
g_amt = 500
origin_tech = "magnets=2"
- secured = 0
-
var/on = 0
var/visible = 0
var/obj/effect/beam/i_beam/first = null
@@ -90,21 +88,22 @@
if((!secured)||(!on)||(cooldown > 0))
return 0
pulse(0)
- visible_message("\icon[src] *beep* *beep*")
+ if(src.loc)
+ src.loc.audible_message("\icon[src] *beep* *beep*", null, 3)
cooldown = 2
spawn(10)
process_cooldown()
return
/obj/item/device/assembly/infra/interact(mob/user as mob)//TODO: change this this to the wire control panel
- if(!secured) return
- user.set_machine(src)
- var/dat = text("
Infrared Laser\nStatus: []
\nVisibility: []
\n", (on ? text("
On", src) : text("
Off", src)), (src.visible ? text("
Visible", src) : text("
Invisible", src)))
- dat += "
Refresh"
- dat += "
Close"
- user << browse(dat, "window=infra")
- onclose(user, "infra")
- return
+ if(is_secured(user))
+ user.set_machine(src)
+ var/dat = text("
Infrared Laser\nStatus: []
\nVisibility: []
\n", (on ? text("
On", src) : text("
Off", src)), (src.visible ? text("
Visible", src) : text("
Invisible", src)))
+ dat += "
Refresh"
+ dat += "
Close"
+ user << browse(dat, "window=infra")
+ onclose(user, "infra")
+ return
/obj/item/device/assembly/infra/Topic(href, href_list)
..()
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 6e3c6c86976..9e6a855a246 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -6,8 +6,6 @@
g_amt = 200
origin_tech = "magnets=1"
- secured = 0
-
var/scanning = 0
var/timing = 0
var/time = 10
@@ -50,7 +48,8 @@
/obj/item/device/assembly/prox_sensor/sense()
if((!secured)||(!scanning)||(cooldown > 0)) return 0
pulse(0)
- visible_message("\icon[src] *beep* *beep*", "*beep* *beep*")
+ if(src.loc)
+ src.loc.audible_message("\icon[src] *beep* *beep*", null, 3)
cooldown = 2
spawn(10)
process_cooldown()
@@ -102,18 +101,16 @@
/obj/item/device/assembly/prox_sensor/interact(mob/user as mob)//TODO: Change this to the wires thingy
- if(!secured)
- user.show_message("
The [name] is unsecured!")
- return 0
- var/second = time % 60
- var/minute = (time - second) / 60
- var/dat = text("
Proximity Sensor\n[] []:[]\n- - + +\n", (timing ? text("
Arming", src) : text("
Not Arming", src)), minute, second, src, src, src, src)
- dat += "
[scanning?"Armed":"Unarmed"] (Movement sensor active when armed!)"
- dat += "
Refresh"
- dat += "
Close"
- user << browse(dat, "window=prox")
- onclose(user, "prox")
- return
+ if(is_secured(user))
+ var/second = time % 60
+ var/minute = (time - second) / 60
+ var/dat = "
Proximity Sensor\n[(timing ? "Arming" : "Not Arming")] [minute]:[second]\n- - + +\n"
+ dat += "
[scanning?"Armed":"Unarmed"] (Movement sensor active when armed!)"
+ dat += "
Refresh"
+ dat += "
Close"
+ user << browse(dat, "window=prox")
+ onclose(user, "prox")
+ return
/obj/item/device/assembly/prox_sensor/Topic(href, href_list)
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 61295e94d7b..667cb17c3f3 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -8,8 +8,6 @@
origin_tech = "magnets=1"
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
- secured = 1
-
var/code = 30
var/frequency = 1457
var/delay = 0
@@ -42,12 +40,13 @@
return
/obj/item/device/assembly/signaler/interact(mob/user as mob, flag1)
- var/t1 = "-------"
-// if ((src.b_stat && !( flag1 )))
-// t1 = text("-------
\nGreen Wire: []
\nRed Wire: []
\nBlue Wire: []
\n", (src.wires & 4 ? text("
Cut Wire", src) : text("
Mend Wire", src)), (src.wires & 2 ? text("
Cut Wire", src) : text("
Mend Wire", src)), (src.wires & 1 ? text("
Cut Wire", src) : text("
Mend Wire", src)))
-// else
-// t1 = "-------" Speaker: [src.listening ? "
Engaged" : "
Disengaged"]
- var/dat = {"
+ if(is_secured(user))
+ var/t1 = "-------"
+ // if ((src.b_stat && !( flag1 )))
+ // t1 = text("-------
\nGreen Wire: []
\nRed Wire: []
\nBlue Wire: []
\n", (src.wires & 4 ? text("
Cut Wire", src) : text("
Mend Wire", src)), (src.wires & 2 ? text("
Cut Wire", src) : text("
Mend Wire", src)), (src.wires & 1 ? text("
Cut Wire", src) : text("
Mend Wire", src)))
+ // else
+ // t1 = "-------" Speaker: [src.listening ? "
Engaged" : "
Disengaged"]
+ var/dat = {"
Send Signal
@@ -67,9 +66,9 @@ Code:
+
[t1]
"}
- user << browse(dat, "window=radio")
- onclose(user, "radio")
- return
+ user << browse(dat, "window=radio")
+ onclose(user, "radio")
+ return
/obj/item/device/assembly/signaler/Topic(href, href_list)
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index b31c883dc68..4b8156a40fb 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -6,8 +6,6 @@
g_amt = 50
origin_tech = "magnets=1"
- secured = 0
-
var/timing = 0
var/time = 5
@@ -37,9 +35,11 @@
/obj/item/device/assembly/timer/proc/timer_end()
- if((!secured)||(cooldown > 0)) return 0
+ if((!secured)||(cooldown > 0))
+ return 0
pulse(0)
- visible_message("\icon[src] *beep* *beep*", "*beep* *beep*")
+ if(src.loc)
+ src.loc.audible_message("\icon[src] *beep* *beep*", null, 3)
cooldown = 2
spawn(10)
process_cooldown()
@@ -68,18 +68,16 @@
/obj/item/device/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires
- if(!secured)
- user.show_message("
The [name] is unsecured!")
- return 0
- var/second = time % 60
- var/minute = (time - second) / 60
- var/dat = text("
Timing Unit\n[] []:[]\n- - + +\n", (timing ? text("
Timing", src) : text("
Not Timing", src)), minute, second, src, src, src, src)
- dat += "
Refresh"
- dat += "
Close"
- var/datum/browser/popup = new(user, "timer", name)
- popup.set_content(dat)
- popup.open()
- return
+ if(is_secured(user))
+ var/second = time % 60
+ var/minute = (time - second) / 60
+ var/dat = "
Timing Unit\n[(timing ? "Timing" : "Not Timing")] [minute]:[second]\n- - + +\n"
+ dat += "
Refresh"
+ dat += "
Close"
+ var/datum/browser/popup = new(user, "timer", name)
+ popup.set_content(dat)
+ popup.open()
+ return
/obj/item/device/assembly/timer/Topic(href, href_list)
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index d255db9b9bd..dd77a4a9f08 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -8,19 +8,19 @@
flags = HEAR
var/listening = 0
var/recorded = "" //the activation message
-
+
/obj/item/device/assembly/voice/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq)
if(speaker == src)
return
if(listening && !radio_freq)
- recorded = raw_message
+ recorded = raw_message
listening = 0
say("Activation message is '[recorded]'.")
- else
+ else
if(findtext(raw_message, recorded))
pulse(0)
-
+
/obj/item/device/assembly/voice/activate()
if(secured)
if(!holder)
@@ -31,10 +31,11 @@
return "beeps, \"[text]\""
/obj/item/device/assembly/voice/attack_self(mob/user)
- if(!user) return 0
+ if(!user)
+ return 0
activate()
return 1
/obj/item/device/assembly/voice/toggle_secure()
- . = ..()
- listening = 0
+ . = ..()
+ listening = 0
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index a244747a41a..3b9687c3306 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -33,14 +33,10 @@
var/darkness_view = 2//Base human is 2
var/invis_view = SEE_INVISIBLE_LIVING
var/emagged = 0
- var/hud = null
var/list/icon/current = list() //the current hud icons
strip_delay = 20
put_on_delay = 25
-/obj/item/clothing/glasses/proc/process_hud(var/mob/M)
- return
-
/*
SEE_SELF // can see self, no matter what
SEE_MOBS // can see all mobs, no matter what
@@ -268,7 +264,7 @@ atom/proc/generate_female_clothing(index,t_color,icon)
var/mob/M = usr
if (istype(M, /mob/dead/))
return
- if (!can_use(usr))
+ if (!can_use(M))
return
if(src.has_sensor >= 2)
usr << "The controls are locked."
@@ -281,13 +277,17 @@ atom/proc/generate_female_clothing(index,t_color,icon)
src.sensor_mode = 0
switch(src.sensor_mode)
if(0)
- usr << "You disable your suit's remote sensing equipment."
+ M << "You disable your suit's remote sensing equipment."
if(1)
- usr << "Your suit will now report whether you are live or dead."
+ M << "Your suit will now report whether you are live or dead."
if(2)
- usr << "Your suit will now report your vital lifesigns."
+ M << "Your suit will now report your vital lifesigns."
if(3)
- usr << "Your suit will now report your vital lifesigns as well as your coordinate position."
+ M << "Your suit will now report your vital lifesigns as well as your coordinate position."
+ if(istype(M,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = M
+ if(H.w_uniform == src)
+ H.update_suit_sensors()
..()
/obj/item/clothing/under/verb/rolldown()
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 054c7d2acab..16e36636c14 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -10,7 +10,7 @@
/obj/item/clothing/glasses/science
name = "Science Goggles"
- desc = "nothing"
+ desc = "A pair of snazzy goggles used to protect against chemical spills."
icon_state = "purple"
item_state = "glasses"
@@ -73,7 +73,7 @@
/obj/item/clothing/glasses/welding
name = "welding goggles"
- desc = "Protects the eyes from welders, approved by the mad scientist association."
+ desc = "Protects the eyes from welders; approved by the mad scientist association."
icon_state = "welding-g"
item_state = "welding-g"
action_button_name = "Toggle Welding Goggles"
@@ -145,6 +145,6 @@
/obj/item/clothing/glasses/thermal/eyepatch
name = "Optical Thermal Eyepatch"
- desc = "An eyepatch with built-in thermal optics"
+ desc = "An eyepatch with built-in thermal optics."
icon_state = "eyepatch"
item_state = "eyepatch"
\ No newline at end of file
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 25e6b20f94a..9b6ab29fda5 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -3,33 +3,27 @@
desc = "A heads-up display that provides important info in (almost) real time."
flags = null //doesn't protect eyes because it's a monocle, duh
origin_tech = "magnets=3;biotech=2"
- hud = 1
+ var/hud_type = null
-/* /obj/item/clothing/glasses/hud/attackby(obj/item/weapon/W as obj, mob/user as mob)
- ..()
- if(istype(W, /obj/item/weapon/card/emag))
- if(emagged == 0)
- emagged = 1
- user << "
PZZTTPFFFT"
- desc = desc+ " The display flickers slightly."
- else
- user << "
It is already emagged!" */ //No emags allowed
+/obj/item/clothing/glasses/hud/equipped(mob/living/carbon/human/user, slot)
+ if(slot == slot_glasses)
+ var/datum/atom_hud/H = huds[hud_type]
+ H.add_hud_to(user)
+
+/obj/item/clothing/glasses/hud/dropped(mob/living/carbon/human/user)
+ var/datum/atom_hud/H = huds[hud_type]
+ H.remove_hud_from(user)
/obj/item/clothing/glasses/hud/emp_act(severity)
if(emagged == 0)
emagged = 1
desc = desc + " The display flickers slightly."
-
/obj/item/clothing/glasses/hud/health
name = "Health Scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
icon_state = "healthhud"
-
-
-/obj/item/clothing/glasses/hud/health/process_hud(var/mob/M)
- process_data_hud(M,DATA_HUD_MEDICAL,DATA_HUD_ADVANCED)
-
+ hud_type = DATA_HUD_MEDICAL_ADVANCED
/obj/item/clothing/glasses/hud/health/night
name = "Night Vision Health Scanner HUD"
@@ -43,6 +37,7 @@
name = "Security HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
icon_state = "securityhud"
+ hud_type = DATA_HUD_SECURITY_ADVANCED
/obj/item/clothing/glasses/hud/security/eyepatch
name = "Eyepatch HUD"
@@ -56,6 +51,7 @@
darkness_view = 1
flash_protect = 1
tint = 1
+
/obj/item/clothing/glasses/hud/security/night
name = "Night Vision Security HUD"
desc = "An advanced heads-up display which provides id data and vision in complete darkness."
@@ -68,5 +64,3 @@
emagged = 1
desc = desc + " The display flickers slightly."
-/obj/item/clothing/glasses/hud/security/process_hud(var/mob/M)
- process_data_hud(M,DATA_HUD_SECURITY,DATA_HUD_ADVANCED)
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 9261975cb54..bc224be8552 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -8,7 +8,7 @@
item_color="yellow"
/obj/item/clothing/gloves/fyellow //Cheap Chinese Crap
- desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly."
+ desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
name = "budget insulated gloves"
icon_state = "yellow"
item_state = "ygloves"
diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm
index 50e1215d277..4ada082a0fa 100644
--- a/code/modules/clothing/head/collectable.dm
+++ b/code/modules/clothing/head/collectable.dm
@@ -7,7 +7,7 @@
/obj/item/clothing/head/collectable/petehat
name = "ultra rare Pete's hat!"
- desc = "It smells faintly of plasma"
+ desc = "It smells faintly of plasma."
icon_state = "petehat"
/obj/item/clothing/head/collectable/slime
@@ -22,13 +22,13 @@
/obj/item/clothing/head/collectable/chef
name = "collectable chef's hat"
- desc = "A rare Chef's Hat meant for hat collectors!"
+ desc = "A rare chef's hat meant for hat collectors!"
icon_state = "chef"
item_state = "chef"
/obj/item/clothing/head/collectable/paper
name = "collectable paper hat"
- desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians."
+ desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from water, fire, and Librarians."
icon_state = "paper"
/obj/item/clothing/head/collectable/tophat
@@ -39,35 +39,35 @@
/obj/item/clothing/head/collectable/captain
name = "collectable captain's hat"
- desc = "A Collectable Hat that'll make you look just like a real comdom!"
+ desc = "A collectable hat that'll make you look just like a real comdom!"
icon_state = "captain"
item_state = "caphat"
/obj/item/clothing/head/collectable/police
name = "collectable police officer's hat"
- desc = "A Collectable Police Officer's Hat. This hat emphasizes that you are THE LAW."
+ desc = "A collectable police officer's Hat. This hat emphasizes that you are THE LAW."
icon_state = "policehelm"
/obj/item/clothing/head/collectable/beret
name = "collectable beret"
- desc = "A Collectable red Beret. It smells faintly of Garlic."
+ desc = "A collectable red beret. It smells faintly of garlic."
icon_state = "beret"
/obj/item/clothing/head/collectable/welding
name = "collectable welding helmet"
- desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!"
+ desc = "A collectable welding helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this helmet is done so at the owner's own risk!"
icon_state = "welding"
item_state = "welding"
/obj/item/clothing/head/collectable/slime
name = "collectable slime hat"
- desc = "Just like a real Brain Slug!"
+ desc = "Just like a real brain slug!"
icon_state = "headslime"
item_state = "headslime"
/obj/item/clothing/head/collectable/flatcap
name = "collectable flat cap"
- desc = "A Collectible farmer's Flat Cap!"
+ desc = "A collectible farmer's flat cap!"
icon_state = "flat_cap"
item_state = "detective"
@@ -79,7 +79,7 @@
/obj/item/clothing/head/collectable/kitty
name = "collectable kitty ears"
- desc = "The fur feels.....a bit too realistic."
+ desc = "The fur feels... a bit too realistic."
icon_state = "kitty"
item_state = "kitty"
@@ -91,18 +91,18 @@
/obj/item/clothing/head/collectable/wizard
name = "collectable wizard's hat"
- desc = "NOTE:Any magical powers gained from wearing this hat are purely coincidental."
+ desc = "NOTE: Any magical powers gained from wearing this hat are purely coincidental."
icon_state = "wizard"
/obj/item/clothing/head/collectable/hardhat
name = "collectable hard hat"
- desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!"
+ desc = "WARNING! Offers no real protection, or luminosity, but damn, is it fancy!"
icon_state = "hardhat0_yellow"
item_state = "hardhat0_yellow"
/obj/item/clothing/head/collectable/HoS
name = "collectable HoS hat"
- desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!"
+ desc = "Now you too can beat prisoners, set silly sentences, and arrest for no reason!"
icon_state = "hoscap"
/obj/item/clothing/head/collectable/thunderdome
@@ -113,6 +113,6 @@
/obj/item/clothing/head/collectable/swat
name = "collectable SWAT helmet"
- desc = "Now you can be in the Deathsquad too!"
+ desc = "That's not real blood. That's red paint." //Reference to the actual description
icon_state = "swat"
item_state = "swat"
\ No newline at end of file
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 88db2bd9160..8244feaccd6 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -44,7 +44,7 @@
/obj/item/clothing/head/helmet/swat
name = "\improper SWAT helmet"
- desc = "An extremely robust, space-worthy helmet with a nanotrasen logo on the top."
+ desc = "An extremely robust, space-worthy helmet with the Nanotrasen logo emblazoned on the top."
icon_state = "swat"
item_state = "swat"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
@@ -56,7 +56,7 @@
/obj/item/clothing/head/helmet/swat/syndicate
name = "blood-red helmet"
- desc = "An extremely robust, space-worthy helmet without a visor to allow for goggle usage underneath. Property of Gorlex Marauders."
+ desc = "An extremely robust, space-worthy helmet that lacks a visor to allow for goggle usage underneath. Property of Gorlex Marauders."
icon_state = "helmetsyndi"
item_state = "helmet"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 132d31c2cc0..36d14821d9c 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -33,13 +33,13 @@
/obj/item/clothing/head/plaguedoctorhat
name = "plague doctor's hat"
- desc = "These were once used by Plague doctors. They're pretty much useless."
+ desc = "These were once used by plague doctors. They're pretty much useless."
icon_state = "plaguedoctor"
permeability_coefficient = 0.01
/obj/item/clothing/head/hasturhood
name = "hastur's hood"
- desc = "It's unspeakably stylish"
+ desc = "It's
unspeakably stylish."
icon_state = "hasturhood"
flags = HEADCOVERSEYES|BLOCKHAIR
@@ -52,7 +52,7 @@
name = "black space-helmet replica"
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
- desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
+ desc = "A plastic replica of a Syndicate agent's space helmet. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!"
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
@@ -80,7 +80,7 @@
/obj/item/clothing/head/justice
name = "justice hat"
- desc = "fight for what's righteous!"
+ desc = "Fight for what's righteous!"
icon_state = "justicered"
item_state = "justicered"
flags = HEADCOVERSEYES|BLOCKHAIR
@@ -175,7 +175,7 @@
name = "sombrero"
icon_state = "sombrero"
item_state = "sombrero"
- desc = "You feel mexican just wearing this."
+ desc = "You can practically taste the fiesta."
/obj/item/clothing/head/sombrero/green
name = "green sombrero"
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index eb41877e893..ea7447a8a16 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -1,6 +1,6 @@
/obj/item/clothing/mask/gas
name = "gas mask"
- desc = "A face-covering mask that can be connected to an air supply."
+ desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate
icon_state = "gas_alt"
flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
@@ -13,7 +13,7 @@
/obj/item/clothing/mask/gas/welding
name = "welding mask"
- desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd."
+ desc = "A gas mask with built-in welding goggles and a face shield. Looks like a skull - clearly designed by a nerd."
icon_state = "weldingmask"
m_amt = 4000
g_amt = 2000
@@ -42,7 +42,7 @@
/obj/item/clothing/mask/gas/sechailer
name = "security gas mask"
- desc = "A standard issue Security gas mask with integrated 'Compli-o-nator 3000' device, plays over a dozen pre-recorded compliance phrases designed to get scumbags to stand still whilst you taze them. Do not tamper with the device."
+ desc = "A standard issue Security gas mask with integrated 'Compli-o-nator 3000' device. Plays over a dozen pre-recorded compliance phrases designed to get scumbags to stand still whilst you taze them. Do not tamper with the device."
action_button_name = "HALT!"
icon_state = "sechailer"
var/cooldown = 0
@@ -50,6 +50,8 @@
ignore_maskadjust = 0
flags = MASKCOVERSMOUTH | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
flags_inv = HIDEFACE
+ visor_flags = MASKCOVERSMOUTH | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+ visor_flags_inv = HIDEFACE
/obj/item/clothing/mask/gas/sechailer/swat
name = "\improper SWAT mask"
@@ -300,7 +302,7 @@ obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user)
/obj/item/clothing/mask/gas/cyborg
name = "cyborg visor"
- desc = "Beep boop"
+ desc = "Beep boop."
icon_state = "death"
/obj/item/clothing/mask/gas/owl_mask
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 5afdd6c4ec9..8fecd4c9431 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -61,7 +61,7 @@
icon_state = "black"
/obj/item/clothing/shoes/galoshes
- desc = "Rubber boots"
+ desc = "A pair of yellow rubber boots, designed to prevent slipping on wet surfaces."
name = "galoshes"
icon_state = "galoshes"
permeability_coefficient = 0.05
@@ -109,7 +109,7 @@
/obj/item/clothing/shoes/cyborg
name = "cyborg boots"
- desc = "Shoes for a cyborg costume"
+ desc = "Shoes for a cyborg costume."
icon_state = "boots"
/obj/item/clothing/shoes/laceup
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index e9c88fd7b85..037ab3952c4 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -67,7 +67,7 @@
name = "NASA Voidsuit"
icon_state = "void"
item_state = "void"
- desc = "An old, NASA Centcom branch designed, dark red Space suit."
+ desc = "An old, NASA Centcom branch designed, dark red space suit."
slowdown = 1
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/multitool)
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index c5f96e73bcc..b4f4bf1d773 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -1,7 +1,7 @@
//Regular syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate
name = "red space helmet"
- desc = "Top secret Spess Helmet."
+ desc = "Top secret spess helmet."
icon_state = "syndicate"
item_state = "syndicate"
desc = "Has a tag: Totally not property of an enemy corporation, honest."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index b0ec44c0d58..a1a80dd4f75 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -10,7 +10,7 @@
*/
/obj/item/clothing/suit/bluetag
name = "blue laser tag armor"
- desc = "Blue Pride, Station Wide"
+ desc = "A piece of plastic armor. It has sensors that react to red light." //Lasers are concentrated light
icon_state = "bluetag"
item_state = "bluetag"
blood_overlay_type = "armor"
@@ -19,7 +19,7 @@
/obj/item/clothing/suit/redtag
name = "red laser tag armor"
- desc = "Pew pew pew"
+ desc = "A piece of plastic armor. It has sensors that react to blue light."
icon_state = "redtag"
item_state = "redtag"
blood_overlay_type = "armor"
@@ -55,8 +55,8 @@
/obj/item/clothing/suit/greatcoat
- name = "great coat"
- desc = "A Nazi great coat"
+ name = "greatcoat"
+ desc = "A Nazi greatcoat."
icon_state = "nazi"
item_state = "nazi"
@@ -70,7 +70,7 @@
/obj/item/clothing/suit/justice
name = "justice suit"
- desc = "this pretty much looks ridiculous"
+ desc = "this pretty much looks ridiculous" //Needs no fixing
icon_state = "justice"
item_state = "justice"
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -98,7 +98,7 @@
name = "black and red space suit replica"
icon_state = "syndicate-black-red"
item_state = "syndicate-black-red"
- desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
+ desc = "A plastic replica of the Syndicate space suit. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!"
w_class = 3
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
@@ -106,7 +106,7 @@
/obj/item/clothing/suit/hastur
name = "\improper Hastur's robe"
- desc = "Robes not meant to be worn by man"
+ desc = "Robes not meant to be worn by man."
icon_state = "hastur"
item_state = "hastur"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
@@ -115,7 +115,7 @@
/obj/item/clothing/suit/imperium_monk
name = "\improper Imperium monk suit"
- desc = "Have YOU killed a xenos today?"
+ desc = "Have YOU killed a xeno today?"
icon_state = "imperium_monk"
item_state = "imperium_monk"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
@@ -134,7 +134,7 @@
/obj/item/clothing/suit/monkeysuit
name = "monkey suit"
- desc = "A suit that looks like a primate"
+ desc = "A suit that looks like a primate."
icon_state = "monkeysuit"
item_state = "monkeysuit"
body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET|HANDS
@@ -143,7 +143,7 @@
/obj/item/clothing/suit/holidaypriest
name = "holiday priest"
- desc = "This is a nice holiday my son."
+ desc = "This is a nice holiday, my son."
icon_state = "holidaypriest"
item_state = "w_suit"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
@@ -180,7 +180,7 @@
/obj/item/clothing/suit/poncho/ponchoshame
name = "poncho of shame"
- desc = "Forced to live on your shameful acting as a fake mexican, you and your poncho have grown inseperable. Literally."
+ desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseperable. Literally."
icon_state = "ponchoshame"
item_state = "ponchoshame"
flags = NODROP
@@ -191,7 +191,7 @@
/obj/item/clothing/suit/straight_jacket
name = "straight jacket"
- desc = "A suit that completely restrains the wearer."
+ desc = "A suit that completely restrains the wearer. Manufactured by Antyphun Corp." //Straight jacket is antifun
icon_state = "straight_jacket"
item_state = "straight_jacket"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
@@ -200,13 +200,13 @@
/obj/item/clothing/suit/ianshirt
name = "worn shirt"
- desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in."
+ desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it, but it's pretty close. Good for sleeping in."
icon_state = "ianshirt"
item_state = "ianshirt"
/obj/item/clothing/suit/nerdshirt
name = "gamer shirt"
- desc = "A baggy shirt with vintage game character Phanic the Weasel. Why would someone wear this?"
+ desc = "A baggy shirt with vintage game character Phanic the Weasel. Why would anyone wear this?"
icon_state = "nerdshirt"
item_state = "nerdshirt"
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index d49c073f38c..58d5cb563e1 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -104,7 +104,7 @@
/obj/item/clothing/head/radiation
name = "radiation hood"
icon_state = "rad"
- desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
+ desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'"
flags = HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR|THICKMATERIAL
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
strip_delay = 60
@@ -113,7 +113,7 @@
/obj/item/clothing/suit/radiation
name = "radiation suit"
- desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
+ desc = "A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'"
icon_state = "rad"
item_state = "rad_suit"
w_class = 4//bulky item
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index df88c830561..5ddf605de07 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -11,12 +11,12 @@
/obj/item/clothing/head/wizard/red
name = "red wizard hat"
- desc = "Strange-looking, red, hat-wear that most certainly belongs to a real magic user."
+ desc = "Strange-looking red hat-wear that most certainly belongs to a real magic user."
icon_state = "redwizard"
/obj/item/clothing/head/wizard/yellow
name = "yellow wizard hat"
- desc = "Strange-looking, yellow, hat-wear that most certainly belongs to a powerful magic user."
+ desc = "Strange-looking yellow hat-wear that most certainly belongs to a powerful magic user."
icon_state = "yellowwizard"
/obj/item/clothing/head/wizard/fake
@@ -29,19 +29,19 @@
/obj/item/clothing/head/wizard/marisa
name = "witch hat"
- desc = "Strange-looking hat-wear, makes you want to cast fireballs."
+ desc = "Strange-looking hat-wear. Makes you want to cast fireballs."
icon_state = "marisa"
/obj/item/clothing/head/wizard/magus
name = "\improper Magus helm"
- desc = "A mysterious helmet that hums with an unearthly power"
+ desc = "A mysterious helmet that hums with an unearthly power."
icon_state = "magus"
item_state = "magus"
/obj/item/clothing/suit/wizrobe
name = "wizard robe"
- desc = "A magnificant, gem-lined robe that seems to radiate power."
+ desc = "A magnificent, gem-lined robe that seems to radiate power."
icon_state = "wizard"
item_state = "wizrobe"
gas_transfer_coefficient = 0.01
@@ -57,13 +57,13 @@
/obj/item/clothing/suit/wizrobe/red
name = "red wizard robe"
- desc = "A magnificant, red, gem-lined robe that seems to radiate power."
+ desc = "A magnificent red gem-lined robe that seems to radiate power."
icon_state = "redwizard"
item_state = "redwizrobe"
/obj/item/clothing/suit/wizrobe/yellow
name = "yellow wizard robe"
- desc = "A magnificant, yellow, gem-lined robe that seems to radiate power."
+ desc = "A magnificant yellow gem-lined robe that seems to radiate power."
icon_state = "yellowwizard"
item_state = "yellowwizrobe"
@@ -75,20 +75,20 @@
/obj/item/clothing/suit/wizrobe/magusblue
name = "\improper Magus robe"
- desc = "A set of armored robes that seem to radiate a dark power"
+ desc = "A set of armored robes that seem to radiate a dark power."
icon_state = "magusblue"
item_state = "magusblue"
/obj/item/clothing/suit/wizrobe/magusred
name = "\improper Magus robe"
- desc = "A set of armored robes that seem to radiate a dark power"
+ desc = "A set of armored robes that seem to radiate a dark power."
icon_state = "magusred"
item_state = "magusred"
/obj/item/clothing/suit/wizrobe/fake
name = "wizard robe"
- desc = "A rather dull, blue robe meant to mimick real wizard robes."
+ desc = "A rather dull blue robe meant to mimick real wizard robes."
icon_state = "wizard-fake"
item_state = "wizrobe"
gas_transfer_coefficient = 1
diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm
index b97de65d3ef..25411ffb4dc 100644
--- a/code/modules/clothing/under/chameleon.dm
+++ b/code/modules/clothing/under/chameleon.dm
@@ -4,7 +4,7 @@
icon_state = "black"
item_state = "bl_suit"
item_color = "black"
- desc = "It's a plain jumpsuit. It seems to have a small dial on the wrist."
+ desc = "It's a plain jumpsuit. It has a small dial on the wrist."
action_button_name = "Change"
origin_tech = "syndicate=3"
var/list/clothing_choices = list()
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 2e331e46790..d01d4d16b47 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -19,6 +19,7 @@
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
+ desc = "A tasteful grey jumpsuit that reminds you of the good old days."
icon_state = "grey"
item_state = "gy_suit"
item_color = "grey"
@@ -45,6 +46,7 @@
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"
icon_state = "pink"
+ desc = "Just looking at this makes you feel
fabulous."
item_state = "p_suit"
item_color = "pink"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 194013b11df..9c14fab6cce 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -43,7 +43,6 @@
/obj/item/clothing/under/rank/chef
desc = "It's an apron which is given only to the most
hardcore chefs in space."
- name = "chef's uniform"
icon_state = "chef"
item_color = "chef"
@@ -116,7 +115,7 @@
/obj/item/clothing/under/lawyer/bluesuit
name = "blue suit"
- desc = "A classy suit and tie"
+ desc = "A classy suit and tie."
icon_state = "bluesuit"
item_state = "bluesuit"
item_color = "bluesuit"
diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm
index 0b8cebe57aa..27708bcf775 100644
--- a/code/modules/clothing/under/jobs/engineering.dm
+++ b/code/modules/clothing/under/jobs/engineering.dm
@@ -1,6 +1,6 @@
//Contains: Engineering department jumpsuits
/obj/item/clothing/under/rank/chief_engineer
- desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
+ desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding."
name = "chief engineer's jumpsuit"
icon_state = "chiefengineer"
item_state = "g_suit"
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index 351a97b5ee1..5947065bf55 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -124,7 +124,7 @@
* Medsci, unused (i think) stuff
*/
/obj/item/clothing/under/rank/geneticist_new
- desc = "It's made of a special fiber which provides minor protection against biohazards."
+ desc = "It's made of a special fiber that provides minor protection against biohazards."
name = "geneticist's jumpsuit"
icon_state = "genetics_new"
item_state = "w_suit"
@@ -134,7 +134,7 @@
can_adjust = 0
/obj/item/clothing/under/rank/chemist_new
- desc = "It's made of a special fiber which provides minor protection against biohazards."
+ desc = "It's made of a special fiber that provides minor protection against biohazards."
name = "chemist's jumpsuit"
icon_state = "chemist_new"
item_state = "w_suit"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index c46f5def722..29c9356fd69 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -23,7 +23,7 @@
/obj/item/clothing/under/roman
name = "roman armor"
- desc = "An ancient Roman armor. Made of metallic strips and leather straps."
+ desc = "Ancient Roman armor. Made of metallic and leather straps."
icon_state = "roman"
item_color = "roman"
item_state = "armor"
@@ -115,7 +115,7 @@
icon_state = "syndicate"
item_state = "bl_suit"
item_color = "syndicate"
- desc = "it's a cybernetically enhanced jumpsuit used for administrative duties."
+ desc = "A cybernetically enhanced jumpsuit used for administrative duties."
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
@@ -296,7 +296,7 @@
/obj/item/clothing/under/kilt
name = "kilt"
- desc = "Includes shoes and plaid"
+ desc = "Includes shoes and plaid."
icon_state = "kilt"
item_state = "kilt"
item_color = "kilt"
@@ -369,7 +369,7 @@
/obj/item/clothing/under/blacktango
name = "black tango dress"
- desc = "Filled with latin fire."
+ desc = "Filled with Latin fire."
icon_state = "black_tango"
item_state = "wcoat"
item_color = "black_tango"
diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
index 142e58fa0f6..7ff6b0ead14 100644
--- a/code/modules/events/disease_outbreak.dm
+++ b/code/modules/events/disease_outbreak.dm
@@ -45,7 +45,5 @@
else
D = new virus_type()
D.carrier = 1
- D.holder = H
- D.affected_mob = H
- H.viruses += D
+ H.AddDisease(D)
break
\ No newline at end of file
diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm
index 7a7867e6458..a64a8861cb1 100644
--- a/code/modules/events/ninja.dm
+++ b/code/modules/events/ninja.dm
@@ -1122,7 +1122,7 @@ This could be a lot better but I'm too tired atm.*/
A.yo = targloc.y - curloc.y
A.xo = targloc.x - curloc.x
cell.charge-=(C*10)
- A.process()
+ A.fire()
else
U << "
There are no targets in view."
return
diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm
index a55038ea1e3..6219d1fda69 100644
--- a/code/modules/events/spontaneous_appendicitis.dm
+++ b/code/modules/events/spontaneous_appendicitis.dm
@@ -14,7 +14,5 @@
continue
var/datum/disease/D = new /datum/disease/appendicitis
- D.holder = H
- D.affected_mob = H
- H.viruses += D
+ H.AddDisease(D)
break
\ No newline at end of file
diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm
index 05cc3e36ff6..dc975701a3f 100644
--- a/code/modules/food&drinks/drinks/drinks.dm
+++ b/code/modules/food&drinks/drinks/drinks.dm
@@ -74,14 +74,13 @@
if(target.reagents.total_volume >= target.reagents.maximum_volume)
user << "
[target] is full."
return
-
+ var/refill = reagents.get_master_reagent_id()
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "
You transfer [trans] units of the solution to [target]."
if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
var/mob/living/silicon/robot/bro = user
bro.cell.use(30)
- var/refill = reagents.get_master_reagent_id()
spawn(600)
reagents.add_reagent(refill, trans)
@@ -95,7 +94,6 @@
desc = "A golden cup"
name = "golden cup"
icon_state = "golden_cup"
- item_state = "" //nope :(
w_class = 4
force = 14
throwforce = 10
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index def1291608f..168c7c15f76 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -176,16 +176,22 @@
user.visible_message("
[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.")
return (BRUTELOSS|TOXLOSS)
-/obj/item/weapon/grown/nettle/pickup(mob/living/carbon/human/user as mob)
- if(!user.gloves)
- user << "
The nettle burns your bare hand!"
- if(istype(user, /mob/living/carbon/human))
- var/organ = ((user.hand ? "l_":"r_") + "arm")
- var/obj/item/organ/limb/affecting = user.get_organ(organ)
- if(affecting.take_damage(0, force))
- user.update_damage_overlays(0)
- else
- user.take_organ_damage(0,force)
+/obj/item/weapon/grown/nettle/pickup(mob/living/user as mob)
+ if(!iscarbon(user))
+ return 0
+ var/mob/living/carbon/C = user
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = C
+ if(H.gloves)
+ return 0
+ var/organ = ((H.hand ? "l_":"r_") + "arm")
+ var/obj/item/organ/limb/affecting = H.get_organ(organ)
+ if(affecting.take_damage(0, force))
+ H.update_damage_overlays(0)
+ else
+ C.take_organ_damage(0,force)
+ C << "
The nettle burns your bare hand!"
+ return 1
/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user as mob,proximity)
if(!proximity) return
@@ -221,18 +227,11 @@
reagents.add_reagent("pacid", round((potency / 2), 1))
force = round((5 + potency / 2.5), 1)
-/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/human/user as mob)
- if(!user.gloves)
- if(istype(user, /mob/living/carbon/human))
- var/organ = ((user.hand ? "l_":"r_") + "arm")
- var/obj/item/organ/limb/affecting = user.get_organ(organ)
- if(affecting.take_damage(0, force))
- user.update_damage_overlays(0)
- else
- user.take_organ_damage(0, force)
+/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user as mob)
+ if(..())
if(prob(50))
user.Paralyse(5)
- user << "
You are stunned by the Deathnettle when you try picking it up!"
+ user << "
You are stunned by the Deathnettle when you try picking it up!"
/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M as mob, mob/user as mob)
if(!..()) return
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 605f2ee5afe..52903fbd0c8 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -738,8 +738,6 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(istype(user, /mob/living/silicon)) //How does AI know what plant is?
return
if(harvest)
- if(!user in range(1,src))
- return
myseed.harvest()
else if(dead)
planted = 0
@@ -772,7 +770,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
var/obj/machinery/hydroponics/parent = loc //for ease of access
var/t_amount = 0
var/list/result = list()
- var/output_loc = Adjacent(user) ? user.loc : parent.loc //needed for TK
+ var/output_loc = parent.Adjacent(user) ? user.loc : parent.loc //needed for TK
while(t_amount < getYield())
var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new product(output_loc, potency)
@@ -813,29 +811,12 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
podman.real_name = realName
else
podman.real_name = "Pod Person [rand(0,999)]"
+ podman.refresh_huds(mind.current)
var/oldactive = mind.active
mind.active = 1
mind.transfer_to(podman)
mind.active = oldactive
- // -- Mode/mind specific stuff goes here. TODO! Broken :( Should be merged into mob/living/Login
- if((podman.mind in ticker.mode.A_bosses) || (podman.mind in ticker.mode.A_gangsters) || (podman.mind in ticker.mode.B_bosses) || (podman.mind in ticker.mode.B_gangsters))
- ticker.mode.update_all_gang_icons()
- if(podman.mind in ticker.mode:revolutionaries)
- ticker.mode.add_revolutionary(podman.mind)
- ticker.mode.update_all_rev_icons() //So the icon actually appears
- if(podman.mind in ticker.mode:head_revolutionaries)
- ticker.mode.add_revolutionary(podman.mind)
- ticker.mode.update_all_rev_icons()
- if(podman.mind in ticker.mode:syndicates)
- ticker.mode:update_all_synd_icons()
- if(podman.mind in ticker.mode:cult)
- ticker.mode:add_cultist(podman.mind)
- ticker.mode:update_all_cult_icons() //So the icon actually appears
-
- // -- End mode specific stuff
-
podman.gender = ghost.gender
-
//dna stuff
hardset_dna(podman, ui, se, null, null, null, !prob(potency) ? /datum/species/plant/pod : null, "#59CE00") //makes sure podman has dna and sets the dna's ui/se/mutantrace/real_name etc variables
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index bb07bb2f569..18b9f1d9e45 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -12,9 +12,13 @@
var/obj/item/weapon/card/id/prisoner/inserted_id
var/obj/machinery/door/airlock/release_door
var/door_tag = "prisonshuttle"
+ var/obj/item/device/radio/Radio //needed to send messages to sec radio
+
/obj/machinery/mineral/labor_claim_console/New()
..()
+ Radio = new/obj/item/device/radio(src)
+ Radio.listening = 0
spawn(7)
src.machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
var/t
@@ -93,7 +97,8 @@
if(s.location == /area/shuttle/laborcamp/outpost)
if(alone_in_area(get_area(loc), usr))
if (s.move_shuttle(0)) // No delay, to stop people from getting on while it is departing.
- broadcast_hud_message("
[inserted_id.registered_name] has met their quota and has returned to the station. Minerals and Prisoner ID card ready for retrieval.", src)
+ Radio.set_frequency(SEC_FREQ)
+ Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", SEC_FREQ)
usr << "
Shuttle recieved message and will be sent shortly."
else
usr << "
Shuttle is already moving."
@@ -162,4 +167,4 @@
else
user << "
Error: Invalid ID"
return
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index f7da665c052..d8aac764edd 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -19,6 +19,7 @@
//Note that this is not a reliable way to determine if admins started as observers, since they change mobs a lot.
var/atom/movable/following = null
var/fun_verbs = 0
+ var/list/datum/atom_hud/oldhuds = null //old antag hud, gets readded in cloning/plantpodding
/mob/dead/observer/New(mob/body)
sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
@@ -69,6 +70,7 @@ Works together with spawning an observer, noted above.
var/mob/dead/observer/ghost = new(src) //Transfer safety to observer spawning proc.
ghost.can_reenter_corpse = can_reenter_corpse
ghost.key = key
+ ghost.refresh_huds(src) //inherit the HUDs
return ghost
/*
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index 513c7b2b6e6..c758e3e4f7a 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -134,7 +134,7 @@ Doesn't work on other aliens/AI.*/
A.current = U
A.yo = U.y - T.y
A.xo = U.x - T.x
- A.process()
+ A.fire()
return
/mob/living/carbon/alien/humanoid/proc/resin()
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index b895068c1c2..a8c5300a573 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -14,6 +14,9 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
if(istype(loc, /mob/living))
affected_mob = loc
affected_mob.status_flags |= XENO_HOST
+ if(istype(affected_mob,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = affected_mob
+ H.med_hud_set_status()
processing_objects.Add(src)
spawn(0)
AddInfectionImages(affected_mob)
@@ -23,6 +26,9 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
/obj/item/alien_embryo/Destroy()
if(affected_mob)
affected_mob.status_flags &= ~(XENO_HOST)
+ if(istype(affected_mob,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = affected_mob
+ H.med_hud_set_status()
spawn(0)
RemoveInfectionImages(affected_mob)
..()
@@ -31,6 +37,9 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
if(!affected_mob) return
if(loc != affected_mob)
affected_mob.status_flags &= ~(XENO_HOST)
+ if(istype(affected_mob,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = affected_mob
+ H.med_hud_set_status()
processing_objects.Remove(src)
spawn(0)
RemoveInfectionImages(affected_mob)
@@ -132,4 +141,4 @@ Des: Removes all images from the mob infected by this embryo
if(alien.client)
for(var/image/I in alien.client.images)
if(dd_hasprefix_case(I.icon_state, "infected") && I.loc == affected_mob)
- qdel(I)
\ No newline at end of file
+ qdel(I)
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 2db5ba3b3d6..f854529c8e1 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -118,12 +118,14 @@ var/const/MAX_ACTIVE_TIME = 400
if(locate(/obj/item/alien_embryo) in L) return 0
if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage
- L.visible_message("
[src] leaps at [L]'s face!")
+ L.visible_message("
[src] leaps at [L]'s face!", \
+ "
[src] leaps at [L]'s face!")
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.head && H.head.flags & HEADCOVERSMOUTH)
- H.visible_message("
[src] smashes against [H]'s [H.head]!")
+ H.visible_message("
[src] smashes against [H]'s [H.head]!", \
+ "
[src] smashes against [H]'s [H.head]!")
Die()
return 0
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 045ca305efa..ede9ea44ada 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -36,6 +36,8 @@
if(dna)
dna.species.spec_death(gibbed,src)
+ med_hud_set_health()
+ med_hud_set_status()
tod = worldtime2text() //weasellos time of death patch
if(mind) mind.store_memory("Time of death: [tod]", 0)
@@ -66,4 +68,4 @@
/mob/living/carbon/proc/Drain()
ChangeToHusk()
mutations |= NOCLONE
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 580b8ace75a..09af3ba01ca 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -4,7 +4,6 @@
voice_name = "Unknown"
icon = 'icons/mob/human.dmi'
icon_state = "caucasian1_m_s"
- var/list/hud_list = list()
@@ -27,9 +26,6 @@
internal_organs += new /obj/item/organ/heart
internal_organs += new /obj/item/organ/brain
- for(var/i=0;i<7;i++) // 2 for medHUDs and 5 for secHUDs
- hud_list += image('icons/mob/hud.dmi', src, "hudunknown")
-
// for spawned humans; overwritten by other code
create_dna(src)
ready_dna(src)
@@ -37,9 +33,24 @@
..()
+/mob/living/carbon/human/prepare_huds()
+ ..()
+ prepare_data_huds()
+
+/mob/living/carbon/human/proc/prepare_data_huds()
+ //Update all our data hud images...
+ med_hud_set_health()
+ med_hud_set_status()
+ sec_hud_set_ID()
+ sec_hud_set_implants()
+ sec_hud_set_security_status()
+ //...and display them
+ add_to_all_data_huds()
+
/mob/living/carbon/human/Destroy()
for(var/atom/movable/organelle in organs)
qdel(organelle)
+ remove_from_all_data_huds()
return ..()
/mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes)
@@ -400,9 +411,7 @@
if(setcriminal != "Cancel")
investigate_log("[src.key] has been set from [R.fields["criminal"]] to [setcriminal] by [usr.name] ([usr.key]).", "records")
R.fields["criminal"] = setcriminal
-
- spawn()
- H.handle_regular_hud_updates()
+ sec_hud_set_security_status()
return
if(href_list["view"])
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 633e72059db..ab55bba100e 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -13,6 +13,8 @@
//TODO: fix husking
if( ((maxHealth - total_burn) < config.health_threshold_dead) && stat == DEAD )
ChangeToHusk()
+ med_hud_set_health()
+ med_hud_set_status()
return
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 2d830e7db32..7b9b0749916 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -307,10 +307,10 @@ emp_act
for(var/obj/item/organ/limb/affecting in damaged)
- affecting.take_damage(4*toxpwr, 2*toxpwr)
+ affecting.take_damage(2*toxpwr, toxpwr)
if(affecting.name == "head")
- affecting.take_damage(4*toxpwr, 2*toxpwr)
+ affecting.take_damage(2*toxpwr, toxpwr)
if(prob(2*acidpwr)) //Applies disfigurement
emote("scream")
facial_hair_style = "Shaved"
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 1cc63bab99c..09ac10b4d51 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -1,5 +1,6 @@
/mob/living/carbon/human
languages = HUMAN
+ hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD, ANTAG_HUD)
//Hair colour and style
var/hair_color = "000"
var/hair_style = "Bald"
@@ -46,4 +47,4 @@
var/xylophone = 0 //For the spoooooooky xylophone cooldown
- var/gender_ambiguous = 0 //if something goes wrong during gender reassignment this generates a line in examine
\ No newline at end of file
+ var/gender_ambiguous = 0 //if something goes wrong during gender reassignment this generates a line in examine
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index b5ad5610e7e..2cc62c8c24a 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -36,7 +36,8 @@
/mob/living/carbon/human/Move(NewLoc, direct)
..()
if(shoes)
- if(loc == NewLoc)
- var/obj/item/clothing/shoes/S = shoes
- S.step_action()
+ if(!lying)
+ if(loc == NewLoc)
+ var/obj/item/clothing/shoes/S = shoes
+ S.step_action()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index c08ffd36903..6da553aaf24 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -260,6 +260,7 @@
if(belt)
unEquip(belt)
w_uniform = null
+ update_suit_sensors()
update_inv_w_uniform(0)
else if(I == gloves)
gloves = null
@@ -289,9 +290,11 @@
if(internals)
internals.icon_state = "internal0"
internal = null
+ sec_hud_set_ID()
update_inv_wear_mask(0)
else if(I == wear_id)
wear_id = null
+ sec_hud_set_ID()
update_inv_wear_id(0)
else if(I == r_store)
r_store = null
@@ -330,6 +333,7 @@
wear_mask = I
if(wear_mask.flags & BLOCKHAIR)
update_hair(redraw_mob) //rebuild hair
+ sec_hud_set_ID()
update_inv_wear_mask(redraw_mob)
if(slot_handcuffed)
handcuffed = I
@@ -348,6 +352,7 @@
update_inv_belt(redraw_mob)
if(slot_wear_id)
wear_id = I
+ sec_hud_set_ID()
update_inv_wear_id(redraw_mob)
if(slot_ears)
ears = I
@@ -373,6 +378,7 @@
update_inv_wear_suit(redraw_mob)
if(slot_w_uniform)
w_uniform = I
+ update_suit_sensors()
update_inv_w_uniform(redraw_mob)
if(slot_l_store)
l_store = I
@@ -387,7 +393,7 @@
if(get_active_hand() == I)
unEquip(I)
I.loc = back
- return
else
src << "
You are trying to equip this item to an unsupported inventory slot. Report this to a coder!"
- return
\ No newline at end of file
+ return
+
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 366d08617cb..6985cf97e93 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -583,8 +583,6 @@
/mob/living/carbon/human/proc/handle_regular_hud_updates()
if(!client) return 0
- regular_hud_updates() //For MED/SEC HUD icon deletion
-
client.screen.Remove(global_hud.blurry, global_hud.druggy, global_hud.vimpaired, global_hud.darkMask)
update_action_buttons()
diff --git a/code/modules/mob/living/carbon/human/login.dm b/code/modules/mob/living/carbon/human/login.dm
index 98ae4a6e6d3..7877b6f6072 100644
--- a/code/modules/mob/living/carbon/human/login.dm
+++ b/code/modules/mob/living/carbon/human/login.dm
@@ -1,6 +1,4 @@
/mob/living/carbon/human/Login()
..()
update_hud()
- if(ticker.mode)
- ticker.mode.update_all_synd_icons() //This proc only sounds CPU-expensive on paper. It is O(n^2), but the outer for-loop only iterates through syndicates, which are only prsenet in nuke rounds and even when they exist, there's usually 6 of them.
return
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index e73f2466b48..3d26f84da37 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -457,9 +457,6 @@
H.sight |= G.vision_flags
H.see_in_dark = G.darkness_view
H.see_invisible = G.invis_view
- if(G.hud)
- G.process_hud(H)
-
if(H.druggy) //Override for druggy
H.see_invisible = see_temp
diff --git a/code/modules/mob/living/carbon/slime/hud.dm b/code/modules/mob/living/carbon/slime/hud.dm
deleted file mode 100644
index ad8ac6a00f6..00000000000
--- a/code/modules/mob/living/carbon/slime/hud.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/mob/living/carbon/slime/regular_hud_updates()
- return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm
index bdb63e28c37..495686752d7 100644
--- a/code/modules/mob/living/carbon/slime/life.dm
+++ b/code/modules/mob/living/carbon/slime/life.dm
@@ -35,8 +35,6 @@
//to find it.
src.blinded = null
- regular_hud_updates() // Basically just deletes any screen objects :<
-
if(environment)
handle_environment(environment) // Handle temperature/pressure differences between body and environment
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 9cc9384382f..83c4e95bbb9 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -441,8 +441,8 @@
if(HULK in usr.mutations)
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
- C.visible_message("
[C] manages to break [I]!", \
- "
You successfully break [I].")
+ C.visible_message("
[C] manages to break [I]!")
+ C << "
You successfully break [I]."
qdel(I)
if(C.handcuffed)
@@ -465,8 +465,8 @@
displaytime = breakouttime / 600
if(isalienadult(C) || HULK in usr.mutations)
- C.visible_message("
[C] is trying to break [I]!", \
- "
You attempt to break [I]. (This will take around 5 seconds and you need to stand still.)")
+ C.visible_message("
[C] is trying to break [I]!")
+ C << "
You attempt to break [I]. (This will take around 5 seconds and you need to stand still.)"
spawn(0)
if(do_after(C, 50))
if(!I || C.buckled)
@@ -476,14 +476,14 @@
C << "
You fail to break [I]!"
else
- C.visible_message("
[C] attempts to remove [I]!", \
- "
You attempt to remove [I]. (This will take around [displaytime] minutes and you need to stand still.)")
+ C.visible_message("
[C] attempts to remove [I]!")
+ C << "
You attempt to remove [I]. (This will take around [displaytime] minutes and you need to stand still.)"
spawn(0)
if(do_after(C, breakouttime))
if(!I || C.buckled)
return
- C.visible_message("
[C] manages to remove [I]!", \
- "
You successfully remove [I].")
+ C.visible_message("
[C] manages to remove [I]!")
+ C << "
You successfully remove [I]."
if(C.handcuffed)
C.handcuffed.loc = usr.loc
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 9358027033b..87e9a0741c4 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -140,7 +140,8 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)
/mob/living/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
- if(!unacidable) take_organ_damage(min(6*toxpwr, acid_volume * toxpwr))
+ if(!unacidable)
+ take_organ_damage(min(10*toxpwr, acid_volume * toxpwr))
/mob/living/proc/grabbedby(mob/living/carbon/user)
if(user == src || anchored)
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index 0d2e5ad541b..889afd142a1 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -4,64 +4,16 @@
sync_mind()
mind.show_memory(src, 0)
- //Round specific stuff like hud updates
+ //Round specific stuff
if(ticker && ticker.mode)
switch(ticker.mode.name)
if("sandbox")
CanBuild()
- if("revolution")
- if((mind in ticker.mode.revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
- ticker.mode.update_rev_icons_added(src.mind)
- if("gang")
- if((mind in ticker.mode.A_bosses) || (mind in ticker.mode.A_gangsters))
- ticker.mode.update_gang_icons_added(src.mind,"A")
- if((mind in ticker.mode.B_bosses) || (mind in ticker.mode.B_gangsters))
- ticker.mode.update_gang_icons_added(src.mind,"B")
- if("cult")
- if(mind in ticker.mode:cult)
- ticker.mode.update_cult_icons_added(src.mind)
- if("nuclear emergency")
- if(mind in ticker.mode:syndicates)
- ticker.mode.update_all_synd_icons()
+
+ //HUD updates (antag hud, etc)
+ refresh_huds()
if(ventcrawler)
src << "
You can ventcrawl! Use alt+click on vents to quickly travel about the station."
update_interface()
return .
-
-//This stuff needs to be merged from cloning.dm but I'm not in the mood to be shouted at for breaking all the things :< ~Carn
- /* clones
- switch(ticker.mode.name)
- if("revolution")
- if(src.occupant.mind in ticker.mode:revolutionaries)
- ticker.mode:update_all_rev_icons() //So the icon actually appears
- if(src.occupant.mind in ticker.mode:head_revolutionaries)
- ticker.mode:update_all_rev_icons()
- if("nuclear emergency")
- if (src.occupant.mind in ticker.mode:syndicates)
- ticker.mode:update_all_synd_icons()
- if("cult")
- if (src.occupant.mind in ticker.mode:cult)
- ticker.mode:add_cultist(src.occupant.mind)
- ticker.mode:update_all_cult_icons() //So the icon actually appears
- */
-
- /* Plantpeople
- switch(ticker.mode.name)
- if ("revolution")
- if (podman.mind in ticker.mode:revolutionaries)
- ticker.mode:add_revolutionary(podman.mind)
- ticker.mode:update_all_rev_icons() //So the icon actually appears
- if (podman.mind in ticker.mode:head_revolutionaries)
- ticker.mode:update_all_rev_icons()
- if ("nuclear emergency")
- if (podman.mind in ticker.mode:syndicates)
- ticker.mode:update_all_synd_icons()
- if ("cult")
- if (podman.mind in ticker.mode:cult)
- ticker.mode:add_cultist(podman.mind)
- ticker.mode:update_all_cult_icons() //So the icon actually appears
- if ("changeling")
- if (podman.mind in ticker.mode:changelings)
- podman.make_changeling()
- */
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 8aae91ee1e2..19e52887f48 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -20,6 +20,8 @@ var/list/ai_list = list()
density = 1
status_flags = CANSTUN|CANPARALYSE|CANPUSH
force_compose = 1 //This ensures that the AI always composes it's own hear message. Needed for hrefs and job display.
+ med_hud = DATA_HUD_MEDICAL_BASIC
+ sec_hud = DATA_HUD_SECURITY_BASIC
var/list/network = list("SS13")
var/obj/machinery/camera/current = null
var/list/connected_robots = list()
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index ea50f2e80b1..54cff59b181 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -163,11 +163,6 @@
sleep(50)
theAPC = null
- regular_hud_updates()
-
- if(sensor_mode) //Data HUDs, such as Security or Medical HUDS. Passes the AI's eye since it seems from that instead of itself.
- process_data_hud(src,sensor_mode,DATA_HUD_BASIC,src.eyeobj)
-
/mob/living/silicon/ai/updatehealth()
if(status_flags & GODMODE)
health = maxHealth
@@ -175,4 +170,4 @@
return
health = maxHealth - getOxyLoss() - getToxLoss() - getBruteLoss()
if(!fire_res_on_core)
- health -= getFireLoss()
\ No newline at end of file
+ health -= getFireLoss()
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index f8a7d0c2ef1..874828a6f69 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -8,12 +8,6 @@
M.show_message("
[src.cable] rapidly retracts back into its spool.", 3, "
You hear a click and the sound of wire spooling rapidly.", 2)
qdel(src.cable)
cable = null
-
- regular_hud_updates()
- if(secHUD == 1)
- process_data_hud(src, DATA_HUD_SECURITY,DATA_HUD_ADVANCED)
- if(medHUD == 1)
- process_data_hud(src, DATA_HUD_MEDICAL,DATA_HUD_ADVANCED)
if(silence_time)
if(world.timeofday >= silence_time)
silence_time = null
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index f5537bf988e..53d4fec79f6 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -65,7 +65,6 @@
pda.ownjob = "Personal Assistant"
pda.owner = text("[]", src)
pda.name = pda.owner + " (" + pda.ownjob + ")"
- pda.toff = 1
follow_pai()
..()
@@ -221,4 +220,4 @@
pai.key = src.key
card.setPersonality(pai)
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index c7ac1b347d5..34e829bc9a2 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -238,10 +238,16 @@
temp = "Unable to locate requested security record. Record may have been deleted, or never have existed."
if("securityhud")
if(href_list["toggle"])
- src.secHUD = !src.secHUD
+ secHUD = !secHUD
+ remove_med_sec_hud()
+ if(secHUD)
+ add_sec_hud()
if("medicalhud")
if(href_list["toggle"])
- src.medHUD = !src.medHUD
+ medHUD = !medHUD
+ remove_med_sec_hud()
+ if(medHUD)
+ add_med_hud()
if("translator")
if(href_list["toggle"])
languages = languages == ALL ? HUMAN & ROBOT : ALL
@@ -639,6 +645,5 @@
return dat
/mob/living/silicon/pai/proc/chatroom()
-
pda.mode = 5
- pda.attack_self()
+ pda.attack_self(src)
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 9ffd615c845..61b4f3487de 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -166,11 +166,6 @@
if(see_override)
see_invisible = see_override
- regular_hud_updates() //Handles MED/SEC HUDs for borgs.
-
- if(sensor_mode)
- process_data_hud(src,sensor_mode,DATA_HUD_ADVANCED)
-
if (src.healths)
if (src.stat != 2)
switch(health)
@@ -310,4 +305,4 @@
/mob/living/silicon/robot/update_canmove()
if(paralysis || stunned || weakened || buckled || lockcharge) canmove = 0
else canmove = 1
- return canmove
\ No newline at end of file
+ return canmove
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index e11c255358f..a1d4cc93437 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -15,7 +15,8 @@
var/lawcheck[1]
var/ioncheck[1]
- var/sensor_mode = 0 //Determines the current HUD.
+ var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
+ var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use
/mob/living/silicon/proc/cancelAlarm()
return
@@ -317,18 +318,32 @@
/mob/living/silicon/assess_threat() //Secbots won't hunt silicon units
return -10
+/mob/living/silicon/proc/remove_med_sec_hud()
+ var/datum/atom_hud/secsensor = huds[sec_hud]
+ var/datum/atom_hud/medsensor = huds[med_hud]
+ secsensor.remove_hud_from(src)
+ medsensor.remove_hud_from(src)
+
+/mob/living/silicon/proc/add_sec_hud()
+ var/datum/atom_hud/secsensor = huds[sec_hud]
+ secsensor.add_hud_to(src)
+
+/mob/living/silicon/proc/add_med_hud()
+ var/datum/atom_hud/medsensor = huds[med_hud]
+ medsensor.add_hud_to(src)
+
/mob/living/silicon/verb/sensor_mode()
set name = "Set Sensor Augmentation"
var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) in list("Security", "Medical","Disable")
+ remove_med_sec_hud()
switch(sensor_type)
if ("Security")
- sensor_mode = DATA_HUD_SECURITY
+ add_sec_hud()
src << "
Security records overlay enabled."
if ("Medical")
- sensor_mode = DATA_HUD_MEDICAL
+ add_med_hud()
src << "
Life signs monitor overlay enabled."
if ("Disable")
- sensor_mode = 0
src << "Sensor augmentations disabled."
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index a543b85b750..06f43d0b8aa 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -73,6 +73,8 @@ F
icon_gib = "megacarp_gib"
maxHealth = 65
health = 65
+ pixel_x = -16
+ mob_size = 2
melee_damage_lower = 20
melee_damage_upper = 20
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 6701a509db1..0f5b32b0ce5 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -269,8 +269,7 @@
A.firer = src
A.yo = target:y - start:y
A.xo = target:x - start:x
- spawn( 0 )
- A.process()
+ A.fire()
return
/mob/living/simple_animal/hostile/proc/DestroySurroundings()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 0ea87f92744..918437895bb 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -13,7 +13,6 @@
/mob/proc/sac_act(var/obj/effect/rune/R, var/mob/victim as mob)
return
-
var/next_mob_id = 0
/mob/New()
tag = "mob_[next_mob_id++]"
@@ -22,8 +21,13 @@ var/next_mob_id = 0
dead_mob_list += src
else
living_mob_list += src
+ prepare_huds()
..()
+/mob/proc/prepare_huds()
+ for(var/hud in hud_possible)
+ hud_list[hud] = image('icons/mob/hud.dmi', src, "")
+
/mob/proc/Cell()
set category = "Admin"
set hidden = 1
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index f13d82a7c8e..6b66ca59f6e 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -3,6 +3,7 @@
layer = 4
animate_movement = 2
flags = NOREACT | HEAR
+ hud_possible = list(ANTAG_HUD)
var/datum/mind/mind
var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 7252eafa2bb..ed782e6daaf 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -463,11 +463,3 @@ proc/is_special_character(mob/M) // returns 1 for special characters and 2 for h
else
return
-/proc/broadcast_hud_message(var/message, var/broadcast_source)
- var/turf/sourceturf = get_turf(broadcast_source)
- var/user_list = sec_hud_users //A local var is used for easy addition of other HUD types.
- var/hud_icon = /obj/item/weapon/restraints/handcuffs //Icon displayed when the HUD triggered. Handcuffs for Sec HUDs.
- for(var/mob/hud_user in user_list)
- var/turf/userturf = get_turf(hud_user)
- if(userturf.z == sourceturf.z) //Must have same z-level.
- hud_user.show_message("
\icon[hud_icon] [message]", 1)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 8b088f09835..90ec8f9336c 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -163,6 +163,7 @@
viruses = list()
for(var/datum/disease/D in O.viruses)
D.affected_mob = O
+ O.med_hud_set_status()
//keep damage?
if (tr_flags & TR_KEEPDAMAGE)
@@ -175,6 +176,7 @@
for(var/obj/item/weapon/implant/I in implants)
I.loc = O
I.implanted = O
+ O.sec_hud_set_implants()
if(mind)
mind.transfer_to(O)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 2360dbea18d..d3101ac63c0 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -145,7 +145,7 @@
else // Any other
A.yo = -20
A.xo = 0
- A.process() //TODO: Carn: check this out
+ A.fire()
/obj/machinery/power/emitter/attackby(obj/item/W, mob/user)
diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
index e99ce0b32eb..8abcea10af0 100644
--- a/code/modules/projectiles/firing.dm
+++ b/code/modules/projectiles/firing.dm
@@ -50,7 +50,7 @@
BB.p_y = text2num(mouse_control["icon-y"])
if(BB)
- BB.process()
+ BB.fire()
BB = null
return 1
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 5e097ea37c9..d2dc5b61e67 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -1,14 +1,3 @@
-/*
-#define BRUTE "brute"
-#define BURN "burn"
-#define TOX "tox"
-#define OXY "oxy"
-#define CLONE "clone"
-
-#define ADD "add"
-#define SET "set"
-*/
-
/obj/item/projectile
name = "projectile"
icon = 'icons/obj/projectiles.dmi'
@@ -37,7 +26,7 @@
var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
var/flag = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb
var/projectile_type = "/obj/item/projectile"
- var/kill_count = 50 //This will de-increment every process(). When 0, it will delete the projectile.
+ var/kill_count = 50 //This will de-increment every step. When 0, it will delete the projectile.
//Effects
var/stun = 0
var/weaken = 0
@@ -48,15 +37,7 @@
var/drowsy = 0
var/forcedodge = 0
-
-
-/obj/item/projectile/proc/delete()
- // Garbage collect the projectiles
- loc = null
-
-
-
-/obj/item/projectile/proc/on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
+/obj/item/projectile/proc/on_hit(atom/target, blocked = 0, hit_zone)
if(!isliving(target)) return 0
if(isanimal(target)) return 0
var/mob/living/L = target
@@ -69,22 +50,15 @@
else
return 50 //if the projectile doesn't do damage, play its hitsound at 50% volume
-
-/obj/item/projectile/Bump(atom/A as mob|obj|turf|area)
+/obj/item/projectile/Bump(atom/A)
if(A == firer)
loc = A.loc
return 0 //cannot shoot yourself
-
if(bumped)//Stops multihit projectiles
return 1
-
bumped = 1
- if(ismob(A))
- var/mob/M = A
- if(!istype(A, /mob/living))
- loc = A.loc
- return 0// nope.avi
-
+ if(isliving(A))
+ var/mob/living/M = A
var/reagent_note
if(reagents && reagents.reagent_list)
reagent_note = " REAGENTS:"
@@ -104,29 +78,14 @@
"
[M] is hit by \a [src] in the [parse_zone(def_zone)]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
add_logs(firer, M, "shot", object="[src]", addition=reagent_note)
-
- spawn(0)
- if(A)
- // We get the location before running A.bullet_act, incase the proc deletes A and makes it null
- var/turf/new_loc = null
- if(istype(A, /turf))
- new_loc = A
- else
- new_loc = A.loc
-
- var/permutation = A.bullet_act(src, def_zone) // searches for return value, could be deleted after run so check A isn't null
-
- if(permutation == -1 || (forcedodge && !istype(A, /turf)))// the bullet passes through a dense object!
- bumped = 0 // reset bumped variable!
- loc = new_loc
- permutated.Add(A)
- return 0
-
-
- delete()
- return 0
- return 1
-
+ var/turf/new_loc = get_turf(A)
+ var/permutation = A.bullet_act(src, def_zone) // searches for return value, could be deleted after run so check A isn't null
+ if(permutation == -1 || forcedodge)// the bullet passes through a dense object!
+ bumped = 0 // reset bumped variable!
+ loc = new_loc
+ permutated.Add(A)
+ return 0
+ qdel(src)
/obj/item/projectile/CanPass(atom/movable/mover, turf/target, height=0)
if(height==0) return 1
@@ -140,26 +99,22 @@
return 1 //Bullets don't drift in space
-/obj/item/projectile/process()
- if(kill_count < 1)
- delete()
- return
- kill_count--
- spawn while(loc)
- if((!( current ) || loc == current))
- current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
- if((x == 1 || x == world.maxx || y == 1 || y == world.maxy))
- delete()
- return
- step_towards(src, current)
- sleep(1)
- if(!bumped && ((original && original.layer>=2.75) || ismob(original)))
- if(loc == get_turf(original))
- if(!(original in permutated))
- Bump(original)
- sleep(1)
- Range()
- return
+/obj/item/projectile/proc/fire()
+ spawn()
+ while(loc)
+ if(kill_count < 1)
+ qdel(src)
+ return
+ kill_count--
+ if((!( current ) || loc == current))
+ current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
+ step_towards(src, current)
+ if(!bumped && ((original && original.layer>=2.75) || ismob(original)))
+ if(loc == get_turf(original))
+ if(!(original in permutated))
+ Bump(original)
+ Range()
+ sleep(1)
/obj/item/projectile/proc/Range()
return
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 32427a49a5b..d6bfe72329a 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -57,8 +57,9 @@
/obj/item/projectile/beam/emitter/singularity_pull()
return //don't want the emitters to miss
-/obj/item/projectile/beam/emitter/delete() //what projectiles use to set loc = null
+obj/item/projectile/beam/emitter/Destroy()
PlaceInPool(src)
+ return 1 //cancels the GCing
/obj/item/projectile/lasertag
name = "laser tag beam"
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 4f1060ea6ad..c283976f256 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -62,7 +62,7 @@
/obj/item/projectile/energy/disabler/Range()
range--
if(range <= 0)
- delete()
+ qdel(src)
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 4d7ae9325c8..d79a35219d0 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -247,7 +247,7 @@ proc/wabbajack(mob/living/M)
flag = "magic"
/obj/item/projectile/magic/animate/Bump(var/atom/change)
- . = ..()
+ ..()
if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, protected_objects))
if(istype(change, /obj/structure/closet/statue))
for(var/mob/living/carbon/human/H in change.contents)
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 224ed9334c4..0c9fd22f526 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -7,9 +7,9 @@
flag = "energy"
- on_hit(var/atom/target, var/blocked = 0)
- empulse(target, 1, 1)
- return 1
+/obj/item/projectile/ion/on_hit(atom/target, blocked = 0)
+ empulse(target, 1, 1)
+ return 1
/obj/item/projectile/bullet/gyro
@@ -19,9 +19,9 @@
flag = "bullet"
- on_hit(var/atom/target, var/blocked = 0)
- explosion(target, -1, 0, 2)
- return 1
+/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
+ explosion(target, -1, 0, 2)
+ return 1
/obj/item/projectile/temp
name = "freeze beam"
@@ -33,11 +33,11 @@
var/temperature = 100
- on_hit(var/atom/target, var/blocked = 0)//These two could likely check temp protection on the mob
- if(istype(target, /mob/living))
- var/mob/M = target
- M.bodytemperature = temperature
- return 1
+/obj/item/projectile/temp/on_hit(atom/target, blocked = 0)//These two could likely check temp protection on the mob
+ if(istype(target, /mob/living))
+ var/mob/M = target
+ M.bodytemperature = temperature
+ return 1
/obj/item/projectile/temp/hot
name = "heat beam"
@@ -52,26 +52,16 @@
nodamage = 1
flag = "bullet"
- Bump(atom/A as mob|obj|turf|area)
- if(A == firer)
- loc = A.loc
- return
-
- sleep(-1) //Might not be important enough for a sleep(-1) but the sleep/spawn itself is necessary thanks to explosions and metoerhits
-
- if(src)//Do not add to this if() statement, otherwise the meteor won't delete them
- if(A)
-
- A.ex_act(2)
- playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
-
- for(var/mob/M in range(10, src))
- if(!M.stat && !istype(M, /mob/living/silicon/ai))\
- shake_camera(M, 3, 1)
- delete()
- return 1
- else
- return 0
+/obj/item/projectile/meteor/Bump(atom/A)
+ if(A == firer)
+ loc = A.loc
+ return
+ A.ex_act(2)
+ playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
+ for(var/mob/M in range(10, src))
+ if(!M.stat)
+ shake_camera(M, 3, 1)
+ qdel(src)
/obj/item/projectile/energy/floramut
name = "alpha somatoray"
@@ -81,10 +71,6 @@
nodamage = 1
flag = "energy"
- on_hit(var/atom/target, var/blocked = 0)
- ..()
- return
-
/obj/item/projectile/energy/florayield
name = "beta somatoray"
icon_state = "energy2"
@@ -93,19 +79,14 @@
nodamage = 1
flag = "energy"
- on_hit(mob/living/carbon/human/target, var/blocked = 0)
- ..()
- return
-
-
/obj/item/projectile/beam/mindflayer
name = "flayer ray"
- on_hit(var/atom/target, var/blocked = 0)
- if(ishuman(target))
- var/mob/living/carbon/human/M = target
- M.adjustBrainLoss(20)
- M.hallucination += 20
+/obj/item/projectile/beam/mindflayer/on_hit(atom/target, blocked = 0)
+ if(ishuman(target))
+ var/mob/living/carbon/human/M = target
+ M.adjustBrainLoss(20)
+ M.hallucination += 20
/obj/item/projectile/kinetic
name = "kinetic force"
@@ -130,9 +111,9 @@ obj/item/projectile/kinetic/New()
range--
if(range <= 0)
new /obj/item/effect/kinetic_blast(src.loc)
- delete()
+ qdel(src)
-/obj/item/projectile/kinetic/on_hit(var/atom/target)
+/obj/item/projectile/kinetic/on_hit(atom/target)
var/turf/target_turf= get_turf(target)
if(istype(target_turf, /turf/simulated/mineral))
var/turf/simulated/mineral/M = target_turf
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 2a71f6b5394..7fe43b639c3 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -613,10 +613,6 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
return
else if (href_list["create_virus_culture"])
if(!wait)
- var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
- B.icon_state = "bottle3"
- B.pixel_x = rand(-3, 3)
- B.pixel_y = rand(-3, 3)
var/type = GetVirusTypeByIndex(text2num(href_list["create_virus_culture"]))//the path is received as string - converting
var/datum/disease/D = null
if(!ispath(type))
@@ -629,10 +625,15 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
D = new type(0, null)
if(!D)
return
+ var/name = stripped_input(usr,"Name:","Name the culture",D.name,MAX_NAME_LEN)
+ if(name == null)
+ return
+ var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
+ B.icon_state = "bottle3"
+ B.pixel_x = rand(-3, 3)
+ B.pixel_y = rand(-3, 3)
replicator_cooldown(50)
var/list/data = list("viruses"=list(D))
- var/name = sanitize(input(usr,"Name:","Name the culture",D.name))
- if(!name || name == " ") name = D.name
B.name = "[name] culture bottle"
B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium."
B.reagents.add_reagent("blood",20,data)
@@ -657,6 +658,8 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
return
else if(href_list["name_disease"])
var/new_name = stripped_input(usr, "Name the Disease", "New Name", "", MAX_NAME_LEN)
+ if(!new_name)
+ return
if(..())
return
var/id = GetVirusTypeByIndex(text2num(href_list["name_disease"]))
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 09ae011ef89..0c91110905f 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -1869,57 +1869,66 @@ datum/reagent/condensedcapsaicin
color = "#B31008" // rgb: 179, 16, 8
datum/reagent/condensedcapsaicin/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- if(!istype(M, /mob/living))
+ if(!istype(M, /mob/living/carbon/human) && !istype(M, /mob/living/carbon/monkey))
return
+
+ var/mob/living/carbon/victim = M
if(method == TOUCH)
- if(istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/victim = M
- var/mouth_covered = 0
- var/eyes_covered = 0
- var/obj/item/safe_thing = null
- if( victim.wear_mask )
- if ( victim.wear_mask.flags & MASKCOVERSEYES )
+ //check for protection
+ var/mouth_covered = 0
+ var/eyes_covered = 0
+ var/obj/item/safe_thing = null
+
+ //monkeys and humans can have masks
+ if( victim.wear_mask )
+ if ( victim.wear_mask.flags & MASKCOVERSEYES )
+ eyes_covered = 1
+ safe_thing = victim.wear_mask
+ if ( victim.wear_mask.flags & MASKCOVERSMOUTH )
+ mouth_covered = 1
+ safe_thing = victim.wear_mask
+
+ //only humans can have helmets and glasses
+ if(istype(victim, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = victim
+ if( H.head )
+ if ( H.head.flags & MASKCOVERSEYES )
eyes_covered = 1
- safe_thing = victim.wear_mask
- if ( victim.wear_mask.flags & MASKCOVERSMOUTH )
+ safe_thing = H.head
+ if ( H.head.flags & MASKCOVERSMOUTH )
mouth_covered = 1
- safe_thing = victim.wear_mask
- if( victim.head )
- if ( victim.head.flags & MASKCOVERSEYES )
- eyes_covered = 1
- safe_thing = victim.head
- if ( victim.head.flags & MASKCOVERSMOUTH )
- mouth_covered = 1
- safe_thing = victim.head
- if(victim.glasses)
+ safe_thing = H.head
+ if(H.glasses)
eyes_covered = 1
if ( !safe_thing )
- safe_thing = victim.glasses
- if ( eyes_covered && mouth_covered )
- return
- else if ( mouth_covered ) // Reduced effects if partially protected
- if(prob(5))
- victim.emote("scream")
- victim.eye_blurry = max(M.eye_blurry, 3)
- victim.eye_blind = max(M.eye_blind, 1)
- victim.confused = max(M.confused, 3)
- victim.damageoverlaytemp = 60
- victim.Weaken(3)
- victim.drop_item()
- return
- else if ( eyes_covered ) // Eye cover is better than mouth cover
- victim.eye_blurry = max(M.eye_blurry, 3)
- victim.damageoverlaytemp = 30
- return
- else // Oh dear :D
- if(prob(5))
- victim.emote("scream")
- victim.eye_blurry = max(M.eye_blurry, 5)
- victim.eye_blind = max(M.eye_blind, 2)
- victim.confused = max(M.confused, 6)
- victim.damageoverlaytemp = 75
- victim.Weaken(5)
- victim.drop_item()
+ safe_thing = H.glasses
+
+ //actually handle the pepperspray effects
+ if ( eyes_covered && mouth_covered )
+ return
+ else if ( mouth_covered ) // Reduced effects if partially protected
+ if(prob(5))
+ victim.emote("scream")
+ victim.eye_blurry = max(M.eye_blurry, 3)
+ victim.eye_blind = max(M.eye_blind, 1)
+ victim.confused = max(M.confused, 3)
+ victim.damageoverlaytemp = 60
+ victim.Weaken(3)
+ victim.drop_item()
+ return
+ else if ( eyes_covered ) // Eye cover is better than mouth cover
+ victim.eye_blurry = max(M.eye_blurry, 3)
+ victim.damageoverlaytemp = 30
+ return
+ else // Oh dear :D
+ if(prob(5))
+ victim.emote("scream")
+ victim.eye_blurry = max(M.eye_blurry, 5)
+ victim.eye_blind = max(M.eye_blind, 2)
+ victim.confused = max(M.confused, 6)
+ victim.damageoverlaytemp = 75
+ victim.Weaken(5)
+ victim.drop_item()
datum/reagent/condensedcapsaicin/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index e20f59e6e1f..d419e7c2c70 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1036,7 +1036,8 @@ datum/chemical_reaction/pestkiller
/mob/living/simple_animal/hostile/asteroid/goliath,
/mob/living/simple_animal/hostile/asteroid/hivelord,
/mob/living/simple_animal/hostile/asteroid/hivelordbrood,
- /mob/living/simple_animal/hostile/carp/holocarp
+ /mob/living/simple_animal/hostile/carp/holocarp,
+ /mob/living/simple_animal/hostile/mining_drone
)//exclusion list for things you don't want the reaction to create.
var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
@@ -1105,7 +1106,8 @@ datum/chemical_reaction/pestkiller
/mob/living/simple_animal/hostile/asteroid/goliath,
/mob/living/simple_animal/hostile/asteroid/hivelord,
/mob/living/simple_animal/hostile/asteroid/hivelordbrood,
- /mob/living/simple_animal/hostile/carp/holocarp
+ /mob/living/simple_animal/hostile/carp/holocarp,
+ /mob/living/simple_animal/hostile/mining_drone
)//exclusion list for things you don't want the reaction to create.
var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index e1661d087e9..e7aa5927287 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -7,6 +7,7 @@
var/amount_per_transfer_from_this = 5
var/possible_transfer_amounts = list(5,10,15,25,30)
var/volume = 30
+ var/list/banned_reagents = list() //List of reagent IDs we reject.
/obj/item/weapon/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this
set name = "Set transfer amount"
@@ -30,13 +31,6 @@
/obj/item/weapon/reagent_containers/attack(mob/M as mob, mob/user as mob, def_zone)
return
-// this prevented pills, food, and other things from being picked up by bags.
-// possibly intentional, but removing it allows us to not duplicate functionality.
-// -Sayu (storage conslidation)
-/*
-/obj/item/weapon/reagent_containers/attackby(obj/item/I as obj, mob/user as mob)
- return
-*/
/obj/item/weapon/reagent_containers/afterattack(obj/target, mob/user , flag)
return
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index f478b9e126f..ca1af24a7bd 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -56,8 +56,8 @@
else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
- if(!target.reagents.total_volume && target.reagents)
- user << "[target] is empty."
+ if(target.reagents && !target.reagents.total_volume)
+ user << "[target] is empty and can't be refilled."
return
if(reagents.total_volume >= reagents.maximum_volume)
@@ -76,6 +76,13 @@
user << "[target] is full."
return
+ if(istype(target, /obj/item/weapon/reagent_containers))
+ var/obj/item/weapon/reagent_containers/RC = target
+ for(var/bad_reg in RC.banned_reagents)
+ if(reagents.has_reagent(bad_reg, 1)) //Message is a bit "Game-y" but I can't think up a better one.
+ user << "A chemical in [src] is far too dangerous to transfer to [RC]!"
+ return
+
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
user << "You transfer [trans] unit\s of the solution to [target]."
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 64b32a2bc6b..0f24cb53a76 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -15,6 +15,7 @@
amount_per_transfer_from_this = 5
volume = 250
possible_transfer_amounts = null
+ banned_reagents = list("pacid","sacid")
/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob)
@@ -42,22 +43,10 @@
user << "\The [src] is empty!"
return
- var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src))
- D.create_reagents(amount_per_transfer_from_this)
-
- reagents.trans_to(D, amount_per_transfer_from_this, 1/spray_currentrange)
- D.color = mix_color_from_reagents(D.reagents.reagent_list)
- spawn(0)
- for(var/i=0, i\The [A] is empty."
- return
-
- if(reagents.total_volume >= reagents.maximum_volume)
- user << "
\The [src] is full."
- return
-
- var/trans = A.reagents.trans_to(src, A:amount_per_transfer_from_this)
- user << "
You fill \the [src] with [trans] units of the contents of \the [A]."
- return
-
- if(reagents.total_volume < amount_per_transfer_from_this)
- user << "
\The [src] is empty!"
- return
-
+/obj/item/weapon/reagent_containers/spray/chemsprayer/spray(var/atom/A)
var/Sprays[3]
for(var/i=1, i<=3, i++) // intialize sprays
if(src.reagents.total_volume < 1) break
@@ -210,19 +190,7 @@
sleep(2)
qdel(D)
- playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
- user.changeNext_move(CLICK_CD_RANGE)
- if(reagents.has_reagent("sacid"))
- message_admins("[key_name_admin(user)] fired sulphuric acid from a chem sprayer.")
- log_game("[key_name(user)] fired sulphuric acid from a chem sprayer.")
- if(reagents.has_reagent("pacid"))
- message_admins("[key_name_admin(user)] fired Polyacid from a chem sprayer.")
- log_game("[key_name(user)] fired Polyacid from a chem sprayer.")
- if(reagents.has_reagent("lube"))
- message_admins("[key_name_admin(user)] fired Space lube from a chem sprayer.")
- log_game("[key_name(user)] fired Space lube from a chem sprayer.")
- return
/obj/item/weapon/reagent_containers/spray/chemsprayer/attack_self(var/mob/user)
diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm
index 054ad9a19d7..bcd0bb32bc1 100644
--- a/code/modules/surgery/implant_removal.dm
+++ b/code/modules/surgery/implant_removal.dm
@@ -29,6 +29,9 @@
if(istype(I, /obj/item/weapon/implant/loyalty))
target << "
You feel a sense of liberation as Nanotrasen's grip on your mind fades away."
qdel(I)
+ if(istype(user, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = user
+ H.sec_hud_set_implants()
else
user.visible_message("
[user] can't find anything in [target]'s [target_zone].")
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 8294e7f4245..dee72977156 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -334,15 +334,16 @@
z_co = Clamp(round(new_z), 1, 10)
if(href_list["ejectGPS"])
- inserted_gps.loc = loc
- inserted_gps = null
+ if(inserted_gps)
+ inserted_gps.loc = loc
+ inserted_gps = null
if(href_list["setMemory"])
- if(last_target)
+ if(last_target && inserted_gps)
inserted_gps.locked_location = last_target
temp_msg = "Location saved."
else
- temp_msg = "ERROR!
No data stored."
+ temp_msg = "ERROR!
No data was stored."
if(href_list["send"])
sending = 1
diff --git a/html/changelogs/Tkdrg-HUDs.yml b/html/changelogs/Tkdrg-HUDs.yml
new file mode 100644
index 00000000000..192dba145fb
--- /dev/null
+++ b/html/changelogs/Tkdrg-HUDs.yml
@@ -0,0 +1,5 @@
+author: Tkdrg
+delete-after: True
+
+changes:
+ - tweak: Security/Medical HUDs are now more responsive and less laggy.
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 0813643efc5..360862e3031 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 648866f97d7..12fe2bf8812 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 0ef8f0b08bc..8df9911ab29 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 85cdc50beb8..1a7e1a5f1d6 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 2cfaf2b0015..390f3f00953 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 49751ad1772..439540b1b54 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 745c1976e57..f0ee66081a6 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 4530e7f5027..c256d38e465 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -23,6 +23,7 @@
#include "code\__DEFINES\combat.dm"
#include "code\__DEFINES\flags.dm"
#include "code\__DEFINES\genetics.dm"
+#include "code\__DEFINES\hud.dm"
#include "code\__DEFINES\machines.dm"
#include "code\__DEFINES\math.dm"
#include "code\__DEFINES\misc.dm"
@@ -131,6 +132,7 @@
#include "code\datums\datacore.dm"
#include "code\datums\datumvars.dm"
#include "code\datums\gas_mixture.dm"
+#include "code\datums\hud.dm"
#include "code\datums\mind.dm"
#include "code\datums\mixed.dm"
#include "code\datums\modules.dm"
@@ -244,6 +246,7 @@
#include "code\game\area\ai_monitored.dm"
#include "code\game\area\areas.dm"
#include "code\game\area\Space Station 13 areas.dm"
+#include "code\game\gamemodes\antag_hud.dm"
#include "code\game\gamemodes\antag_spawner.dm"
#include "code\game\gamemodes\events.dm"
#include "code\game\gamemodes\factions.dm"
@@ -1073,7 +1076,6 @@
#include "code\modules\mob\living\carbon\slime\death.dm"
#include "code\modules\mob\living\carbon\slime\emote.dm"
#include "code\modules\mob\living\carbon\slime\examine.dm"
-#include "code\modules\mob\living\carbon\slime\hud.dm"
#include "code\modules\mob\living\carbon\slime\life.dm"
#include "code\modules\mob\living\carbon\slime\login.dm"
#include "code\modules\mob\living\carbon\slime\powers.dm"
diff --git a/tools/mapmerge/Location.java b/tools/mapmerge/Location.java
new file mode 100644
index 00000000000..2a901d54b27
--- /dev/null
+++ b/tools/mapmerge/Location.java
@@ -0,0 +1,42 @@
+class Location
+{
+ int x;
+ int y;
+ int z;
+
+ public Location()
+ {
+ }
+
+ public Location(int paramInt1, int paramInt2, int paramInt3)
+ {
+ this.x = paramInt1;
+ this.y = paramInt2;
+ this.z = paramInt3;
+ }
+
+ public void set(int paramInt1, int paramInt2, int paramInt3)
+ {
+ this.x = paramInt1;
+ this.y = paramInt2;
+ this.z = paramInt3;
+ }
+
+ public boolean equals(Object paramObject)
+ {
+ if (!(paramObject instanceof Location)) return false;
+ Location localLocation = (Location)paramObject;
+ if ((this.x != localLocation.x) || (this.y != localLocation.y) || (this.z != localLocation.z)) return false;
+ return true;
+ }
+
+ public int hashCode()
+ {
+ return (this.z * 256 + this.y) * 256 + this.x;
+ }
+
+ public String toString()
+ {
+ return "(" + this.x + "," + this.y + "," + this.z + ")";
+ }
+}
diff --git a/tools/mapmerge/META-INF/MANIFEST.MF b/tools/mapmerge/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..d66a7b3b698
--- /dev/null
+++ b/tools/mapmerge/META-INF/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Created-By: 1.6.0_31 (Sun Microsystems Inc.)
+Main-Class: MapPatcher
+
diff --git a/tools/mapmerge/Map.java b/tools/mapmerge/Map.java
new file mode 100644
index 00000000000..949db7e6cad
--- /dev/null
+++ b/tools/mapmerge/Map.java
@@ -0,0 +1,314 @@
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Vector;
+
+public class Map
+{
+ boolean sizeunknown;
+ int minx;
+ int miny;
+ int minz;
+ int maxx;
+ int maxy;
+ int maxz;
+ HashMap
tile_types;
+ HashMap codes_by_value;
+ HashMap tiles;
+
+ public Map()
+ {
+ this.sizeunknown = true;
+ this.tile_types = new HashMap();
+ this.codes_by_value = new HashMap();
+ this.tiles = new HashMap();
+ }
+
+ public Map(File paramFile)
+ {
+ this(paramFile, false);
+ }
+
+ public Map(File paramFile, boolean paramBoolean)
+ {
+ this.sizeunknown = true;
+ try {
+ BufferedReader localBufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(paramFile)));
+
+ this.tile_types = new HashMap();
+ this.codes_by_value = new HashMap();
+ this.tiles = new HashMap();
+
+ MapPatcher.Systemoutprintln(new StringBuilder().append("Loading map ").append(paramFile.getName()).toString());
+ MapPatcher.Systemoutprint("Loading tiles");
+ String str1 = "";
+ int i = 0;
+ while ((str1 = localBufferedReader.readLine()) != null)
+ {
+ if (str1.equals("")) break;
+ if (str1.startsWith("\""))
+ {
+ if (i < 1)
+ {
+ int j = str1.indexOf("\"", 1);
+ i = j - 1;
+ }
+ String str2 = str1.substring(1, 1 + i);
+ String str3 = str1.substring(str1.indexOf("("));
+ this.tile_types.put(str2, str3);
+ this.codes_by_value.put(str3, str2);
+ }
+ }
+
+ MapPatcher.Systemoutprintln(new StringBuilder().append(" ").append(this.tile_types.size()).toString());
+ if (!paramBoolean)
+ {
+ MapPatcher.Systemoutprintln("Loading levels");
+ while (true)
+ {
+ if ((str1 = localBufferedReader.readLine()) != null) { if (str1.startsWith("(")) break label270; } else {
+ label270: if (str1 == null)
+ {
+ break;
+ }
+ int k = str1.indexOf(",", 1);
+ int m = Integer.parseInt(str1.substring(1, k));
+ str1 = str1.substring(k);
+ k = str1.indexOf(",", 1);
+ int n = Integer.parseInt(str1.substring(1, k));
+ str1 = str1.substring(k);
+ k = str1.indexOf(")", 1);
+ int i1 = Integer.parseInt(str1.substring(1, k));
+
+ MapPatcher.Systemoutprintln(new StringBuilder().append("New map part from (").append(m).append(",").append(n).append(",").append(i1).append(")").toString());
+
+ int i3 = n;
+ if (this.sizeunknown)
+ {
+ this.minx = m; this.maxx = this.minx;
+ this.miny = n; this.maxy = this.miny;
+ this.minz = i1; this.maxz = this.minz;
+ this.sizeunknown = false;
+ }
+ if (this.minz > i1) this.minz = i1;
+ if (this.maxz < i1) this.maxz = i1;
+ while (!(str1 = localBufferedReader.readLine()).startsWith("\"}"))
+ {
+ int i2 = m;
+ if (this.miny > i3) this.miny = i3;
+ if (this.maxy < i3) this.maxy = i3;
+ while (str1.length() > 0)
+ {
+ String str4 = str1.substring(0, i);
+ Location localLocation = new Location(i2, i3, i1);
+ if (this.minx > i2) this.minx = i2;
+ if (this.maxx < i2) this.maxx = i2;
+ this.tiles.put(localLocation, this.tile_types.get(str4));
+ str1 = str1.substring(i);
+ i2++;
+ }
+ i3++;
+ }
+ }
+ }
+ }
+ localBufferedReader.close();
+ }
+ catch (Exception localException)
+ {
+ localException.printStackTrace();
+ }
+ }
+
+ public void mirrorY()
+ {
+ for (int i = this.minz; i <= this.maxz; i++)
+ for (int j = this.minx; j <= this.maxx; j++)
+ for (int k = this.miny; k < (this.miny + this.maxy) / 2; k++)
+ {
+ int m = this.maxy - (k - this.miny);
+ String str = contentAt2(j, k, i);
+ setAt(j, k, i, contentAt2(j, m, i));
+ setAt(j, m, i, str);
+ }
+ }
+
+ public String contentAt(int paramInt1, int paramInt2, int paramInt3)
+ {
+ Location localLocation = new Location(paramInt1, paramInt2, paramInt3);
+ String str = (String)this.tiles.get(localLocation);
+ if (str == null) System.err.println(new StringBuilder().append("Null at ").append(paramInt1).append(",").append(paramInt2).append(",").append(paramInt3).append(" Possible loading error").toString());
+ return str == null ? "null" : str;
+ }
+
+ public String contentAt2(int paramInt1, int paramInt2, int paramInt3)
+ {
+ Location localLocation = new Location(paramInt1, paramInt2, paramInt3);
+ return (String)this.tiles.get(localLocation);
+ }
+
+ public void setAt(int paramInt1, int paramInt2, int paramInt3, String paramString)
+ {
+ if (this.sizeunknown)
+ {
+ this.minx = (this.maxx = paramInt1);
+ this.miny = (this.maxy = paramInt2);
+ this.minz = (this.maxz = paramInt3);
+ this.sizeunknown = false;
+ }
+ else
+ {
+ this.minx = Math.min(this.minx, paramInt1);
+ this.miny = Math.min(this.miny, paramInt2);
+ this.minz = Math.min(this.minz, paramInt3);
+ this.maxx = Math.max(this.maxx, paramInt1);
+ this.maxy = Math.max(this.maxy, paramInt2);
+ this.maxz = Math.max(this.maxz, paramInt3);
+ }
+ Location localLocation = new Location(paramInt1, paramInt2, paramInt3);
+ localLocation.set(paramInt1, paramInt2, paramInt3);
+ this.tiles.put(localLocation, paramString);
+ }
+
+ public void save(File paramFile) throws Exception
+ {
+ saveReferencing(paramFile, null);
+ }
+
+ public void saveReferencing(File paramFile, Map paramMap) throws Exception
+ {
+ FileWriter localFileWriter = new FileWriter(paramFile);
+
+ this.tile_types.clear();
+ this.codes_by_value.clear();
+ Vector localVector1 = new Vector();
+ for (Object localObject1 = this.tiles.keySet().iterator(); ((Iterator)localObject1).hasNext(); ) { Location localLocation = (Location)((Iterator)localObject1).next();
+
+ String str1 = (String)this.tiles.get(localLocation);
+ if (!localVector1.contains(str1))
+ localVector1.add(str1);
+ }
+ MapPatcher.Systemoutprintln(new StringBuilder().append("We have ").append(localVector1.size()).append(" different tiles").toString());
+ localObject1 = new String[] { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
+
+ int i = 1;
+ int j = localObject1.length;
+ while (j < localVector1.size())
+ {
+ j *= localObject1.length;
+ i++;
+ }
+ Vector localVector2;
+ if (paramMap == null) {
+ localVector2 = localVector1;
+ }
+ else {
+ localVector2 = new Vector();
+ for (Iterator localIterator = localVector1.iterator(); localIterator.hasNext(); ) { localObject2 = (String)localIterator.next();
+
+ if (paramMap.codes_by_value.containsKey(localObject2))
+ {
+ localObject3 = paramMap.getIdFor((String)localObject2);
+ this.tile_types.put(localObject3, localObject2);
+ this.codes_by_value.put(localObject2, localObject3);
+ }
+ else {
+ localVector2.add(localObject2);
+ } }
+ localVector1.clear();
+ }
+
+ int k = 0;
+ for (Object localObject2 = localVector2.iterator(); ((Iterator)localObject2).hasNext(); ) { localObject3 = (String)((Iterator)localObject2).next();
+ do
+ {
+ str2 = int2code((String[])localObject1, k, i);
+ k++;
+ }while (this.tile_types.containsKey(str2));
+ this.tile_types.put(str2, localObject3);
+ this.codes_by_value.put(localObject3, str2);
+ }
+ String str2;
+ localVector2.clear();
+
+ k = 0;
+ for (int m = 0; m < this.tile_types.size(); m++)
+ {
+ do
+ {
+ localObject3 = int2code((String[])localObject1, k, i);
+ k++;
+ }while (!this.tile_types.containsKey(localObject3));
+ str2 = (String)this.tile_types.get(localObject3);
+ localFileWriter.write(new StringBuilder().append("\"").append((String)localObject3).append("\" = ").append(str2).append("\r\n").toString());
+ }
+ localVector2.clear();
+
+ localFileWriter.write("\n");
+
+ m = 1 + this.maxz - this.minz;
+ Object localObject3 = new SavingThread[m];
+ int n = (this.maxy - this.miny) * ((this.maxx - this.minx) * i + 2) + 32;
+
+ for (k = 0; k < m; k++)
+ {
+ localObject3[k] = new SavingThread(this.minz + k, this, n);
+ localObject3[k].start();
+ }
+
+ int i1 = 0;
+ String str3 = "";
+ while (i1 == 0) {
+ try {
+ Thread.sleep(100L); } catch (Exception localException) {
+ }
+ i1 = 1;
+
+ str3 = "";
+ for (k = 0; k < m; k++)
+ {
+ if (!localObject3[k].done)
+ i1 = 0;
+ if (str3.length() != 0) str3 = new StringBuilder().append(str3).append(" ").toString();
+ str3 = new StringBuilder().append(str3).append(localObject3[k].done ? "Done" : new StringBuilder().append(localObject3[k].progress).append("%").toString()).toString();
+ }
+ MapPatcher.Systemoutprint(new StringBuilder().append(str3).append("\r").toString());
+ }
+
+ for (k = 0; k < m; k++) {
+ localFileWriter.write(localObject3[k].result.toString());
+ }
+ localFileWriter.flush();
+ localFileWriter.close();
+ }
+
+ public String getIdFor(String paramString)
+ {
+ if (this.codes_by_value.containsKey(paramString))
+ {
+ return (String)this.codes_by_value.get(paramString);
+ }
+ return "???";
+ }
+
+ public String int2code(String[] paramArrayOfString, int paramInt1, int paramInt2)
+ {
+ String str = "";
+ while (paramInt1 >= paramArrayOfString.length)
+ {
+ int i = paramInt1 % paramArrayOfString.length;
+ str = new StringBuilder().append(paramArrayOfString[i]).append(str).toString();
+ paramInt1 -= i;
+ paramInt1 /= paramArrayOfString.length;
+ }
+ str = new StringBuilder().append(paramArrayOfString[paramInt1]).append(str).toString();
+ while (str.length() < paramInt2) str = new StringBuilder().append(paramArrayOfString[0]).append(str).toString();
+ return str;
+ }
+}
diff --git a/tools/mapmerge/MapPatcher.java b/tools/mapmerge/MapPatcher.java
new file mode 100644
index 00000000000..c8d50b9b2fe
--- /dev/null
+++ b/tools/mapmerge/MapPatcher.java
@@ -0,0 +1,304 @@
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.util.Arrays;
+
+public class MapPatcher
+{
+ static boolean silent = false;
+
+ public static void main(String[] paramArrayOfString)
+ {
+ String str1 = "usage: [me] -diff [old_map] [new_map] [diff_file]";
+ String str2 = "usage: [me] -patch [old_map] [diff_file] [new_map]";
+ String str3 = "usage: [me] -pack [unpacked] [packed.dmm]";
+ String str4 = "usage: [me] -unpack [packed.dmm] [unpacked]";
+ String str5 = "usage: [me] -clean [oldmap.dmm] [newmap.dmm] [cleaned.dmm]";
+ String str6 = "usage: [me] -merge [original] [local] [remote] [output]";
+
+ for (int i = 0; i < paramArrayOfString.length; i++)
+ if (paramArrayOfString[i].equalsIgnoreCase("-silent"))
+ {
+ silent = true;
+ for (; i < paramArrayOfString.length - 1; i++)
+ paramArrayOfString[i] = paramArrayOfString[(i + 1)];
+ paramArrayOfString = (String[])Arrays.copyOf(paramArrayOfString, paramArrayOfString.length - 1);
+ break;
+ }
+ Object localObject;
+ int i2;
+ int i3;
+ int i5;
+ if ((paramArrayOfString.length > 0) && (paramArrayOfString[0].equalsIgnoreCase("-merge")))
+ {
+ if (paramArrayOfString.length < 5)
+ {
+ System.out.println(str6);
+ try { System.in.read(); } catch (Exception localException1) {
+ }return;
+ }
+
+ Map localMap1 = new Map(new File(paramArrayOfString[1]));
+ localObject = new Map(new File(paramArrayOfString[2]));
+ Map localMap8 = new Map(new File(paramArrayOfString[3]));
+ Map localMap9 = new Map();
+
+ if ((localMap1.minx != ((Map)localObject).minx) || (localMap1.minx != localMap8.minx) || (localMap1.maxx != ((Map)localObject).maxx) || (localMap1.maxx != localMap8.maxx) || (localMap1.miny != ((Map)localObject).miny) || (localMap1.miny != localMap8.miny) || (localMap1.maxy != ((Map)localObject).maxy) || (localMap1.maxy != localMap8.maxy) || (localMap1.minz != ((Map)localObject).minz) || (localMap1.minz != localMap8.minz) || (localMap1.maxz != ((Map)localObject).maxz) || (localMap1.maxz != localMap8.maxz))
+ {
+ Systemoutprintln("Map sizes differ");
+ System.exit(1);
+ }
+ try
+ {
+ for (int n = localMap1.minz; n <= localMap1.maxz; n++)
+ for (i2 = localMap1.miny; i2 <= localMap1.maxy; i2++)
+ for (i3 = localMap1.minx; i3 <= localMap1.maxx; i3++)
+ {
+ boolean bool1 = localMap1.contentAt(i3, i2, n).equals(((Map)localObject).contentAt(i3, i2, n));
+ boolean bool2 = localMap1.contentAt(i3, i2, n).equals(localMap8.contentAt(i3, i2, n));
+ i5 = ((Map)localObject).contentAt(i3, i2, n).equals(localMap8.contentAt(i3, i2, n));
+ if ((!bool1) && (!bool2))
+ {
+ if (i5 == 0)
+ {
+ Systemoutprintln(i3 + "," + i2 + "," + n + " local and remote don't match original and differ");
+ System.exit(1);
+ }
+ else {
+ localMap9.setAt(i3, i2, n, ((Map)localObject).contentAt(i3, i2, n));
+ }
+ } else if (!bool1)
+ localMap9.setAt(i3, i2, n, ((Map)localObject).contentAt(i3, i2, n));
+ else if (!bool2)
+ localMap9.setAt(i3, i2, n, localMap8.contentAt(i3, i2, n));
+ else
+ localMap9.setAt(i3, i2, n, localMap1.contentAt(i3, i2, n));
+ }
+ Systemoutprintln("Saving");
+ localMap9.saveReferencing(new File(paramArrayOfString[4]), localMap1);
+ Systemoutprintln("Done");
+ }
+ catch (Exception localException12)
+ {
+ localException12.printStackTrace();
+ }
+ }
+ else
+ {
+ int m;
+ int i1;
+ if ((paramArrayOfString.length > 0) && (paramArrayOfString[0].equalsIgnoreCase("-diff")))
+ {
+ if (paramArrayOfString.length < 4)
+ {
+ System.out.println(str1);
+ try { System.in.read(); } catch (Exception localException2) {
+ }return;
+ }
+
+ Map localMap2 = new Map(new File(paramArrayOfString[1]));
+ localObject = new Map(new File(paramArrayOfString[2]));
+
+ int j = Math.max(localMap2.minx, ((Map)localObject).minx);
+ m = Math.min(localMap2.maxx, ((Map)localObject).maxx);
+ i1 = Math.max(localMap2.miny, ((Map)localObject).miny);
+ i2 = Math.min(localMap2.maxy, ((Map)localObject).maxy);
+ i3 = Math.max(localMap2.minz, ((Map)localObject).minz);
+ int i4 = Math.min(localMap2.maxz, ((Map)localObject).maxz);
+ Systemoutprintln("Comparing: x(" + j + "-" + m + ") y(" + i1 + "-" + i2 + ") z(" + i3 + "-" + i4 + ")");
+ try
+ {
+ FileWriter localFileWriter2 = new FileWriter(paramArrayOfString[3]);
+ i5 = 0;
+ for (int i6 = i3; i6 <= i4; i6++)
+ {
+ Systemoutprintln("Z-level " + i6);
+ for (int i7 = i1; i7 <= i2; i7++)
+ for (int i8 = j; i8 <= m; i8++)
+ if (!localMap2.contentAt(i8, i7, i6).equals(((Map)localObject).contentAt(i8, i7, i6)))
+ {
+ localFileWriter2.write("(" + i8 + "," + (1 + ((Map)localObject).maxy - i7) + "," + i6 + ")=" + ((Map)localObject).contentAt(i8, i7, i6) + "\n");
+ i5++;
+ }
+ }
+ localFileWriter2.flush();
+ localFileWriter2.close();
+ if (i5 == 0)
+ Systemoutprintln("Files do match");
+ else
+ Systemoutprintln("Writed out " + i5 + " differences");
+ }
+ catch (Exception localException13)
+ {
+ localException13.printStackTrace();
+ }
+
+ Systemoutprintln("Done");
+ }
+ else
+ {
+ String str7;
+ String str8;
+ if ((paramArrayOfString.length > 0) && (paramArrayOfString[0].equalsIgnoreCase("-patch")))
+ {
+ if (paramArrayOfString.length < 4)
+ {
+ System.out.println(str2);
+ try { System.in.read(); } catch (Exception localException3) {
+ }return;
+ }
+
+ Map localMap3 = new Map(new File(paramArrayOfString[1]));
+ try
+ {
+ localObject = new BufferedReader(new InputStreamReader(new FileInputStream(paramArrayOfString[2])));
+
+ while ((str7 = ((BufferedReader)localObject).readLine()) != null)
+ {
+ str7 = str7.trim();
+ if (str7.length() != 0)
+ {
+ m = str7.indexOf(",", 1);
+ i1 = Integer.parseInt(str7.substring(1, m));
+ str7 = str7.substring(m);
+ m = str7.indexOf(",", 1);
+ i2 = Integer.parseInt(str7.substring(1, m));
+ str7 = str7.substring(m);
+ m = str7.indexOf(")", 1);
+ i3 = Integer.parseInt(str7.substring(1, m));
+ str8 = str7.substring(str7.indexOf("=") + 1);
+ localMap3.setAt(i1, 1 + localMap3.maxy - i2, i3, str8);
+ }
+ }
+ localMap3.save(new File(paramArrayOfString[3]));
+ }
+ catch (Exception localException8)
+ {
+ localException8.printStackTrace();
+ }
+
+ Systemoutprintln("Done");
+ }
+ else if ((paramArrayOfString.length > 0) && (paramArrayOfString[0].equalsIgnoreCase("-pack")))
+ {
+ if (paramArrayOfString.length < 3)
+ {
+ System.out.println(str3);
+ try { System.in.read(); } catch (Exception localException4) {
+ }return;
+ }
+
+ Map localMap4 = new Map();
+ try {
+ BufferedReader localBufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(paramArrayOfString[1])));
+ Systemoutprintln("Loading");
+
+ while ((str7 = localBufferedReader.readLine()) != null)
+ {
+ str7 = str7.trim();
+ if (str7.length() != 0)
+ {
+ m = str7.indexOf(",", 1);
+ i1 = Integer.parseInt(str7.substring(1, m));
+ str7 = str7.substring(m);
+ m = str7.indexOf(",", 1);
+ i2 = Integer.parseInt(str7.substring(1, m));
+ str7 = str7.substring(m);
+ m = str7.indexOf(")", 1);
+ i3 = Integer.parseInt(str7.substring(1, m));
+ str8 = str7.substring(str7.indexOf("=") + 1);
+ localMap4.setAt(i1, i2, i3, str8);
+ }
+ }
+ Systemoutprintln("Flipping");
+ localMap4.mirrorY();
+ Systemoutprintln("Saving, bounds: x{" + localMap4.minx + " - " + localMap4.maxx + "}, y{" + localMap4.miny + " - " + localMap4.maxy + "}, z{" + localMap4.minz + " - " + localMap4.maxz + "}");
+ localMap4.save(new File(paramArrayOfString[2]));
+ Systemoutprintln("Done");
+ }
+ catch (Exception localException9)
+ {
+ localException9.printStackTrace();
+ }
+ }
+ else if ((paramArrayOfString.length > 0) && (paramArrayOfString[0].equalsIgnoreCase("-unpack")))
+ {
+ if (paramArrayOfString.length < 3)
+ {
+ System.out.println(str4);
+ try { System.in.read(); } catch (Exception localException5) {
+ }return;
+ }
+
+ Systemoutprintln("Loading");
+ Map localMap5 = new Map(new File(paramArrayOfString[1]));
+ try {
+ FileWriter localFileWriter1 = new FileWriter(paramArrayOfString[2]);
+ Systemoutprintln("Saving");
+ for (int k = localMap5.minz; k <= localMap5.maxz; k++)
+ {
+ Systemoutprintln("Z-level " + k);
+ for (m = localMap5.miny; m <= localMap5.maxy; m++)
+ for (i1 = localMap5.minx; i1 <= localMap5.maxx; i1++)
+ localFileWriter1.write("(" + i1 + "," + (1 + localMap5.maxy - m) + "," + k + ")=" + localMap5.contentAt(i1, m, k) + "\n");
+ localFileWriter1.write("\n");
+ }
+ localFileWriter1.flush();
+ localFileWriter1.close();
+
+ Systemoutprintln("Done");
+ }
+ catch (Exception localException10)
+ {
+ localException10.printStackTrace();
+ }
+ }
+ else if ((paramArrayOfString.length > 0) && (paramArrayOfString[0].equalsIgnoreCase("-clean")))
+ {
+ if (paramArrayOfString.length < 4)
+ {
+ System.out.println(str5);
+ try { System.in.read(); } catch (Exception localException6) {
+ }return;
+ }
+
+ Map localMap6 = new Map(new File(paramArrayOfString[1]), true);
+ Map localMap7 = new Map(new File(paramArrayOfString[2]));
+ try
+ {
+ localMap7.saveReferencing(new File(paramArrayOfString[3]), localMap6);
+ Systemoutprintln("Done");
+ }
+ catch (Exception localException11)
+ {
+ localException11.printStackTrace();
+ }
+ }
+ else
+ {
+ System.out.println(str1);
+ System.out.println(str2);
+ System.out.println(str3);
+ System.out.println(str4);
+ System.out.println(str5);
+ System.out.println(str6);
+ try {
+ System.in.read(); } catch (Exception localException7) { }
+ }
+ }
+ }
+ }
+
+ public static void Systemoutprintln(String paramString) { if (!silent)
+ System.out.println(paramString); }
+
+ public static void Systemoutprint(String paramString)
+ {
+ if (!silent)
+ System.out.print(paramString);
+ }
+}
diff --git a/tools/mapmerge/SavingThread.java b/tools/mapmerge/SavingThread.java
new file mode 100644
index 00000000000..24a3d7b04df
--- /dev/null
+++ b/tools/mapmerge/SavingThread.java
@@ -0,0 +1,37 @@
+class SavingThread extends Thread
+{
+ int z;
+ Map mymap;
+ boolean done;
+ int progress;
+ StringBuilder result;
+
+ public SavingThread(int paramInt1, Map paramMap, int paramInt2)
+ {
+ this.z = paramInt1;
+ this.mymap = paramMap;
+ this.progress = 0;
+ this.done = false;
+ this.result = new StringBuilder(paramInt2);
+ }
+
+ public void run()
+ {
+ this.result.append("(" + this.mymap.minx + "," + this.mymap.miny + "," + this.z + ") = {\"\r\n");
+
+ int i = (this.mymap.maxx - this.mymap.minx) * (this.mymap.maxy - this.mymap.miny) / 100;
+ int j = 0;
+ for (int k = this.mymap.miny; k <= this.mymap.maxy; k++)
+ {
+ for (int m = this.mymap.minx; m <= this.mymap.maxx; m++)
+ {
+ this.result.append(this.mymap.getIdFor(this.mymap.contentAt(m, k, this.z)));
+ j++; if (j >= i) { j = 0; this.progress += 1; }
+ }
+ this.result.append("\r\n");
+ }
+ this.result.append("\"}\r\n");
+ this.result.append("\r\n");
+ this.done = true;
+ }
+}