"
@@ -372,7 +372,7 @@
proc/se_menu()
if(!viable)
return "No viable occupant detected."
- var/dat = topic_link(src,"mode=0","<< Main Menu") + "
Structural Enzymes: [getblockstring(ui=0)]
"
dat += "Selected Block: " + block_plus_minus("seblock",se_block,1,MAX_SEBLOCK) + "
"
@@ -382,7 +382,7 @@
return dat
proc/emitter_menu()
- var/dat = topic_link(src,"mode=0","<< Main Menu") + "
"
+ to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "
")
dat += "
Radiation Emitter Settings
"
if (viable)
dat += topic_link(src,"pulse","Pulse Radiation")
@@ -741,7 +741,7 @@
human_occupant.reagents.add_reagent("inaprovaline", REJUVENATORS_INJECT)
else
human_occupant.reagents.add_reagent("inaprovaline", round(REJUVENATORS_MAX - human_occupant.reagents.get_reagent_amount("inaprovaline")))
- //usr << text("Occupant now has [] units of rejuvenation in his/her bloodstream.", human_occupant.reagents.get_reagent_amount("inaprovaline"))
+// to_chat(usr, text("Occupant now has [] units of rejuvenation in his/her bloodstream.", human_occupant.reagents.get_reagent_amount("inaprovaline")))
////////////////////////////////////////////////////////
if (href_list["strucmenuplus"])
diff --git a/code/modules/computer3/computers/security.dm b/code/modules/computer3/computers/security.dm
index 6cc18293a49..c7eb0a8881b 100644
--- a/code/modules/computer3/computers/security.dm
+++ b/code/modules/computer3/computers/security.dm
@@ -58,7 +58,7 @@
return
if (computer.z > 6)
- usr << "\red
Unable to establish a connection: \black You're too far away from the station!"
+ to_chat(usr, "\red
Unable to establish a connection: \black You're too far away from the station!")
return
var/dat
@@ -305,7 +305,7 @@ What a mess.*/
return
Perp = new/list()
t1 = lowertext(t1)
- var/list/components = text2list(t1, " ")
+ var/list/components = splittext(t1, " ")
if(components.len > 5)
return //Lets not let them search too greedily.
for(var/datum/data/record/R in data_core.general)
diff --git a/code/modules/computer3/computers/shuttle.dm b/code/modules/computer3/computers/shuttle.dm
index 37c5291bada..236de564868 100644
--- a/code/modules/computer3/computers/shuttle.dm
+++ b/code/modules/computer3/computers/shuttle.dm
@@ -19,16 +19,16 @@
var/obj/item/device/pda/pda = W
W = pda.id
if (!W:access) //no access
- user << "The access level of [W:registered_name]\'s card is not high enough. "
+ to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return
var/list/cardaccess = W:access
if(!istype(cardaccess, /list) || !cardaccess.len) //no access
- user << "The access level of [W:registered_name]\'s card is not high enough. "
+ to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return
if(!(access_heads in W:access)) //doesn't have this access
- user << "The access level of [W:registered_name]\'s card is not high enough. "
+ to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
return 0
var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort")
@@ -41,11 +41,11 @@
if (src.auth_need - src.authorized.len > 0)
message_admins("[key_name_admin(user)] has authorized early shuttle launch")
log_game("[user.ckey] has authorized early shuttle launch")
- world << text("\blue
Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len)
+ to_chat(world, text("\blue
Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len))
else
message_admins("[key_name_admin(user)] has launched the shuttle")
log_game("[user.ckey] has launched the shuttle early")
- world << "\blue
Alert: Shuttle launch time shortened to 10 seconds!"
+ to_chat(world, "\blue
Alert: Shuttle launch time shortened to 10 seconds!")
emergency_shuttle.online = 1
emergency_shuttle.settimeleft(10)
//src.authorized = null
@@ -54,10 +54,10 @@
if("Repeal")
src.authorized -= W:registered_name
- world << text("\blue
Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len)
+ to_chat(world, text("\blue
Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len))
if("Abort")
- world << "\blue
All authorizations to shorting time for shuttle launch have been revoked!"
+ to_chat(world, "\blue
All authorizations to shorting time for shuttle launch have been revoked!")
src.authorized.len = 0
src.authorized = list( )
return
@@ -69,7 +69,7 @@
if(!emagged && emergency_shuttle.location == 1)
switch(choice)
if("Launch")
- world << "\blue
Alert: Shuttle launch time shortened to 10 seconds!"
+ to_chat(world, "\blue
Alert: Shuttle launch time shortened to 10 seconds!")
emergency_shuttle.settimeleft( 10 )
emagged = 1
if("Cancel")
diff --git a/code/modules/computer3/computers/specops_shuttle.dm b/code/modules/computer3/computers/specops_shuttle.dm
index 409246b9c8a..8281a30479f 100644
--- a/code/modules/computer3/computers/specops_shuttle.dm
+++ b/code/modules/computer3/computers/specops_shuttle.dm
@@ -58,7 +58,7 @@ var/specops_shuttle_timeleft = 0
if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
if (!specops_can_move())
- usr << "\red The Special Operations shuttle is unable to leave."
+ to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
return
//Begin Marauder launchpad.
@@ -153,7 +153,7 @@ var/specops_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
- M << "\red You have arrived to [station_name]. Commence operation!"
+ to_chat(M, "\red You have arrived to [station_name]. Commence operation!")
/proc/specops_can_move()
if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return 0
@@ -170,17 +170,17 @@ var/specops_shuttle_timeleft = 0
/obj/machinery/computer3/specops_shuttle/attackby(I as obj, user as mob, params)
if(istype(I,/obj/item/card/emag))
- user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals."
+ to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.")
else
return attack_hand(user)
/obj/machinery/computer3/specops_shuttle/attack_hand(var/mob/user as mob)
if(!allowed(user))
- user << "\red Access Denied."
+ to_chat(user, "\red Access Denied.")
return
if (sent_strike_team == 0)
- usr << "\red The strike team has not yet deployed."
+ to_chat(usr, "\red The strike team has not yet deployed.")
return
if(..())
@@ -214,17 +214,17 @@ var/specops_shuttle_timeleft = 0
if (href_list["sendtodock"])
if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
- usr << "\blue Central Command will not allow the Special Operations shuttle to return."
+ to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return.")
return
else if (href_list["sendtostation"])
if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return
if (!specops_can_move())
- usr << "\red The Special Operations shuttle is unable to leave."
+ to_chat(usr, "\red The Special Operations shuttle is unable to leave.")
return
- usr << "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds."
+ to_chat(usr, "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.")
temp += "Shuttle departing.
OK"
updateUsrDialog()
diff --git a/code/modules/computer3/computers/syndicate_shuttle.dm b/code/modules/computer3/computers/syndicate_shuttle.dm
index 1b4d35456c7..5585f4fff0a 100644
--- a/code/modules/computer3/computers/syndicate_shuttle.dm
+++ b/code/modules/computer3/computers/syndicate_shuttle.dm
@@ -47,7 +47,7 @@
/obj/machinery/computer3/syndicate_station/attack_hand(mob/user as mob)
if(!allowed(user))
- user << "\red Access Denied"
+ to_chat(user, "\red Access Denied")
return
user.set_machine(src)
diff --git a/code/modules/computer3/computers/syndicate_specops_shuttle.dm b/code/modules/computer3/computers/syndicate_specops_shuttle.dm
index 2e9b4bc1842..f490cd3c822 100644
--- a/code/modules/computer3/computers/syndicate_specops_shuttle.dm
+++ b/code/modules/computer3/computers/syndicate_specops_shuttle.dm
@@ -58,7 +58,7 @@ var/syndicate_elite_shuttle_timeleft = 0
if (syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
if (!syndicate_elite_can_move())
- usr << "\red The Syndicate Elite shuttle is unable to leave."
+ to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
return
sleep(600)
@@ -166,7 +166,7 @@ var/syndicate_elite_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
- M << "\red You have arrived to [station_name]. Commence operation!"
+ to_chat(M, "\red You have arrived to [station_name]. Commence operation!")
/proc/syndicate_elite_can_move()
if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0
@@ -183,17 +183,17 @@ var/syndicate_elite_shuttle_timeleft = 0
/obj/machinery/computer3/syndicate_elite_shuttle/attackby(I as obj, user as mob, params)
if(istype(I,/obj/item/card/emag))
- user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals."
+ to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.")
else
return attack_hand(user)
/obj/machinery/computer3/syndicate_elite_shuttle/attack_hand(var/mob/user as mob)
if(!allowed(user))
- user << "\red Access Denied."
+ to_chat(user, "\red Access Denied.")
return
// if (sent_syndicate_strike_team == 0)
-// usr << "\red The strike team has not yet deployed."
+// to_chat(usr, "\red The strike team has not yet deployed.")
// return
if(..())
@@ -226,17 +226,17 @@ var/syndicate_elite_shuttle_timeleft = 0
if (href_list["sendtodock"])
if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
- usr << "\blue The Syndicate will not allow the Elite Squad shuttle to return."
+ to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.")
return
else if (href_list["sendtostation"])
if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
if (!specops_can_move())
- usr << "\red The Syndicate Elite shuttle is unable to leave."
+ to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.")
return
- usr << "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds."
+ to_chat(usr, "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.")
temp = "Shuttle departing.
OK"
updateUsrDialog()
diff --git a/code/modules/computer3/laptop.dm b/code/modules/computer3/laptop.dm
index 037b505d779..dd4f73914b6 100644
--- a/code/modules/computer3/laptop.dm
+++ b/code/modules/computer3/laptop.dm
@@ -35,22 +35,22 @@
set src in view(1)
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
- usr << "\red You can't do that."
+ to_chat(usr, "\red You can't do that.")
return
if(!Adjacent(usr))
- usr << "You can't reach it."
+ to_chat(usr, "You can't reach it.")
return
if(!istype(loc,/turf))
- usr << "[src] is too bulky! You'll have to set it down."
+ to_chat(usr, "[src] is too bulky! You'll have to set it down.")
return
if(!stored_computer)
if(contents.len)
for(var/obj/O in contents)
O.forceMove(loc)
- usr << "\The [src] crumbles to pieces."
+ to_chat(usr, "\The [src] crumbles to pieces.")
spawn(5)
qdel(src)
return
@@ -61,13 +61,13 @@
stored_computer.stat &= ~MAINT
stored_computer.update_icon()
loc = null
- usr << "You open \the [src]."
+ to_chat(usr, "You open \the [src].")
spawn(5)
stored_computer.manipulating = 0
qdel(src)
else
- usr << "\red You are already opening the computer!"
+ to_chat(usr, "\red You are already opening the computer!")
AltClick()
@@ -95,7 +95,7 @@
var/obj/item/part/computer/cardslot/C = locate() in src.contents
if(!C)
- usr << "There is no card port on the laptop."
+ to_chat(usr, "There is no card port on the laptop.")
return
var/obj/item/weapon/card/id/card
@@ -104,10 +104,10 @@
else if(C.writer)
card = C.writer
else
- usr << "There is nothing to remove from the laptop card port."
+ to_chat(usr, "There is nothing to remove from the laptop card port.")
return
- usr << "You remove [card] from the laptop."
+ to_chat(usr, "You remove [card] from the laptop.")
C.remove(card)
@@ -135,11 +135,11 @@
set src in view(1)
if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living))
- usr << "\red You can't do that."
+ to_chat(usr, "\red You can't do that.")
return
if(!Adjacent(usr))
- usr << "You can't reach it."
+ to_chat(usr, "You can't reach it.")
return
if(istype(loc,/obj/item/device/laptop))
@@ -150,7 +150,7 @@
return
if(stat&BROKEN)
- usr << "\The [src] is broken! You can't quite get it closed."
+ to_chat(usr, "\The [src] is broken! You can't quite get it closed.")
return
if(!portable)
@@ -161,7 +161,7 @@
portable.forceMove(loc)
forceMove(portable)
stat |= MAINT
- usr << "You close \the [src]."
+ to_chat(usr, "You close \the [src].")
auto_use_power()
if(stat&MAINT)
diff --git a/code/modules/computer3/lapvend.dm b/code/modules/computer3/lapvend.dm
index 7e4a0f1769e..8383981046d 100644
--- a/code/modules/computer3/lapvend.dm
+++ b/code/modules/computer3/lapvend.dm
@@ -56,7 +56,7 @@
usr.drop_item()
L.loc = src
vendmode = 3
- usr << "
You slot your [L.name] into \The [src.name]"
+ to_chat(usr, "
You slot your [L.name] into \The [src.name]")
else
..()
@@ -262,11 +262,11 @@
network = 0
power = 0
else
- usr << "\icon[src]
You don't have that much money!"
+ to_chat(usr, "\icon[src]
You don't have that much money!")
else
- usr << "\icon[src]
Unable to access account. Check security settings and try again."
+ to_chat(usr, "\icon[src]
Unable to access account. Check security settings and try again.")
else
- usr << "\icon[src]
Unable to access vendor account. Please record the machine ID and call CentComm Support."
+ to_chat(usr, "\icon[src]
Unable to access vendor account. Please record the machine ID and call CentComm Support.")
/obj/machinery/lapvend/proc/total()
var/total = 0
@@ -405,6 +405,6 @@
power = 0
else
- usr << "\icon[src]
Unable to access account. Check security settings and try again."
+ to_chat(usr, "\icon[src]
Unable to access account. Check security settings and try again.")
else
- usr << "\icon[src]
Unable to access vendor account. Please record the machine ID and call CentComm Support."
\ No newline at end of file
+ to_chat(usr, "\icon[src]
Unable to access vendor account. Please record the machine ID and call CentComm Support.")
diff --git a/code/modules/computer3/storage.dm b/code/modules/computer3/storage.dm
index 3fe8279fad7..9ff8cab497b 100644
--- a/code/modules/computer3/storage.dm
+++ b/code/modules/computer3/storage.dm
@@ -116,16 +116,16 @@
attackby(obj/O as obj, mob/user as mob, params)
if(inserted && istype(O,/obj/item/weapon/pen))
- usr << "You use [O] to carefully pry [inserted] out of [src]."
+ to_chat(usr, "You use [O] to carefully pry [inserted] out of [src].")
eject_disk(forced = 1)
return
if(istype(O,/obj/item/weapon/disk/file))
if(inserted)
- usr << "There's already a disk in [src]!"
+ to_chat(usr, "There's already a disk in [src]!")
return
- usr << "You insert [O] into [src]."
+ to_chat(usr, "You insert [O] into [src].")
usr.drop_item()
O.loc = src
inserted = O
diff --git a/code/modules/computer3/upload/programs.dm b/code/modules/computer3/upload/programs.dm
index bcf45159b69..34197f3bf69 100644
--- a/code/modules/computer3/upload/programs.dm
+++ b/code/modules/computer3/upload/programs.dm
@@ -8,6 +8,6 @@
if(!interactable() || istype(usr,/mob/living/silicon))
return 0
if(!computer.net)
- usr << "An indecipherable set of code flicks across the screen. Nothing else happens."
+ to_chat(usr, "An indecipherable set of code flicks across the screen. Nothing else happens.")
return
var/list/results = computer.net.get_machines
\ No newline at end of file
diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm
index 095dfcbe360..8a9d5803529 100644
--- a/code/modules/crafting/guncrafting.dm
+++ b/code/modules/crafting/guncrafting.dm
@@ -20,7 +20,7 @@
/obj/item/weaponcrafting/receiver/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/pipe))
- user << "You attach the shotgun barrel to the receiver. The pins seem loose."
+ to_chat(user, "You attach the shotgun barrel to the receiver. The pins seem loose.")
var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction
user.unEquip(src)
user.put_in_hands(I)
@@ -42,7 +42,7 @@
var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2
user.unEquip(src)
user.put_in_hands(C)
- user << "
You screw the pins into place, securing the pipe to the receiver."
+ to_chat(user, "
You screw the pins into place, securing the pipe to the receiver.")
qdel(src)
/obj/item/weaponcrafting/ishotgunconstruction2
@@ -53,7 +53,7 @@
/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weaponcrafting/stock))
- user << "You attach the stock to the receiver-barrel assembly."
+ to_chat(user, "You attach the stock to the receiver-barrel assembly.")
var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3
user.unEquip(src)
user.put_in_hands(I)
@@ -75,9 +75,9 @@
var/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/W = new /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
user.unEquip(src)
user.put_in_hands(W)
- user << "
You tie the wrapping paper around the stock and the barrel to secure it."
+ to_chat(user, "
You tie the wrapping paper around the stock and the barrel to secure it.")
qdel(src)
else
- user << "
You need at least five feet of wrapping paper to secure the stock."
+ to_chat(user, "
You need at least five feet of wrapping paper to secure the stock.")
return
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index fa0a59010d4..c578c452bbc 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -36,7 +36,7 @@
/datum/table_recipe/ed209
name = "ED209"
- result = /obj/machinery/bot/ed209
+ result = /mob/living/simple_animal/bot/ed209
reqs = list(/obj/item/robot_parts/robot_suit = 1,
/obj/item/clothing/head/helmet = 1,
/obj/item/clothing/suit/armor/vest = 1,
@@ -53,7 +53,7 @@
/datum/table_recipe/secbot
name = "Secbot"
- result = /obj/machinery/bot/secbot
+ result = /mob/living/simple_animal/bot/secbot
reqs = list(/obj/item/device/assembly/signaler = 1,
/obj/item/clothing/head/helmet = 1,
/obj/item/weapon/melee/baton = 1,
@@ -64,7 +64,7 @@
/datum/table_recipe/cleanbot
name = "Cleanbot"
- result = /obj/machinery/bot/cleanbot
+ result = /mob/living/simple_animal/bot/cleanbot
reqs = list(/obj/item/weapon/reagent_containers/glass/bucket = 1,
/obj/item/device/assembly/prox_sensor = 1,
/obj/item/robot_parts/r_arm = 1)
@@ -72,7 +72,7 @@
/datum/table_recipe/floorbot
name = "Floorbot"
- result = /obj/machinery/bot/floorbot
+ result = /mob/living/simple_animal/bot/floorbot
reqs = list(/obj/item/weapon/storage/toolbox/mechanical = 1,
/obj/item/stack/tile/plasteel = 1,
/obj/item/device/assembly/prox_sensor = 1,
@@ -81,7 +81,7 @@
/datum/table_recipe/medbot
name = "Medbot"
- result = /obj/machinery/bot/medbot
+ result = /mob/living/simple_animal/bot/medbot
reqs = list(/obj/item/device/healthanalyzer = 1,
/obj/item/weapon/storage/firstaid = 1,
/obj/item/device/assembly/prox_sensor = 1,
@@ -192,4 +192,12 @@
result = /obj/item/weapon/soap/ducttape
time = 100
reqs = list(/obj/item/stack/tape_roll = 1,
- /datum/reagent/liquidgibs = 10)
\ No newline at end of file
+ /datum/reagent/liquidgibs = 10)
+
+/datum/table_recipe/garrote
+ name = "Makeshift Garrote"
+ result = /obj/item/weapon/twohanded/garrote/improvised
+ time = 15
+ reqs = list(/obj/item/stack/sheet/wood = 1,
+ /obj/item/stack/cable_coil = 5)
+ tools = list(/obj/item/weapon/kitchen/knife) // Gotta carve the wood into handles
\ No newline at end of file
diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm
index b43c4cb89ce..19ea37c3866 100644
--- a/code/modules/crafting/table.dm
+++ b/code/modules/crafting/table.dm
@@ -203,15 +203,15 @@
return
if(href_list["make"])
if(!check_table_space())
- usr << "
The table is too crowded."
+ to_chat(usr, "
The table is too crowded.")
return
var/datum/table_recipe/TR = locate(href_list["make"])
busy = 1
interact(usr)
if(construct_item(usr, TR))
- usr << "
[TR.name] constructed."
+ to_chat(usr, "
[TR.name] constructed.")
else
- usr << "
Construction failed."
+ to_chat(usr, "
Construction failed.")
busy = 0
interact(usr)
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 38543abc5a8..c89d08b8d1b 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -28,29 +28,29 @@
/obj/item/device/fluff/tattoo_gun/attack(mob/living/carbon/M as mob, mob/user as mob)
if(user.a_intent == "harm")
user.visible_message("
[user] stabs [M] with the [src]!", "
You stab [M] with the [src]!")
- M << "
[user] stabs you with the [src]!
You feel a tiny prick!"
+ to_chat(M, "
[user] stabs you with the [src]!
You feel a tiny prick!")
return
if(used)
- user << "
The [src] is out of ink."
+ to_chat(user, "
The [src] is out of ink.")
return
if(!istype(M, /mob/living/carbon/human))
- user << "
You don't think tattooing [M] is the best idea."
+ to_chat(user, "
You don't think tattooing [M] is the best idea.")
return
var/mob/living/carbon/human/target = M
if(istype(target.species, /datum/species/machine))
- user << "
[target] has no skin, how do you expect to tattoo them?"
+ to_chat(user, "
[target] has no skin, how do you expect to tattoo them?")
return
if(target.m_style != "None")
- user << "
[target] already has body markings, any more would look silly!"
+ to_chat(user, "
[target] already has body markings, any more would look silly!")
return
if(target == user)
- user << "
You use the [src] to apply a [tattoo_name] to yourself!"
+ to_chat(user, "
You use the [src] to apply a [tattoo_name] to yourself!")
else
user.visible_message("
[user] begins to apply a [tattoo_name] [target] with the [src].", "
You begin to tattoo [target] with the [src]!")
@@ -127,7 +127,7 @@
C.regenerate_icons()
C.name = "Detective Sax"
C.visible_message("
[C] suddenly winks into existence at [user]'s feet!")
- user << "
[src] crumbles to dust in your hands!"
+ to_chat(user, "
[src] crumbles to dust in your hands!")
qdel(src)
/obj/item/weapon/storage/toolbox/fluff/lunchbox //godoforeos: Jason Conrad
@@ -149,6 +149,13 @@
new /obj/item/weapon/reagent_containers/food/drinks/cans/cola(src)
+/obj/item/device/guitar/jello_guitar //Antcolon3: Dan Jello
+ name = "Dan Jello's Pink Guitar"
+ desc = "Dan Jello's special pink guitar."
+ icon = 'icons/obj/custom_items.dmi'
+ icon_state = "jello_guitar"
+ item_state = "jello_guitar"
+
//////////////////////////////////
//////////// Clothing ////////////
//////////////////////////////////
@@ -220,15 +227,15 @@
switch(icon_state)
if("Kluysfluff1")
src.icon_state = "Kluysfluff2"
- usr << "The fibre unfolds into a jacket."
+ to_chat(usr, "The fibre unfolds into a jacket.")
if("Kluysfluff2")
src.icon_state = "Kluysfluff3"
- usr << "The fibre unfolds into a coat."
+ to_chat(usr, "The fibre unfolds into a coat.")
if("Kluysfluff3")
src.icon_state = "Kluysfluff1"
- usr << "The fibre gets sucked back into its holder."
+ to_chat(usr, "The fibre gets sucked back into its holder.")
else
- usr << "You attempt to hit the button but can't."
+ to_chat(usr, "You attempt to hit the button but can't.")
return
usr.update_inv_wear_suit()
@@ -277,10 +284,10 @@
if(src.icon_state == "jane_sid_suit_down")
src.item_color = "jane_sid_suit"
- usr << "You zip up \the [src]."
+ to_chat(usr, "You zip up \the [src].")
else
src.item_color = "jane_sid_suit_down"
- usr << "You unzip and roll down \the [src]."
+ to_chat(usr, "You unzip and roll down \the [src].")
src.icon_state = "[item_color]"
src.item_state = "[item_color]"
@@ -363,12 +370,12 @@
if(adjusted)
icon_state = initial(icon_state)
item_state = initial(item_state)
- usr << "You untransform \the [src]."
+ to_chat(usr, "You untransform \the [src].")
adjusted = 0
else
icon_state += "_open"
item_state += "_open"
- usr << "You transform \the [src]."
+ to_chat(usr, "You transform \the [src].")
adjusted = 1
usr.update_inv_head()
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index 18735c73cc9..d0b350b9b1e 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -12,7 +12,7 @@
var/jobmask = query.item[3]
var/ok = 0
if(jobmask != "*")
- var/list/allowed_jobs = text2list(jobmask,",")
+ var/list/allowed_jobs = splittext(jobmask,",")
for(var/i = 1, i <= allowed_jobs.len, i++)
if(istext(allowed_jobs[i]))
allowed_jobs[i] = trim(allowed_jobs[i])
@@ -45,13 +45,13 @@
if(S.contents.len < S.storage_slots)
Item.loc = M.back
ok = 1
- M << "
Your [Item.name] has been added to your [M.back.name]."
+ to_chat(M, "
Your [Item.name] has been added to your [M.back.name].")
if(ok == 0)
for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
if (S.contents.len < S.storage_slots)
Item.loc = S
ok = 1
- M << "
Your [Item.name] has been added to your [S.name]."
+ to_chat(M, "
Your [Item.name] has been added to your [S.name].")
break
if(description)
Item.desc = description
@@ -66,13 +66,13 @@
// This is hacky, but since it's difficult as fuck to make a proper parser in BYOND without killing the server, here it is. - N3X
/proc/HackProperties(var/mob/living/carbon/human/M,var/obj/item/I,var/script)
- var/list/statements = text2list(script,";")
+ var/list/statements = splittext(script,";")
if(statements.len == 0)
return
for(var/statement in statements)
- var/list/assignmentChunks = text2list(statement,"=")
+ var/list/assignmentChunks = splittext(statement,"=")
var/varname = assignmentChunks[1]
- var/list/typeChunks=text2list(script,":")
+ var/list/typeChunks=splittext(script,":")
var/desiredType=typeChunks[1]
switch(desiredType)
if("string")
diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm
index e2cf4ba6931..4654e0ab665 100644
--- a/code/modules/detective_work/evidence.dm
+++ b/code/modules/detective_work/evidence.dm
@@ -22,15 +22,15 @@
return
if(istype(I, /obj/item/weapon/evidencebag))
- user << "
You find putting an evidence bag in another evidence bag to be slightly absurd."
+ to_chat(user, "
You find putting an evidence bag in another evidence bag to be slightly absurd.")
return 1 //now this is podracing
if(I.w_class > 3)
- user << "
[I] won't fit in [src]."
+ to_chat(user, "
[I] won't fit in [src].")
return
if(contents.len)
- user << "
[src] already has something inside it."
+ to_chat(user, "
[src] already has something inside it.")
return
if(!isturf(I.loc)) //If it isn't on the floor. Do some checks to see if it's in our hands or a box. Otherwise give up.
@@ -77,7 +77,7 @@
desc = "An empty evidence bag."
else
- user << "[src] is empty."
+ to_chat(user, "[src] is empty.")
icon_state = "evidenceobj"
return
diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm
index 71d0431a420..59466282384 100644
--- a/code/modules/detective_work/scanner.dm
+++ b/code/modules/detective_work/scanner.dm
@@ -17,7 +17,7 @@
/obj/item/device/detective_scanner/attack_self(var/mob/user)
if(log.len && !scanning)
scanning = 1
- user << "
Printing report, please wait..."
+ to_chat(user, "
Printing report, please wait...")
playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1)
spawn(100)
@@ -25,20 +25,20 @@
var/obj/item/weapon/paper/P = new(get_turf(src))
P.name = "paper- 'Scanner Report'"
P.info = "
Scanner Report
"
- P.info += list2text(log, "
")
+ P.info += jointext(log, "
")
P.info += "
Notes:"
P.info_links = P.info
if(ismob(loc))
var/mob/M = loc
M.put_in_hands(P)
- M << "
Report printed. Log cleared."
+ to_chat(M, "Report printed. Log cleared.")
// Clear the logs
log = list()
scanning = 0
else
- user << "The scanner has no logs or is in use."
+ to_chat(user, "The scanner has no logs or is in use.")
/obj/item/device/detective_scanner/attack(mob/living/M as mob, mob/user as mob)
return
@@ -59,7 +59,7 @@
scanning = 1
user.visible_message("\The [user] points the [src.name] at \the [A] and performs a forensic scan.")
- user << "You scan \the [A]. The scanner is now analysing the results..."
+ to_chat(user, "You scan \the [A]. The scanner is now analysing the results...")
// GATHER INFORMATION
@@ -152,10 +152,10 @@
if(!found_something)
add_log("# No forensic traces found #", 0) // Don't display this to the holder user
if(holder)
- holder << "Unable to locate any fingerprints, materials, fibers, or blood on \the [target_name]!"
+ to_chat(holder, "Unable to locate any fingerprints, materials, fibers, or blood on \the [target_name]!")
else
if(holder)
- holder << "You finish scanning \the [target_name]."
+ to_chat(holder, "You finish scanning \the [target_name].")
add_log("---------------------------------------------------------", 0)
scanning = 0
@@ -165,7 +165,7 @@
if(scanning)
if(broadcast && ismob(loc))
var/mob/M = loc
- M << msg
+ to_chat(M, msg)
log += " [msg]"
else
CRASH("[src] \ref[src] is adding a log when it was never put in scanning mode!")
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 2f359cd2a39..7448d3da352 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -112,7 +112,7 @@ log transactions
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
- user << "You insert [C] into [src]."
+ to_chat(user, "You insert [C] into [src].")
src.attack_hand(user)
qdel(I)
else
@@ -120,7 +120,7 @@ log transactions
/obj/machinery/atm/attack_hand(mob/user as mob)
if(istype(user, /mob/living/silicon))
- user << "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005."
+ to_chat(user, "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005.")
return
if(get_dist(src,user) <= 1)
//check to see if the user has low security enabled
@@ -225,7 +225,7 @@ log transactions
var/target_account_number = text2num(href_list["target_acc_number"])
var/transfer_purpose = href_list["purpose"]
if(linked_db.charge_to_account(target_account_number, authenticated_account.owner_name, transfer_purpose, machine_id, transfer_amount))
- usr << "\icon[src]Funds transfer successful."
+ to_chat(usr, "\icon[src]Funds transfer successful.")
authenticated_account.money -= transfer_amount
//create an entry in the account transaction log
@@ -238,10 +238,10 @@ log transactions
T.amount = "([transfer_amount])"
authenticated_account.transaction_log.Add(T)
else
- usr << "\icon[src]Funds transfer failed."
+ to_chat(usr, "\icon[src]Funds transfer failed.")
else
- usr << "\icon[src]You don't have enough funds to do that!"
+ to_chat(usr, "\icon[src]You don't have enough funds to do that!")
if("view_screen")
view_screen = text2num(href_list["view_screen"])
if("change_security_level")
@@ -275,11 +275,11 @@ log transactions
T.time = worldtime2text()
failed_account.transaction_log.Add(T)
else
- usr << "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining."
+ to_chat(usr, "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.")
previous_account_number = tried_account_num
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
else
- usr << "\red \icon[src] incorrect pin/account combination entered."
+ to_chat(usr, "\red \icon[src] incorrect pin/account combination entered.")
number_incorrect_tries = 0
else
playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
@@ -295,7 +295,7 @@ log transactions
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
- usr << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
+ to_chat(usr, "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'")
previous_account_number = tried_account_num
if("withdrawal")
@@ -308,7 +308,7 @@ log transactions
//remove the money
if(amount > 10000) // prevent crashes
- usr << "\blue The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 10,000.'"
+ to_chat(usr, "\blue The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 10,000.'")
amount = 10000
authenticated_account.money -= amount
withdraw_arbitrary_sum(amount)
@@ -323,11 +323,11 @@ log transactions
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)
else
- usr << "\icon[src]You don't have enough funds to do that!"
+ to_chat(usr, "\icon[src]You don't have enough funds to do that!")
if("balance_statement")
if(authenticated_account)
if(world.timeofday < lastprint + PRINT_DELAY)
- usr << "The [src.name] flashes an error on its display."
+ to_chat(usr, "The [src.name] flashes an error on its display.")
return
lastprint = world.timeofday
playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1)
@@ -391,7 +391,7 @@ log transactions
if(I)
authenticated_account = attempt_account_access(I.associated_account_number)
if(authenticated_account)
- human_user << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
+ to_chat(human_user, "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'")
//create a transaction log entry
var/datum/transaction/T = new()
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index 729ae67acce..a9fe34e1e46 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -111,9 +111,9 @@
var/obj/item/weapon/card/I = O
scan_card(I)
else
- usr << "\icon[src]Unable to connect to linked account."
+ to_chat(usr, "\icon[src]Unable to connect to linked account.")
else
- usr << "\icon[src]Unable to connect to accounts database."
+ to_chat(usr, "\icon[src]Unable to connect to accounts database.")
else
..()
@@ -130,7 +130,7 @@
alert("That is not a valid code!")
print_reference()
else
- usr << "\icon[src]Incorrect code entered."
+ to_chat(usr, "\icon[src]Incorrect code entered.")
if("change_id")
var/attempt_code = text2num(input("Re-enter the current EFTPOS access code", "Confirm EFTPOS code"))
if(attempt_code == access_code)
@@ -139,7 +139,7 @@
eftpos_name = name + " EFTPOS scanner"
print_reference()
else
- usr << "\icon[src]Incorrect code entered."
+ to_chat(usr, "\icon[src]Incorrect code entered.")
if("link_account")
if(!linked_db)
reconnect_database()
@@ -148,7 +148,7 @@
var/attempt_pin = input("Enter pin code", "Account pin") as num
linked_account = attempt_account_access(attempt_account_num, attempt_pin, 1)
else
- usr << "\icon[src]Unable to connect to accounts database."
+ to_chat(usr, "\icon[src]Unable to connect to accounts database.")
if("trans_purpose")
var/purpose = input("Enter reason for EFTPOS transaction", "Transaction purpose") as text|null
if(purpose)
@@ -168,7 +168,7 @@
else if(linked_account)
transaction_locked = 1
else
- usr << "\icon[src] No account connected to send transactions to."
+ to_chat(usr, "\icon[src] No account connected to send transactions to.")
if("scan_card")
//attempt to connect to a new db, and if that doesn't work then fail
if(!linked_db)
@@ -178,7 +178,7 @@
if (istype(I, /obj/item/weapon/card))
scan_card(I)
else
- usr << "\icon[src]Unable to link accounts."
+ to_chat(usr, "\icon[src]Unable to link accounts.")
if("reset")
//reset the access code - requires HoP/captain access
var/obj/item/I = usr.get_active_hand()
@@ -186,10 +186,10 @@
var/obj/item/weapon/card/id/C = I
if(access_cent_commander in C.access || access_hop in C.access || access_captain in C.access)
access_code = 0
- usr << "\icon[src]Access code reset to 0."
+ to_chat(usr, "\icon[src]Access code reset to 0.")
else if (istype(I, /obj/item/weapon/card/emag))
access_code = 0
- usr << "\icon[src]Access code reset to 0."
+ to_chat(usr, "\icon[src]Access code reset to 0.")
src.attack_self(usr)
@@ -233,11 +233,11 @@
T.time = worldtime2text()
linked_account.transaction_log.Add(T)
else
- usr << "\icon[src]You don't have that much money!"
+ to_chat(usr, "\icon[src]You don't have that much money!")
else
- usr << "\icon[src]Unable to access account. Check security settings and try again."
+ to_chat(usr, "\icon[src]Unable to access account. Check security settings and try again.")
else
- usr << "\icon[src]EFTPOS is not connected to an account."
+ to_chat(usr, "\icon[src]EFTPOS is not connected to an account.")
else
..()
diff --git a/code/modules/economy/POS.dm b/code/modules/economy/POS.dm
index 1601956e0a0..79e506ddee9 100644
--- a/code/modules/economy/POS.dm
+++ b/code/modules/economy/POS.dm
@@ -403,7 +403,7 @@ var/const/POS_HEADER = {"
src.attack_hand(usr)
return
if(usr != logged_in)
- usr << "\red [logged_in.name] is already logged in. You cannot use this machine until they log out."
+ to_chat(usr, "\red [logged_in.name] is already logged in. You cannot use this machine until they log out.")
return
if("act" in href_list)
switch(href_list["act"])
@@ -428,10 +428,10 @@ var/const/POS_HEADER = {"
if("Add to Order")
AddToOrder(href_list["preset"],text2num(href_list["units"]))
if("Add Products")
- for(var/list/line in text2list(href_list["csv"],"\n"))
- var/list/cells = text2list(line,",")
+ for(var/list/line in splittext(href_list["csv"],"\n"))
+ var/list/cells = splittext(line,",")
if(cells.len<2)
- usr << "\red The CSV must have at least two columns: Product Name, followed by Price (as a number)."
+ to_chat(usr, "\red The CSV must have at least two columns: Product Name, followed by Price (as a number).")
src.attack_hand(usr)
return
var/line_item/LI = new
@@ -445,7 +445,7 @@ var/const/POS_HEADER = {"
if("Save Settings")
var/datum/money_account/new_linked_account = get_money_account(text2num(href_list["payableto"]),z)
if(!new_linked_account)
- usr << "\red Unable to link new account."
+ to_chat(usr, "\red Unable to link new account.")
else
linked_account = new_linked_account
screen=POS_SCREEN_SETTINGS
diff --git a/code/modules/economy/utils.dm b/code/modules/economy/utils.dm
index a23308b9219..5ef9a033b6d 100644
--- a/code/modules/economy/utils.dm
+++ b/code/modules/economy/utils.dm
@@ -48,7 +48,7 @@
/datum/money_account/proc/charge(var/transaction_amount,var/datum/money_account/dest,var/transaction_purpose, var/terminal_name="", var/terminal_id=0, var/dest_name = "UNKNOWN")
if(suspended)
- usr << "Unable to access source account: account suspended."
+ to_chat(usr, "Unable to access source account: account suspended.")
return 0
if(transaction_amount <= money)
@@ -88,5 +88,5 @@
transaction_log.Add(T)
return 1
else
- usr << "Insufficient funds in account."
+ to_chat(usr, "Insufficient funds in account.")
return 0
\ No newline at end of file
diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm
index 118f4f4ddff..82a4da4cc15 100644
--- a/code/modules/events/anomaly_bluespace.dm
+++ b/code/modules/events/anomaly_bluespace.dm
@@ -36,10 +36,9 @@
command_announcement.Announce("Massive bluespace translocation detected.", "Anomaly Alert")
var/list/flashers = list()
- for(var/mob/living/carbon/human/M in viewers(TO, null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash) // flash dose faggots
- flashers += M
+ for(var/mob/living/carbon/C in viewers(TO, null))
+ if(C.flash_eyes())
+ flashers += C
var/y_distance = TO.y - FROM.y
var/x_distance = TO.x - FROM.x
@@ -66,4 +65,3 @@
M.client.screen -= blueeffect
qdel(blueeffect)
qdel(newAnomaly)
-
\ No newline at end of file
diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm
index 3ec9b6d2e46..6ada1a25c0f 100644
--- a/code/modules/events/communications_blackout.dm
+++ b/code/modules/events/communications_blackout.dm
@@ -7,9 +7,9 @@
"#4nd%;f4y6,>?%-BZZZZZZZT")
for(var/mob/living/silicon/ai/A in player_list) //AIs are always aware of communication blackouts.
- A << "
"
- A << "[alert]"
- A << "
"
+ to_chat(A, "
")
+ to_chat(A, "[alert]")
+ to_chat(A, "
")
if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts.
command_announcement.Announce(alert)
@@ -23,8 +23,8 @@
command_announcement.Announce("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT", new_sound = 'sound/misc/interference.ogg')
else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms
for(var/mob/living/silicon/ai/A in player_list)
- A << "
"
- A << "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT"
- A << "
"
+ to_chat(A, "
")
+ to_chat(A, "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")
+ to_chat(A, "
")
for(var/obj/machinery/telecomms/T in telecomms_list)
T.emp_act(1)
diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
new file mode 100644
index 00000000000..ce6e214053d
--- /dev/null
+++ b/code/modules/events/disease_outbreak.dm
@@ -0,0 +1,37 @@
+/datum/event/disease_outbreak
+ announceWhen = 15
+
+ var/virus_type
+
+/datum/event/disease_outbreak/setup()
+ announceWhen = rand(15, 30)
+
+/datum/event/disease_outbreak/announce()
+ command_announcement.Announce("Confirmed outbreak of level 7 major viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
+
+/datum/event/disease_outbreak/start()
+ if(!virus_type)
+ virus_type = pick(/datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis)
+
+ for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
+ if(issmall(H)) //don't infect monkies; that's a waste
+ continue
+ if(H.species.virus_immune) //don't let virus immune things get diseases they're not supposed to get.
+ continue
+ var/turf/T = get_turf(H)
+ if(!T)
+ continue
+ if(T.z != 1)
+ continue
+ var/foundAlready = 0 // don't infect someone that already has the virus
+ for(var/datum/disease/D in H.viruses)
+ foundAlready = 1
+ break
+ if(H.stat == DEAD || foundAlready)
+ continue
+
+ var/datum/disease/D
+ D = new virus_type()
+ D.carrier = 1
+ H.AddDisease(D)
+ break
\ No newline at end of file
diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm
index c29d8add45d..8d16fd5a4cb 100644
--- a/code/modules/events/event_container.dm
+++ b/code/modules/events/event_container.dm
@@ -139,6 +139,7 @@ var/list/event_last_fired = list()
severity = EVENT_LEVEL_MODERATE
available_events = list(
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Nothing", /datum/event/nothing, 1230),
+ new /datum/event_meta(EVENT_LEVEL_MODERATE, "Appendicitis", /datum/event/spontaneous_appendicitis, 0, list(ASSIGNMENT_MEDICAL = 10), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Carp School", /datum/event/carp_migration, 200, list(ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_SECURITY = 20), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Rogue Drones", /datum/event/rogue_drone, 40, list(ASSIGNMENT_SECURITY = 20)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Vines", /datum/event/spacevine, 250, list(ASSIGNMENT_ENGINEER = 10)),
@@ -151,7 +152,6 @@ var/list/event_last_fired = list()
//new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grid Check", /datum/event/grid_check, 200, list(ASSIGNMENT_ENGINEER = 60)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Electrical Storm", /datum/event/electrical_storm, 250, list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_JANITOR = 150)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Radiation Storm", /datum/event/radiation_storm, 0, list(ASSIGNMENT_MEDICAL = 50), 1),
- new /datum/event_meta(EVENT_LEVEL_MODERATE, "Viral Infection", /datum/event/viral_infection, 0, list(ASSIGNMENT_MEDICAL = 150)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Spider Infestation", /datum/event/spider_infestation, 100, list(ASSIGNMENT_SECURITY = 30), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Ion Storm", /datum/event/ion_storm, 0, list(ASSIGNMENT_AI = 50, ASSIGNMENT_CYBORG = 50, ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_SCIENTIST = 5)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Borer Infestation", /datum/event/borer_infestation, 40, list(ASSIGNMENT_SECURITY = 30), 1),
@@ -170,7 +170,8 @@ var/list/event_last_fired = list()
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Gravitational Anomaly", /datum/event/anomaly/anomaly_grav, 200),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Revenant", /datum/event/revenant, 150),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Swarmer Spawn", /datum/event/spawn_swarmer, 150, is_one_shot = 1),
- new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/spawn_morph, 0, is_one_shot = 1)
+ new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/spawn_morph, 0, is_one_shot = 1),
+ new /datum/event_meta(EVENT_LEVEL_MODERATE, "Disease Outbreak", /datum/event/disease_outbreak, 0, list(ASSIGNMENT_MEDICAL = 150), 1)
)
/datum/event_container/major
@@ -179,7 +180,6 @@ var/list/event_last_fired = list()
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Nothing", /datum/event/nothing, 1320),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration", /datum/event/carp_migration, 0, list(ASSIGNMENT_SECURITY = 3), 1),
//new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach", /datum/event/prison_break/station, 0, list(ASSIGNMENT_ANY = 5)),
- new /datum/event_meta(EVENT_LEVEL_MAJOR, "Viral Infection", /datum/event/viral_infection, 0, list(ASSIGNMENT_MEDICAL = 30), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob", /datum/event/blob, 0, list(ASSIGNMENT_ENGINEER = 30), 1),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Wave", /datum/event/meteor_wave, 0, list(ASSIGNMENT_ENGINEER = 3), 1),
new /datum/event_meta/alien(EVENT_LEVEL_MAJOR, "Alien Infestation", /datum/event/alien_infestation, 0, list(ASSIGNMENT_SECURITY = 30), 1),
diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm
index 7ddb6470282..85ffa86f25f 100644
--- a/code/modules/events/event_manager.dm
+++ b/code/modules/events/event_manager.dm
@@ -73,7 +73,7 @@
if(!report_at_round_end)
return
- world << "
Random Events This Round:"
+ to_chat(world, "
Random Events This Round:")
for(var/datum/event/E in active_events|finished_events)
var/datum/event_meta/EM = E.event_meta
if(EM.name == "Nothing")
@@ -87,7 +87,7 @@
else
message += "and ran to completion."
- world << message
+ to_chat(world, message)
/datum/event_manager/proc/GetInteractWindow()
var/html = "Refresh"
diff --git a/code/modules/events/holidays/Holidays.dm b/code/modules/events/holidays/Holidays.dm
index 38ea6d63ac6..e06c7764a39 100644
--- a/code/modules/events/holidays/Holidays.dm
+++ b/code/modules/events/holidays/Holidays.dm
@@ -140,8 +140,8 @@ var/global/Holiday = null
//Run at the start of a round
/proc/Holiday_Game_Start()
if(Holiday)
- world << "and..."
- world << "Happy [Holiday] Everybody!
"
+ to_chat(world, "and...")
+ to_chat(world, "Happy [Holiday] Everybody!
")
switch(Holiday) //special holidays
if("Easter")
//do easter stuff
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index 351324c9ba8..d153294c790 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -27,14 +27,14 @@
var/message = generate_ion_law(ionMessage)
if(message)
M.add_ion_law(message)
- M << "
"
- M << "[message] ...LAWS UPDATED"
- M << "
"
+ to_chat(M, "
")
+ to_chat(M, "[message] ...LAWS UPDATED")
+ to_chat(M, "
")
if(botEmagChance)
- for(var/obj/machinery/bot/bot in machines)
+ for(var/mob/living/simple_animal/bot/bot in machines)
if(prob(botEmagChance))
- bot.Emag()
+ bot.emag_act()
/proc/generate_ion_law(ionMessage)
if(ionMessage)
diff --git a/code/modules/events/meaty_gore.dm b/code/modules/events/meaty_gore.dm
new file mode 100644
index 00000000000..729f5182344
--- /dev/null
+++ b/code/modules/events/meaty_gore.dm
@@ -0,0 +1,17 @@
+/datum/event/meteor_wave/gore/announce()
+ command_announcement.Announce("Unknown biological debris have been detected near [station_name()], please stand-by.", "Debris Alert")
+
+/datum/event/meteor_wave/gore/setup()
+ waves = 3
+
+
+/datum/event/meteor_wave/gore/tick()
+ if(waves && activeFor >= next_meteor)
+ spawn() spawn_meteors(rand(5,8), meteors_gore)
+ next_meteor += rand(15, 30)
+ waves--
+ endWhen = (waves ? next_meteor + 1 : activeFor + 15)
+
+
+/datum/event/meteor_wave/gore/end()
+ command_announcement.Announce("The station has cleared the debris.", "Debris Alert")
diff --git a/code/modules/events/meaty_ops.dm b/code/modules/events/meaty_ops.dm
new file mode 100644
index 00000000000..d6bdea43393
--- /dev/null
+++ b/code/modules/events/meaty_ops.dm
@@ -0,0 +1,19 @@
+/datum/event/meteor_wave/goreop/announce()
+ var/meteor_declaration = "MeteorOps have declared thier intent to utterly destroy [station_name()] with thier own bodies, and dares the crew to try and stop them."
+ command_announcement.Announce(meteor_declaration, "Declaration of 'War'", 'sound/effects/siren.ogg')
+
+/datum/event/meteor_wave/goreop/setup()
+ waves = 3
+
+
+/datum/event/meteor_wave/goreop/tick()
+ if(waves && activeFor >= next_meteor)
+ spawn() spawn_meteors(5, meteors_ops)
+ next_meteor += rand(15, 30)
+ waves--
+ endWhen = (waves ? next_meteor + 1 : activeFor + 15)
+
+
+
+/datum/event/meteor_wave/goreops/end()
+ command_announcement.Announce("All MeteorOps are dead. Major Station Victory.", "MeteorOps")
\ No newline at end of file
diff --git a/code/modules/events/money_spam.dm b/code/modules/events/money_spam.dm
index 37a29a00bbd..94f27958b9b 100644
--- a/code/modules/events/money_spam.dm
+++ b/code/modules/events/money_spam.dm
@@ -103,17 +103,4 @@
if(ai.aiPDA != P && ai.aiPDA != src)
ai.show_message("Intercepted message from [sender] (Unknown / spam?) to [P:owner]: [message]")
- //Commented out because we don't send messages like this anymore. Instead it will just popup in their chat window.
- //P.tnote += "← From [sender] (Unknown / spam?):
[message]
"
-
- PM.play_ringtone()
- //Search for holder of the PDA.
- var/mob/living/L = null
- if(P.loc && isliving(P.loc))
- L = P.loc
- //Maybe they are a pAI!
- else
- L = get(P, /mob/living/silicon)
-
- if(L)
- L << "\icon[P] Message from [sender] (Unknown / spam?), \"[message]\" (Unable to Reply)"
+ PM.notify("Message from [sender] (Unknown / spam?), \"[message]\" (Unable to Reply)", 0)
\ No newline at end of file
diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm
index b1a6c522081..89671701958 100644
--- a/code/modules/events/prison_break.dm
+++ b/code/modules/events/prison_break.dm
@@ -50,7 +50,7 @@
for(var/obj/machinery/message_server/MS in world)
MS.send_rc_message("Engineering", my_department, rc_message, "", "", 2)
for(var/mob/living/silicon/ai/A in player_list)
- A << "Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department]."
+ to_chat(A, "Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department].")
else
log_to_dd("ERROR: Could not initate grey-tide. Unable to find suitable containment area.")
diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm
new file mode 100644
index 00000000000..964b3c9e50d
--- /dev/null
+++ b/code/modules/events/spontaneous_appendicitis.dm
@@ -0,0 +1,15 @@
+/datum/event/spontaneous_appendicitis/start()
+ for(var/mob/living/carbon/human/H in shuffle(living_mob_list))
+ if(issmall(H)) //don't infect monkies; that's a waste.
+ continue
+ if(H.species.virus_immune) //don't count things that are virus immune; they'll just get picked and auto-cure
+ continue
+ var/foundAlready = 0 //don't infect someone that already has the virus
+ for(var/datum/disease/D in H.viruses)
+ foundAlready = 1
+ if(H.stat == 2 || foundAlready)
+ continue
+
+ var/datum/disease/D = new /datum/disease/appendicitis
+ H.ForceContractDisease(D)
+ break
\ No newline at end of file
diff --git a/code/modules/events/tear.dm b/code/modules/events/tear.dm
index 605c6d1705d..e409f6592d8 100644
--- a/code/modules/events/tear.dm
+++ b/code/modules/events/tear.dm
@@ -41,15 +41,17 @@
if(animation) qdel(animation)
spawn(rand(30,120))
- var/blocked = blocked_mobs //global variable for blocked mobs
+ var/list/tear_critters = list()
+ for(var/T in typesof(/mob/living/simple_animal))
+ var/mob/living/simple_animal/SA = T
+ if(initial(SA.gold_core_spawnable) == CHEM_MOB_SPAWN_HOSTILE)
+ tear_critters += T
- var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
-
- for(var/i = 1, i <= 5, i++)
- var/chosen = pick(critters)
- var/mob/living/simple_animal/hostile/C = new chosen
- C.faction = list("slimesummon")
- C.loc = src.loc
+ for(var/i in 1 to 5)
+ var/chosen = pick(tear_critters)
+ var/mob/living/simple_animal/C = new chosen
+ C.faction |= "chemicalsummon"
+ C.forceMove(get_turf(src))
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
step(C, pick(NORTH,SOUTH,EAST,WEST))
diff --git a/code/modules/events/undead.dm b/code/modules/events/undead.dm
index c6aa04ba00f..2ff8d05c20a 100644
--- a/code/modules/events/undead.dm
+++ b/code/modules/events/undead.dm
@@ -37,4 +37,4 @@
/datum/event/undead/announce()
for(var/mob/living/M in player_list)
- M << "You feel [pick("a chill","a deathly chill","the undead","dirty", "creeped out","afraid","fear")]!"
+ to_chat(M, "You feel [pick("a chill","a deathly chill","the undead","dirty", "creeped out","afraid","fear")]!")
diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm
deleted file mode 100644
index 362093b62ee..00000000000
--- a/code/modules/events/viral_infection.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-/datum/event/viral_infection
- severity = 1
-
-/datum/event/viral_infection/setup()
- announceWhen = rand(0, 3000)
- endWhen = announceWhen + 1
- severity = rand(1, 3)
-
-/datum/event/viral_infection/announce()
- command_announcement.Announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
-
-/datum/event/viral_infection/start()
- var/list/candidates = list() //list of candidate keys
- for(var/mob/living/carbon/human/G in player_list)
- if(G.client && G.stat != DEAD)
- candidates += G
- if(!candidates.len) return
- candidates = shuffle(candidates)//Incorporating Donkie's list shuffle
-
- var/datum/disease2/disease/D = new /datum/disease2/disease
- D.makerandom()
- D.infectionchance = 1
- message_admins("Viral Infection: releasing strain [D.uniqueID]")
-
- while(severity > 0 && candidates.len)
- var/mob/living/carbon/human/H = candidates[1]
- H.virus2["[D.uniqueID]"] = D
- candidates.Remove(candidates[1])
- severity--
diff --git a/code/modules/events/viral_outbreak.dm b/code/modules/events/viral_outbreak.dm
deleted file mode 100644
index 6c24c37137e..00000000000
--- a/code/modules/events/viral_outbreak.dm
+++ /dev/null
@@ -1,28 +0,0 @@
-/datum/event/viral_outbreak
- severity = 1
-
-/datum/event/viral_outbreak/setup()
- announceWhen = rand(0, 3000)
- endWhen = announceWhen + 1
- severity = rand(2, 4)
-
-/datum/event/viral_outbreak/announce()
- command_announcement.Announce("Confirmed outbreak of level 7 major viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
-
-/datum/event/viral_outbreak/start()
- var/list/candidates = list() //list of candidate keys
- for(var/mob/living/carbon/human/G in player_list)
- if(G.client && G.stat != DEAD)
- candidates += G
- if(!candidates.len) return
- candidates = shuffle(candidates)//Incorporating Donkie's list shuffle
-
- var/datum/disease2/disease/D = new /datum/disease2/disease
- D.makerandom()
- message_admins("Viral Outbreak: releasing strain [D.uniqueID]")
-
- while(severity > 0 && candidates.len)
- var/mob/living/carbon/human/H = candidates[1]
- H.virus2["[D.uniqueID]"] = D
- candidates.Remove(candidates[1])
- severity--
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index 612c991b938..00659104480 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -39,7 +39,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
throw_range = 7
suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw
- viewers(user) << "[user] places the [src.name] on top of \his head, \his fingers tangled in the netting! It looks like \he's trying to commit suicide."
+ to_chat(viewers(user), "[user] places the [src.name] on top of \his head, \his fingers tangled in the netting! It looks like \he's trying to commit suicide.")
return(OXYLOSS)
/obj/item/weapon/fishfood
@@ -65,7 +65,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
attack_verb = list("scrubbed", "brushed", "scraped")
suicide_act(mob/user)
- viewers(user) << "[user] is vigorously scrubbing \himself raw with the [src.name]! It looks like \he's trying to commit suicide."
+ to_chat(viewers(user), "[user] is vigorously scrubbing \himself raw with the [src.name]! It looks like \he's trying to commit suicide.")
return(BRUTELOSS|FIRELOSS)
//////////////////////////////////////////////
@@ -133,7 +133,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
/obj/item/weapon/fish/shark/attackby(var/obj/item/O, var/mob/user as mob)
if(istype(O, /obj/item/weapon/wirecutters))
- user << "You rip out the teeth of \the [src.name]!"
+ to_chat(user, "You rip out the teeth of \the [src.name]!")
new /obj/item/weapon/fish/toothless_shark(get_turf(src))
new /obj/item/weapon/shard/shark_teeth(get_turf(src))
qdel(src)
@@ -166,7 +166,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
/obj/item/weapon/fish/catfish/attackby(var/obj/item/O, var/mob/user as mob)
if(is_sharp(O))
- user << "You carefully clean and gut \the [src.name]."
+ to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/weapon/reagent_containers/food/snacks/catfishmeat(get_turf(src))
new /obj/item/weapon/reagent_containers/food/snacks/catfishmeat(get_turf(src))
qdel(src)
@@ -185,7 +185,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
/obj/item/weapon/fish/salmon/attackby(var/obj/item/O, var/mob/user as mob)
if(is_sharp(O))
- user << "You carefully clean and gut \the [src.name]."
+ to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/weapon/reagent_containers/food/snacks/salmonmeat(get_turf(src))
new /obj/item/weapon/reagent_containers/food/snacks/salmonmeat(get_turf(src))
qdel(src)
@@ -201,7 +201,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
/obj/item/weapon/fish/babycarp/attackby(var/obj/item/O, var/mob/user as mob)
if(is_sharp(O))
- user << "You carefully clean and gut \the [src.name]."
+ to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
qdel(src)
return
diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm
index ba02098e30e..8fe4bfa746d 100644
--- a/code/modules/fish/fishtank.dm
+++ b/code/modules/fish/fishtank.dm
@@ -310,7 +310,7 @@
src.visible_message("A new [type] has hatched in \the [src]!")
//Null type fish are dud eggs, give a message to inform the player
else
- usr << "The eggs disolve in the water. They were duds!"
+ to_chat(usr, "The eggs disolve in the water. They were duds!")
/obj/machinery/fishtank/proc/select_egg_type()
var/fish = pick(fish_list) //Select a fish from the fish in the tank
@@ -340,7 +340,7 @@
/obj/machinery/fishtank/proc/harvest_fish(var/mob/user)
if(!fish_count) //Can't catch non-existant fish!
- usr << "There are no fish in \the [src] to catch!"
+ to_chat(usr, "There are no fish in \the [src] to catch!")
return
var/caught_fish
@@ -496,7 +496,7 @@
//Finally, report the full examine_message constructed from the above reports
- user << "[examine_message]"
+ to_chat(user, "[examine_message]")
return examine_message
//////////////////////////////
@@ -523,7 +523,7 @@
kill_fish() //Kill a random fish
M.health = M.maxHealth //Eating fish heals the predator
else
- usr << "There are no fish in [src]!"
+ to_chat(usr, "There are no fish in [src]!")
else
attack_generic(M, M.harm_intent_damage)
else if(istype(M, /mob/living/simple_animal/hostile/bear))
@@ -541,7 +541,7 @@
kill_fish() //Kill a random fish
M.health = M.maxHealth //Eating fish heals the predator
else
- usr << "There are no fish in [src]!"
+ to_chat(usr, "There are no fish in [src]!")
else
attack_generic(M, M.harm_intent_damage)
else
@@ -606,14 +606,14 @@
if(user.a_intent == I_HELP)
if(W.isOn())
if(cur_health < max_health)
- usr << "You repair some of the cracks on \the [src]."
+ to_chat(usr, "You repair some of the cracks on \the [src].")
cur_health += 20
check_health()
else
- usr << "There is no damage to fix!"
+ to_chat(usr, "There is no damage to fix!")
else
if(cur_health < max_health)
- usr << "[W.name] must on to repair this damage."
+ to_chat(usr, "[W.name] must on to repair this damage.")
else
user.changeNext_move(CLICK_CD_MELEE)
hit(W.force)
@@ -622,7 +622,7 @@
if(O.is_open_container())
if(istype(O, /obj/item/weapon/reagent_containers/glass))
if(lid_switch)
- usr << "Open the lid on \the [src] first!"
+ to_chat(usr, "Open the lid on \the [src] first!")
return
var/obj/item/weapon/reagent_containers/glass/C = O
//Containers with any reagents will get dumped in
@@ -640,7 +640,7 @@
C.reagents.clear_reagents()
else
if(water_level == water_capacity)
- usr << "[src] is already full!"
+ to_chat(usr, "[src] is already full!")
return
else
message = "The filtration process purifies the water, raising the water level."
@@ -656,7 +656,7 @@
//Empty containers will scoop out water, filling the container as much as possible from the water_level
else
if(water_level == 0)
- usr << "[src] is empty!"
+ to_chat(usr, "[src] is empty!")
else
if(water_level >= C.volume) //Enough to fill the container completely
C.reagents.add_reagent("fishwater", C.volume)
@@ -671,23 +671,23 @@
//Wrenches can deconstruct empty tanks, but not tanks with any water. Kills any fish left inside and destroys any unharvested eggs in the process
if(istype(O, /obj/item/weapon/wrench))
if(water_level == 0)
- usr << "Now disassembling [src]."
+ to_chat(usr, "Now disassembling [src].")
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user,50, target = src))
destroy(1)
else
- usr << "[src] must be empty before you disassemble it!"
+ to_chat(usr, "[src] must be empty before you disassemble it!")
return
//Fish eggs
else if(istype(O, /obj/item/fish_eggs))
var/obj/item/fish_eggs/egg = O
//Don't add eggs if there is no water (they kinda need that to live)
if(water_level == 0)
- usr << "[src] has no water; [egg.name] won't hatch without water!"
+ to_chat(usr, "[src] has no water; [egg.name] won't hatch without water!")
else
//Don't add eggs if the tank already has the max number of fish
if(fish_count >= max_fish)
- usr << "[src] can't hold any more fish."
+ to_chat(usr, "[src] can't hold any more fish.")
else
add_fish(egg.fish_type)
qdel(egg)
@@ -703,9 +703,9 @@
user.visible_message("[user.name] feeds the fish in \the [src]. The fish look excited!", "You feed the fish in \the [src]. They look excited!")
food_level += 10
else
- usr << "[src] already has plenty of food in it. You decide to not add more."
+ to_chat(usr, "[src] already has plenty of food in it. You decide to not add more.")
else
- usr << "[src] doesn't have any water in it. You should fill it with water first."
+ to_chat(usr, "[src] doesn't have any water in it. You should fill it with water first.")
check_food_level()
return
//Fish egg scoop
@@ -723,7 +723,7 @@
//Tank brush
if(istype(O, /obj/item/weapon/tank_brush))
if(filth_level == 0)
- usr << "[src] is already spotless!"
+ to_chat(usr, "[src] is already spotless!")
else
filth_level = 0
user.visible_message("[user.name] scrubs the inside of \the [src], cleaning the filth.", "You scrub the inside of \the [src], cleaning the filth.")
diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index a6c8ee86e5b..3b165750d0b 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -20,7 +20,7 @@ mob/living/carbon/proc/dream()
for(var/i = rand(1,4),i > 0, i--)
var/dream_image = pick(dreams)
dreams -= dream_image
- src << "... [dream_image] ..."
+ to_chat(src, "... [dream_image] ...")
sleep(rand(40,70))
if(paralysis <= 0)
dreaming = 0
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 0151136b580..c4088d9a53f 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -243,11 +243,11 @@ Gunshots/explosions/opening doors/less rare audio (done)
sleep(10)
if(!xeno) return
var/xeno_name = xeno.name
- target << "[xeno_name] begins climbing into the ventilation system..."
+ to_chat(target, "[xeno_name] begins climbing into the ventilation system...")
sleep(10)
if(!xeno) return
qdel(xeno)
- target << "[xeno_name] scrambles into the ventilation ducts!"
+ to_chat(target, "[xeno_name] scrambles into the ventilation ducts!")
qdel(src)
/obj/effect/hallucination/singularity_scare
@@ -295,29 +295,29 @@ Gunshots/explosions/opening doors/less rare audio (done)
switch(rand(1,5))
if(1) //Laser fight
for(var/i=0,i[my_target] stumbles around."
+ to_chat(O, "[my_target] stumbles around.")
/obj/effect/fake_attacker/New(loc,var/mob/living/carbon/T)
..()
@@ -455,7 +459,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
else if(src.dir == WEST)
qdel(src.currentimage)
src.currentimage = new /image(left,src)
- my_target << currentimage
+ to_chat(my_target, currentimage)
/obj/effect/fake_attacker/proc/attack_loop()
@@ -499,7 +503,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
var/obj/effect/overlay/O = new/obj/effect/overlay(target.loc)
O.name = "blood"
var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1)
- target << I
+ to_chat(target, I)
spawn(300)
qdel(O)
return
@@ -561,13 +565,13 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
person = H
people += H
if(person) //Basic talk
- target << target.hear_say(pick(speak_messages),language = pick(person.languages),speaker = person)
+ to_chat(target, target.hear_say(pick(speak_messages),language = pick(person.languages),speaker = person))
else // Radio talk
var/list/humans = list()
for(var/mob/living/carbon/human/H in living_mob_list)
humans += H
person = pick(humans)
- target << target.hear_radio(pick(radio_messages),language = pick(person.languages),speaker = person, part_a = "\[[get_frequency_name(PUB_FREQ)]\] ", part_b = " ")
+ to_chat(target, target.hear_radio(pick(radio_messages),language = pick(person.languages),speaker = person, part_a = "\[[get_frequency_name(PUB_FREQ)]\] ", part_b = " "))
qdel(src)
/obj/effect/hallucination/message
@@ -584,7 +588,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
"You feel faint.", \
"You hear a strange, alien voice in your head...[pick("Hiss","Ssss")]", \
"You can see...everything!")
- target << chosen
+ to_chat(target, chosen)
qdel(src)
/mob/living/carbon/proc/hallucinate(var/hal_type) // Todo -> proc / defines
@@ -611,24 +615,34 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
new /obj/effect/hallucination/message(src.loc,src)
if("sounds")
//Strange audio
- //src << "Strange Audio"
+// to_chat(src, "Strange Audio")
switch(rand(1,18))
- if(1) src << 'sound/machines/airlock.ogg'
+ if(1)
+ src << 'sound/machines/airlock.ogg'
if(2)
- if(prob(50))src << 'sound/effects/Explosion1.ogg'
- else src << 'sound/effects/Explosion2.ogg'
- if(3) src << 'sound/effects/explosionfar.ogg'
- if(4) src << 'sound/effects/Glassbr1.ogg'
- if(5) src << 'sound/effects/Glassbr2.ogg'
- if(6) src << 'sound/effects/Glassbr3.ogg'
- if(7) src << 'sound/machines/twobeep.ogg'
- if(8) src << 'sound/machines/windowdoor.ogg'
+ if(prob(50))
+ src << 'sound/effects/Explosion1.ogg'
+ else
+ src << 'sound/effects/Explosion2.ogg'
+ if(3)
+ src << 'sound/effects/explosionfar.ogg'
+ if(4)
+ src << 'sound/effects/Glassbr1.ogg'
+ if(5)
+ src << 'sound/effects/Glassbr2.ogg'
+ if(6)
+ src << 'sound/effects/Glassbr3.ogg'
+ if(7)
+ src << 'sound/machines/twobeep.ogg'
+ if(8)
+ src << 'sound/machines/windowdoor.ogg'
if(9)
//To make it more realistic, I added two gunshots (enough to kill)
src << 'sound/weapons/Gunshot.ogg'
spawn(rand(10,30))
src << 'sound/weapons/Gunshot.ogg'
- if(10) src << 'sound/weapons/smash.ogg'
+ if(10)
+ src << 'sound/weapons/smash.ogg'
if(11)
//Same as above, but with tasers.
src << 'sound/weapons/Taser.ogg'
@@ -644,10 +658,10 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg')
src << pick(creepyasssounds)
if(13)
- src << "You feel a tiny prick!"
+ to_chat(src, "You feel a tiny prick!")
if(14)
- src << "Priority Announcement
"
- src << "
The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.
"
+ to_chat(src, "Priority Announcement
")
+ to_chat(src, "
The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.
")
src << sound('sound/AI/shuttledock.ogg')
if(15)
src << 'sound/items/Welder.ogg'
@@ -659,13 +673,13 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
src << 'sound/weapons/saberoff.ogg'
if("hudscrew")
//Screwy HUD
- //src << "Screwy HUD"
+// to_chat(src, "Screwy HUD")
hal_screwyhud = pick(1,2,3,3,4,4)
spawn(rand(100,250))
hal_screwyhud = 0
if("items")
//Strange items
- //src << "Traitor Items"
+// to_chat(src, "Traitor Items")
if(!halitem)
halitem = new
var/list/slots_free = list(ui_lhand,ui_rhand)
@@ -711,7 +725,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
qdel(halitem)
if("dangerflash")
//Flashes of danger
- //src << "Danger Flash"
+// to_chat(src, "Danger Flash")
if(!halimage)
var/list/possible_points = list()
for(var/turf/simulated/floor/F in view(src,world.view))
@@ -721,13 +735,13 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
switch(rand(1,3))
if(1)
- //src << "Space"
+// to_chat(src, "Space")
halimage = image('icons/turf/space.dmi',target,"[rand(1,25)]",TURF_LAYER)
if(2)
- //src << "Fire"
+// to_chat(src, "Fire")
halimage = image('icons/effects/fire.dmi',target,"1",TURF_LAYER)
if(3)
- //src << "C4"
+// to_chat(src, "C4")
halimage = image('icons/obj/assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01)
diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm
index 44cc91a8e45..5a40ea1934a 100644
--- a/code/modules/flufftext/TextFilters.dm
+++ b/code/modules/flufftext/TextFilters.dm
@@ -26,7 +26,7 @@ proc/Intoxicated(phrase)
proc/NewStutter(phrase,stunned)
phrase = html_decode(phrase)
- var/list/split_phrase = text2list(phrase," ") //Split it up into words.
+ var/list/split_phrase = splittext(phrase," ") //Split it up into words.
var/list/unstuttered_words = split_phrase.Copy()
var/i = rand(1,3)
@@ -57,7 +57,7 @@ proc/NewStutter(phrase,stunned)
split_phrase[index] = word
- return sanitize(list2text(split_phrase," "))
+ return sanitize(jointext(split_phrase," "))
proc/Stagger(mob/M,d) //Technically not a filter, but it relates to drunkenness.
step(M, pick(d,turn(d,90),turn(d,-90)))
@@ -67,7 +67,7 @@ proc/Ellipsis(original_msg, chance = 50)
if(chance >= 100) return original_msg
var/list
- words = text2list(original_msg," ")
+ words = splittext(original_msg," ")
new_words = list()
var/new_msg = ""
@@ -78,6 +78,6 @@ proc/Ellipsis(original_msg, chance = 50)
else
new_words += w
- new_msg = list2text(new_words," ")
+ new_msg = jointext(new_words," ")
return new_msg
diff --git a/code/modules/food/cooker.dm b/code/modules/food/cooker.dm
index 76f67e47fb8..40e04817209 100644
--- a/code/modules/food/cooker.dm
+++ b/code/modules/food/cooker.dm
@@ -35,11 +35,11 @@
// check if you can put it in the machine
/obj/machinery/cooker/proc/checkValid(obj/item/check, mob/user)
if(on)
- user << "[src] is still active!"
+ to_chat(user, "[src] is still active!")
return 0
if(istype(check, /obj/item/weapon/reagent_containers/food/snacks))
return 1
- user << "You can only process food!"
+ to_chat(user, "You can only process food!")
return 0
/obj/machinery/cooker/proc/setIcon(obj/item/copyme, obj/item/copyto)
@@ -61,7 +61,7 @@
/obj/machinery/cooker/proc/burn(mob/user, obj/item/weapon/reagent_containers/props)
var/obj/item/weapon/reagent_containers/food/snacks/badrecipe/burnt = new(get_turf(src))
setRegents(props, burnt)
- user << "You smell burning coming from the [src]!"
+ to_chat(user, "You smell burning coming from the [src]!")
var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread() // burning things makes smoke!
smoke.set_up(5, 0, src)
smoke.start()
@@ -80,7 +80,7 @@
/obj/machinery/cooker/proc/putIn(obj/item/tocook, mob/chef)
icon_state = onicon
- chef << "You put [tocook] into [src]."
+ to_chat(chef, "You put [tocook] into [src].")
on = 1
chef.drop_item()
tocook.loc = src
@@ -98,7 +98,7 @@
if(!burns)
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks))
if(checkCooked(I))
- user << "That is already [thiscooktype], it would do nothing!"
+ to_chat(user, "That is already [thiscooktype], it would do nothing!")
return
putIn(I, user)
sleep(cooktime)
diff --git a/code/modules/food/customizables.dm b/code/modules/food/customizables.dm
index ccab1b11afc..ff1ff9f6ad5 100644
--- a/code/modules/food/customizables.dm
+++ b/code/modules/food/customizables.dm
@@ -324,12 +324,12 @@
/obj/item/weapon/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
if(src.contents.len > sandwich_limit)
- user << "If you put anything else in or on [src] it's going to make a mess."
+ to_chat(user, "If you put anything else in or on [src] it's going to make a mess.")
return
if(!istype(I, /obj/item/weapon/reagent_containers/food/snacks))
- user << "\The [I] isn't exactly something that you would want to eat."
+ to_chat(user, "\The [I] isn't exactly something that you would want to eat.")
return
- user << "You add [I] to [src]."
+ to_chat(user, "You add [I] to [src].")
if(istype(I, /obj/item/weapon/reagent_containers/))
var/obj/item/weapon/reagent_containers/F = I
F.reagents.trans_to(src, F.reagents.total_volume)
@@ -386,7 +386,7 @@
..(user)
var/whatsinside = pick(ingredients)
- user << " You think you can see [whatsinside] in there."
+ to_chat(user, " You think you can see [whatsinside] in there.")
/*
/obj/item/weapon/reagent_containers/food/snacks/customizable/attack(mob/M as mob, mob/user as mob, def_zone) //SNOOOOOOOWFLAAAAAAAAAAAAAAAAAKES
@@ -402,7 +402,7 @@
H = M
if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable.
- H << "\red You lacerate your mouth on a [shard.name] in the sandwich!"
+ to_chat(H, "\red You lacerate your mouth on a [shard.name] in the sandwich!")
H.adjustBruteLoss(5) //TODO: Target head if human.
..()
*/
diff --git a/code/modules/food/icecream_vat.dm b/code/modules/food/icecream_vat.dm
index eae35e2df0e..6c23d781818 100644
--- a/code/modules/food/icecream_vat.dm
+++ b/code/modules/food/icecream_vat.dm
@@ -32,14 +32,14 @@
/obj/machinery/icemachine/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/reagent_containers/glass))
if(beaker)
- user << "A container is already inside [src]."
+ to_chat(user, "A container is already inside [src].")
return
if(!user.drop_item())
- user << "\The [I] is stuck to you!"
+ to_chat(user, "\The [I] is stuck to you!")
return
beaker = I
I.forceMove(src)
- user << "You add [I] to [src]"
+ to_chat(user, "You add [I] to [src]")
updateUsrDialog()
return
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/icecream))
@@ -51,7 +51,7 @@
I.name += " with sprinkles"
I.desc += ". This also has sprinkles."
else
- user << "This [I] already has sprinkles."
+ to_chat(user, "This [I] already has sprinkles.")
/obj/machinery/icemachine/proc/validexchange(reag)
@@ -59,7 +59,7 @@
return 1
else
if(reagents.total_volume < 500)
- usr << "[src] vibrates for a moment, apparently accepting the unknown liquid."
+ to_chat(usr, "[src] vibrates for a moment, apparently accepting the unknown liquid.")
playsound(loc, 'sound/machines/twobeep.ogg', 10, 1)
return 1
diff --git a/code/modules/food/oven.dm b/code/modules/food/oven.dm
index 3ed9cb3888f..604adaaf142 100644
--- a/code/modules/food/oven.dm
+++ b/code/modules/food/oven.dm
@@ -17,7 +17,7 @@
/obj/machinery/cooking/attackby(obj/item/I, mob/user, params)
if(on)
- user << "The machine is already running."
+ to_chat(user, "The machine is already running.")
return
else
var/obj/item/F = I
@@ -26,7 +26,7 @@
if(!C)
return
else
- user << "You put [F] into [src] for cooking."
+ to_chat(user, "You put [F] into [src] for cooking.")
user.drop_item()
F.loc = src
on = TRUE
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 3bbcc875bb4..0f58955a2bf 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -651,13 +651,6 @@ datum/recipe/microwave/slimesandwich
)
result = /obj/item/weapon/reagent_containers/food/snacks/sashimi
-// Fuck Science!
-/datum/recipe/microwave/ruinedvirusdish
- items = list(
- /obj/item/weapon/virusdish
- )
- result = /obj/item/weapon/ruinedvirusdish
-
/datum/recipe/microwave/mashedtaters
fruit = list("potato" = 1)
reagents = list("gravy" = 5)
diff --git a/code/modules/garbage_collection/garbage_collector.dm b/code/modules/garbage_collection/garbage_collector.dm
index f6675365f8d..aa8933c42de 100644
--- a/code/modules/garbage_collection/garbage_collector.dm
+++ b/code/modules/garbage_collection/garbage_collector.dm
@@ -142,7 +142,7 @@ var/global/datum/controller/process/garbage_collector/garbageCollector
#endif
garbageCollector.addTrash(D)
else
- // world << "WARNING GC DID NOT GET A RETURN VALUE FOR [D], [D.type]!"
+// to_chat(world, "WARNING GC DID NOT GET A RETURN VALUE FOR [D], [D.type]!")
garbageCollector.addTrash(D)
diff --git a/code/modules/garbage_collection/gc_testing.dm b/code/modules/garbage_collection/gc_testing.dm
index f571a00c791..25fc4bef495 100644
--- a/code/modules/garbage_collection/gc_testing.dm
+++ b/code/modules/garbage_collection/gc_testing.dm
@@ -9,7 +9,7 @@
return
garbageCollector.del_everything = !garbageCollector.del_everything
- // world << "GC: qdel turned [garbageCollector.del_everything ? "off" : "on"]."
+// to_chat(world, "GC: qdel turned [garbageCollector.del_everything ? "off" : "on"].")
log_admin("[key_name(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].")
message_admins("\blue [key_name_admin(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].", 1)
@@ -44,12 +44,12 @@
return
if(!gc_hard_del_types || !gc_hard_del_types.len)
- usr << "No hard del()'d types found."
+ to_chat(usr, "No hard del()'d types found.")
return
- usr << "Types hard del()'d by the GC:"
+ to_chat(usr, "Types hard del()'d by the GC:")
for(var/A in gc_hard_del_types)
- usr << "[A]"
+ to_chat(usr, "[A]")
// Profiling stuff
var/global/del_profiling = 0
@@ -169,7 +169,7 @@ var/global/list/ghdels_profiled = list()
if(usr && usr.client)
usr.client.running_find_references = null
running_find_references = null
-
+
/client/verb/purge_all_destroyed_objects()
set category = "Debug"
if(garbageCollector)
@@ -190,4 +190,3 @@ var/global/list/ghdels_profiled = list()
if(!running_find_references)
find_references(remove_from_queue = FALSE)
#endif
-
\ No newline at end of file
diff --git a/code/modules/holiday/holiday.dm b/code/modules/holiday/holiday.dm
index 43d7cf2a464..db82a5227e6 100644
--- a/code/modules/holiday/holiday.dm
+++ b/code/modules/holiday/holiday.dm
@@ -317,7 +317,7 @@
begin_day += 31
begin_month-- //begins in march, ends in april
-// world << "Easter calculates to be on [begin_day] of [begin_month] ([days_early] early) to [end_day] of [end_month] ([days_extra] extra) for 20[yy]"
+// to_chat(world, "Easter calculates to be on [begin_day] of [begin_month] ([days_early] early) to [end_day] of [end_month] ([days_extra] extra) for 20[yy]")
return ..()
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 8aa79cd6484..a025e32f872 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -28,7 +28,7 @@
if(!plant_controller)
sleep(250) // ugly hack, should mean roundstart plants are fine.
if(!plant_controller)
- world << "Plant controller does not exist and [src] requires it. Aborting."
+ to_chat(world, "Plant controller does not exist and [src] requires it. Aborting.")
qdel(src)
return
@@ -83,7 +83,7 @@
if(!plant_controller)
sleep(250) // ugly hack, should mean roundstart plants are fine.
if(!plant_controller)
- world << "Plant controller does not exist and [src] requires it. Aborting."
+ to_chat(world, "Plant controller does not exist and [src] requires it. Aborting.")
qdel(src)
return
@@ -182,7 +182,7 @@
return
M.stop_pulling()
- M << "You slipped on the [name]!"
+ to_chat(M, "You slipped on the [name]!")
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
M.Stun(8)
M.Weaken(5)
@@ -202,7 +202,7 @@
var/obj/item/stack/cable_coil/C = W
if(C.use(5))
//TODO: generalize this.
- user << "You add some cable to the [src.name] and slide it inside the battery casing."
+ to_chat(user, "You add some cable to the [src.name] and slide it inside the battery casing.")
var/obj/item/weapon/stock_parts/cell/potato/pocell = new /obj/item/weapon/stock_parts/cell/potato(get_turf(user))
if(src.loc == user && !(user.l_hand && user.r_hand) && istype(user,/mob/living/carbon/human))
user.put_in_hands(pocell)
@@ -219,21 +219,21 @@
qdel(src)
return
else if(seed.kitchen_tag == "potato")
- user << "You slice \the [src] into sticks."
+ to_chat(user, "You slice \the [src] into sticks.")
reagents_per_slice = reagents.total_volume
slice = new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src))
reagents.trans_to(slice, reagents_per_slice)
qdel(src)
return
else if(seed.kitchen_tag == "carrot")
- user << "You slice \the [src] into sticks."
+ to_chat(user, "You slice \the [src] into sticks.")
reagents_per_slice = reagents.total_volume
slice = new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
reagents.trans_to(slice, reagents_per_slice)
qdel(src)
return
else if(seed.kitchen_tag == "watermelon")
- user << "You slice \the [src] into large slices."
+ to_chat(user, "You slice \the [src] into large slices.")
reagents_per_slice = reagents.total_volume/5
for(var/i=0,i<5,i++)
slice = new /obj/item/weapon/reagent_containers/food/snacks/watermelonslice(get_turf(src))
@@ -241,7 +241,7 @@
qdel(src)
return
else if(seed.kitchen_tag == "soybeans")
- user << "You roughly chop up \the [src]."
+ to_chat(user, "You roughly chop up \the [src].")
reagents_per_slice = reagents.total_volume
slice = new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
reagents.trans_to(slice, reagents_per_slice)
@@ -259,7 +259,7 @@
if(G.amount>=G.max_amount)
continue
G.attackby(NG, user)
- user << "You add the newly-formed wood to the stack. It now contains [NG.amount] planks."
+ to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.amount] planks.")
qdel(src)
return
else if(istype(W, /obj/item/weapon/rollingpaper))
@@ -283,10 +283,10 @@
src.reagents.trans_to(J, J.chem_volume)
qdel(W)
user.put_in_active_hand(J)
- user << "\blue You roll the [src] into a rolling paper."
+ to_chat(user, "\blue You roll the [src] into a rolling paper.")
qdel(src)
else
- user << "\red You can't roll a smokable from the [src]."
+ to_chat(user, "\red You can't roll a smokable from the [src].")
..()
@@ -347,12 +347,12 @@
return
if(reagents && reagents.total_volume <= 0) //used-up fruit will be destroyed
if(user)
- user << "\The [src] has dried out and crumbles to dust."
+ to_chat(user, "\The [src] has dried out and crumbles to dust.")
//user.drop_from_inventory(src)
qdel(src)
else if(prob(35)) //fruit that still has reagents has a chance of breaking each time it stings on hit
if(user)
- user << "\The [src] has fallen to bits."
+ to_chat(user, "\The [src] has fallen to bits.")
//user.drop_from_inventory(src)
qdel(src)
@@ -378,7 +378,7 @@
return
if(user.a_intent == I_DISARM && seed.get_trait(TRAIT_SPREAD) > 0) //Using disarm so we can tell if you want to plant or convert non-final plants
- user << "You plant the [src.name]."
+ to_chat(user, "You plant the [src.name].")
new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed)
new /obj/effect/plant(get_turf(user), src.seed)
qdel(src)
@@ -390,13 +390,13 @@
if("comfrey")
var/obj/item/stack/medical/bruise_pack/comfrey/poultice = new /obj/item/stack/medical/bruise_pack/comfrey(user.loc)
poultice.heal_brute = potency
- user << "You mash the leaves into a poultice."
+ to_chat(user, "You mash the leaves into a poultice.")
qdel(src)
return
if("aloe")
var/obj/item/stack/medical/ointment/aloe/poultice = new /obj/item/stack/medical/ointment/aloe(user.loc)
poultice.heal_burn = potency
- user << "You mash the petals into a poultice."
+ to_chat(user, "You mash the petals into a poultice.")
qdel(src)
return
if("grass")
@@ -410,7 +410,7 @@
if(NG.amount>=NG.max_amount)
continue
NG.attackby(G, user)
- user << "You add the newly-formed grass to the stack. It now contains [G.amount] tiles."
+ to_chat(user, "You add the newly-formed grass to the stack. It now contains [G.amount] tiles.")
qdel(src)
return
if("sunflower")
@@ -424,7 +424,7 @@
if(prob(10))
user.say("PRAISE THE SUN!")
else
- user << "PRAISE THE SUN!"
+ to_chat(user, "PRAISE THE SUN!")
user.unEquip(src)
user.put_in_hands(NF)
qdel(src)
@@ -432,7 +432,7 @@
if("nettle")
var/obj/item/weapon/grown/nettle/nettle = new /obj/item/weapon/grown/nettle(user.loc)
nettle.force = round((5 + potency / 5), 1)
- user << "You straighten up the plant."
+ to_chat(user, "You straighten up the plant.")
user.unEquip(src)
user.put_in_hands(nettle)
qdel(src)
@@ -440,41 +440,41 @@
if("deathnettle")
var/obj/item/weapon/grown/nettle/death/DN = new /obj/item/weapon/grown/nettle/death(user.loc)
DN.force = round((5 + potency / 2.5), 1)
- user << "You straighten up the plant."
+ to_chat(user, "You straighten up the plant.")
user.unEquip(src)
user.put_in_hands(DN)
qdel(src)
return
if("cashpod")
- user << "You crack open the cash pod..."
+ to_chat(user, "You crack open the cash pod...")
var/value = round(seed.get_trait(TRAIT_POTENCY))
user.unEquip(src)
switch(value)
if(0)
- user << "It's empty! What a waste..."
+ to_chat(user, "It's empty! What a waste...")
if(1 to 10)
- user << "It has a space dollar inside. Woo."
+ to_chat(user, "It has a space dollar inside. Woo.")
new /obj/item/weapon/spacecash(get_turf(user))
if(11 to 20)
- user << "It has 10 space dollars inside!"
+ to_chat(user, "It has 10 space dollars inside!")
new /obj/item/weapon/spacecash/c10(get_turf(user))
if(21 to 30)
- user << "It has 20 space dollars inside! Cool!"
+ to_chat(user, "It has 20 space dollars inside! Cool!")
new /obj/item/weapon/spacecash/c20(get_turf(user))
if(31 to 40)
- user << "It has 50 space dollars inside! Nice!"
+ to_chat(user, "It has 50 space dollars inside! Nice!")
new /obj/item/weapon/spacecash/c50(get_turf(user))
if(41 to 50)
- user << "It has 100 space dollars inside! Sweet!"
+ to_chat(user, "It has 100 space dollars inside! Sweet!")
new /obj/item/weapon/spacecash/c100(get_turf(user))
if(51 to 60)
- user << "It has 200 space dollars inside! Awesome!"
+ to_chat(user, "It has 200 space dollars inside! Awesome!")
new /obj/item/weapon/spacecash/c200(get_turf(user))
if(61 to 80)
- user << "It has 500 space dollars inside! CHA-CHING!"
+ to_chat(user, "It has 500 space dollars inside! CHA-CHING!")
new /obj/item/weapon/spacecash/c500(get_turf(user))
else
- user << "It has 1000 space dollars inside! JACKPOT!"
+ to_chat(user, "It has 1000 space dollars inside! JACKPOT!")
new /obj/item/weapon/spacecash/c1000(get_turf(user))
qdel(src)
return
@@ -507,5 +507,5 @@
O.update_icon() //update power meters and such
batteries_recharged = 1
if(batteries_recharged)
- usr << "Battery has recovered."
+ to_chat(usr, "Battery has recovered.")
..()
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index c806bf0b8c1..fd9405cc6bf 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -65,7 +65,7 @@
user.UpdateDamageIcon()
else
C.take_organ_damage(0,force)
- C << "The nettle burns your bare hand!"
+ to_chat(C, "The nettle burns your bare hand!")
return 1
/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
@@ -73,7 +73,7 @@
if(force > 0)
force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off
else
- usr << "All the leaves have fallen off the nettle from violent whacking."
+ to_chat(usr, "All the leaves have fallen off the nettle from violent whacking.")
usr.unEquip(src)
qdel(src)
@@ -90,11 +90,11 @@
if(..())
if(prob(50))
user.Paralyse(5)
- user << "You are stunned by the Deathnettle when you try picking it up!"
+ to_chat(user, "You are stunned by the Deathnettle when you try picking it up!")
/obj/item/weapon/grown/nettle/death/afterattack(mob/living/carbon/M, mob/user)
if(istype(M, /mob/living))
- M << "You are stunned by the powerful acid of the Deathnettle!"
+ to_chat(M, "You are stunned by the powerful acid of the Deathnettle!")
add_logs(M, user, "attacked", src)
M.eye_blurry += force/7
@@ -118,7 +118,7 @@
/obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/knife))
- user << "You use [W] to fashion a pipe out of the corn cob!"
+ to_chat(user, "You use [W] to fashion a pipe out of the corn cob!")
new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
qdel(src)
return
@@ -149,8 +149,8 @@
throw_range = 20
/obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob)
- M << " [user] smacks you with a [name]!FLOWER POWER"
- user << " Your [name]'s FLOWER POWER strikes [M]"
+ to_chat(M, " [user] smacks you with a [name]!FLOWER POWER")
+ to_chat(user, " Your [name]'s FLOWER POWER strikes [M]")
// Novaflower
@@ -167,13 +167,13 @@
throw_range = 20
/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob)
- M << "[user] smacks you with a [name]!FLOWER POWER"
- user << " Your [name]'s FLOWER POWER strikes [M]"
+ to_chat(M, "[user] smacks you with a [name]!FLOWER POWER")
+ to_chat(user, " Your [name]'s FLOWER POWER strikes [M]")
if(istype(M, /mob/living))
- M << "You are heated by the warmth of the of the [name]!"
+ to_chat(M, "You are heated by the warmth of the of the [name]!")
M.bodytemperature += potency/2 * TEMPERATURE_DAMAGE_COEFFICIENT
/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob)
if(!user.gloves)
- user << "The [name] burns your bare hand!"
+ to_chat(user, "The [name] burns your bare hand!")
user.adjustFireLoss(rand(1,5))
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index 896eb886060..7f7addca012 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -120,15 +120,15 @@
if(get_trait(TRAIT_CARNIVOROUS))
if(get_trait(TRAIT_CARNIVOROUS) == 2)
if(affecting)
- target << "\The [fruit]'s thorns pierce your [affecting.name] greedily!"
+ to_chat(target, "\The [fruit]'s thorns pierce your [affecting.name] greedily!")
else
- target << "\The [fruit]'s thorns pierce your flesh greedily!"
+ to_chat(target, "\The [fruit]'s thorns pierce your flesh greedily!")
damage = get_trait(TRAIT_POTENCY)/2
else
if(affecting)
- target << "\The [fruit]'s thorns dig deeply into your [affecting.name]!"
+ to_chat(target, "\The [fruit]'s thorns dig deeply into your [affecting.name]!")
else
- target << "\The [fruit]'s thorns dig deeply into your flesh!"
+ to_chat(target, "\The [fruit]'s thorns dig deeply into your flesh!")
damage = get_trait(TRAIT_POTENCY)/5
else
return
@@ -187,7 +187,7 @@
if(!protection_needed) //properly protected, good job!
return
- target << "You are stung by \the [fruit]!"
+ to_chat(target, "You are stung by \the [fruit]!")
for(var/rid in chems)
var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5))
target.reagents.add_reagent(rid,injecting)
@@ -713,9 +713,11 @@
return
if(!force_amount && get_trait(TRAIT_YIELD) == 0 && !harvest_sample)
- if(istype(user)) user << "You fail to harvest anything useful."
+ if(istype(user))
+ to_chat(user, "You fail to harvest anything useful.")
else
- if(istype(user)) user << "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name]."
+ if(istype(user))
+ to_chat(user, "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name].")
//This may be a new line. Update the global if it is.
if(name == "new line" || !(name in plant_controller.seeds))
diff --git a/code/modules/hydroponics/seed_controller.dm b/code/modules/hydroponics/seed_controller.dm
index 7e373bfd2a6..5ba2b4dcfb3 100644
--- a/code/modules/hydroponics/seed_controller.dm
+++ b/code/modules/hydroponics/seed_controller.dm
@@ -13,11 +13,11 @@
if(!holder) return
if(!plant_controller || !plant_controller.gene_tag_list)
- usr << "Gene tags not set."
+ to_chat(usr, "Gene tags not set.")
return
for(var/gene_tag in plant_controller.gene_tag_list)
- usr << "[gene_tag]"
+ to_chat(usr, "[gene_tag]")
var/global/datum/controller/plants/plant_controller // Set in New().
@@ -144,7 +144,7 @@ var/global/datum/controller/plants/plant_controller // Set in New().
/client/proc/list_plant_sprites()
if(!plant_controller || !plant_controller.plant_sprites || !plant_controller.plant_sprites.len)
- world << "Cannot list plant sprites, plant controller or plant sprites list may not be initialized."
+ to_chat(world, "Cannot list plant sprites, plant controller or plant sprites list may not be initialized.")
for(var/base in plant_controller.plant_sprites)
- world << "[base] : [plant_controller.plant_sprites[base]] growth states"
\ No newline at end of file
+ to_chat(world, "[base] : [plant_controller.plant_sprites[base]] growth states")
diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm
index 3f01f903763..6e94201c75c 100644
--- a/code/modules/hydroponics/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines.dm
@@ -17,7 +17,7 @@
if(genes.len)
var/choice = alert(user, "Are you sure you want to wipe the disk?", "Xenobotany Data", "No", "Yes")
if(src && user && genes && choice && choice == "Yes" && user.Adjacent(get_turf(src)))
- user << "You wipe the disk data."
+ to_chat(user, "You wipe the disk data.")
name = initial(name)
desc = initial(name)
genes = list()
@@ -82,21 +82,21 @@
/obj/machinery/botany/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/seeds))
if(seed)
- user << "There is already a seed loaded."
+ to_chat(user, "There is already a seed loaded.")
return
var/obj/item/seeds/S =W
if(S.seed && S.seed.get_trait(TRAIT_IMMUTABLE) > 0)
- user << "That seed is not compatible with our genetics technology."
+ to_chat(user, "That seed is not compatible with our genetics technology.")
else
user.drop_item(W)
W.loc = src
seed = W
- user << "You load [W] into [src]."
+ to_chat(user, "You load [W] into [src].")
return
if(istype(W,/obj/item/weapon/screwdriver))
open = !open
- user << "You [open ? "open" : "close"] the maintenance panel."
+ to_chat(user, "You [open ? "open" : "close"] the maintenance panel.")
return
if(open)
@@ -106,24 +106,24 @@
if(istype(W,/obj/item/weapon/disk/botany))
if(loaded_disk)
- user << "There is already a data disk loaded."
+ to_chat(user, "There is already a data disk loaded.")
return
else
var/obj/item/weapon/disk/botany/B = W
if(B.genes && B.genes.len)
if(!disk_needs_genes)
- user << "That disk already has gene data loaded."
+ to_chat(user, "That disk already has gene data loaded.")
return
else
if(disk_needs_genes)
- user << "That disk does not have any gene data loaded."
+ to_chat(user, "That disk does not have any gene data loaded.")
return
user.drop_item(W)
W.loc = src
loaded_disk = W
- user << "You load [W] into [src]."
+ to_chat(user, "You load [W] into [src].")
return
..()
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index 568af7a89ec..dee87d848d3 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -62,7 +62,7 @@ var/global/list/plant_seed_sprites = list()
/obj/item/seeds/examine(mob/user)
..(user)
if(seed && !seed.roundstart)
- user << "It's tagged as variety #[seed.uid]."
+ to_chat(user, "It's tagged as variety #[seed.uid].")
/obj/item/seeds/cutting
name = "cuttings"
diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index ad8cc8fa281..fe905595677 100644
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -215,12 +215,12 @@
if (loaded)
user.visible_message("[user] puts the seeds from \the [O.name] into \the [src].", "You put the seeds from \the [O.name] into \the [src].")
else
- user << "There are no seeds in \the [O.name]."
+ to_chat(user, "There are no seeds in \the [O.name].")
return
else if(istype(O, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
anchored = !anchored
- user << "You [anchored ? "wrench" : "unwrench"] \the [src]."
+ to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].")
/obj/machinery/seed_storage/proc/add(var/obj/item/seeds/O as obj)
if (istype(O.loc, /mob))
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index c169711ef83..c26d5b98bad 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -92,7 +92,7 @@
if(!plant_controller)
sleep(250) // ugly hack, should mean roundstart plants are fine.
if(!plant_controller)
- world << "Plant controller does not exist and [src] requires it. Aborting."
+ to_chat(world, "Plant controller does not exist and [src] requires it. Aborting.")
qdel(src)
return
@@ -243,7 +243,7 @@
if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel))
if(!seed)
- user << "There is nothing to take a sample from."
+ to_chat(user, "There is nothing to take a sample from.")
return
seed.harvest(user,0,1)
health -= (rand(3,5)*10)
diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm
index fbdc534c4e4..5de1ba34473 100644
--- a/code/modules/hydroponics/spreading/spreading_response.dm
+++ b/code/modules/hydroponics/spreading/spreading_response.dm
@@ -52,6 +52,6 @@
//entangling people
if(victim.loc == src.loc)
- victim << "Tendrils [pick("wind", "tangle", "tighten")] around you!"
+ to_chat(victim, "Tendrils [pick("wind", "tangle", "tighten")] around you!")
can_buckle = 1
buckle_mob(victim)
\ No newline at end of file
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 4eda71ebfd1..d394fcefea8 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -163,7 +163,8 @@
return
if(closed_system)
- if(user) user << "You can't harvest from the plant while the lid is shut."
+ if(user)
+ to_chat(user, "You can't harvest from the plant while the lid is shut.")
return
if(user)
@@ -196,7 +197,7 @@
if(!user || !dead) return
if(closed_system)
- user << "You can't remove the dead plant while the lid is shut."
+ to_chat(user, "You can't remove the dead plant while the lid is shut.")
return
seed = null
@@ -208,7 +209,7 @@
yield_mod = 0
mutation_mod = 0
- user << "You remove the dead plant."
+ to_chat(user, "You remove the dead plant.")
check_health()
return
@@ -336,11 +337,11 @@
set src in view(1)
if(labelled)
- usr << "You remove the label."
+ to_chat(usr, "You remove the label.")
labelled = null
update_icon()
else
- usr << "There is no label to remove."
+ to_chat(usr, "There is no label to remove.")
return
/obj/machinery/portable_atmospherics/hydroponics/verb/setlight()
@@ -351,7 +352,7 @@
var/new_light = input("Specify a light level.") as null|anything in list(0,1,2,3,4,5,6,7,8,9,10)
if(new_light)
tray_light = new_light
- usr << "You set the tray to a light level of [tray_light] lumens."
+ to_chat(usr, "You set the tray to a light level of [tray_light] lumens.")
/obj/machinery/portable_atmospherics/hydroponics/proc/check_level_sanity()
//Make sure various values are sane.
@@ -398,7 +399,7 @@
if(istype(O, /obj/item/weapon/crowbar))
if(anchored==2)
- user << "Unscrew the hoses first!"
+ to_chat(user, "Unscrew the hoses first!")
return
default_deconstruction_crowbar(O, 1)
@@ -410,11 +411,11 @@
var/obj/item/weapon/reagent_containers/glass/C = O
//Check if container is empty
if(!C.reagents.total_volume)
- user << "\red [C] is empty."
+ to_chat(user, "\red [C] is empty.")
return
//Container not empty, transfer contents to tray
var/trans = C.reagents.trans_to(src, C.amount_per_transfer_from_this)
- user << "\blue You transfer [trans] units of the solution to [src]."
+ to_chat(user, "\blue You transfer [trans] units of the solution to [src].")
check_level_sanity()
process_reagents()
@@ -427,7 +428,7 @@
toxins += P.toxicity
pestlevel -= P.pest_kill_str
weedlevel -= P.weed_kill_str
- user << "You spray [src] with [O]."
+ to_chat(user, "You spray [src] with [O].")
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
qdel(O)
@@ -440,7 +441,7 @@
user.drop_item(O)
toxins += W.toxicity
weedlevel -= W.weed_kill_str
- user << "You spray [src] with [O]."
+ to_chat(user, "You spray [src] with [O].")
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
qdel(O)
@@ -453,7 +454,7 @@
//Check if there is a plant in the tray
if(seed)
if(!S.reagents.total_volume)
- user << "\red [S] is empty."
+ to_chat(user, "\red [S] is empty.")
return
//Container not empty, transfer contents to tray
S.reagents.trans_to(src, S.amount_per_transfer_from_this)
@@ -462,20 +463,20 @@
check_level_sanity()
update_icon()
else
- user << "There's nothing in [src] to spray!"
+ to_chat(user, "There's nothing in [src] to spray!")
else if(istype(O, /obj/item/weapon/screwdriver) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY
if(anchored)
if(anchored == 2)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 1
- user << "You unscrew the [src]'s hoses."
+ to_chat(user, "You unscrew the [src]'s hoses.")
panel_open = 0
else if(anchored == 1)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 2
- user << "You screw in the [src]'s hoses."
+ to_chat(user, "You screw in the [src]'s hoses.")
panel_open = 1
for(var/obj/machinery/portable_atmospherics/hydroponics/h in range(1,src))
@@ -485,15 +486,15 @@
if(istype(O, /obj/item/weapon/wirecutters) || istype(O, /obj/item/weapon/scalpel))
if(!seed)
- user << "There is nothing to take a sample from in \the [src]."
+ to_chat(user, "There is nothing to take a sample from in \the [src].")
return
if(sampled)
- user << "You have already sampled from this plant."
+ to_chat(user, "You have already sampled from this plant.")
return
if(dead)
- user << "The plant is dead."
+ to_chat(user, "The plant is dead.")
return
// Create a sample.
@@ -518,14 +519,14 @@
if(seed)
return ..()
else
- user << "There's no plant to inject."
+ to_chat(user, "There's no plant to inject.")
return 1
else
if(seed)
//Leaving this in in case we want to extract from plants later.
- user << "You can't get any extract out of this plant."
+ to_chat(user, "You can't get any extract out of this plant.")
else
- user << "There's nothing to draw something from."
+ to_chat(user, "There's nothing to draw something from.")
return 1
else if (istype(O, /obj/item/seeds))
@@ -536,11 +537,11 @@
user.drop_item(O)
if(!S.seed)
- user << "The packet seems to be empty. You throw it away."
+ to_chat(user, "The packet seems to be empty. You throw it away.")
qdel(O)
return
- user << "You plant the [S.seed.seed_name] [S.seed.seed_noun]."
+ to_chat(user, "You plant the [S.seed.seed_name] [S.seed.seed_noun].")
seed = S.seed //Grab the seed datum.
dead = 0
age = 1
@@ -554,7 +555,7 @@
check_health()
else
- user << "\The [src] already has seeds in it!"
+ to_chat(user, "\The [src] already has seeds in it!")
else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe
@@ -563,7 +564,7 @@
weedlevel = 0
update_icon()
else
- user << "This plot is completely devoid of weeds. It doesn't need uprooting."
+ to_chat(user, "This plot is completely devoid of weeds. It doesn't need uprooting.")
else if (istype(O, /obj/item/weapon/storage/bag/plants))
@@ -583,12 +584,12 @@
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
anchored = !anchored
- user << "You [anchored ? "wrench" : "unwrench"] \the [src]."
+ to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].")
else if(istype(O, /obj/item/apiary))
if(seed)
- user << "[src] is already occupied!"
+ to_chat(user, "[src] is already occupied!")
else
user.drop_item()
qdel(O)
@@ -600,7 +601,7 @@
qdel(src)
else if ((istype(O, /obj/item/weapon/tank) && !( src.destroyed )))
if (src.holding)
- user << "\blue There is alreadu a tank loaded into the [src]."
+ to_chat(user, "\blue There is alreadu a tank loaded into the [src].")
return
var/obj/item/weapon/tank/T = O
user.drop_item()
@@ -635,26 +636,26 @@
..(user)
if(!seed)
- user << "[src] is empty."
+ to_chat(user, "[src] is empty.")
return
- user << "[seed.display_name] are growing here."
+ to_chat(user, "[seed.display_name] are growing here.")
if(!Adjacent(user))
return
- user << "Water: [round(waterlevel,0.1)]/[maxwater]"
- user << "Nutrient: [round(nutrilevel,0.1)]/[maxnutri]"
+ to_chat(user, "Water: [round(waterlevel,0.1)]/[maxwater]")
+ to_chat(user, "Nutrient: [round(nutrilevel,0.1)]/[maxnutri]")
if(weedlevel >= 5)
- user << "\The [src] is infested with weeds!"
+ to_chat(user, "\The [src] is infested with weeds!")
if(pestlevel >= 5)
- user << "\The [src] is infested with tiny worms!"
+ to_chat(user, "\The [src] is infested with tiny worms!")
if(dead)
- user << "The plant is dead."
+ to_chat(user, "The plant is dead.")
else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2))
- user << "The plant looks unhealthy."
+ to_chat(user, "The plant looks unhealthy.")
if(mechanical)
var/turf/T = loc
@@ -682,7 +683,7 @@
light_available = 5
light_string = "a light level of [light_available] lumens"
- user << "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K."
+ to_chat(user, "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K.")
/obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb()
set name = "Toggle Tray Lid"
@@ -695,7 +696,7 @@
return
closed_system = !closed_system
- user << "You [closed_system ? "close" : "open"] the tray's lid."
+ to_chat(user, "You [closed_system ? "close" : "open"] the tray's lid.")
update_icon()
/obj/machinery/portable_atmospherics/hydroponics/verb/eject_tank_verb()
@@ -709,9 +710,9 @@
return
if(!holding)
- usr << "\red There is no tank loaded into [src] to eject."
+ to_chat(usr, "\red There is no tank loaded into [src] to eject.")
if(istype(holding, /obj/item/weapon/tank))
- usr << "\blue You eject [holding.name] from [src]."
+ to_chat(usr, "\blue You eject [holding.name] from [src].")
holding.loc = loc
holding = null
\ No newline at end of file
diff --git a/code/modules/hydroponics/trays/tray_apiary.dm b/code/modules/hydroponics/trays/tray_apiary.dm
index f21ac2765df..25a2698d274 100644
--- a/code/modules/hydroponics/trays/tray_apiary.dm
+++ b/code/modules/hydroponics/trays/tray_apiary.dm
@@ -35,10 +35,10 @@
else if(istype(Proj ,/obj/item/projectile/energy/florayield))
if(!yieldmod)
yieldmod += 1
- //world << "Yield increased by 1, from 0, to a total of [myseed.yield]"
+// to_chat(world, "Yield increased by 1, from 0, to a total of [myseed.yield]")
else if (prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2...
yieldmod += 1
- //world << "Yield increased by 1, to a total of [myseed.yield]"
+// to_chat(world, "Yield increased by 1, to a total of [myseed.yield]")
else
..()
return
@@ -46,56 +46,56 @@
/obj/machinery/apiary/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/queen_bee))
if(health > 0)
- user << "\red There is already a queen in there."
+ to_chat(user, "\red There is already a queen in there.")
else
health = 10
nutrilevel += 10
user.drop_item()
qdel(O)
- user << "\blue You carefully insert the queen into [src], she gets busy making a hive."
+ to_chat(user, "\blue You carefully insert the queen into [src], she gets busy making a hive.")
bees_in_hive = 0
else if(istype(O, /obj/item/beezeez))
beezeez += 100
nutrilevel += 10
user.drop_item()
if(health > 0)
- user << "\blue You insert [O] into [src]. A relaxed humming appears to pick up."
+ to_chat(user, "\blue You insert [O] into [src]. A relaxed humming appears to pick up.")
else
- user << "\blue You insert [O] into [src]. Now it just needs some bees."
+ to_chat(user, "\blue You insert [O] into [src]. Now it just needs some bees.")
qdel(O)
else if(istype(O, /obj/item/weapon/minihoe))
if(health > 0)
- user << "\red You begin to dislodge the apiary from the tray, the bees don't like that."
+ to_chat(user, "\red You begin to dislodge the apiary from the tray, the bees don't like that.")
angry_swarm(user)
else
- user << "\blue You begin to dislodge the dead apiary from the tray."
+ to_chat(user, "\blue You begin to dislodge the dead apiary from the tray.")
if(do_after(user, 50, target = src))
new hydrotray_type(src.loc)
new /obj/item/apiary(src.loc)
- user << "\red You dislodge the apiary from the tray."
+ to_chat(user, "\red You dislodge the apiary from the tray.")
qdel(src)
else if(istype(O, /obj/item/weapon/bee_net))
var/obj/item/weapon/bee_net/N = O
if(N.caught_bees > 0)
- user << "\blue You empty the bees into the apiary."
+ to_chat(user, "\blue You empty the bees into the apiary.")
bees_in_hive += N.caught_bees
N.caught_bees = 0
else
- user << "\blue There are no more bees in the net."
+ to_chat(user, "\blue There are no more bees in the net.")
else if(istype(O, /obj/item/weapon/reagent_containers/glass))
var/obj/item/weapon/reagent_containers/glass/G = O
if(harvestable_honey > 0)
if(health > 0)
- user << "\red You begin to harvest the honey. The bees don't seem to like it."
+ to_chat(user, "\red You begin to harvest the honey. The bees don't seem to like it.")
angry_swarm(user)
else
- user << "\blue You begin to harvest the honey."
+ to_chat(user, "\blue You begin to harvest the honey.")
if(do_after(user,50, target = src))
G.reagents.add_reagent("honey",harvestable_honey)
harvestable_honey = 0
- user << "\blue You successfully harvest the honey."
+ to_chat(user, "\blue You successfully harvest the honey.")
else
- user << "\blue There is no honey left to harvest."
+ to_chat(user, "\blue There is no honey left to harvest.")
else
angry_swarm(user)
..()
@@ -236,5 +236,5 @@
if(toxic > 0)
H.reagents.add_reagent("toxin", toxic)
- usr << "\blue You harvest the honeycomb from the hive. There is a wild buzzing!"
+ to_chat(usr, "\blue You harvest the honeycomb from the hive. There is a wild buzzing!")
angry_swarm(usr)
diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index a25eaec652b..b4c4c5c4543 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -29,7 +29,7 @@
/obj/item/device/analyzer/plant_analyzer/proc/print_report(var/mob/living/user)
if(!last_data)
- user << "There is no scan data to print."
+ to_chat(user, "There is no scan data to print.")
return
playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1)
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src))
@@ -99,7 +99,7 @@
grown_reagents = H.reagents
if(!grown_seed)
- user << "[src] can tell you nothing about \the [target]."
+ to_chat(user, "[src] can tell you nothing about \the [target].")
return
form_title = "[grown_seed.seed_name] (#[grown_seed.uid])"
@@ -344,7 +344,7 @@
/obj/item/weapon/scythe/tele/attack_self(mob/user as mob)
extend = !extend
if(extend)
- user << "With a flick of the wrist, you extend the scythe. It's reaping time!"
+ to_chat(user, "With a flick of the wrist, you extend the scythe. It's reaping time!")
icon_state = "tscythe1"
item_state = "scythe0"
slot_flags &= ~SLOT_BELT
@@ -355,7 +355,7 @@
//Extend sound (blade unsheath)
playsound(src.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1) //Sound credit to Qat of Freesound.org
else
- user << "You collapse the scythe, folding it for easy storage."
+ to_chat(user, "You collapse the scythe, folding it for easy storage.")
icon_state = "tscythe0"
item_state = "tscythe0" //no sprite in other words
slot_flags |= SLOT_BELT
diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm
index ceab49c8e2f..aac0822a283 100644
--- a/code/modules/hydroponics/trays/tray_update_icons.dm
+++ b/code/modules/hydroponics/trays/tray_update_icons.dm
@@ -30,7 +30,7 @@
if(!seed.growth_stages)
seed.update_growth_stages()
if(!seed.growth_stages)
- world << "Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value."
+ to_chat(world, "Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.")
return
var/overlay_stage = 1
if(age >= seed.get_trait(TRAIT_MATURATION))
diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm
index 9633383e98a..12dedc60fba 100644
--- a/code/modules/karma/karma.dm
+++ b/code/modules/karma/karma.dm
@@ -54,11 +54,11 @@ var/list/karma_spenders = list()
set category = "Special Verbs"
if(!ticker || !player_list.len)
- usr << "\red You can't award karma until the game has started."
+ to_chat(usr, "\red You can't award karma until the game has started.")
return
if(ticker.current_state == GAME_STATE_PREGAME)
- usr << "\red You can't award karma until the game has started."
+ to_chat(usr, "\red You can't award karma until the game has started.")
return
var/list/karma_list = list("Cancel")
@@ -68,7 +68,7 @@ var/list/karma_spenders = list()
karma_list += M
if(!karma_list.len || karma_list.len == 1)
- usr << "\red There's no-one to spend your karma on."
+ to_chat(usr, "\red There's no-one to spend your karma on.")
return
var/pickedmob = input("Who would you like to award Karma to?", "Award Karma", "Cancel") as null|mob in karma_list
@@ -77,7 +77,7 @@ var/list/karma_spenders = list()
return
if(!istype(pickedmob, /mob))
- usr << "\red That's not a mob."
+ to_chat(usr, "\red That's not a mob.")
return
spend_karma(pickedmob)
@@ -88,37 +88,37 @@ var/list/karma_spenders = list()
set category = "Special Verbs"
if(!M)
- usr << "Please right click a mob to award karma directly, or use the 'Award Karma' verb to select a player from the player listing."
+ to_chat(usr, "Please right click a mob to award karma directly, or use the 'Award Karma' verb to select a player from the player listing.")
return
if(!istype(M, /mob))
- usr << "\red That's not a mob."
+ to_chat(usr, "\red That's not a mob.")
return
if(!M.client)
- usr << "\red That mob has no client connected at the moment."
+ to_chat(usr, "\red That mob has no client connected at the moment.")
return
if(src.client.karma_spent)
- usr << "\red You've already spent your karma for the round."
+ to_chat(usr, "\red You've already spent your karma for the round.")
return
for(var/a in karma_spenders)
if(a == src.key)
- usr << "\red You've already spent your karma for the round."
+ to_chat(usr, "\red You've already spent your karma for the round.")
return
if(M.key == src.key)
- usr << "\red You can't spend karma on yourself!"
+ to_chat(usr, "\red You can't spend karma on yourself!")
return
if(M.client.address == src.client.address)
message_admins("\red Illegal karma spending detected from [src.key] to [M.key]. Using the same IP!")
log_game("\red Illegal karma spending detected from [src.key] to [M.key]. Using the same IP!")
- usr << "\red The karma system is not available to multi-accounters."
+ to_chat(usr, "\red The karma system is not available to multi-accounters.")
var/choice = input("Give [M.name] good karma?", "Karma") in list("Good", "Cancel")
if(!choice || choice == "Cancel")
return
if(choice == "Good" && !(src.client.karma_spent))
if(src.client.karma_spent)
- usr << "\red You've already spent your karma for the round."
+ to_chat(usr, "\red You've already spent your karma for the round.")
return
M.client.karma += 1
- usr << "[choice] karma spent on [M.name]."
+ to_chat(usr, "[choice] karma spent on [M.name].")
src.client.karma_spent = 1
karma_spenders.Add(src.key)
if(M.client.karma <= -2 || M.client.karma >= 2)
@@ -140,13 +140,13 @@ var/list/karma_spenders = list()
set desc = "Reports how much karma you have accrued."
var/currentkarma=verify_karma()
- usr << {"
You have [currentkarma] available."}
+ to_chat(usr, {"
You have [currentkarma] available."})
return
/client/proc/verify_karma()
var/currentkarma=0
if(!dbcon.IsConnected())
- usr << "\red Unable to connect to karma database. Please try again later.
"
+ to_chat(usr, "\red Unable to connect to karma database. Please try again later.
")
return
else
var/DBQuery/query = dbcon.NewQuery("SELECT karma, karmaspent FROM [format_table_name("karmatotals")] WHERE byondkey='[src.key]'")
@@ -159,10 +159,10 @@ var/list/karma_spenders = list()
karmaspent = query.item[2]
currentkarma = (text2num(totalkarma) - text2num(karmaspent))
/* if(totalkarma)
- usr << {"
You have [currentkarma] available.
+ to_chat(usr, {"
You have [currentkarma] available.
)
You've gained [totalkarma] total karma in your time here.
"}
else
- usr << "Your total karma is: 0
"*/
+ to_chat(usr, "Your total karma is: 0
")*/
return currentkarma
/client/verb/karmashop()
@@ -265,15 +265,15 @@ You've gained [totalkarma] total karma in your time here.
"}
message_admins("SQL ERROR during whitelist logging (adding new key). Error: \[[err]\]\n")
return
else
- usr << "You have unlocked [job]."
+ to_chat(usr, "You have unlocked [job].")
message_admins("[key_name(usr)] has unlocked [job].")
karmacharge(cost)
if(dbckey)
- var/list/joblist = text2list(dbjob,",")
+ var/list/joblist = splittext(dbjob,",")
if(!(job in joblist))
joblist += job
- var/newjoblist = list2text(joblist,",")
+ var/newjoblist = jointext(joblist,",")
query = dbcon.NewQuery("UPDATE [format_table_name("whitelist")] SET job='[newjoblist]' WHERE ckey='[dbckey]'")
if(!query.Execute())
var/err = query.ErrorMsg()
@@ -281,11 +281,11 @@ You've gained [totalkarma] total karma in your time here.
"}
message_admins("SQL ERROR during whitelist logging (updating existing entry). Error : \[[err]\]\n")
return
else
- usr << "You have unlocked [job]."
+ to_chat(usr, "You have unlocked [job].")
message_admins("[key_name(usr)] has unlocked [job].")
karmacharge(cost)
else
- usr << "You already have this job unlocked!"
+ to_chat(usr, "You already have this job unlocked!")
return
/client/proc/DB_species_unlock(var/species,var/cost)
@@ -305,15 +305,15 @@ You've gained [totalkarma] total karma in your time here.
"}
message_admins("SQL ERROR during whitelist logging (adding new key). Error : \[[err]\]\n")
return
else
- usr << "You have unlocked [species]."
+ to_chat(usr, "You have unlocked [species].")
message_admins("[key_name(usr)] has unlocked [species].")
karmacharge(cost)
if(dbckey)
- var/list/specieslist = text2list(dbspecies,",")
+ var/list/specieslist = splittext(dbspecies,",")
if(!(species in specieslist))
specieslist += species
- var/newspecieslist = list2text(specieslist,",")
+ var/newspecieslist = jointext(specieslist,",")
query = dbcon.NewQuery("UPDATE [format_table_name("whitelist")] SET species='[newspecieslist]' WHERE ckey='[dbckey]'")
if(!query.Execute())
var/err = query.ErrorMsg()
@@ -321,11 +321,11 @@ You've gained [totalkarma] total karma in your time here.
"}
message_admins("SQL ERROR during whitelist logging (updating existing entry). Error: \[[err]\]\n")
return
else
- usr << "You have unlocked [species]."
+ to_chat(usr, "You have unlocked [species].")
message_admins("[key_name(usr)] has unlocked [species].")
karmacharge(cost)
else
- usr << "You already have this species unlocked!"
+ to_chat(usr, "You already have this species unlocked!")
return
/client/proc/karmacharge(var/cost,var/refund = 0)
@@ -345,7 +345,7 @@ You've gained [totalkarma] total karma in your time here.
"}
message_admins("SQL ERROR during karmaspent updating (updating existing entry). Error: \[[err]\]\n")
return
else
- usr << "You have been [refund ? "refunded" : "charged"] [cost] karma."
+ to_chat(usr, "You have been [refund ? "refunded" : "charged"] [cost] karma.")
message_admins("[key_name(usr)] has been [refund ? "refunded" : "charged"] [cost] karma.")
return
@@ -371,7 +371,7 @@ You've gained [totalkarma] total karma in your time here.
"}
else if(name == "Nanotrasen Recruiter")
cost = 10
else
- usr << "\red That job is not refundable."
+ to_chat(usr, "\red That job is not refundable.")
return
var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("whitelist")] WHERE ckey='[usr.key]'")
@@ -388,15 +388,15 @@ You've gained [totalkarma] total karma in your time here.
"}
if(dbckey)
var/list/typelist = list()
if(type == "job")
- typelist = text2list(dbjob,",")
+ typelist = splittext(dbjob,",")
else if(type == "species")
- typelist = text2list(dbspecies,",")
+ typelist = splittext(dbspecies,",")
else
- usr << "\red Type [type] is not a valid column."
+ to_chat(usr, "\red Type [type] is not a valid column.")
if(name in typelist)
typelist -= name
- var/newtypelist = list2text(typelist,",")
+ var/newtypelist = jointext(typelist,",")
query = dbcon.NewQuery("UPDATE [format_table_name("whitelist")] SET [type]='[newtypelist]' WHERE ckey='[dbckey]'")
if(!query.Execute())
var/err = query.ErrorMsg()
@@ -404,14 +404,14 @@ You've gained [totalkarma] total karma in your time here.
"}
message_admins("SQL ERROR during whitelist logging (updating existing entry). Error: \[[err]\]\n")
return
else
- usr << "You have been refunded [cost] karma for [type] [name]."
+ to_chat(usr, "You have been refunded [cost] karma for [type] [name].")
message_admins("[key_name(usr)] has been refunded [cost] karma for [type] [name].")
karmacharge(text2num(cost),1)
else
- usr << "\red You have not bought [name]."
+ to_chat(usr, "\red You have not bought [name].")
else
- usr << "\red Your ckey ([dbckey]) was not found."
+ to_chat(usr, "\red Your ckey ([dbckey]) was not found.")
/client/proc/checkpurchased(var/name = null) // If the first parameter is null, return a full list of purchases
var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("whitelist")] WHERE ckey='[usr.key]'")
@@ -426,8 +426,8 @@ You've gained [totalkarma] total karma in your time here.
"}
dbspecies = query.item[4]
if(dbckey)
- var/list/joblist = text2list(dbjob,",")
- var/list/specieslist = text2list(dbspecies,",")
+ var/list/joblist = splittext(dbjob,",")
+ var/list/specieslist = splittext(dbspecies,",")
var/list/combinedlist = joblist + specieslist
if(name)
if(name in combinedlist)
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 962470c4cf1..498b7b62a37 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -32,7 +32,7 @@
O.loc = src
update_icon()
else if(istype(O, /obj/item/weapon/wrench))
- user << "\blue Now disassembling bookcase"
+ to_chat(user, "\blue Now disassembling bookcase")
playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user,50, target = src))
new /obj/item/stack/sheet/wood(get_turf(src))
@@ -160,19 +160,19 @@
/obj/item/weapon/book/attack_self(var/mob/user as mob)
if(carved)
if(store)
- user << "[store] falls out of [title]!"
+ to_chat(user, "[store] falls out of [title]!")
store.loc = get_turf(src.loc)
store = null
return
else
- user << "The pages of [title] have been cut out!"
+ to_chat(user, "The pages of [title] have been cut out!")
return
if(src.dat)
user << browse("Penned by [author].
" + "[dat]", "window=book")
user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.")
onclose(user, "book")
else
- user << "This book is completely blank!"
+ to_chat(user, "This book is completely blank!")
/obj/item/weapon/book/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(carved)
@@ -181,24 +181,24 @@
user.drop_item()
W.loc = src
store = W
- user << "You put [W] in [title]."
+ to_chat(user, "You put [W] in [title].")
return
else
- user << "[W] won't fit in [title]."
+ to_chat(user, "[W] won't fit in [title].")
return
else
- user << "There's already something in [title]!"
+ to_chat(user, "There's already something in [title]!")
return
if(istype(W, /obj/item/weapon/pen))
if(unique)
- user << "These pages don't seem to take the ink well. Looks like you can't modify it."
+ to_chat(user, "These pages don't seem to take the ink well. Looks like you can't modify it.")
return
var/choice = input("What would you like to change?") in list("Title", "Contents", "Author", "Cancel")
switch(choice)
if("Title")
var/newtitle = reject_bad_text(stripped_input(usr, "Write a new title:"))
if(!newtitle)
- usr << "The title is invalid."
+ to_chat(usr, "The title is invalid.")
return
else
src.name = newtitle
@@ -206,14 +206,14 @@
if("Contents")
var/content = strip_html(input(usr, "Write your book's contents (HTML NOT allowed):"),8192) as message|null
if(!content)
- usr << "The content is invalid."
+ to_chat(usr, "The content is invalid.")
return
else
src.dat += content
if("Author")
var/newauthor = stripped_input(usr, "Write the author's name:")
if(!newauthor)
- usr << "The name is invalid."
+ to_chat(usr, "The name is invalid.")
return
else
src.author = newauthor
@@ -222,37 +222,37 @@
else if(istype(W, /obj/item/weapon/barcodescanner))
var/obj/item/weapon/barcodescanner/scanner = W
if(!scanner.computer)
- user << "[W]'s screen flashes: 'No associated computer found!'"
+ to_chat(user, "[W]'s screen flashes: 'No associated computer found!'")
else
switch(scanner.mode)
if(0)
scanner.book = src
- user << "[W]'s screen flashes: 'Book stored in buffer.'"
+ to_chat(user, "[W]'s screen flashes: 'Book stored in buffer.'")
if(1)
scanner.book = src
scanner.computer.buffer_book = src.name
- user << "[W]'s screen flashes: 'Book stored in buffer. Book title stored in associated computer buffer.'"
+ to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Book title stored in associated computer buffer.'")
if(2)
scanner.book = src
for(var/datum/borrowbook/b in scanner.computer.checkouts)
if(b.bookname == src.name)
scanner.computer.checkouts.Remove(b)
- user << "[W]'s screen flashes: 'Book stored in buffer. Book has been checked in.'"
+ to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Book has been checked in.'")
return
- user << "[W]'s screen flashes: 'Book stored in buffer. No active check-out record found for current title.'"
+ to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. No active check-out record found for current title.'")
if(3)
scanner.book = src
for(var/obj/item/weapon/book in scanner.computer.inventory)
if(book == src)
- user << "[W]'s screen flashes: 'Book stored in buffer. Title already present in inventory, aborting to avoid duplicate entry.'"
+ to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Title already present in inventory, aborting to avoid duplicate entry.'")
return
scanner.computer.inventory.Add(src)
- user << "[W]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'"
+ to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'")
else if(istype(W, /obj/item/weapon/kitchen/knife) || istype(W, /obj/item/weapon/wirecutters))
if(carved) return
- user << "You begin to carve out [title]."
+ to_chat(user, "You begin to carve out [title].")
if(do_after(user, 30, target = src))
- user << "You carve out the pages from [title]! You didn't want to read it anyway."
+ to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.")
carved = 1
return
else
@@ -277,7 +277,7 @@
mode += 1
if(mode > 3)
mode = 0
- user << "[src] Status Display:"
+ to_chat(user, "[src] Status Display:")
var/modedesc
switch(mode)
if(0)
@@ -290,9 +290,9 @@
modedesc = "Scan book to local buffer, attempt to add book to general inventory."
else
modedesc = "ERROR"
- user << " - Mode [mode] : [modedesc]"
+ to_chat(user, " - Mode [mode] : [modedesc]")
if(src.computer)
- user << "Computer has been associated with this unit."
+ to_chat(user, "Computer has been associated with this unit.")
else
- user << "No associated computer found. Only local scans will function properly."
- user << "\n"
\ No newline at end of file
+ to_chat(user, "No associated computer found. Only local scans will function properly.")
+ to_chat(user, "\n")
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 3f93963a796..57f1b85b227 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -147,7 +147,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
dat += "7. Access the Forbidden Lore Vault
"
if(src.arcanecheckout)
new /obj/item/weapon/tome(src.loc)
- user << "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it."
+ to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.")
user.visible_message("[user] stares at the blank screen for a few moments, his expression frozen in fear. When he finally awakens from it, he looks a lot older.", 2)
src.arcanecheckout = 0
if(1)
@@ -244,7 +244,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
if(istype(W, /obj/item/weapon/barcodescanner))
var/obj/item/weapon/barcodescanner/scanner = W
scanner.computer = src
- user << "[scanner]'s associated machine has been set to [src]."
+ to_chat(user, "[scanner]'s associated machine has been set to [src].")
for (var/mob/V in hearers(src))
V.show_message("[src] lets out a low, short blip.", 2)
else
@@ -481,7 +481,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
set desc = "Permamently deletes a book from the database."
set category = "Admin"
if(!src.holder)
- src << "Only administrators may use this command."
+ to_chat(src, "Only administrators may use this command.")
return
var/isbn = input("ISBN number?", "Delete Book") as num | null
diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
index 53a44c79bf7..92500ecc1d9 100644
--- a/code/modules/lighting/lighting_atom.dm
+++ b/code/modules/lighting/lighting_atom.dm
@@ -78,4 +78,4 @@
/obj/item/dropped()
. = ..()
- update_light()
\ No newline at end of file
+ update_light()
diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm
index 31874c00eb8..f2dede3b8ba 100644
--- a/code/modules/lighting/lighting_overlay.dm
+++ b/code/modules/lighting/lighting_overlay.dm
@@ -52,9 +52,9 @@
if(lum_r / mx1 != (lum_r + delta_r) / mx2 || lum_g / mx1 != (lum_g + delta_g) / mx2 || lum_b / mx1 != (lum_b + delta_b) / mx2) //Stuff would change.
should_update = 1
- lum_r += delta_r
- lum_g += delta_g
- lum_b += delta_b
+ lum_r = max(lum_r + delta_r, 0) //Lum shouldn't drop below 1
+ lum_g = max(lum_g + delta_g, 0)
+ lum_b = max(lum_b + delta_b, 0)
if(!needs_update && should_update)
needs_update = 1
diff --git a/code/modules/logic/converter.dm b/code/modules/logic/converter.dm
new file mode 100644
index 00000000000..ff4b8ad1db3
--- /dev/null
+++ b/code/modules/logic/converter.dm
@@ -0,0 +1,143 @@
+
+//////////////////////////////////
+// Converter Gate //
+//////////////////////////////////
+
+/*
+ This gate is special enough to warrant its own file, as it overrides a lot of the logic_gate procs as well as adds a new one.
+ - CONVERT Gates convert signaler and logic signals, to allow logic gates to actually be used in tandem with assemblies and station equipment like doors.
+ - While technically a mono-input device, the input and output are actually completely different types of signals, and thus incompatible without this gate.
+ - A signaler must be attached manually before the gate is fully functional, and will retain any frequency and code settings it had when attached.
+ - You can adjust these settings through a link in the multitool menu, but the receiving mode is automatically controlled by the converter.
+ - While attached, the ability to manually send the signal on the signaler through its menu is also disabled, to avoid messing up the logic system.
+*/
+
+//CONVERT Gate
+/obj/machinery/logic_gate/convert
+ name = "CONVERT Gate"
+ desc = "Converts signals between radio and logic types, allowing for signaller input/output from logic systems."
+ icon_state = "logic_convert"
+ mono_input = 1
+
+ var/logic_output = 0 //When set to 1, the logic signal is the output. When set to 0, the logic signal is the input.
+ var/obj/item/device/assembly/signaler/attached_signaler = null
+
+/obj/machinery/logic_gate/convert/handle_logic()
+ output_state = input1_state
+ return
+
+/obj/machinery/logic_gate/convert/attackby(obj/item/O, mob/user, params)
+ if(tamperproof) //Extra precaution to avoid people attaching/removing signalers from tamperproofed converters
+ return
+ if(istype(O, /obj/item/device/assembly/signaler))
+ var/obj/item/device/assembly/signaler/S = O
+ if(S.secured)
+ to_chat(user, "The [S] is already secured.")
+ return
+ if(attached_signaler)
+ to_chat(user, "There is already a device attached, remove it first.")
+ return
+ user.unEquip(S)
+ S.forceMove(src)
+ S.holder = src
+ S.toggle_secure()
+ if(logic_output) //Make sure we are set to receive if the converter is set to output logic, and send if the converter is set to accept logic input
+ S.receiving = 1
+ else
+ S.receiving = 0
+ attached_signaler = S
+ to_chat(user, "You attach \the [S] to the I/O connection port and secure it.")
+ return
+ if(attached_signaler && istype(O, /obj/item/weapon/screwdriver)) //Makes sure we remove the attached signaler before we can open up and deconstruct the machine
+ var/obj/item/device/assembly/signaler/S = attached_signaler
+ attached_signaler = null
+ S.forceMove(get_turf(src))
+ S.holder = null
+ S.toggle_secure()
+ to_chat(user, "You unsecure and detach \the [S] from the I/O connection port.")
+ return
+ ..()
+
+/obj/machinery/logic_gate/convert/multitool_menu(var/mob/user, var/obj/item/device/multitool/P)
+ var/logic_state_string
+ var/menu_contents = {"
+
+ "}
+ if(logic_output)
+ switch(output_state)
+ if(LOGIC_OFF)
+ logic_state_string = "OFF"
+ if(LOGIC_ON)
+ logic_state_string = "ON"
+ if(LOGIC_FLICKER)
+ logic_state_string = "FLICKER"
+ else
+ logic_state_string = "ERROR: UNKNOWN STATE"
+ menu_contents += {"
+ - Output: [format_tag("ID Tag","output_id_tag")]
+ - Output State: [logic_state_string]
+ "}
+ else
+ switch(input1_state)
+ if(LOGIC_OFF)
+ logic_state_string = "OFF"
+ if(LOGIC_ON)
+ logic_state_string = "ON"
+ if(LOGIC_FLICKER)
+ logic_state_string = "FLICKER"
+ else
+ logic_state_string = "ERROR: UNKNOWN STATE"
+ menu_contents += {"
+ - Input: [format_tag("ID Tag","input1_id_tag")]
+ - Input State: [logic_state_string]
+ "}
+ menu_contents += {"
+ - Logic Signal Designation: [logic_output ? "Output" : "Input"]
+ "}
+ if(attached_signaler)
+ menu_contents += "- Adjust Signaler Settings
"
+ else
+ menu_contents += "- NO SIGNALER ATTACHED!
"
+ menu_contents += {"
+
+ "}
+ return menu_contents
+
+/obj/machinery/logic_gate/convert/multitool_topic(var/mob/user,var/list/href_list,var/obj/O)
+ ..()
+ if("toggle_logic" in href_list)
+ logic_output = !logic_output
+ if(attached_signaler) //If we have a signaler attached, make sure we update it to send/receive when we change the logic signal desgination
+ if(logic_output)
+ attached_signaler.receiving = 1
+ else
+ attached_signaler.receiving = 0
+ if(("adjust_signaler" in href_list) && attached_signaler) //Make sure that we have a signaler attached to handle this one, otherwise ignore this command
+ attached_signaler.interact(user, 1)
+ update_multitool_menu(user)
+
+/obj/machinery/logic_gate/convert/receive_signal(datum/signal/signal, receive_method, receive_param)
+ if(logic_output)
+ if(attached_signaler)
+ attached_signaler.receive_signal(signal)
+ return
+ else
+ ..()
+
+/obj/machinery/logic_gate/convert/handle_output()
+ if(logic_output)
+ ..()
+ else
+ if(attached_signaler && (output_state == LOGIC_ON || output_state == LOGIC_FLICKER))
+ attached_signaler.signal()
+ return
+
+/obj/machinery/logic_gate/convert/proc/process_activation(var/obj/item/device/D)
+ if(!logic_output) //Don't bother if our input is a logic signal
+ return
+ if(D == attached_signaler) //Ignore if we somehow got called by a device that isn't what we have attached
+ input1_state = LOGIC_FLICKER
+ spawn(LOGIC_FLICKER_TIME)
+ if(input1_state == LOGIC_FLICKER)
+ input1_state = LOGIC_OFF
+ return
diff --git a/code/modules/logic/dual_input.dm b/code/modules/logic/dual_input.dm
new file mode 100644
index 00000000000..03bfa4f1688
--- /dev/null
+++ b/code/modules/logic/dual_input.dm
@@ -0,0 +1,99 @@
+
+//////////////////////////////////
+// Dual-Input Gates //
+//////////////////////////////////
+
+
+// OR Gate
+/obj/machinery/logic_gate/or
+ name = "OR Gate"
+ desc = "Outputs ON when at least one input is ON."
+ icon_state = "logic_or"
+
+/obj/machinery/logic_gate/or/handle_logic()
+ if(input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER || input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER)
+ if(input1_state == LOGIC_ON || input2_state == LOGIC_ON) //continuous signal takes priority in determining what to output
+ output_state = LOGIC_ON
+ else
+ output_state = LOGIC_FLICKER
+ else //Both inputs were off, so input is off
+ output_state = LOGIC_OFF
+ return
+
+// AND Gate
+/obj/machinery/logic_gate/and
+ name = "AND Gate"
+ desc = "Outputs ON only when both inputs are ON."
+ icon_state = "logic_and"
+
+/obj/machinery/logic_gate/and/handle_logic()
+ if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) && (input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER))
+ if(input1_state == LOGIC_ON && input2_state == LOGIC_ON) //only output a continuous signal when both inputs are continuous signals
+ output_state = LOGIC_ON
+ else
+ output_state = LOGIC_FLICKER
+ else //At least one input was off, so output is off
+ output_state = LOGIC_OFF
+ return
+
+// NAND Gate
+/obj/machinery/logic_gate/nand
+ name = "NAND Gate"
+ desc = "Outputs OFF only when both inputs are ON."
+ output_state = LOGIC_ON
+ icon_state = "logic_nand"
+
+/obj/machinery/logic_gate/nand/handle_logic()
+ if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) && (input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER))
+ output_state = LOGIC_OFF //This can only output continuous signals
+ else //At least one input was ON/FLICKER, so output is off
+ output_state = LOGIC_OFF
+ return
+
+// NOR Gate
+/obj/machinery/logic_gate/nor
+ name = "NOR Gate"
+ desc = "Outputs OFF when at least one input is ON."
+ icon_state = "logic_nor"
+ output_state = LOGIC_ON
+
+/obj/machinery/logic_gate/nor/handle_logic()
+ if(input1_state == LOGIC_OFF ||input2_state == LOGIC_OFF)
+ output_state = LOGIC_ON //This can only output continuous signals
+ else //Both inputs are ON, so output is OFF
+ output_state = LOGIC_OFF
+ return
+
+// XOR Gate
+/obj/machinery/logic_gate/xor
+ name = "XOR Gate"
+ desc = "Outputs ON when only one input is ON."
+ icon_state = "logic_xor"
+
+/obj/machinery/logic_gate/xor/handle_logic()
+ if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) || input2_state == LOGIC_OFF) //Only input1 is ON/FLICKER, so output matches input1
+ output_state = input1_state
+ else if((input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER) || input1_state == LOGIC_OFF) //Only input2 is ON/FLICKER, so output matches input2
+ output_state = input2_state
+ else //Both inputs are ON or OFF, so output is OFF
+ output_state = LOGIC_OFF
+ return
+
+// XNOR Gate
+/obj/machinery/logic_gate/xnor
+ name = "XNOR Gate"
+ desc = "Outputs ON when both inputs are ON or OFF."
+ icon_state = "logic_xnor"
+ output_state = LOGIC_ON
+
+/obj/machinery/logic_gate/xnor/handle_logic()
+ if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) && (input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER)) //Both inputs are ON/FLICKER
+ if(input1_state == LOGIC_ON && input2_state == LOGIC_ON) //Only continuous signal when both inputs are ON
+ output_state = LOGIC_ON
+ else //If at least one input is FLICKER, output FLICKER
+ output_state = LOGIC_FLICKER
+ else if(input1_state == LOGIC_OFF && input2_state == LOGIC_OFF) //Both inputs are OFF
+ output_state = LOGIC_ON //Always continuous in this case
+ else //Only one input is ON/FLICKER
+ output_state = LOGIC_OFF
+ return
diff --git a/code/modules/logic/logic_base.dm b/code/modules/logic/logic_base.dm
new file mode 100644
index 00000000000..926b8a1f129
--- /dev/null
+++ b/code/modules/logic/logic_base.dm
@@ -0,0 +1,283 @@
+
+/obj/machinery/logic_gate
+ name = "Logic Base"
+ desc = "This does nothing except connect to things. Highly illogical, report to a coder at once if you see this in-game."
+ icon = 'icons/obj/computer3.dmi'
+ icon_state = "serverframe"
+ density = 1
+ anchored = 1
+
+ settagwhitelist = list("input1_id_tag", "input2_id_tag", "output_id_tag")
+
+ var/tamperproof = 0 //if set, will make the machine unable to be destroyed, adjusted, etc. via in-game interaction (USE ONLY FOR MAPPING STUFF)
+ var/mono_input = 0 //if set, will ignore input2
+
+ var/datum/radio_frequency/radio_connection
+ var/frequency = 0
+
+ /*
+ Some notes on Input/Output:
+ - Multiple things can be linked to the same input or output tag, just like how wires can connect multiple sources and receivers.
+ - For inputs, only the last signal received BEFORE a process() call will be used in the logic handling.
+ - Input states are updated immediately whenever an input signal is received, so it is possible to update multiple times within a single process cycle.
+ - This means if you have multiple connected inputs, but the last signal received before the process() call is OFF, it won't matter if the others are both ON.
+ - For this reason, please set up your logic properly. You can theoretically chain these infinitely, so there's no need to link multiple things to a single input.
+ - For outputs, the signal will attempt to be sent out every process() call, to ensure newly connected things are updated within one process cycle
+ - Connecting an output to multiple inputs should not cause issues, as long as you don't have multiple connections to a given input (see previous notes on inputs).
+ - The output state is determined immediately preceeding the signal broadcast, using the input states at the time of the process() call, not when a signal is received.
+ - Because of how the process cycle works, it is possible that it may take multiple cycles for a signal to fully propogate through a logic chain.
+ - This is because machines attempt to process in the order they were added to the scheduler.
+ - Building the logic gates at the end of the chain first may cause delays in signal propogation.
+ If you take all this into consideration when linking and using logic machinery, you should have no unexpected issues with input/output. Your design flaws are on you though.
+ */
+
+ var/input1_id_tag = null
+ var/input1_state = LOGIC_OFF
+ var/input2_id_tag = null
+ var/input2_state = LOGIC_OFF
+ var/output_id_tag = null
+ var/output_state = LOGIC_OFF
+
+/obj/machinery/logic_gate/New()
+ if(tamperproof) //doing this during New so we don't have to worry about forgetting to set these vars during editting / defining
+ unacidable = 1
+ ..()
+ if(radio_controller)
+ set_frequency(frequency)
+ component_parts = list()
+ var/obj/item/weapon/circuitboard/logic_gate/LG = new(null)
+ LG.set_type(type)
+ component_parts += LG
+ component_parts += new /obj/item/stack/cable_coil(null, 1)
+
+/obj/machinery/logic_gate/initialize()
+ ..()
+ set_frequency(frequency)
+
+/obj/machinery/logic_gate/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ radio_connection = radio_controller.add_object(src, frequency, RADIO_LOGIC)
+ return
+
+/obj/machinery/logic_gate/Destroy()
+ if(radio_controller)
+ radio_controller.remove_object(src,frequency)
+ return ..()
+
+/obj/machinery/logic_gate/process()
+ handle_logic()
+ handle_output() //All output will send for at least one cycle, and will attempt to send every cycle. Hopefully this won't be too taxing.
+ return
+
+/obj/machinery/logic_gate/proc/handle_logic()
+ return
+
+/obj/machinery/logic_gate/proc/handle_output()
+ if(!radio_connection) //can't output without this
+ return
+
+ if(output_id_tag == null) //Don't output to an undefined id_tag
+ return
+
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
+
+ signal.data = list(
+ "tag" = output_id_tag,
+ "sigtype" = "logic",
+ "state" = output_state,
+ )
+
+ radio_connection.post_signal(src, signal, filter = RADIO_LOGIC)
+
+/obj/machinery/logic_gate/receive_signal(datum/signal/signal, receive_method, receive_param)
+ if(!signal.data["tag"] || ((signal.data["tag"] != input1_id_tag) && (signal.data["tag"] != input2_id_tag)) || (signal.data["sigtype"] != "logic"))
+ //If the signal lacks tag data, the signal's tag data doesn't match either input id tag, or is not a "logic" signal, ignore it since it's not for us
+ return
+
+ if(signal.data["tag"] == input1_id_tag) //If the signal is for input1
+ if(signal.data["state"] == input1_state) //If we already match, ignore the new signal since nothing changes
+ return
+ if(signal.data["state"] == LOGIC_OFF) //Shut it down and keep it off
+ input1_state = LOGIC_OFF
+ return
+ if(signal.data["state"] == LOGIC_ON) //Turn it on and keep it on
+ input1_state = LOGIC_ON
+ return
+ if(signal.data["state"] == LOGIC_FLICKER) //Turn it on then turn it off
+ if(input1_state == LOGIC_ON) //An existing continuous ON state overrides new flicker signals
+ return
+ input1_state = LOGIC_FLICKER
+ spawn(LOGIC_FLICKER_TIME)
+ if(input1_state == LOGIC_FLICKER) //Make sure we didn't get a new continuous signal set while we waited (those take priority)
+ input1_state = LOGIC_OFF
+ return
+
+ //Now, you may be wondering why I included those returns.
+ //The answer is "If you link both inputs to the same source, you're an idiot and deserve to have it break", so yeah. Deal with it.
+
+ if(mono_input)
+ //We only care about input1, so if we didn't receive a signal for that, we're done.
+ return
+
+ if(signal.data["tag"] == input2_id_tag) //If the signal is for input2 (reaching this point assumes mono_input is not set)
+ if(signal.data["state"] == input2_state) //If we already match, ignore the new signal since nothing changes
+ return
+ if(signal.data["state"] == LOGIC_OFF) //Shut it down and keep it off
+ input2_state = LOGIC_OFF
+ return
+ if(signal.data["state"] == LOGIC_ON) //Turn it on and keep it on
+ input2_state = LOGIC_ON
+ return
+ if(signal.data["state"] == LOGIC_FLICKER) //Turn it on then turn it off
+ if(input2_state == LOGIC_ON) //An existing continuous ON state overrides new flicker signals
+ return
+ input2_state = LOGIC_FLICKER
+ spawn(LOGIC_FLICKER_TIME)
+ if(input2_state == LOGIC_FLICKER) //Make sure we didn't get a new continuous signal set while we waited (those take priority)
+ input2_state = LOGIC_OFF
+ return
+
+/obj/machinery/logic_gate/multitool_menu(var/mob/user, var/obj/item/device/multitool/P)
+ var/input1_state_string
+ var/input2_state_string
+ var/output_state_string
+
+ switch(input1_state)
+ if(LOGIC_OFF)
+ input1_state_string = "OFF"
+ if(LOGIC_ON)
+ input1_state_string = "ON"
+ if(LOGIC_FLICKER)
+ input1_state_string = "FLICKER"
+ else
+ input1_state_string = "ERROR: UNKNOWN STATE"
+
+ switch(input2_state)
+ if(LOGIC_OFF)
+ input2_state_string = "OFF"
+ if(LOGIC_ON)
+ input2_state_string = "ON"
+ if(LOGIC_FLICKER)
+ input2_state_string = "FLICKER"
+ else
+ input2_state_string = "ERROR: UNKNOWN STATE"
+
+ switch(output_state)
+ if(LOGIC_OFF)
+ output_state_string = "OFF"
+ if(LOGIC_ON)
+ output_state_string = "ON"
+ if(LOGIC_FLICKER)
+ output_state_string = "FLICKER"
+ else
+ output_state_string = "ERROR: UNKNOWN STATE"
+ var/menu_contents = {"
+
+ - Input: [format_tag("ID Tag","input1_id_tag")]
+ - Input State: [input1_state_string]
+ "}
+ if(!mono_input)
+ menu_contents = {"
+ - Input 1: [format_tag("ID Tag","input1_id_tag")]
+ - Input 1 State: [input1_state_string]
+ - Input 2: [format_tag("ID Tag","input2_id_tag")]
+ - Input 2 State: [input2_state_string]
+ "}
+ menu_contents += {"
+ - Output: [format_tag("ID Tag","output_id_tag")]
+ - Output State: [output_state_string]
+
+ "}
+ return menu_contents
+
+/obj/machinery/logic_gate/convert/multitool_topic(var/mob/user,var/list/href_list,var/obj/O)
+ ..()
+ update_multitool_menu(user)
+
+/obj/machinery/logic_gate/attackby(obj/item/O, mob/user, params)
+ if(tamperproof)
+ to_chat(user, "The [src] appears to be tamperproofed! You can't interact with it!")
+ return 0
+ if(istype(O, /obj/item/device/multitool))
+ update_multitool_menu(user)
+ return 1
+ if(istype(O, /obj/item/weapon/screwdriver))
+ panel_open = !panel_open
+ to_chat(user, "You [panel_open ? "open" : "close"] the access panel.")
+ return 1
+ if(panel_open && istype(O, /obj/item/weapon/crowbar))
+ default_deconstruction_crowbar(O)
+ return 1
+
+//////////////////////////////////////
+// Attack procs //
+//////////////////////////////////////
+
+/obj/machinery/logic_gate/attack_ai(mob/user)
+ if(tamperproof)
+ to_chat(user, "The [src] appears to be tamperproofed! You can't interface with it!")
+ return 0
+ add_hiddenprint(user)
+ return ui_interact(user)
+
+/obj/machinery/logic_gate/attack_ghost(mob/user)
+ if(tamperproof)
+ to_chat(user, "The [src] appears to be tamperproofed! You can't haunt it!")
+ return 0
+ return ui_interact(user)
+
+/obj/machinery/logic_gate/attack_hand(mob/user)
+ if(tamperproof)
+ to_chat(user, "The [src] appears to be tamperproofed! You can't interact with it!")
+ return 0
+ . = ..()
+ if(.)
+ return 0
+ return interact(user)
+
+/obj/machinery/logic_gate/attack_alien(mob/user) //No xeno logic, that's too silly.
+ to_chat(user, "The [src] appears to be too complex! You can't comprehend it and back off in fear!")
+ return 0
+
+/obj/machinery/logic_gate/attack_animal(mob/user) //No animal logic either.
+ to_chat(user, "The [src] appears to be beyond your comprehension! You can't fathom it!")
+ return 0
+
+/obj/machinery/logic_gate/attack_slime(mob/user) //No slime logic. Seriously.
+ to_chat(user, "The [src] appears to be beyond your gelatinous understanding! You ignore it!")
+ return 0
+
+/obj/machinery/logic_gate/emp_act(severity)
+ if(tamperproof)
+ return 0
+ ..()
+
+/obj/machinery/logic_gate/ex_act(severity)
+ if(tamperproof)
+ return 0
+ ..()
+
+/obj/machinery/logic_gate/blob_act()
+ if(tamperproof)
+ return 0
+ ..()
+
+/obj/machinery/logic_gate/singularity_act()
+ if(tamperproof)
+ //This is some top-level tamperproofing right here, that's for sure. It can even defy a singularity!
+ return 0
+ ..()
+
+/obj/machinery/logic_gate/bullet_act()
+ if(tamperproof)
+ return 0
+ ..()
+
+/obj/machinery/logic_gate/tesla_act(var/power)
+ if(tamperproof)
+ tesla_zap(src, 3, power) //If we're tamperproof, we'll just bounce the full shock of the tesla zap we got hit by, so it continues on normally without diminishing
+ return 0
+ ..()
\ No newline at end of file
diff --git a/code/modules/logic/mono_input.dm b/code/modules/logic/mono_input.dm
new file mode 100644
index 00000000000..58b76232fa0
--- /dev/null
+++ b/code/modules/logic/mono_input.dm
@@ -0,0 +1,62 @@
+
+//////////////////////////////////
+// Mono-Input Gates //
+//////////////////////////////////
+
+//NOT Gate
+/obj/machinery/logic_gate/not
+ name = "NOT Gate"
+ desc = "Accepts one input and outputs the reverse state."
+ icon_state = "logic_not"
+ mono_input = 1 //NOT Gates are the simplest logic gate because they only utilize one input.
+ output_state = LOGIC_ON //Starts with an active output, since the input will be OFF at start
+/*
+ A quick note regarding NOT Gates:
+ - Connecting multiple things to the input of a NOT Gate can cause weird behaviour due to updating both when it receives a signal and when it calls process().
+ - This means it will attempt to output once for every logic machine connected to its input's own process() call.
+ - It will then attempt to output an additional time based on the current state when it comes to its own process() call.
+ - For this reason, it is HIGHLY RECOMMENDED that you only connect a single signal source to the input of a NOT Gate to avoid signal spasms.
+ - Connecting multiple things to the output of a NOT Gate should not cause this unusual behavior.
+*/
+/obj/machinery/logic_gate/not/handle_logic() //Our output will always be a continuous signal, even with a FLICKER, it just will update the output when the FLICKER ends
+ if(input1_state == LOGIC_ON) //Output is OFF while input is ON
+ output_state = LOGIC_OFF
+ else if(input1_state == LOGIC_FLICKER) //Output is OFF while input is FLICKER, then output returns to ON when input returns to OFF
+ output_state = LOGIC_OFF
+ spawn(LOGIC_FLICKER_TIME + 1) //Call handle_logic again after this delay (the input should update from the spawn(LOGIC_FLICKER_TIME) in receive_signal() by then)
+ handle_logic()
+ else //Output is ON while input is OFF
+ output_state = LOGIC_ON
+ handle_output()
+ return
+
+//STATUS Gate
+/obj/machinery/logic_gate/status
+ name = "Status Gate"
+ desc = "Accepts one input and outputs the same state, showing a colored light based on current state."
+ icon_state = "logic_status"
+ mono_input = 1 //STATUS Gate doesn't actually perform logic operations, but instead acts as a testing conduit.
+
+/*
+ STATUS Gates are largely a diagnostics tool, but I'm sure someone will still make a logic gate rave with them anyways.
+ - There is no need to actually connect an output for these to work, they just need an input to sample from.
+ - STATUS Gates attempt to update their lights whenever they receive a signal.
+*/
+
+/obj/machinery/logic_gate/status/receive_signal(datum/signal/signal, receive_method, receive_params)
+ ..()
+ handle_logic() //STATUS Gate calls handle_logic() when it receives a signal to update its light and output_state
+
+/obj/machinery/logic_gate/status/handle_logic()
+ output_state = input1_state //Output is equal to input, since it is simply a connection with an attached light
+ if(output_state == LOGIC_OFF) //Red light when OFF
+ set_light(2,2,"#ff0000")
+ return
+ if(output_state == LOGIC_ON) //Green light when ON
+ set_light(2,2,"#009933")
+ return
+ if(output_state == LOGIC_FLICKER) //Orange light when FLICKER, then update after LOGIC_FLICKER_TIME + 1 to reflect the changed state
+ set_light(2,2,"#ff9900")
+ spawn(LOGIC_FLICKER_TIME + 1)
+ handle_logic()
+ return
diff --git a/code/modules/media/broadcast/receivers/radio.dm b/code/modules/media/broadcast/receivers/radio.dm
index 095550197e3..7b9c4ad7b15 100644
--- a/code/modules/media/broadcast/receivers/radio.dm
+++ b/code/modules/media/broadcast/receivers/radio.dm
@@ -14,7 +14,7 @@
/obj/machinery/media/receiver/boombox/attack_hand(var/mob/user)
if(stat & (NOPOWER|BROKEN))
- usr << "\red You don't see anything to mess with."
+ to_chat(usr, "\red You don't see anything to mess with.")
return
user.set_machine(src)
interact(user)
@@ -59,7 +59,7 @@
media_frequency = newfreq
connect_frequency()
else
- usr << "\red Invalid FM frequency. (90.0, 200.0)"
+ to_chat(usr, "\red Invalid FM frequency. (90.0, 200.0)")
updateDialog()
diff --git a/code/modules/media/broadcast/transmitters/broadcast.dm b/code/modules/media/broadcast/transmitters/broadcast.dm
index 55bb10eaf7d..d8607851752 100644
--- a/code/modules/media/broadcast/transmitters/broadcast.dm
+++ b/code/modules/media/broadcast/transmitters/broadcast.dm
@@ -135,7 +135,7 @@
media_frequency = newfreq
connect_frequency()
else
- usr << "\red Invalid FM frequency. (90.0, 200.0)"
+ to_chat(usr, "\red Invalid FM frequency. (90.0, 200.0)")
/obj/machinery/media/transmitter/broadcast/process()
if(stat & (NOPOWER|BROKEN))
@@ -160,23 +160,23 @@
var/datum/gas_mixture/removed = env.remove(transfer_moles)
- //world << "got [transfer_moles] moles at [removed.temperature]"
+// to_chat(world, "got [transfer_moles] moles at [removed.temperature]")
if(removed)
var/heat_capacity = removed.heat_capacity()
- //world << "heating ([heat_capacity])"
+// to_chat(world, "heating ([heat_capacity])")
if(heat_capacity) // Added check to avoid divide by zero (oshi-) runtime errors -- TLE
if(removed.temperature < MAX_TEMP + T0C)
removed.temperature = min(removed.temperature + heating_power/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE
else
removed.temperature = max(removed.temperature - heating_power/heat_capacity, TCMB)
- //world << "now at [removed.temperature]"
+// to_chat(world, "now at [removed.temperature]")
env.merge(removed)
- //world << "turf now at [env.temperature]"
+// to_chat(world, "turf now at [env.temperature]")
/*
// Checks heat from the environment and applies any integrity damage
var/datum/gas_mixture/environment = loc.return_air()
diff --git a/code/modules/media/jukebox.dm b/code/modules/media/jukebox.dm
index a6b27dcd1e7..33a44c5f23b 100644
--- a/code/modules/media/jukebox.dm
+++ b/code/modules/media/jukebox.dm
@@ -115,7 +115,7 @@ var/global/loopModeNames=list(
/obj/machinery/media/jukebox/attack_hand(var/mob/user)
if(stat & NOPOWER)
- usr << "\red You don't see anything to mess with."
+ to_chat(usr, "\red You don't see anything to mess with.")
return
if(stat & BROKEN && playlist!=null)
user.visible_message("\red [user.name] smacks the side of \the [src.name].","\red You hammer the side of \the [src.name].")
@@ -180,7 +180,7 @@ var/global/loopModeNames=list(
/obj/machinery/media/jukebox/Topic(href, href_list)
..()
if(emagged)
- usr << "\red You touch the bluescreened menu. Nothing happens. You feel dumber."
+ to_chat(usr, "\red You touch the bluescreened menu. Nothing happens. You feel dumber.")
return
if (href_list["power"])
@@ -190,7 +190,7 @@ var/global/loopModeNames=list(
if (href_list["playlist"])
if(!check_reload())
- usr << "\red You must wait 60 seconds between playlist reloads."
+ to_chat(usr, "\red You must wait 60 seconds between playlist reloads.")
return
playlist_id=href_list["playlist"]
last_reload=world.time
diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm
index 3753f358500..d78afc6f9f2 100644
--- a/code/modules/media/mediamanager.dm
+++ b/code/modules/media/mediamanager.dm
@@ -81,7 +81,7 @@ if(vlc.attachEvent) {
#ifdef DEBUG_MEDIAPLAYER
-#define MP_DEBUG(x) owner << x
+to_chat(#define MP_DEBUG(x) owner, x)
#warning Please comment out #define DEBUG_MEDIAPLAYER before committing.
#else
#define MP_DEBUG(x)
@@ -137,7 +137,7 @@ if(vlc.attachEvent) {
if(M && M.playing)
targetURL = M.media_url
targetStartTime = M.media_start_time
- //owner << "Found audio source: [M.media_url] @ [(world.time - start_time) / 10]s."
+// to_chat(owner, "Found audio source: [M.media_url] @ [(world.time - start_time) / 10]s.")
//else
// testing("M is not playing or null.")
@@ -155,7 +155,7 @@ if(vlc.attachEvent) {
set desc = "Set jukebox volume"
if(!media || !istype(media))
- usr << "You have no media datum to change, if you're not in the lobby tell an admin."
+ to_chat(usr, "You have no media datum to change, if you're not in the lobby tell an admin.")
return
var/value = input("Choose your Jukebox volume.", "Jukebox volume", media.get_volume())
value = round(max(0, min(100, value)))
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index 7b7f6eded45..16c247b6b50 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -64,29 +64,29 @@
/obj/structure/closet/crate/secure/loot/togglelock(mob/user as mob)
if(locked)
- user << "The crate is locked with a Deca-code lock."
+ to_chat(user, "The crate is locked with a Deca-code lock.")
var/input = input(usr, "Enter digit from [min] to [max].", "Deca-Code Lock", "") as num
if(in_range(src, user))
input = Clamp(input, 0, 10)
if (input == code)
- user << "The crate unlocks!"
+ to_chat(user, "The crate unlocks!")
locked = 0
overlays.Cut()
overlays += greenlight
else if (input == null || input > max || input < min)
- user << "You leave the crate alone."
+ to_chat(user, "You leave the crate alone.")
else
- user << "A red light flashes."
+ to_chat(user, "A red light flashes.")
lastattempt = input
attempts--
if (attempts == 0)
- user << "The crate's anti-tamper system activates!"
+ to_chat(user, "The crate's anti-tamper system activates!")
var/turf/T = get_turf(src.loc)
explosion(T, -1, -1, 1, 1)
qdel(src)
return
else
- user << "You attempt to interact with the device using a hand gesture, but it appears this crate is from before the DECANECT came out."
+ to_chat(user, "You attempt to interact with the device using a hand gesture, but it appears this crate is from before the DECANECT came out.")
return
else
return ..()
@@ -94,21 +94,21 @@
/obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(locked)
if (istype(W, /obj/item/weapon/card/emag))
- user << "The crate unlocks!"
+ to_chat(user, "The crate unlocks!")
locked = 0
if (istype(W, /obj/item/device/multitool))
- user << "DECA-CODE LOCK REPORT:"
+ to_chat(user, "DECA-CODE LOCK REPORT:")
if (attempts == 1)
- user << "* Anti-Tamper Bomb will activate on next failed access attempt."
+ to_chat(user, "* Anti-Tamper Bomb will activate on next failed access attempt.")
else
- user << "* Anti-Tamper Bomb will activate after [src.attempts] failed access attempts."
+ to_chat(user, "* Anti-Tamper Bomb will activate after [src.attempts] failed access attempts.")
if (lastattempt == null)
- user << " has been made to open the crate thus far."
+ to_chat(user, " has been made to open the crate thus far.")
return
// hot and cold
if (code > lastattempt)
- user << "* Last access attempt lower than expected code."
+ to_chat(user, "* Last access attempt lower than expected code.")
else
- user << "* Last access attempt higher than expected code."
+ to_chat(user, "* Last access attempt higher than expected code.")
else ..()
else ..()
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index e40e9ff77ed..a8ac5e1a88c 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -102,15 +102,15 @@
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/CC = W
if(string_attached)
- user << "There already is a string attached to this coin."
+ to_chat(user, "There already is a string attached to this coin.")
return
if (CC.use(1))
overlays += image('icons/obj/items.dmi',"coin_string_overlay")
string_attached = 1
- user << "You attach a string to the coin."
+ to_chat(user, "You attach a string to the coin.")
else
- user << "You need one length of cable to attach a string to the coin."
+ to_chat(user, "You need one length of cable to attach a string to the coin.")
return
else if(istype(W,/obj/item/weapon/wirecutters))
@@ -123,7 +123,7 @@
CC.update_icon()
overlays = list()
string_attached = null
- user << "You detach the string from the coin."
+ to_chat(user, "You detach the string from the coin.")
else if(istype(W,/obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(WT.welding && WT.remove_fuel(0, user))
@@ -134,7 +134,7 @@
"uranium" = /obj/item/clothing/gloves/ring/uranium)
var/typekey = typelist[cmineral]
if(ispath(typekey))
- user << "\blue You make [src] into a ring."
+ to_chat(user, "\blue You make [src] into a ring.")
new typekey(get_turf(loc))
qdel(src)
else ..()
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index a1a4ff10d0f..7bd4fd1ad47 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -20,7 +20,7 @@
var/sheet_per_ore = 1
var/point_upgrade = 1
var/list/ore_values = list(("sand" = 1), ("iron" = 1), ("plasma" = 15), ("silver" = 16), ("gold" = 18), ("uranium" = 30), ("diamond" = 50), ("bananium" = 60), ("tranquillite" = 60))
- var/list/supply_consoles = list("Science", "Robotics", "Research Director's Desk", "Mechanic", "Engineering" = list("metal", "glass", "plasma"), "Chief Engineer's Desk" = list("metal", "glass", "plasma"), "Atmospherics" = list("metal", "glass", "plasma"), "Bar" = list("uranium", "plasma"))
+ var/list/supply_consoles = list("Science", "Robotics", "Research Director's Desk", "Mechanic", "Engineering" = list("metal", "glass", "plasma"), "Chief Engineer's Desk" = list("metal", "glass", "plasma"), "Atmospherics" = list("metal", "glass", "plasma"), "Bar" = list("uranium", "plasma"), "Virology" = list("plasma", "uranium", "gold"))
/obj/machinery/mineral/ore_redemption/New()
..()
@@ -209,7 +209,7 @@
inserted_id.mining_points += points
points = 0
else
- usr << "Required access not found."
+ to_chat(usr, "Required access not found.")
else if(href_list["choice"] == "insert")
var/obj/item/weapon/card/id/I = usr.get_active_hand()
if(istype(I))
@@ -217,7 +217,8 @@
return
I.loc = src
inserted_id = I
- else usr << "No valid ID."
+ else
+ to_chat(usr, "No valid ID.")
if(href_list["release"])
if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user.
if(!(text2path(href_list["release"]) in stack_list)) return
@@ -231,7 +232,7 @@
if(inp.amount < 1)
stack_list -= text2path(href_list["release"])
else
- usr << "Required access not found."
+ to_chat(usr, "Required access not found.")
if(href_list["plasteel"])
if(check_access(inserted_id) || allowed(usr))
if(!(/obj/item/stack/sheet/metal in stack_list)) return
@@ -247,7 +248,7 @@
plasmastack.amount -= plasteelout.amount
unload_mineral(plasteelout)
else
- usr << "Required access not found."
+ to_chat(usr, "Required access not found.")
if(href_list["plasglass"])
if(check_access(inserted_id) || allowed(usr))
if(!(/obj/item/stack/sheet/glass in stack_list)) return
@@ -263,7 +264,7 @@
plasmastack.amount -= plasglassout.amount
unload_mineral(plasglassout)
else
- usr << "Required access not found."
+ to_chat(usr, "Required access not found.")
updateUsrDialog()
return
@@ -414,7 +415,8 @@
return
I.loc = src
inserted_id = I
- else usr << "No valid ID."
+ else
+ to_chat(usr, "No valid ID.")
if(href_list["purchase"])
if(istype(inserted_id))
var/datum/data/mining_equipment/prize = locate(href_list["purchase"])
@@ -495,15 +497,15 @@
if(points)
var/obj/item/weapon/card/id/C = I
C.mining_points += points
- user << "You transfer [points] points to [C]."
+ to_chat(user, "You transfer [points] points to [C].")
points = 0
else
- user << "There's no points left on [src]."
+ to_chat(user, "There's no points left on [src].")
..()
/obj/item/weapon/card/mining_point_card/examine(mob/user)
..(user)
- user << "There's [points] points on the card."
+ to_chat(user, "There's [points] points on the card.")
/**********************Jaunter**********************/
@@ -522,7 +524,7 @@
/obj/item/device/wormhole_jaunter/attack_self(mob/user as mob)
var/turf/device_turf = get_turf(user)
if(!device_turf||device_turf.z==2||device_turf.z>=7)
- user << "You're having difficulties getting the [src.name] to work."
+ to_chat(user, "You're having difficulties getting the [src.name] to work.")
return
else
user.visible_message("[user.name] activates the [src.name]!")
@@ -532,7 +534,7 @@
if(T.z == ZLEVEL_STATION)
L += B
if(!L.len)
- user << "The [src.name] failed to create a wormhole."
+ to_chat(user, "The [src.name] failed to create a wormhole.")
return
var/chosen_beacon = pick(L)
var/obj/effect/portal/wormhole/jaunt_tunnel/J = new /obj/effect/portal/wormhole/jaunt_tunnel(get_turf(src), chosen_beacon)
@@ -556,14 +558,15 @@
L.Weaken(3)
if(ishuman(L))
shake_camera(L, 20, 1)
+ var/mob/living/carbon/human/H = L
spawn(20)
- if(L)
- L.visible_message("[L.name] vomits from travelling through the [src.name]!", "You throw up from travelling through the [src.name]!")
- L.nutrition -= 20
- L.adjustToxLoss(-3)
- var/turf/T = get_turf(L)
- T.add_vomit_floor(L)
- playsound(L, 'sound/effects/splat.ogg', 50, 1)
+ if(H && H.check_has_mouth())
+ H.visible_message("[L.name] vomits from travelling through the [src.name]!", "You throw up from travelling through the [src.name]!")
+ H.nutrition -= 20
+ H.adjustToxLoss(-3)
+ var/turf/T = get_turf(H)
+ T.add_vomit_floor(H)
+ playsound(H, 'sound/effects/splat.ogg', 50, 1)
/**********************Resonator**********************/
@@ -602,10 +605,10 @@
/obj/item/weapon/resonator/attack_self(mob/user as mob)
if(burst_time == 50)
burst_time = 30
- user << "You set the resonator's fields to detonate after 3 seconds."
+ to_chat(user, "You set the resonator's fields to detonate after 3 seconds.")
else
burst_time = 50
- user << "You set the resonator's fields to detonate after 5 seconds."
+ to_chat(user, "You set the resonator's fields to detonate after 5 seconds.")
/obj/item/weapon/resonator/afterattack(atom/target, mob/user, proximity_flag)
if(proximity_flag)
@@ -642,11 +645,11 @@
if(creator)
for(var/mob/living/L in src.loc)
add_logs(L, creator, "used a resonator field on", object="resonator")
- L << "The [src.name] ruptured with you in it!"
+ to_chat(L, "The [src.name] ruptured with you in it!")
L.adjustBruteLoss(resonance_damage)
else
for(var/mob/living/L in src.loc)
- L << "The [src.name] ruptured with you in it!"
+ to_chat(L, "The [src.name] ruptured with you in it!")
L.adjustBruteLoss(resonance_damage)
qdel(src)
@@ -693,14 +696,7 @@
mouse_opacity = 1
faction = list("neutral")
a_intent = I_HARM
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
wander = 0
idle_vision_range = 5
@@ -729,16 +725,16 @@
var/obj/item/weapon/weldingtool/W = I
if(W.welding && !stat)
if(stance != HOSTILE_STANCE_IDLE)
- user << "[src] is moving around too much to repair!"
+ to_chat(user, "[src] is moving around too much to repair!")
return
if(maxHealth == health)
- user << "[src] is at full integrity."
+ to_chat(user, "[src] is at full integrity.")
else
health += 10
- user << "You repair some of the armor on [src]."
+ to_chat(user, "You repair some of the armor on [src].")
return
if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner))
- user << "You instruct [src] to drop any collected ore."
+ to_chat(user, "You instruct [src] to drop any collected ore.")
DropOre()
return
..()
@@ -760,10 +756,10 @@
switch(search_objects)
if(0)
SetCollectBehavior()
- M << "[src] has been set to search and store loose ore."
+ to_chat(M, "[src] has been set to search and store loose ore.")
if(2)
SetOffenseBehavior()
- M << "[src] has been set to attack hostile wildlife."
+ to_chat(M, "[src] has been set to attack hostile wildlife.")
return
..()
@@ -870,10 +866,10 @@
icon_state = "lazarus_empty"
return
else
- user << "[src] is only effective on the dead."
+ to_chat(user, "[src] is only effective on the dead.")
return
else
- user << "[src] is only effective on lesser beings."
+ to_chat(user, "[src] is only effective on lesser beings.")
return
/obj/item/weapon/lazarus_injector/emag_act()
@@ -887,9 +883,9 @@
/obj/item/weapon/lazarus_injector/examine(mob/user)
..(user)
if(!loaded)
- user << "[src] is empty."
+ to_chat(user, "[src] is empty.")
if(malfunctioning)
- user << "The display on [src] seems to be flickering."
+ to_chat(user, "The display on [src] seems to be flickering.")
/**********************Mining Scanner**********************/
@@ -995,8 +991,8 @@
/obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/internal/M, mob/user)
var/obj/item/organ/internal/hivelord_core/C = M
if(!istype(C, /obj/item/organ/internal/hivelord_core))
- user << "The stabilizer only works on hivelord cores."
+ to_chat(user, "The stabilizer only works on hivelord cores.")
return ..()
C.preserved = 1
- user << "You inject the hivelord core with the stabilizer. It will no longer go inert."
+ to_chat(user, "You inject the hivelord core with the stabilizer. It will no longer go inert.")
qdel(src)
\ No newline at end of file
diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm
index 07233a2f6fd..25bbf0f3ee5 100644
--- a/code/modules/mining/laborcamp/laborshuttle.dm
+++ b/code/modules/mining/laborcamp/laborshuttle.dm
@@ -18,10 +18,10 @@
if(href_list["move"])
var/obj/docking_port/mobile/M = shuttle_master.getShuttle("laborcamp")
if(!M)
- usr << "Cannot locate shuttle!"
+ to_chat(usr, "Cannot locate shuttle!")
return 0
var/obj/docking_port/stationary/S = M.get_docked()
if(S && S.name == "laborcamp_away")
- usr << "Shuttle is already at the outpost!"
+ to_chat(usr, "Shuttle is already at the outpost!")
return 0
..()
\ No newline at end of file
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index b5a14e9caa5..47c9c45dbc3 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -72,7 +72,7 @@
/obj/machinery/mineral/labor_claim_console/proc/emag(mob/user as mob)
if(!emagged)
emagged = 1
- user << "PZZTTPFFFT"
+ to_chat(user, "PZZTTPFFFT")
@@ -88,30 +88,31 @@
if(href_list["choice"] == "claim")
inserted_id.points += machine.points
machine.points = 0
- src << "Points transferred."
+ to_chat(src, "Points transferred.")
else if(href_list["choice"] == "insert")
var/obj/item/weapon/card/id/prisoner/I = usr.get_active_hand()
if(istype(I))
usr.drop_item()
I.loc = src
inserted_id = I
- else usr << "Invalid ID."
+ else
+ to_chat(usr, "Invalid ID.")
if(check_auth()) //Sanity check against hef spoofs
if(href_list["choice"] == "station")
if(!alone_in_area(get_area(src), usr))
- usr << "Prisoners are only allowed to be released while alone."
+ to_chat(usr, "Prisoners are only allowed to be released while alone.")
else
switch(shuttle_master.moveShuttle("laborcamp","laborcamp_home"))
if(1)
- usr << "Shuttle not found"
+ to_chat(usr, "Shuttle not found")
if(2)
- usr << "Shuttle already at station"
+ to_chat(usr, "Shuttle already at station")
if(3)
- usr << "No permission to dock could be granted."
+ to_chat(usr, "No permission to dock could be granted.")
else
var/message = "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval."
announcer.autosay(message, "Labor Camp Controller", "Security")
- usr << "Shuttle received message and will be sent shortly."
+ to_chat(usr, "Shuttle received message and will be sent shortly.")
if(href_list["choice"] == "release")
if(alone_in_area(get_area(loc), usr))
@@ -120,9 +121,9 @@
if(release_door && release_door.density)
release_door.open()
else
- usr << "Prisoners can only be released while docked with the station."
+ to_chat(usr, "Prisoners can only be released while docked with the station.")
else
- usr << "Prisoners are only allowed to be released while alone."
+ to_chat(usr, "Prisoners are only allowed to be released while alone.")
src.updateUsrDialog()
return
@@ -168,11 +169,11 @@
if(istype(I, /obj/item/weapon/card/id))
if(istype(I, /obj/item/weapon/card/id/prisoner))
var/obj/item/weapon/card/id/prisoner/prisoner_id = I
- user << "ID: [prisoner_id.registered_name]"
- user << "Points Collected:[prisoner_id.points]"
- user << "Point Quota: [prisoner_id.goal]"
- user << "Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release."
+ to_chat(user, "ID: [prisoner_id.registered_name]")
+ to_chat(user, "Points Collected:[prisoner_id.points]")
+ to_chat(user, "Point Quota: [prisoner_id.goal]")
+ to_chat(user, "Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.")
else
- user << "Error: Invalid ID"
+ to_chat(user, "Error: Invalid ID")
return
..()
diff --git a/code/modules/mining/manufacturing.dm b/code/modules/mining/manufacturing.dm
index d74386828df..429b0ee42bc 100644
--- a/code/modules/mining/manufacturing.dm
+++ b/code/modules/mining/manufacturing.dm
@@ -177,7 +177,7 @@
usr.machine = src
if (href_list["download"])
- if(!src.dl_list) usr << "\red This unit is not capable of downloading any additional schematics."
+ to_chat(if(!src.dl_list) usr, "\red This unit is not capable of downloading any additional schematics.")
else
var/amtdl = 0
//var/dontload = 0
@@ -191,8 +191,8 @@
src.download += new S.type(src)
amtdl++
else dontload = 0*/
- if (amtdl) usr << "\blue [amtdl] new schematics downloaded from Robotics Research Database."
- else usr << "\red No new schematics currently available in Robotics Research Database."
+ to_chat(if (amtdl) usr, "\blue [amtdl] new schematics downloaded from Robotics Research Database.")
+ to_chat(else usr, "\red No new schematics currently available in Robotics Research Database.")
if (href_list["delete"])
var/operation = text2num(href_list["delete"])
@@ -201,15 +201,15 @@
for(var/datum/manufacture/D in src.diskload)
src.diskload-= D
amtgone++
- if (amtgone) usr << "\blue Cleared [amtgone] schematics from database."
- else usr << "\red No disk-loaded schematics detected in database."
+ to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.")
+ to_chat(else usr, "\red No disk-loaded schematics detected in database.")
if(operation == 2) // Clear Download Schematics
var/amtgone = 0
for(var/datum/manufacture/D in src.download)
src.download-= D
amtgone++
- if (amtgone) usr << "\blue Cleared [amtgone] schematics from database."
- else usr << "\red No downloaded schematics detected in database."
+ to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.")
+ to_chat(else usr, "\red No downloaded schematics detected in database.")
if (href_list["eject"])
var/operation = text2num(href_list["eject"])
@@ -228,7 +228,7 @@
if(10) ejecting = /obj/item/weapon/ore/hydrogen
if(11) ejecting = /obj/item/weapon/ore/fabric
else
- usr << "\red Error. Unknown ore type."
+ to_chat(usr, "\red Error. Unknown ore type.")
return
sleep(3)
ejectamt = input(usr,"How many units do you want to eject?","Eject Materials") as num
@@ -249,7 +249,7 @@
if (istype(O,I.cost2)) A2++
if (istype(O,I.cost3)) A3++
if (A1 < I.amount1 || A2 < I.amount2 || A3 < I.amount3)
- usr << "\red Insufficient materials to manufacture that item."
+ to_chat(usr, "\red Insufficient materials to manufacture that item.")
return
// Consume Mats
var/C1 = I.amount1
@@ -337,7 +337,7 @@
if(istype(W,/obj/item/clothing/suit/space/)) new /obj/item/weapon/ore/fabric(src)
load = 2
else if(istype(W, /obj/item/weapon/disk/data/schematic))
- if (!src.acceptdisk) user << "\red This unit is unable to accept disks."
+ to_chat(if (!src.acceptdisk) user, "\red This unit is unable to accept disks.")
else
var/amtload = 0
var/dontload = 0
@@ -354,19 +354,19 @@
src.diskload += new WS.type(src)
amtload++
else dontload = 0
- if (amtload) user << "\blue [amtload] new schematics downloaded from disk."
- else user << "\red No new schematics available on disk."
+ to_chat(if (amtload) user, "\blue [amtload] new schematics downloaded from disk.")
+ to_chat(else user, "\red No new schematics available on disk.")
else if (istype(W, /obj/item/weapon/storage/bag/ore))
for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] uses the []'s automatic ore loader on []!", user, src, W), 1)
var/amtload = 0
for (var/obj/item/weapon/ore/M in W.contents)
M.loc = src
amtload++
- if (amtload) user << "\blue [amtload] pieces of ore loaded from [W]!"
- else user << "\red No ore loaded!"
+ to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [W]!")
+ to_chat(else user, "\red No ore loaded!")
else if(istype(W, /obj/item/weapon/card/emag))
src.hacked = 1
- user << "\blue You remove the [src]'s product locks!"
+ to_chat(user, "\blue You remove the [src]'s product locks!")
else ..()
if (load == 1)
@@ -391,8 +391,8 @@
for (var/obj/item/weapon/ore/M in O.contents)
M.loc = src
amtload++
- if (amtload) user << "\blue [amtload] pieces of ore loaded from [O]!"
- else user << "\red No ore loaded!"
+ to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [O]!")
+ to_chat(else user, "\red No ore loaded!")
else if (istype(O, /obj/item/weapon/ore/))
for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing ore into []!", user, src), 1)
var/staystill = user.loc
@@ -400,7 +400,7 @@
M.loc = src
sleep(3)
if (user.loc != staystill) break
- user << "\blue You finish stuffing ore into [src]!"
+ to_chat(user, "\blue You finish stuffing ore into [src]!")
/*else if (istype(O, /obj/item/weapon/plant/wheat/metal))
for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing [O] into []!", user, src), 1)
var/staystill = user.loc
@@ -409,7 +409,7 @@
del M
sleep(3)
if (user.loc != staystill) break
- user << "\blue You finish stuffing [O] into [src]!"*/
+ to_chat(user, "\blue You finish stuffing [O] into [src]!"*/)
else ..()
src.updateUsrDialog()
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index f9b4228e792..f1f317789b4 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -211,7 +211,7 @@
return ..()
/obj/item/device/mobcapsule/attack(var/atom/A, mob/user, prox_flag)
- if(!istype(A, /mob/living/simple_animal))
+ if(!istype(A, /mob/living/simple_animal) || isbot(A))
return ..()
capture(A, user)
return 1
@@ -219,17 +219,17 @@
/obj/item/device/mobcapsule/proc/capture(var/mob/target, var/mob/U as mob)
var/mob/living/simple_animal/T = target
if(captured)
- U << "Capture failed!: The capsule already has a mob registered to it!"
+ to_chat(U, "Capture failed!: The capsule already has a mob registered to it!")
else
if(istype(T) && "neutral" in T.faction)
T.forceMove(src)
T.name = "[U.name]'s [initial(T.name)]"
T.cancel_camera()
name = "Lazarus Capsule: [initial(T.name)]"
- U << "You placed a [T.name] inside the Lazarus Capsule!"
+ to_chat(U, "You placed a [T.name] inside the Lazarus Capsule!")
captured = T
else
- U << "You can't capture that mob!"
+ to_chat(U, "You can't capture that mob!")
/obj/item/device/mobcapsule/throw_impact(atom/A, mob/user)
..()
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index fe31649e6d3..e2ff03a506e 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -361,7 +361,7 @@ var/global/list/rockTurfEdgeCache
/turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob, params)
if (!user.IsAdvancedToolUser())
- usr << "You don't have the dexterity to do this!"
+ to_chat(usr, "You don't have the dexterity to do this!")
return
if (istype(P, /obj/item/weapon/pickaxe))
@@ -372,12 +372,12 @@ var/global/list/rockTurfEdgeCache
if(last_act+P.digspeed > world.time)//prevents message spam
return
last_act = world.time
- user << "You start picking..."
+ to_chat(user, "You start picking...")
P.playDigSound()
if(do_after(user, P.digspeed, target = src))
if(istype(src, /turf/simulated/mineral)) //sanity check against turf being deleted during digspeed delay
- user << "You finish cutting into the rock."
+ to_chat(user, "You finish cutting into the rock.")
P.update_icon()
gets_drilled(user)
feedback_add_details("pick_used_mining","[P.name]")
@@ -407,10 +407,10 @@ var/global/list/rockTurfEdgeCache
..()
/turf/simulated/mineral/attack_alien(var/mob/living/carbon/alien/M)
- M << "You start digging into the rock..."
+ to_chat(M, "You start digging into the rock...")
playsound(src, 'sound/effects/break_stone.ogg', 50, 1)
if(do_after(M, 40, target = src))
- M << "You tunnel into the rock."
+ to_chat(M, "You tunnel into the rock.")
gets_drilled()
/turf/simulated/mineral/Bumped(AM as mob|obj)
@@ -475,14 +475,14 @@ var/global/list/rockTurfEdgeCache
return
if (dug)
- user << "This area has already been dug!"
+ to_chat(user, "This area has already been dug!")
return
- user << "You start digging..."
+ to_chat(user, "You start digging...")
sleep(20)
if ((user.loc == T && user.get_active_hand() == W))
- user << "You dig a hole."
+ to_chat(user, "You dig a hole.")
gets_dug()
return
@@ -493,14 +493,14 @@ var/global/list/rockTurfEdgeCache
return
if (dug)
- user << "This area has already been dug!"
+ to_chat(user, "This area has already been dug!")
return
- user << "You start digging..."
+ to_chat(user, "You start digging...")
sleep(P.digspeed)
if ((user.loc == T && user.get_active_hand() == W))
- user << "You dig a hole."
+ to_chat(user, "You dig a hole.")
gets_dug()
return
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index 51d28af42dd..be34465c207 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -124,7 +124,7 @@
usr.set_machine(src)
src.add_fingerprint(usr)
if(processing==1)
- usr << "The machine is processing."
+ to_chat(usr, "The machine is processing.")
return
if(href_list["choose"])
chosen = href_list["choose"]
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index 079a75341d6..a7a7b4b10df 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -67,13 +67,13 @@
var/obj/item/weapon/coin/C = W
if(!user.drop_item())
return
- user << "You add the [C.name] into the bag."
+ to_chat(user, "You add the [C.name] into the bag.")
contents += C
if (istype(W, /obj/item/weapon/moneybag))
var/obj/item/weapon/moneybag/C = W
for (var/obj/O in C.contents)
contents += O;
- user << "You empty the [C.name] into the bag."
+ to_chat(user, "You empty the [C.name] into the bag.")
return
/obj/item/weapon/moneybag/Topic(href, href_list)
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index 056432c1892..f5e0f2349be 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -13,7 +13,7 @@
new refined_type(get_turf(src.loc))
qdel(src)
else if(W.isOn())
- user << "Not enough fuel to smelt [src]."
+ to_chat(user, "Not enough fuel to smelt [src].")
..()
/obj/item/weapon/ore/Crossed(AM as mob|obj)
@@ -64,7 +64,7 @@
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
/obj/item/weapon/ore/glass/attack_self(mob/living/user as mob)
- user << "You use the sand to make sandstone."
+ to_chat(user, "You use the sand to make sandstone.")
var/sandAmt = 1
for(var/obj/item/weapon/ore/glass/G in user.loc) // The sand on the floor
sandAmt += 1
@@ -94,7 +94,7 @@
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
if(W.welding)
- user << "You can't hit a high enough temperature to smelt [src] properly!"
+ to_chat(user, "You can't hit a high enough temperature to smelt [src] properly!")
else
..()
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 166c05e10c6..7d6750c4be4 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -19,7 +19,7 @@
S.hide_from(usr)
for(var/obj/item/weapon/ore/O in S.contents)
S.remove_from_storage(O, src) //This will move the item to this item's contents
- user << "You empty the satchel into the box."
+ to_chat(user, "You empty the satchel into the box.")
return
/obj/structure/ore_box/attack_hand(mob/user as mob)
@@ -91,7 +91,7 @@
for (var/obj/item/weapon/ore/O in contents)
contents -= O
O.loc = src.loc
- usr << "You empty the box."
+ to_chat(usr, "You empty the box.")
src.updateUsrDialog()
return
@@ -106,25 +106,25 @@ obj/structure/ore_box/ex_act(severity, target)
set src in view(1)
if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes.
- usr << "You are physically incapable of emptying the ore box."
+ to_chat(usr, "You are physically incapable of emptying the ore box.")
return
if( usr.stat || usr.restrained() )
return
if(!Adjacent(usr)) //You can only empty the box if you can physically reach it
- usr << "You cannot reach the ore box."
+ to_chat(usr, "You cannot reach the ore box.")
return
add_fingerprint(usr)
if(contents.len < 1)
- usr << "The ore box is empty."
+ to_chat(usr, "The ore box is empty.")
return
for (var/obj/item/weapon/ore/O in contents)
contents -= O
O.loc = src.loc
- usr << "You empty the ore box."
+ to_chat(usr, "You empty the ore box.")
return
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 90b568110b3..82b83db73ef 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -110,18 +110,6 @@ Works together with spawning an observer, noted above.
if(!loc) return
if(!client) return 0
- //regular_hud_updates()
- //if(client.images.len)
- // for(var/image/hud in client.images)
- // if(copytext(hud.icon_state,1,4) == "hud")
- // client.images.Remove(hud)
- //if(antagHUD)
- // var/list/target_list = list()
- // for(var/mob/living/target in oview(src, 14))
- // if(target.mind && (target.mind.special_role || issilicon(target) || target.mind.nation))
- // target_list += target
- // if(target_list.len)
- // assess_targets(target_list, src)
/mob/dead/proc/assess_targets(list/target_list, mob/dead/observer/U)
@@ -213,9 +201,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
show_stat_station_time()
if(ticker)
if(ticker.mode)
- //world << "DEBUG: ticker not null"
+// to_chat(world, "DEBUG: ticker not null")
if(ticker.mode.name == "AI malfunction")
- //world << "DEBUG: malf mode ticker test"
+// to_chat(world, "DEBUG: malf mode ticker test")
if(ticker.mode:malf_mode_declared)
stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]")
show_stat_emergency_shuttle_eta()
@@ -225,13 +213,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set name = "Re-enter Corpse"
if(!client) return
if(!can_reenter_corpse)
- src << "You've given up your right to respawn!"
+ to_chat(src, "You've given up your right to respawn!")
return
if(!(mind && mind.current && can_reenter_corpse))
- src << "You have no body."
+ to_chat(src, "You have no body.")
return
if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients
- usr << "Another consciousness is in your body...It is resisting you."
+ to_chat(usr, "Another consciousness is in your body...It is resisting you.")
return
if(mind.current.ajourn && mind.current.stat != DEAD) //check if the corpse is astral-journeying (it's client ghosted using a cultist rune).
var/turf/T = get_turf(mind.current)
@@ -242,7 +230,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
found_astral_rune = 1
break
if(!found_astral_rune)
- usr << "The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you."
+ to_chat(usr, "The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you.")
return
mind.current.ajourn=0
@@ -257,6 +245,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return 1
+/mob/dead/observer/proc/notify_cloning(var/message, var/sound, var/atom/source)
+ if(message)
+ to_chat(src, "[message]")
+ to_chat(src, "(Click to re-enter)")
+ if(sound)
+ to_chat(src, sound(sound))
+
/mob/dead/observer/proc/show_me_the_hud(hud_index)
var/datum/atom_hud/H = huds[hud_index]
H.add_hud_to(src)
@@ -275,16 +270,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
switch(data_hud_seen) //give new huds
if(0)
show_me_the_hud(DATA_HUD_SECURITY_BASIC)
- src << "Security HUD set."
+ to_chat(src, "Security HUD set.")
if(DATA_HUD_SECURITY_BASIC)
show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED)
- src << "Medical HUD set."
+ to_chat(src, "Medical HUD set.")
if(DATA_HUD_MEDICAL_ADVANCED)
show_me_the_hud(DATA_HUD_DIAGNOSTIC)
- src << "Diagnostic HUD set."
+ to_chat(src, "Diagnostic HUD set.")
if(DATA_HUD_DIAGNOSTIC)
data_hud_seen = 0
- src << "HUDs disabled."
+ to_chat(src, "HUDs disabled.")
/mob/dead/observer/verb/toggle_antagHUD()
@@ -292,13 +287,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set name = "Toggle AntagHUD"
set desc = "Toggles AntagHUD allowing you to see who is the antagonist"
if(!config.antag_hud_allowed && !client.holder)
- src << "\red Admins have disabled this for this round."
+ to_chat(src, "\red Admins have disabled this for this round.")
return
if(!client)
return
var/mob/dead/observer/M = src
if(jobban_isbanned(M, "AntagHUD"))
- src << "\red You have been banned from using this feature"
+ to_chat(src, "\red You have been banned from using this feature")
return
if(config.antag_hud_restricted && !M.has_enabled_antagHUD && !check_rights(R_ADMIN|R_MOD,0))
var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No")
@@ -313,17 +308,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
//var/adding_hud = (usr in A.hudusers) ? 0 : 1
for(var/datum/atom_hud/antag/H in (huds))
- //if(istype(H, /datum/atom_hud/antag))// || istype(H, /datum/atom_hud/data/human/security/advanced))
if(!M.antagHUD)
- //(adding_hud) ? H.add_hud_to(usr) : H.remove_hud_from(usr)
H.add_hud_to(usr)
else
H.remove_hud_from(usr)
if(!M.antagHUD)
- usr << "AntagHud Toggled ON"
+ to_chat(usr, "AntagHud Toggled ON")
M.antagHUD = 1
else
- usr << "AntagHud Toggled OFF"
+ to_chat(usr, "AntagHud Toggled OFF")
M.antagHUD = 0
/mob/dead/observer/proc/dead_tele(A in ghostteleportlocs)
@@ -332,7 +325,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set desc= "Teleport to a location"
if(!isobserver(usr))
- usr << "Not when you're not dead!"
+ to_chat(usr, "Not when you're not dead!")
return
usr.verbs -= /mob/dead/observer/proc/dead_tele
@@ -347,7 +340,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
L += T
if(!L || !L.len)
- usr << "No area available."
+ to_chat(usr, "No area available.")
usr.forceMove(pick(L))
following = null
@@ -370,7 +363,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(following && following == target)
return
following = target
- src << "Now following [target]"
+ to_chat(src, "Now following [target]")
if(ismob(target))
forceMove(get_turf(target))
var/mob/M = target
@@ -425,7 +418,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
forceMove(T)
following = null
else
- src << "This mob is not located in the game world."
+ to_chat(src, "This mob is not located in the game world.")
/* Now a spell. See spells.dm
@@ -445,11 +438,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/memory()
set hidden = 1
- src << "\red You are dead! You have no mind to store memory!"
+ to_chat(src, "\red You are dead! You have no mind to store memory!")
/mob/dead/observer/add_memory()
set hidden = 1
- src << "\red You are dead! You have no mind to store memory!"
+ to_chat(src, "\red You are dead! You have no mind to store memory!")
/mob/dead/observer/verb/analyze_air()
set name = "Analyze Air"
@@ -466,11 +459,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles()
- src << "\blue Results:"
+ to_chat(src, "\blue Results:")
if(abs(pressure - ONE_ATMOSPHERE) < 10)
- src << "\blue Pressure: [round(pressure,0.1)] kPa"
+ to_chat(src, "\blue Pressure: [round(pressure,0.1)] kPa")
else
- src << "\red Pressure: [round(pressure,0.1)] kPa"
+ to_chat(src, "\red Pressure: [round(pressure,0.1)] kPa")
if(total_moles)
var/o2_concentration = environment.oxygen/total_moles
var/n2_concentration = environment.nitrogen/total_moles
@@ -479,28 +472,28 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
if(abs(n2_concentration - N2STANDARD) < 20)
- src << "\blue Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)"
+ to_chat(src, "\blue Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)")
else
- src << "\red Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)"
+ to_chat(src, "\red Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)")
if(abs(o2_concentration - O2STANDARD) < 2)
- src << "\blue Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)"
+ to_chat(src, "\blue Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)")
else
- src << "\red Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)"
+ to_chat(src, "\red Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)")
if(co2_concentration > 0.01)
- src << "\red CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)"
+ to_chat(src, "\red CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)")
else
- src << "\blue CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)"
+ to_chat(src, "\blue CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)")
if(plasma_concentration > 0.01)
- src << "\red Plasma: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)"
+ to_chat(src, "\red Plasma: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)")
if(unknown_concentration > 0.01)
- src << "\red Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)"
+ to_chat(src, "\red Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)")
- src << "\blue Temperature: [round(environment.temperature-T0C,0.1)]°C"
- src << "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]"
+ to_chat(src, "\blue Temperature: [round(environment.temperature-T0C,0.1)]°C")
+ to_chat(src, "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]")
/mob/dead/observer/verb/view_manifest()
set name = "View Crew Manifest"
@@ -557,7 +550,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if (href_list["jump"])
var/mob/target = locate(href_list["jump"])
var/mob/A = usr;
- A << "Teleporting to [target]..."
+ to_chat(A, "Teleporting to [target]...")
//var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list
if(target && target != usr)
spawn(0)
@@ -580,9 +573,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
src.anonsay = !src.anonsay
if(anonsay)
- src << "Your key won't be shown when you speak in dead chat."
+ to_chat(src, "Your key won't be shown when you speak in dead chat.")
else
- src << "Your key will be publicly visible again."
+ to_chat(src, "Your key will be publicly visible again.")
/mob/dead/observer/verb/toggle_ghostsee()
set name = "Toggle Ghost Vision"
@@ -590,7 +583,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set category = "Ghost"
ghostvision = !(ghostvision)
updateghostsight()
- usr << "You [(ghostvision?"now":"no longer")] have ghost vision."
+ to_chat(usr, "You [(ghostvision?"now":"no longer")] have ghost vision.")
/mob/dead/observer/verb/toggle_darkness()
set name = "Toggle Darkness"
@@ -636,3 +629,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return 0
usr.visible_message("[src] points to [A].")
return 1
+
+/mob/dead/observer/proc/incarnate_ghost()
+ if(!client)
+ return
+ var/mob/living/carbon/human/new_char = new(get_turf(src))
+ client.prefs.copy_to(new_char)
+ if(mind)
+ mind.active = 1
+ mind.transfer_to(new_char)
+ else
+ new_char.key = key
\ No newline at end of file
diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm
index 34a0d44d631..7f63a8f1261 100644
--- a/code/modules/mob/dead/observer/say.dm
+++ b/code/modules/mob/dead/observer/say.dm
@@ -8,7 +8,7 @@
if (src.client)
if(src.client.prefs.muted & MUTE_DEADCHAT)
- src << "\red You cannot talk in deadchat (muted)."
+ to_chat(src, "\red You cannot talk in deadchat (muted).")
return
if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
@@ -30,7 +30,7 @@
if(src.client)
if(src.client.prefs.muted & MUTE_DEADCHAT)
- src << "\red You cannot emote in deadchat (muted)."
+ to_chat(src, "\red You cannot emote in deadchat (muted).")
return
if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT))
diff --git a/code/modules/mob/dead/observer/spells.dm b/code/modules/mob/dead/observer/spells.dm
index ef51c787e5a..993f2b6e344 100644
--- a/code/modules/mob/dead/observer/spells.dm
+++ b/code/modules/mob/dead/observer/spells.dm
@@ -32,7 +32,7 @@ var/global/list/boo_phrases=list(
if(ishuman(A))
var/mob/living/carbon/human/H = A
if(H && H.client)
- H << "[pick(boo_phrases)]"
+ to_chat(H, "[pick(boo_phrases)]")
// Flicker unblessed lights in range
if(istype(A,/obj/machinery/light))
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 77b1dfa8dcb..8d03cdd969a 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -17,7 +17,7 @@
/mob/proc/custom_emote(var/m_type=1,var/message = null)
if(stat || !use_me && usr == src)
- usr << "You are unable to emote."
+ to_chat(usr, "You are unable to emote.")
return
var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
@@ -85,16 +85,16 @@
/mob/proc/emote_dead(var/message)
if(client.prefs.muted & MUTE_DEADCHAT)
- src << "\red You cannot send deadchat emotes (muted)."
+ to_chat(src, "\red You cannot send deadchat emotes (muted).")
return
if(!(client.prefs.toggles & CHAT_DEAD))
- src << "\red You have deadchat muted."
+ to_chat(src, "\red You have deadchat muted.")
return
if(!src.client.holder)
if(!config.dsay_allowed)
- src << "\red Deadchat is globally muted"
+ to_chat(src, "\red Deadchat is globally muted")
return
@@ -118,7 +118,7 @@
continue
if(check_rights(R_ADMIN|R_MOD, 0, M) && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to admins/mods
- M << message
+ to_chat(M, message)
else if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to regular ghosts with deadchat toggled on
M.show_message(message, 2)
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 538bbc24d3f..c3ca5a602c9 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -65,14 +65,14 @@
if(sdisabilities & DEAF || ear_deaf)
if(!language || !(language.flags & INNATE)) // INNATE is the flag for audible-emote-language, so we don't want to show an "x talks but you cannot hear them" message if it's set
if(speaker == src)
- src << "You cannot hear yourself speak!"
+ to_chat(src, "You cannot hear yourself speak!")
else
- src << "[speaker_name][alt_name] talks but you cannot hear them."
+ to_chat(src, "[speaker_name][alt_name] talks but you cannot hear them.")
else
if(language)
- src << "[speaker_name][alt_name] [track][language.format_message(message, verb)]"
+ to_chat(src, "[speaker_name][alt_name] [track][language.format_message(message, verb)]")
else
- src << "[speaker_name][alt_name] [track][verb], \"[message]\""
+ to_chat(src, "[speaker_name][alt_name] [track][verb], \"[message]\"")
if (speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z))
var/turf/source = speaker? get_turf(speaker) : get_turf(src)
src.playsound_local(source, speech_sound, sound_vol, 1)
@@ -114,7 +114,7 @@
message = stars(message)
var/speaker_name = "unknown"
- if(speaker)
+ if(speaker)
speaker_name = speaker.name
if(vname)
@@ -160,7 +160,7 @@
else
track = "[speaker_name] ([jobname])"
else
- if(istype(follow_target, /obj/machinery/bot))
+ if(istype(follow_target, /mob/living/simple_animal/bot))
track = "[speaker_name] ([jobname])"
else
track = "[speaker_name] ([jobname])"
@@ -177,11 +177,11 @@
formatted = "[verb], \"[message]\""
if(sdisabilities & DEAF || ear_deaf)
if(prob(20))
- src << "You feel your headset vibrate but can hear nothing from it!"
+ to_chat(src, "You feel your headset vibrate but can hear nothing from it!")
else if(track)
- src << "[part_a][track][part_b][formatted]"
+ to_chat(src, "[part_a][track][part_b][formatted]")
else
- src << "[part_a][speaker_name][part_b][formatted]"
+ to_chat(src, "[part_a][speaker_name][part_b][formatted]")
/mob/proc/hear_signlang(var/message, var/verb = "gestures", var/datum/language/language, var/mob/speaker = null)
if(!client)
@@ -203,7 +203,7 @@
var/heard = ""
if(prob(15))
var/list/punctuation = list(",", "!", ".", ";", "?")
- var/list/messages = text2list(message, " ")
+ var/list/messages = splittext(message, " ")
var/R = rand(1, messages.len)
var/heardword = messages[R]
if(copytext(heardword,1, 1) in punctuation)
@@ -215,4 +215,4 @@
else
heard = "
...You almost hear someone talking..."
- src << heard
+ to_chat(src, heard)
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 10ea0c752c7..09f8009be75 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -34,15 +34,23 @@
for(var/mob/living/M in contents)
M.show_message(message,m_type)
+/obj/item/weapon/holder/emp_act(var/intensity)
+ for(var/mob/living/M in contents)
+ M.emp_act(intensity)
+
+/obj/item/weapon/holder/ex_act(var/intensity)
+ for(var/mob/living/M in contents)
+ M.ex_act(intensity)
+
/obj/item/weapon/holder/container_resist(var/mob/living/L)
var/mob/M = src.loc //Get our mob holder (if any).
if(istype(M))
M.unEquip(src)
- M << "[src] wriggles out of your grip!"
- src << "You wriggle out of [M]'s grip!"
+ to_chat(M, "[src] wriggles out of your grip!")
+ to_chat(src, "You wriggle out of [M]'s grip!")
else if(istype(src.loc,/obj/item))
- src << "You struggle free of [src.loc]."
+ to_chat(src, "You struggle free of [src.loc].")
src.forceMove(get_turf(src))
if(istype(M))
@@ -66,8 +74,8 @@
if(desc) H.desc = desc
H.attack_hand(grabber)
- grabber << "
You scoop up \the [src]."
- src << "\The [grabber] scoops you up."
+ to_chat(grabber, "You scoop up \the [src].")
+ to_chat(src, "\The [grabber] scoops you up.")
grabber.status_flags |= PASSEMOTES
return H
@@ -91,4 +99,5 @@
/obj/item/weapon/holder/mouse
name = "mouse"
desc = "It's a small, disease-ridden rodent."
+ icon = 'icons/mob/animal.dmi'
icon_state = "mouse_gray"
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 265c7697de2..777eac07ec8 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -104,11 +104,11 @@
for(var/mob/player in player_list)
if(istype(player,/mob/dead) && follow)
var/msg_dead = "[name], [speaker_mask] ([ghost_follow_link(speaker, ghost=player)]) [format_message(message, get_spoken_verb(message))]"
- player << msg_dead
+ to_chat(player, msg_dead)
continue
else if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player)))
- player << msg
+ to_chat(player, msg)
/datum/language/proc/check_special_condition(var/mob/other)
return 1
diff --git a/code/modules/mob/living/autohiss.dm b/code/modules/mob/living/autohiss.dm
index 219ec491624..4506ce50cfb 100644
--- a/code/modules/mob/living/autohiss.dm
+++ b/code/modules/mob/living/autohiss.dm
@@ -25,14 +25,14 @@
autohiss_mode = (autohiss_mode + 1) % AUTOHISS_NUM
switch(autohiss_mode)
if(AUTOHISS_OFF)
- src << "Auto-hiss is now OFF."
+ to_chat(src, "Auto-hiss is now OFF.")
if(AUTOHISS_BASIC)
- src << "Auto-hiss is now BASIC."
+ to_chat(src, "Auto-hiss is now BASIC.")
if(AUTOHISS_FULL)
- src << "Auto-hiss is now FULL."
+ to_chat(src, "Auto-hiss is now FULL.")
else
autohiss_mode = AUTOHISS_OFF
- src << "Auto-hiss is now OFF."
+ to_chat(src, "Auto-hiss is now OFF.")
/datum/species
var/list/autohiss_basic_map = null
@@ -102,7 +102,7 @@
. += pick(map[min_char])
message = copytext(message, min_index + 1)
- return list2text(.)
+ return jointext(., "")
#undef AUTOHISS_OFF
#undef AUTOHISS_BASIC
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 3dc4575a20b..fdd86c790f9 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -67,7 +67,7 @@
return
-/mob/living/carbon/alien/eyecheck()
+/mob/living/carbon/alien/check_eye_prot()
return 2
/mob/living/carbon/alien/updatehealth()
@@ -84,7 +84,7 @@
var/loc_temp = get_temperature(environment)
- //world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Fire protection: [heat_protection] - Location: [loc] - src: [src]"
+// to_chat(world, "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Fire protection: [heat_protection] - Location: [loc] - src: [src]")
// Aliens are now weak to fire.
@@ -196,7 +196,7 @@
usr.hud_used.nightvisionicon.icon_state = "nightvision0"
-/mob/living/carbon/alien/assess_threat(var/obj/machinery/bot/secbot/judgebot, var/lasercolor)
+/mob/living/carbon/alien/assess_threat(var/mob/living/simple_animal/bot/secbot/judgebot, var/lasercolor)
if(judgebot.emagged == 2)
return 10 //Everyone is a criminal!
var/threatcount = 0
diff --git a/code/modules/mob/living/carbon/alien/alien_defenses.dm b/code/modules/mob/living/carbon/alien/alien_defenses.dm
index 7ae01f43cfe..397a14fc259 100644
--- a/code/modules/mob/living/carbon/alien/alien_defenses.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defenses.dm
@@ -7,11 +7,11 @@ In all, this is a lot like the monkey code. /N
*/
/mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
switch(M.a_intent)
@@ -38,7 +38,7 @@ In all, this is a lot like the monkey code. /N
add_logs(src, M, "attacked", admin=0)
updatehealth()
else
- M << "[name] is too injured for that."
+ to_chat(M, "[name] is too injured for that.")
return
diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm
index 115a49f20a8..de954cb3c75 100644
--- a/code/modules/mob/living/carbon/alien/death.dm
+++ b/code/modules/mob/living/carbon/alien/death.dm
@@ -52,7 +52,6 @@
for(var/mob/O in viewers(src, null))
O.show_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...", 1)
update_canmove()
- if(client) blind.layer = 0
update_icons()
timeofdeath = worldtime2text()
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 17680b80f56..afae056b99f 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -8,13 +8,13 @@ Doesn't work on other aliens/AI.*/
/mob/living/carbon/proc/powerc(X, Y)//Y is optional, checks for weed planting. X can be null.
if(stat)
- src << "You must be conscious to do this."
+ to_chat(src, "You must be conscious to do this.")
return 0
else if(X && getPlasma() < X)
- src << "Not enough plasma stored."
+ to_chat(src, "Not enough plasma stored.")
return 0
else if(Y && (!isturf(src.loc) || istype(src.loc, /turf/space)))
- src << "You can't place that here!"
+ to_chat(src, "You can't place that here!")
return 0
else return 1
@@ -24,7 +24,7 @@ Doesn't work on other aliens/AI.*/
set category = "Alien"
if(locate(/obj/structure/alien/weeds/node) in get_turf(src))
- src << "There's already a weed node here."
+ to_chat(src, "There's already a weed node here.")
return
if(powerc(50,1))
@@ -44,8 +44,8 @@ Doesn't work on other aliens/AI.*/
var/msg = sanitize(input("Message:", "Alien Whisper") as text|null)
if(msg)
log_say("Alien Whisper: [key_name(src)]->[key_name(M)]: [msg]")
- M << "You hear a strange, alien voice in your head...[msg]"
- src << "You said: [msg] to [M]"
+ to_chat(M, "You hear a strange, alien voice in your head...[msg]")
+ to_chat(src, "You said: [msg] to [M]")
for(var/mob/dead/observer/G in player_list)
G.show_message("Alien message from [src] ([ghost_follow_link(src, ghost=G)]) to [M] ([ghost_follow_link(M, ghost=G)]): [msg]")
return
@@ -63,10 +63,10 @@ Doesn't work on other aliens/AI.*/
if (get_dist(src,M) <= 1)
M.adjustPlasma(amount)
adjustPlasma(-amount)
- M << "[src] has transfered [amount] plasma to you."
- src << {"You have trasferred [amount] plasma to [M]"}
+ to_chat(M, "[src] has transfered [amount] plasma to you.")
+ to_chat(src, {"You have trasferred [amount] plasma to [M]"})
else
- src << "You need to be closer."
+ to_chat(src, "You need to be closer.")
return
@@ -81,18 +81,18 @@ Doesn't work on other aliens/AI.*/
if(isobj(O))
var/obj/I = O
if(I.unacidable) //So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid.
- src << "You cannot dissolve this object."
+ to_chat(src, "You cannot dissolve this object.")
return
// TURF CHECK
else if(istype(O, /turf/simulated))
var/turf/T = O
// R WALL
if(istype(T, /turf/simulated/wall/r_wall))
- src << "You cannot dissolve this object."
+ to_chat(src, "You cannot dissolve this object.")
return
// R FLOOR
if(istype(T, /turf/simulated/floor/engine))
- src << "You cannot dissolve this object."
+ to_chat(src, "You cannot dissolve this object.")
return
else// Not a type we can acid.
return
@@ -101,7 +101,7 @@ Doesn't work on other aliens/AI.*/
new /obj/effect/acid(get_turf(O), O)
visible_message("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!")
else
- src << "Target is too far away."
+ to_chat(src, "Target is too far away.")
return
/mob/living/carbon/alien/humanoid/proc/neurotoxin() // ok
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
index 19cad5aa5fc..e45fa198006 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
@@ -34,11 +34,11 @@
no_queen = 0
if(src.has_brain_worms())
- src << "We cannot perform this ability at the present time!"
+ to_chat(src, "We cannot perform this ability at the present time!")
return
if(no_queen)
adjustPlasma(-500)
- src << "You begin to evolve!"
+ to_chat(src, "You begin to evolve!")
for(var/mob/O in viewers(src, null))
O.show_message(text("[src] begins to twist and contort!"), 1)
var/mob/living/carbon/alien/humanoid/queen/new_xeno = new(loc)
@@ -46,5 +46,5 @@
new_xeno.mind.name = new_xeno.name
qdel(src)
else
- src << "We already have an alive queen."
+ to_chat(src, "We already have an alive queen.")
return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index 9a667ab79fc..a5e72059ab8 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -50,7 +50,7 @@
leap_on_click = !leap_on_click
leap_icon.icon_state = "leap_[leap_on_click ? "on":"off"]"
if(message)
- src << "You will now [leap_on_click ? "leap at":"slash at"] enemies!"
+ to_chat(src, "You will now [leap_on_click ? "leap at":"slash at"] enemies!")
else
return
@@ -65,14 +65,14 @@
/mob/living/carbon/alien/humanoid/hunter/proc/leap_at(var/atom/A)
if(pounce_cooldown)
- src << "You are too fatigued to pounce right now!"
+ to_chat(src, "You are too fatigued to pounce right now!")
return
if(leaping) //Leap while you leap, so you can leap while you leap
return
if(!has_gravity(src) || !has_gravity(A))
- src << "It is unsafe to leap without gravity!"
+ to_chat(src, "It is unsafe to leap without gravity!")
//It's also extremely buggy visually, so it's balance+bugfix
return
if(lying)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
index 342c8a530d3..eb2ae210e71 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
@@ -76,7 +76,7 @@
if(powerc(250))
adjustToxLoss(-250)
- src << "\green You begin to evolve!"
+ to_chat(src, "\green You begin to evolve!")
for(var/mob/O in viewers(src, null))
O.show_message(text("[src] begins to twist and contort!"), 1)
var/mob/living/carbon/alien/humanoid/sentinel/praetorian/new_xeno = new(loc)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm
index a80a0d5892c..caf3cc4e5ad 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm
@@ -105,7 +105,7 @@
message = "\The [src] does a flip!"
src.SpinAnimation(5,1)
if("help")
- src << "burp, flip, deathgasp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper"
+ to_chat(src, "burp, flip, deathgasp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper")
if(!stat)
if (act == "roar")
diff --git a/code/modules/mob/living/carbon/alien/humanoid/empress.dm b/code/modules/mob/living/carbon/alien/humanoid/empress.dm
index 11cf3c0c4d6..d4716aafccb 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/empress.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/empress.dm
@@ -82,7 +82,7 @@
set category = "Alien"
if(locate(/obj/structure/alien/egg) in get_turf(src))
- src << "There's already an egg here."
+ to_chat(src, "There's already an egg here.")
return
if(powerc(250,1))//Can't plant eggs on spess tiles. That's silly.
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index f6fd8281a7d..c50e4603e41 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -2,6 +2,7 @@
name = "alien"
icon_state = "alien_s"
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/xenomeat = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
var/obj/item/weapon/r_store = null
var/obj/item/weapon/l_store = null
var/caste = ""
@@ -112,7 +113,7 @@
/mob/living/carbon/alien/humanoid/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if(M.Victim) return // can't attack while eating!
@@ -183,11 +184,11 @@
/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
if(..()) //to allow surgery to return properly.
@@ -251,11 +252,11 @@ In all, this is a lot like the monkey code. /N
/mob/living/carbon/alien/humanoid/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
..()
@@ -281,7 +282,7 @@ In all, this is a lot like the monkey code. /N
adjustBruteLoss(damage)
updatehealth()
else
- M << "[name] is too injured for that."
+ to_chat(M, "[name] is too injured for that.")
return
@@ -303,7 +304,7 @@ In all, this is a lot like the monkey code. /N
adjustBruteLoss(damage)
updatehealth()
else
- L << "[name] is too injured for that."
+ to_chat(L, "[name] is too injured for that.")
return
@@ -317,22 +318,27 @@ In all, this is a lot like the monkey code. /N
/mob/living/carbon/alien/humanoid/var/temperature_resistance = T0C+75
/mob/living/carbon/alien/humanoid/show_inv(mob/user as mob)
-
user.set_machine(src)
- var/dat = {"
-
[name]
-
-
Left Hand: [(l_hand ? text("[]", l_hand) : "Nothing")]
-
Right Hand: [(r_hand ? text("[]", r_hand) : "Nothing")]
-
Head: [(head ? text("[]", head) : "Nothing")]
-
(Exo)Suit: [(wear_suit ? text("[]", wear_suit) : "Nothing")]
-
Empty Pouches
-
Close
-
"}
- user << browse(dat, text("window=mob[name];size=340x480"))
- onclose(user, "mob[name]")
- return
+ var/dat = {"
+ Close
+ "}
+
+ var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 500)
+ popup.set_content(dat)
+ popup.open()
/mob/living/carbon/alien/humanoid/canBeHandcuffed()
return 1
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index 6e4fe3705f4..b41d5a9705d 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -17,7 +17,7 @@
/mob/living/carbon/alien/humanoid/handle_disabilities()
if (disabilities & EPILEPSY)
if ((prob(1) && paralysis < 10))
- src << "You have a seizure!"
+ to_chat(src, "You have a seizure!")
Paralyse(10)
if (disabilities & COUGHING)
if ((prob(5) && paralysis <= 1))
@@ -130,77 +130,4 @@
if(druggy)
druggy = max(druggy-1, 0)
- return 1
-
-
-/mob/living/carbon/alien/humanoid/handle_regular_hud_updates()
-
- if (stat == 2 || (XRAY in mutations))
- sight |= SEE_TURFS
- sight |= SEE_MOBS
- sight |= SEE_OBJS
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_LEVEL_TWO
- else if (stat != 2)
- sight |= SEE_MOBS
- sight &= ~SEE_TURFS
- sight &= ~SEE_OBJS
- if(nightvision)
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_MINIMUM
- else if(!nightvision)
- see_in_dark = 4
- see_invisible = 45
- if(see_override)
- see_invisible = see_override
-
- if (healths)
- if (stat != 2)
- switch(health)
- if(100 to INFINITY)
- healths.icon_state = "health0"
- if(75 to 100)
- healths.icon_state = "health1"
- if(50 to 75)
- healths.icon_state = "health2"
- if(25 to 50)
- healths.icon_state = "health3"
- if(0 to 25)
- healths.icon_state = "health4"
- else
- healths.icon_state = "health5"
- else
- healths.icon_state = "health6"
-
- if (toxin) toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
- if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
- if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"
- //NOTE: the alerts dont reset when youre out of danger. dont blame me,
- //blame the person who coded them. Temporary fix added.
-
- client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
-
- if ((blind && stat != 2))
- if ((blinded))
- blind.layer = 18
- else
- blind.layer = 0
-
- if (disabilities & NEARSIGHTED)
- client.screen += global_hud.vimpaired
-
- if (eye_blurry)
- client.screen += global_hud.blurry
-
- if (druggy)
- client.screen += global_hud.druggy
-
- if (stat != 2)
- if (machine)
- if (!( machine.check_eye(src) ))
- reset_view(null)
- else
- if(!client.adminobs)
- reset_view(null)
-
- return 1
+ return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index 188d485d83f..5b2e19f011d 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -63,7 +63,7 @@
set desc = "Lay an egg to produce huggers to impregnate prey with."
set category = "Alien"
if(locate(/obj/structure/alien/egg) in get_turf(src))
- src << "There's already an egg here."
+ to_chat(src, "There's already an egg here.")
return
if(powerc(75,1))//Can't plant eggs on spess tiles. That's silly.
@@ -111,7 +111,7 @@
if(no_queen)
adjustToxLoss(-1000)
- src << "You begin to evolve!"
+ to_chat(src, "You begin to evolve!")
for(var/mob/O in viewers(src, null))
O.show_message(text("[src] begins to twist and contort!"), 1)
var/mob/living/carbon/alien/humanoid/empress/new_xeno = new(loc)
@@ -122,7 +122,7 @@
new_xeno.mind.name = new_xeno.name
qdel(src)
else
- src << "We already have an alive empress."
+ to_chat(src, "We already have an alive empress.")
return
*/
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/larva/death.dm b/code/modules/mob/living/carbon/alien/larva/death.dm
index 574b617ca58..03eeeaa5c81 100644
--- a/code/modules/mob/living/carbon/alien/larva/death.dm
+++ b/code/modules/mob/living/carbon/alien/larva/death.dm
@@ -7,7 +7,6 @@
if(!gibbed)
visible_message("[src] lets out a waning high-pitched cry.")
update_canmove()
- if(client) blind.layer = 0
timeofdeath = worldtime2text()
if(mind) mind.store_memory("Time of death: [timeofdeath]", 0)
diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm
index 88437be1392..b617a1fc883 100644
--- a/code/modules/mob/living/carbon/alien/larva/emote.dm
+++ b/code/modules/mob/living/carbon/alien/larva/emote.dm
@@ -15,7 +15,7 @@
return
if (src.client)
if (client.prefs.muted & MUTE_IC)
- src << "\red You cannot send IC messages (muted)."
+ to_chat(src, "\red You cannot send IC messages (muted).")
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
@@ -110,9 +110,9 @@
message = text("[] collapses!", src)
m_type = 2
if("help")
- src << "burp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper"
+ to_chat(src, "burp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper")
else
- src << text("Invalid Emote: []", act)
+ to_chat(src, text("Invalid Emote: []", act))
if ((message && src.stat == 0))
log_emote("[name]/[key] : [message]")
if (m_type & 1)
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 90b3aa3ebb8..a513ab76a90 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -38,7 +38,7 @@
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(70))
- src << "\red You fail to push [tmob]'s fat ass out of the way."
+ to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.")
now_pushing = 0
return
if(!(tmob.status_flags & CANPUSH))
@@ -124,7 +124,7 @@
/mob/living/carbon/alien/larva/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if(M.Victim)
@@ -149,11 +149,11 @@
/mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
..()
@@ -195,11 +195,11 @@
/mob/living/carbon/alien/larva/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
..()
@@ -224,7 +224,7 @@
adjustBruteLoss(damage)
updatehealth()
else
- M << "[name] is too injured for that."
+ to_chat(M, "[name] is too injured for that.")
return
/mob/living/carbon/alien/larva/restrained()
@@ -237,15 +237,6 @@
/mob/living/carbon/alien/larva/show_inv(mob/user as mob)
-
- user.set_machine(src)
- var/dat = {"
-
[name]
-
-
Close
-
"}
- user << browse(dat, text("window=mob[name];size=340x480"))
- onclose(user, "mob[name]")
return
/* Commented out because it's duplicated in life.dm
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index d4e57324826..4e7b974d855 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -85,84 +85,4 @@
if(druggy)
druggy = max(druggy-1, 0)
- return 1
-
-
-/mob/living/carbon/alien/larva/handle_regular_hud_updates()
-
- if (stat == 2 || (XRAY in mutations))
- sight |= SEE_TURFS
- sight |= SEE_MOBS
- sight |= SEE_OBJS
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_LEVEL_TWO
- else if (stat != 2)
- sight |= SEE_MOBS
- sight &= ~SEE_TURFS
- sight &= ~SEE_OBJS
- if(nightvision)
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_MINIMUM
- else if(!nightvision)
- see_in_dark = 4
- see_invisible = 45
- if(see_override)
- see_invisible = see_override
-
- if (healths)
- if (stat != 2)
- switch(health)
- if(25 to INFINITY)
- healths.icon_state = "health0"
- if(19 to 25)
- healths.icon_state = "health1"
- if(13 to 19)
- healths.icon_state = "health2"
- if(7 to 13)
- healths.icon_state = "health3"
- if(0 to 7)
- healths.icon_state = "health4"
- else
- healths.icon_state = "health5"
- else
- healths.icon_state = "health6"
-
- if(pullin)
- if(pulling)
- pullin.icon_state = "pull"
- else
- pullin.icon_state = "pull0"
-
- if (toxin) toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
- if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
- if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"
- //NOTE: the alerts dont reset when youre out of danger. dont blame me,
- //blame the person who coded them. Temporary fix added.
-
-
- client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
-
- if ((blind && stat != 2))
- if ((blinded))
- blind.layer = 18
- else
- blind.layer = 0
-
- if (disabilities & NEARSIGHTED)
- client.screen += global_hud.vimpaired
-
- if (eye_blurry)
- client.screen += global_hud.blurry
-
- if (druggy)
- client.screen += global_hud.druggy
-
- if (stat != 2)
- if (machine)
- if (!( machine.check_eye(src) ))
- reset_view(null)
- else
- if(!client.adminobs)
- reset_view(null)
-
return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm
index a8cb230f9e7..44351eb792a 100644
--- a/code/modules/mob/living/carbon/alien/larva/powers.dm
+++ b/code/modules/mob/living/carbon/alien/larva/powers.dm
@@ -9,16 +9,16 @@
if (layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
- src << text("You are now hiding.")
+ to_chat(src, text("You are now hiding."))
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
- O << text("[] scurries to the ground!", src)
+ to_chat(O, text("[] scurries to the ground!", src))
else
layer = MOB_LAYER
- src << text("\green You have stopped hiding.")
+ to_chat(src, text("\green You have stopped hiding."))
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
- O << text("[] slowly peaks up from the ground...", src)
+ to_chat(O, text("[] slowly peaks up from the ground...", src))
/mob/living/carbon/alien/larva/verb/evolve()
set name = "Evolve"
@@ -29,15 +29,15 @@
return
if(handcuffed || legcuffed)
- src << "\red You cannot evolve when you are cuffed."
+ to_chat(src, "\red You cannot evolve when you are cuffed.")
if(amount_grown >= max_grown) //TODO ~Carn
//green is impossible to read, so i made these blue and changed the formatting slightly
- src << "\blue You are growing into a beautiful alien! It is time to choose a caste."
- src << "\blue There are three to choose from:"
- src << "Hunters \blue are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves."
- src << "Sentinels \blue are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters."
- src << "Drones \blue are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen."
+ to_chat(src, "\blue You are growing into a beautiful alien! It is time to choose a caste.")
+ to_chat(src, "\blue There are three to choose from:")
+ to_chat(src, "Hunters \blue are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves.")
+ to_chat(src, "Sentinels \blue are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters.")
+ to_chat(src, "Drones \blue are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen.")
var/alien_caste = alert(src, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
var/mob/living/carbon/alien/humanoid/new_xeno
@@ -56,5 +56,5 @@
qdel(src)
return
else
- src << "You are not fully grown."
+ to_chat(src, "You are not fully grown.")
return
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index e65165ec31d..93bf633093f 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -33,7 +33,27 @@
/mob/living/carbon/alien/handle_breath_temperature(datum/gas_mixture/breath)
if(breath.temperature > (T0C + 66) && !(RESIST_COLD in mutations))
if(prob(20))
- src << "You feel a searing heat in your lungs!"
+ to_chat(src, "You feel a searing heat in your lungs!")
fire_alert = max(fire_alert, 1)
else
- fire_alert = 0
\ No newline at end of file
+ fire_alert = 0
+
+/mob/living/carbon/alien/update_sight()
+ if(stat == DEAD || (XRAY in mutations))
+ sight |= SEE_TURFS
+ sight |= SEE_MOBS
+ sight |= SEE_OBJS
+ see_in_dark = 8
+ see_invisible = SEE_INVISIBLE_LEVEL_TWO
+ else if(stat != DEAD)
+ sight |= SEE_MOBS
+ sight &= ~SEE_TURFS
+ sight &= ~SEE_OBJS
+ if(nightvision)
+ see_in_dark = 8
+ see_invisible = SEE_INVISIBLE_MINIMUM
+ else if(!nightvision)
+ see_in_dark = 4
+ see_invisible = 45
+ if(see_override)
+ see_invisible = see_override
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 60c6c996eae..151ed93e3ef 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -6,13 +6,14 @@
icon = 'icons/mob/alien.dmi'
icon_state = "larva0_dead"
var/stage = 0
+ var/polling = 0
/obj/item/organ/internal/body_egg/alien_embryo/on_find(mob/living/finder)
..()
if(stage < 4)
- finder << "It's small and weak, barely the size of a fetus."
+ to_chat(finder, "It's small and weak, barely the size of a fetus.")
else
- finder << "It's grown quite large, and writhes slightly as you look at it."
+ to_chat(finder, "It's grown quite large, and writhes slightly as you look at it.")
if(prob(10))
AttemptGrow(0)
@@ -29,24 +30,24 @@
if(prob(2))
owner.emote("cough")
if(prob(2))
- owner << "Your throat feels sore."
+ to_chat(owner, "Your throat feels sore.")
if(prob(2))
- owner << "Mucous runs down the back of your throat."
+ to_chat(owner, "Mucous runs down the back of your throat.")
if(4)
if(prob(2))
owner.emote("sneeze")
if(prob(2))
owner.emote("cough")
if(prob(4))
- owner << "Your muscles ache."
+ to_chat(owner, "Your muscles ache.")
if(prob(20))
owner.take_organ_damage(1)
if(prob(4))
- owner << "Your stomach hurts."
+ to_chat(owner, "Your stomach hurts.")
if(prob(20))
owner.adjustToxLoss(1)
if(5)
- owner << "You feel something tearing its way out of your stomach..."
+ to_chat(owner, "You feel something tearing its way out of your stomach...")
owner.adjustToxLoss(10)
/obj/item/organ/internal/body_egg/alien_embryo/egg_process()
@@ -65,8 +66,9 @@
/obj/item/organ/internal/body_egg/alien_embryo/proc/AttemptGrow(var/gib_on_success = 1)
- if(!owner)
+ if(!owner || polling)
return
+ polling = 1
spawn()
var/list/candidates = pollCandidates("Do you want to play as an alien?", ROLE_ALIEN, 0)
var/mob/C = null
@@ -81,7 +83,8 @@
else if(owner.client)
C = owner.client
else
- stage = 4 // Let's try again later.
+ stage = 2 // Let's try again later.
+ polling = 0
return
var/overlay = image('icons/mob/alien.dmi', loc = owner, icon_state = "burst_lie")
@@ -95,7 +98,8 @@
new_xeno.mind.name = new_xeno.name
new_xeno.mind.assigned_role = "MODE"
new_xeno.mind.special_role = "Alien"
- new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100) //To get the player's attention
+ to_chat(new_xeno, sound('sound/voice/hiss5.ogg',0,0,0,100))//To get the player's attention
+
if(gib_on_success)
owner.gib()
else
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 6f958533515..f0935c520ce 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -49,11 +49,11 @@ var/const/MAX_ACTIVE_TIME = 400
return
switch(stat)
if(DEAD,UNCONSCIOUS)
- user << "[src] is not moving."
+ to_chat(user, "[src] is not moving.")
if(CONSCIOUS)
- user << "[src] seems to be active!"
+ to_chat(user, "[src] seems to be active!")
if (sterile)
- user << "It looks like the proboscis has been removed."
+ to_chat(user, "It looks like the proboscis has been removed.")
/obj/item/clothing/mask/facehugger/attackby(obj/item/O,mob/m, params)
if(O.force)
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index f5e832cdaa7..6ad6a672b43 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -19,20 +19,17 @@
/obj/item/device/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/organ/internal/brain/crystal ))
- user << " This brain is too malformed to be able to use with the [src]."
+ to_chat(user, " This brain is too malformed to be able to use with the [src].")
return
if(istype(O,/obj/item/organ/internal/brain) && !brainmob) //Time to stick a brain in it --NEO
var/obj/item/organ/internal/brain/B = O
if(!B.brainmob)
- user << "You aren't sure where this brain came from, but you're pretty sure it's a useless brain."
+ to_chat(user, "You aren't sure where this brain came from, but you're pretty sure it's a useless brain.")
return
if(held_brain)
- user << "Somehow, this MMI still has a brain in it. Report this to the bug tracker."
+ to_chat(user, "Somehow, this MMI still has a brain in it. Report this to the bug tracker.")
log_to_dd("[user] tried to stick a [O] into [src] in [get_area(src)], but the held brain variable wasn't cleared")
return
- if(B.status & ORGAN_DEAD) // As it stood, a brain would never become unviable for MMI usage. Perhaps we should keep it that way?
- user << "This [B] is dead"
- return
for(var/mob/V in viewers(src, null))
V.show_message("[user] sticks \a [O] into \the [src].")
brainmob = B.brainmob
@@ -70,9 +67,9 @@
/obj/item/device/mmi/attack_self(mob/user as mob)
if(!brainmob)
- user << "You upend the MMI, but there's nothing in it."
+ to_chat(user, "You upend the MMI, but there's nothing in it.")
else
- user << "You unlock and upend the MMI, spilling the brain onto the floor."
+ to_chat(user, "You unlock and upend the MMI, spilling the brain onto the floor.")
dropbrain(get_turf(user))
icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_empty"
@@ -104,7 +101,7 @@
/obj/item/device/mmi/proc/dropbrain(var/turf/dropspot)
if(isnull(held_brain))
log_to_dd("[src] at [loc] attempted to drop brain without a contained brain in [get_area(src)].")
- brainmob << "Your MMI did not contain a brain! We'll make a new one for you, but you'd best report this to the bugtracker!"
+ to_chat(brainmob, "Your MMI did not contain a brain! We'll make a new one for you, but you'd best report this to the bugtracker!")
held_brain = new(dropspot) // Let's not ruin someone's round because of something dumb -- Crazylemon
held_brain.dna = brainmob.dna.Clone()
held_brain.name = "\the [brainmob.name]'s [initial(held_brain.name)]"
@@ -140,10 +137,10 @@
set popup_menu = 0
if(brainmob.stat)
- brainmob << "Can't do that while incapacitated or dead."
+ to_chat(brainmob, "Can't do that while incapacitated or dead.")
radio.listening = radio.listening==1 ? 0 : 1
- brainmob << "Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast."
+ to_chat(brainmob, "Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast.")
/obj/item/device/mmi/emp_act(severity)
if(!brainmob)
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index e95315bb88c..5fbfd6c5012 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -23,9 +23,10 @@
owner.ear_deaf = 0
/obj/item/organ/internal/brain/xeno
- name = "thinkpan"
- desc = "It looks kind of like an enormous wad of purple bubblegum."
- icon_state = "brain-x-d"
+ name = "xenomorph brain"
+ desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"
+ icon_state = "brain-x"
+ origin_tech = "biotech=7"
/obj/item/organ/internal/brain/New()
..()
@@ -47,18 +48,20 @@
if(H.mind)
H.mind.transfer_to(brainmob)
- brainmob << "You feel slightly disoriented. That's normal when you're just a [initial(src.name)]."
+ to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a [initial(src.name)].")
callHook("debrain", list(brainmob))
/obj/item/organ/internal/brain/examine(mob/user) // -- TLE
..(user)
if(brainmob && brainmob.client)//if thar be a brain inside... the brain.
- user << "You can feel the small spark of life still left in this one."
+ to_chat(user, "You can feel the small spark of life still left in this one.")
else
- user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.."
+ to_chat(user, "This one seems particularly lifeless. Perhaps it will regain some of its luster later..")
/obj/item/organ/internal/brain/remove(var/mob/living/user,special = 0)
+ name = "[dna.real_name]'s [initial(name)]"
+
if(!owner) return ..() // Probably a redundant removal; just bail
var/obj/item/organ/internal/brain/B = src
@@ -67,7 +70,7 @@
if(borer)
borer.detatch() //Should remove borer if the brain is removed - RR
- if(owner.mind)//don't transfer if the owner does not have a mind.
+ if(owner.mind && !non_primary)//don't transfer if the owner does not have a mind.
B.transfer_identity(user)
if(istype(owner,/mob/living/carbon/human))
@@ -77,7 +80,7 @@
/obj/item/organ/internal/brain/insert(var/mob/living/target,special = 0)
- name = "brain"
+ name = "[initial(name)]"
var/brain_already_exists = 0
if(istype(target,/mob/living/carbon/human)) // No more IPC multibrain shenanigans
if(target.get_int_organ(/obj/item/organ/internal/brain))
@@ -94,7 +97,7 @@
brainmob.mind.transfer_to(target)
else
target.key = brainmob.key
- ..()
+ ..(target, special = special, dont_remove_slot = brain_already_exists)
/obj/item/organ/internal/brain/prepare_eat()
return // Too important to eat.
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index efb1b8e8d87..8345c791a22 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -6,7 +6,6 @@
container.icon_state = "mmi_dead"
stat = DEAD
- if(blind) blind.layer = 0
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
see_invisible = SEE_INVISIBLE_LEVEL_TWO
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
index 0441eb00ac4..fd2a4879c9d 100644
--- a/code/modules/mob/living/carbon/brain/emote.dm
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -14,15 +14,15 @@
switch(act)
if ("alarm")
- src << "You sound an alarm."
+ to_chat(src, "You sound an alarm.")
message = "\The [src] sounds an alarm."
m_type = 2
if ("alert")
- src << "You let out a distressed noise."
+ to_chat(src, "You let out a distressed noise.")
message = "\The [src] lets out a distressed noise."
m_type = 2
if ("notice")
- src << "You play a loud tone."
+ to_chat(src, "You play a loud tone.")
message = "\The [src] plays a loud tone."
m_type = 2
if ("flash")
@@ -32,19 +32,19 @@
message = "\The [src] blinks."
m_type = 1
if ("whistle")
- src << "You whistle."
+ to_chat(src, "You whistle.")
message = "\The [src] whistles."
m_type = 2
if ("beep")
- src << "You beep."
+ to_chat(src, "You beep.")
message = "\The [src] beeps."
m_type = 2
if ("boop")
- src << "You boop."
+ to_chat(src, "You boop.")
message = "\The [src] boops."
m_type = 2
if ("help")
- src << "alarm, alert, notice, flash,blink, whistle, beep, boop"
+ to_chat(src, "alarm, alert, notice, flash,blink, whistle, beep, boop")
if(message && !stat)
..(act, m_type, message)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index ad91f6c152e..857546732d7 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -5,9 +5,9 @@
adjustToxLoss(3)
updatehealth()
if(!container)
- src << "You feel weak."
+ to_chat(src, "You feel weak.")
else
- src << "STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED."
+ to_chat(src, "STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED.")
switch(radiation)
if(0 to 49)
@@ -22,9 +22,9 @@
if(prob(5))
radiation -= 5
if(!container)
- src << "You feel weak."
+ to_chat(src, "You feel weak.")
else
- src << "STATUS: DANGEROUS AMOUNTS OF RADIATION DETECTED."
+ to_chat(src, "STATUS: DANGEROUS AMOUNTS OF RADIATION DETECTED.")
updatehealth()
if(75 to 100)
@@ -93,4 +93,4 @@
sight &= ~SEE_OBJS
see_in_dark = 2
see_invisible = SEE_INVISIBLE_LIVING
- handle_hud_icons_health()
+ handle_hud_icons_health()
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index aa589713cb9..07251303a12 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -18,7 +18,7 @@
/obj/item/device/mmi/posibrain/attack_self(mob/user as mob)
if(brainmob && !brainmob.key && searching == 0)
//Start the process of searching for a new user.
- user << "\blue You carefully locate the manual activation switch and start the positronic brain's boot process."
+ to_chat(user, "\blue You carefully locate the manual activation switch and start the positronic brain's boot process.")
icon_state = "posibrain-searching"
ghost_volunteers.Cut()
src.searching = 1
@@ -32,21 +32,21 @@
else
if(silenced)
silenced = 0
- user << "You toggle the speaker to 'on', on the [src]."
+ to_chat(user, "You toggle the speaker to 'on', on the [src].")
desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. The speaker switch is set to 'on'."
if(brainmob && brainmob.key)
- brainmob << "Your internal speaker has been toggled to 'on'."
+ to_chat(brainmob, "Your internal speaker has been toggled to 'on'.")
else
silenced = 1
- user << "You toggle the speaker to 'off', on the [src]."
+ to_chat(user, "You toggle the speaker to 'off', on the [src].")
desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. The speaker switch is set to 'off'."
if(brainmob && brainmob.key)
- brainmob << "Your internal speaker has been toggled to 'off'."
+ to_chat(brainmob, "Your internal speaker has been toggled to 'off'.")
/obj/item/device/mmi/posibrain/proc/request_player()
for(var/mob/dead/observer/O in player_list)
if(check_observer(O))
- O << "\A [src] has been activated. (Teleport | Sign Up)"
+ to_chat(O, "\A [src] has been activated. (Teleport | Sign Up)")
// if(ROLE_POSIBRAIN in O.client.prefs.be_special) The Guardian implementation looks cleaner
// question(O.client)
@@ -86,7 +86,7 @@
brainmob.mind.assigned_role = "Positronic Brain"
if(H.mind)
H.mind.transfer_to(brainmob)
- brainmob << "You feel slightly disoriented. That's normal when you're just a metal cube."
+ to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a metal cube.")
icon_state = "posibrain-occupied"
return
@@ -95,9 +95,9 @@
src.brainmob.key = candidate.key
src.name = "positronic brain ([src.brainmob.name])"
- src.brainmob << "You are a positronic brain, brought into existence on [station_name()]."
- src.brainmob << "As a synthetic intelligence, you answer to all crewmembers, as well as the AI."
- src.brainmob << "Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm."
+ to_chat(src.brainmob, "You are a positronic brain, brought into existence on [station_name()].")
+ to_chat(src.brainmob, "As a synthetic intelligence, you answer to all crewmembers, as well as the AI.")
+ to_chat(src.brainmob, "Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.")
src.brainmob.mind.assigned_role = "Positronic Brain"
var/turf/T = get_turf_or_move(src.loc)
@@ -123,25 +123,25 @@
/obj/item/device/mmi/posibrain/proc/volunteer(var/mob/dead/observer/O)
if(!searching)
- O << "Not looking for a ghost, yet."
+ to_chat(O, "Not looking for a ghost, yet.")
return
if(!istype(O))
- O << "\red Error."
+ to_chat(O, "\red Error.")
return
if(O in ghost_volunteers)
- O << "\blue Removed from registration list."
+ to_chat(O, "\blue Removed from registration list.")
ghost_volunteers.Remove(O)
return
if(!check_observer(O))
- O << "\red You cannot be \a [src]."
+ to_chat(O, "\red You cannot be \a [src].")
return
if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
- O << "\red Upon using the antagHUD you forfeited the ability to join the round."
+ to_chat(O, "\red Upon using the antagHUD you forfeited the ability to join the round.")
return
if(jobban_isbanned(O, "Cyborg") || jobban_isbanned(O,"nonhumandept"))
- O << "\red You are job banned from this role."
+ to_chat(O, "\red You are job banned from this role.")
return
- O.<< "\blue You've been added to the list of ghosts that may become this [src]. Click again to unvolunteer."
+ to_chat(O., "\blue You've been added to the list of ghosts that may become this [src]. Click again to unvolunteer.")
ghost_volunteers.Add(O)
@@ -161,7 +161,7 @@
else
msg += "It appears to be completely inactive.\n"
msg += "*---------*"
- user << msg
+ to_chat(user, msg)
/obj/item/device/mmi/posibrain/emp_act(severity)
if(!src.brainmob)
diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm
index 367363ed2a1..03d6906b876 100644
--- a/code/modules/mob/living/carbon/brain/say.dm
+++ b/code/modules/mob/living/carbon/brain/say.dm
@@ -9,7 +9,7 @@
if(container && istype(container, /obj/item/device/mmi/posibrain))
var/obj/item/device/mmi/posibrain/P = container
if(P && P.silenced)
- usr << "You cannot speak, as your internal speaker has been toggled to 'off'."
+ to_chat(usr, "You cannot speak, as your internal speaker has been toggled to 'off'.")
return
if(prob(emp_damage*4))
if(prob(10))//10% chane to drop the message entirely
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a6f57fe5150..ac4bb584528 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -92,6 +92,42 @@
#undef STOMACH_ATTACK_DELAY
+/mob/living/carbon/proc/vomit(var/lost_nutrition = 10, var/blood = 0, var/stun = 1, var/distance = 0, var/message = 1)
+ if(src.is_muzzled())
+ if(message)
+ to_chat(src, "The muzzle prevents you from vomiting!")
+ return 0
+ if(stun)
+ Stun(4)
+ if(nutrition < 100 && !blood)
+ if(message)
+ visible_message("[src] dry heaves!", \
+ "You try to throw up, but there's nothing your stomach!")
+ if(stun)
+ Weaken(10)
+ else
+ if(message)
+ visible_message("[src] throws up!", \
+ "You throw up!")
+ playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
+ var/turf/T = get_turf(src)
+ for(var/i=0 to distance)
+ if(blood)
+ if(T)
+ T.add_blood_floor(src)
+ if(stun)
+ adjustBruteLoss(3)
+ else
+ if(T)
+ T.add_vomit_floor(src)
+ nutrition -= lost_nutrition
+ if(stun)
+ adjustToxLoss(-3)
+ T = get_step(T, dir)
+ if (is_blocked_turf(T))
+ break
+ return 1
+
/mob/living/carbon/gib()
for(var/obj/item/organ/internal/I in internal_organs)
if(isturf(loc))
@@ -107,19 +143,6 @@
visible_message("[M] bursts out of [src]!")
. = ..()
-
-/mob/living/carbon/attack_hand(mob/M as mob)
- if(!istype(M, /mob/living/carbon)) return
- if (ishuman(M))
- var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
- if (H.hand)
- temp = H.organs_by_name["l_hand"]
- if(temp && !temp.is_usable())
- H << "\red You can't use your [temp.name]"
- return
- return
-
/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, override = 0, tesla_shock = 0)
if(status_flags & GODMODE) //godmode
return 0
@@ -170,7 +193,7 @@
if(item_in_hand) //this segment checks if the item in your hand is twohanded.
if(istype(item_in_hand,/obj/item/weapon/twohanded))
if(item_in_hand:wielded == 1)
- usr << "Your other hand is too busy holding the [item_in_hand.name]"
+ to_chat(usr, "Your other hand is too busy holding the [item_in_hand.name]")
return
src.hand = !( src.hand )
if(hud_used.l_hand_hud_object && hud_used.r_hand_hud_object)
@@ -237,9 +260,9 @@
src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.name,status),1)
if(staminaloss)
if(staminaloss > 30)
- src << "You're completely exhausted."
+ to_chat(src, "You're completely exhausted.")
else
- src << "You feel fatigued."
+ to_chat(src, "You feel fatigued.")
if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit))
H.play_xylophone()
else
@@ -286,9 +309,54 @@
if(H.w_uniform)
H.w_uniform.add_fingerprint(M)
+/mob/living/carbon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0)
+ . = ..()
+ var/damage = intensity - check_eye_prot()
+ if(.)
+ if(visual)
+ return
+ if(weakeyes)
+ Stun(2)
+
+ var/obj/item/organ/internal/eyes/E = get_int_organ(/obj/item/organ/internal/eyes)
+ if(!E)
+ return
+
+ switch(damage)
+ if(1)
+ to_chat(src, "Your eyes sting a little.")
+ if(prob(40)) //waiting on carbon organs
+ E.damage += 1
+
+ if(2)
+ to_chat(src, "Your eyes burn.")
+ E.damage += rand(2, 4)
+
+ else
+ to_chat(src, "Your eyes itch and burn severely!")
+ E.damage += rand(12, 16)
+
+ if(E.damage > E.min_bruised_damage)
+ eye_blind += damage
+ eye_blurry += damage * rand(3, 6)
+
+ if(E.damage > (E.min_bruised_damage + E.min_broken_damage) / 2)
+ if(!(E.status & ORGAN_ROBOT))
+ to_chat(src, "Your eyes start to burn badly!")
+ else //snowflake conditions piss me off for the record
+ to_chat(src, "The flash blinds you!")
+
+ else if(E.damage >= E.min_broken_damage)
+ to_chat(src, "You can't see anything!")
+
+ else
+ to_chat(src, "Your eyes are really starting to hurt. This can't be good for you!")
+ return 1
+
+ else if(damage == 0) // just enough protection
+ if(prob(20))
+ to_chat(src, "Something bright flashes in the corner of your vision!")
-/mob/living/carbon/proc/eyecheck()
- return 0
/mob/living/carbon/proc/tintcheck()
return 0
@@ -318,15 +386,15 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
if(!ventcrawlerlocal) return
if(stat)
- src << "You must be conscious to do this!"
+ to_chat(src, "You must be conscious to do this!")
return
if(lying)
- src << "You can't vent crawl while you're stunned!"
+ to_chat(src, "You can't vent crawl while you're stunned!")
return
if(buckled_mob)
- src << "You can't vent crawl with [buckled_mob] on you!"
+ to_chat(src, "You can't vent crawl with [buckled_mob] on you!")
return
var/obj/machinery/atmospherics/unary/vent_found
@@ -370,7 +438,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
failed++
if(failed)
- src << "You can't crawl around in the ventilation ducts with items!"
+ to_chat(src, "You can't crawl around in the ventilation ducts with items!")
return
visible_message("[src] scrambles into the ventilation ducts!", "You climb into the ventilation system.")
@@ -378,7 +446,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
add_ventcrawl(vent_found)
else
- src << "This ventilation duct is not connected to anything!"
+ to_chat(src, "This ventilation duct is not connected to anything!")
/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine)
@@ -546,31 +614,34 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
/mob/living/carbon/show_inv(mob/user)
user.set_machine(src)
- var/dat = {"
-
- [name]
-
-
Head: [(head && !(head.flags&ABSTRACT)) ? head : "Nothing"]
-
Mask: [(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "Nothing"]
-
Left Hand: [(l_hand && !(l_hand.flags&ABSTRACT)) ? l_hand : "Nothing"]
-
Right Hand: [(r_hand && !(r_hand.flags&ABSTRACT)) ? r_hand : "Nothing"]"}
- dat += "
Back: [back ? back : "Nothing"]"
+ var/dat = {"
+ Close
"}
- user << browse(dat, "window=mob\ref[src];size=325x500")
- onclose(user, "mob\ref[src]")
+
+ var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 500)
+ popup.set_content(dat)
+ popup.open()
/mob/living/carbon/Topic(href, href_list)
..()
@@ -588,7 +659,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
if(!(head && head.flags & AIRTIGHT))
no_mask = 1
if(no_mask)
- usr << "[src] is not wearing a suitable mask or helmet!"
+ to_chat(usr, "[src] is not wearing a suitable mask or helmet!")
return
if(do_mob(usr, src, POCKET_STRIP_DELAY))
@@ -602,7 +673,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
if(!(head && head.flags & AIRTIGHT))
no_mask2 = 1
if(no_mask2)
- usr << "[src] is not wearing a suitable mask or helmet!"
+ to_chat(usr, "[src] is not wearing a suitable mask or helmet!")
return
internal = ITEM
if(internals)
@@ -729,7 +800,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
for(var/t = 0, t<=tilesSlipped, t++)
spawn (t) step(src, src.dir)
stop_pulling()
- src << "You slipped on the [description]!"
+ to_chat(src, "You slipped on the [description]!")
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
if (stun)
Stun(stun)
@@ -760,18 +831,18 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
/mob/living/carbon/proc/selfFeed(var/obj/item/weapon/reagent_containers/food/toEat, fullness)
if(istype(toEat, /obj/item/weapon/reagent_containers/food/pill))
- src << "You [toEat.apply_method] [toEat]."
+ to_chat(src, "You [toEat.apply_method] [toEat].")
else
if (fullness <= 50)
- src << "You hungrily chew out a piece of [toEat] and gobble it!"
+ to_chat(src, "You hungrily chew out a piece of [toEat] and gobble it!")
else if (fullness > 50 && fullness <= 150)
- src << "You hungrily begin to eat [toEat]."
+ to_chat(src, "You hungrily begin to eat [toEat].")
else if (fullness > 150 && fullness <= 350)
- src << "You take a bite of [toEat]."
+ to_chat(src, "You take a bite of [toEat].")
else if (fullness > 350 && fullness <= 550)
- src << "You unwillingly chew a bit of [toEat]."
+ to_chat(src, "You unwillingly chew a bit of [toEat].")
else if (fullness > (550 * (1 + overeatduration / 2000))) // The more you eat - the more you can eat
- src << "You cannot force any more of [toEat] to go down your throat."
+ to_chat(src, "You cannot force any more of [toEat] to go down your throat.")
return 0
return 1
@@ -813,4 +884,15 @@ so that different stomachs can handle things in different ways VB*/
if(toEat.reagents.total_volume > toEat.bitesize)
toEat.reagents.trans_to(src, toEat.bitesize*toEat.transfer_efficiency)
else
- toEat.reagents.trans_to(src, toEat.reagents.total_volume*toEat.transfer_efficiency)
\ No newline at end of file
+ toEat.reagents.trans_to(src, toEat.reagents.total_volume*toEat.transfer_efficiency)
+
+/mob/living/carbon/get_access()
+ . = ..()
+
+ var/obj/item/RH = get_active_hand()
+ if(RH)
+ . |= RH.GetAccess()
+
+ var/obj/item/LH = get_inactive_hand()
+ if(LH)
+ . |= LH.GetAccess()
diff --git a/code/modules/mob/living/carbon/carbon_defenses.dm b/code/modules/mob/living/carbon/carbon_defenses.dm
index 0f37ff365ba..efebc58ffc1 100644
--- a/code/modules/mob/living/carbon/carbon_defenses.dm
+++ b/code/modules/mob/living/carbon/carbon_defenses.dm
@@ -23,4 +23,17 @@
for(var/datum/surgery/S in surgeries)
if(S.next_step(user, src))
return 1
- ..()
\ No newline at end of file
+ ..()
+
+/mob/living/carbon/attack_hand(mob/living/carbon/human/user)
+ if(!iscarbon(user))
+ return
+
+ for(var/datum/disease/D in viruses)
+ if(D.IsSpreadByTouch())
+ user.ContractDisease(D)
+
+ for(var/datum/disease/D in user.viruses)
+ if(D.IsSpreadByTouch())
+ ContractDisease(D)
+ return 0
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 033e8ddfb1c..07a6a0d28cd 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -4,7 +4,6 @@
var/list/stomach_contents = list()
var/list/internal_organs = list()
var/brain_op_stage = 0.0
- var/list/datum/disease2/disease/virus2 = list()
var/antibodies = 0
var/last_eating = 0 //Not sure what this does... I found it hidden in food.dm
diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm
index 796f2997cc4..13e8fe153ea 100644
--- a/code/modules/mob/living/carbon/give.dm
+++ b/code/modules/mob/living/carbon/give.dm
@@ -3,16 +3,17 @@
set name = "Give"
if(!iscarbon(target)) //something is bypassing the give arguments, no clue what, adding a sanity check JIC
- usr << "Wait a second... \the [target] HAS NO HANDS! AHH!" //cheesy messages ftw
+ to_chat(usr, "Wait a second... \the [target] HAS NO HANDS! AHH!")//cheesy messages ftw
+
return
if(target.stat == 2 || usr.stat == 2|| target.client == null)
return
var/obj/item/I
if(!usr.hand && usr.r_hand == null)
- usr << " You don't have anything in your right hand to give to [target.name]"
+ to_chat(usr, " You don't have anything in your right hand to give to [target.name]")
return
if(usr.hand && usr.l_hand == null)
- usr << " You don't have anything in your left hand to give to [target.name]"
+ to_chat(usr, " You don't have anything in your left hand to give to [target.name]")
return
if(usr.hand)
I = usr.l_hand
@@ -21,7 +22,7 @@
if(!I)
return
if((I.flags & NODROP) || (I.flags & ABSTRACT))
- usr << "That's not exactly something you can give."
+ to_chat(usr, "That's not exactly something you can give.")
return
if(target.r_hand == null || target.l_hand == null)
switch(alert(target,"[usr] wants to give you \a [I]?",,"Yes","No"))
@@ -29,16 +30,16 @@
if(!I)
return
if(!Adjacent(usr))
- usr << " You need to stay in reaching distance while giving an object."
- target << " [usr.name] moved too far away."
+ to_chat(usr, " You need to stay in reaching distance while giving an object.")
+ to_chat(target, " [usr.name] moved too far away.")
return
if((usr.hand && usr.l_hand != I) || (!usr.hand && usr.r_hand != I))
- usr << " You need to keep the item in your active hand."
- target << " [usr.name] seem to have given up on giving \the [I.name] to you."
+ to_chat(usr, " You need to keep the item in your active hand.")
+ to_chat(target, " [usr.name] seem to have given up on giving \the [I.name] to you.")
return
if(target.r_hand != null && target.l_hand != null)
- target << " Your hands are full."
- usr << " Their hands are full."
+ to_chat(target, " Your hands are full.")
+ to_chat(usr, " Their hands are full.")
return
else
usr.drop_item()
@@ -57,4 +58,4 @@
if("No")
target.visible_message(" [usr.name] tried to hand [I.name] to [target.name] but [target.name] didn't want it.")
else
- usr << " [target.name]'s hands are full."
\ No newline at end of file
+ to_chat(usr, " [target.name]'s hands are full.")
diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm
index 6cd20e79b19..d74dcbd54c4 100644
--- a/code/modules/mob/living/carbon/human/appearance.dm
+++ b/code/modules/mob/living/carbon/human/appearance.dm
@@ -177,9 +177,27 @@
continue
if(gender == FEMALE && S.gender == MALE)
continue
- if(!(species.name in S.species_allowed))
- continue
- valid_hairstyles += hairstyle
+ if(species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head...
+ var/obj/item/organ/external/head/H = organs_by_name["head"]
+ if(!H)
+ return
+ if(species.name in S.species_allowed) //If this is a hairstyle native to the user's species...
+ if(H.model == "Morpheus Cyberkinetics") //Check to see if they have the default head.
+ valid_hairstyles += hairstyle //Give them their hairstyles if they do.
+ continue
+ else //If they don't have the default head, they shouldn't be getting any hairstyles they wouldn't normally.
+ continue
+ else
+ if(H.model == "Morpheus Cyberkinetics") //If the hairstyle is not native to the user's species, and they're using the default head, don't let them access it.
+ continue
+ else
+ if("Human" in S.species_allowed) //If the user has a robotic head and the hairstyle can fit humans, let them use it as a wig for their humanoid robot head.
+ valid_hairstyles += hairstyle
+ continue
+ else
+ if(!(species.name in S.species_allowed)) //If the user is not a species who can have robotic heads, use the default handling.
+ continue
+ valid_hairstyles += hairstyle
return valid_hairstyles
@@ -192,9 +210,27 @@
continue
if(gender == FEMALE && S.gender == MALE)
continue
- if(!(species.name in S.species_allowed))
- continue
+ if(species.flags & ALL_RPARTS) //If the user is a species who can have a robotic head...
+ var/obj/item/organ/external/head/H = organs_by_name["head"]
+ if(!H)
+ continue // No head, no hair
+ if(species.name in S.species_allowed) //If this is a facial hair style native to the user's species...
+ if(H.model == "Morpheus Cyberkinetics") //Check to see if they have the default head.
+ valid_facial_hairstyles += facialhairstyle //Give them their facial hair styles if they do.
+ continue
+ else //If they don't have the default head, they shouldn't be getting any facial hair styles they wouldn't normally.
+ continue
+ else
- valid_facial_hairstyles += facialhairstyle
+ if(H.model == "Morpheus Cyberkinetics") //If the facial hair style is not native to the user's species, and they're using the default head, don't let them access it.
+ continue
+ else
+ if("Human" in S.species_allowed) //If the user has a robotic head and the facial hair style can fit humans, let them use it as a postiche for their humanoid robot head.
+ valid_facial_hairstyles += facialhairstyle
+ continue
+ else //If the user is not a species who can have robotic heads, use the default handling.
+ if(!(species.name in S.species_allowed))
+ continue
+ valid_facial_hairstyles += facialhairstyle
return valid_facial_hairstyles
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 589331a7c01..aa31c912841 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -129,7 +129,6 @@
if(!gibbed)
update_canmove()
- if(client) blind.layer = 0
timeofdeath = worldtime2text()
med_hud_set_health()
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index c2ff4795320..657d40983de 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -753,7 +753,7 @@
right_hand_good = 1
if (!left_hand_good && !right_hand_good)
- usr << "You need at least one hand in good working order to snap your fingers."
+ to_chat(usr, "You need at least one hand in good working order to snap your fingers.")
return
message = "[src] snaps \his fingers."
@@ -769,8 +769,8 @@
return
// playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
if(locate(/obj/item/weapon/storage/bible) in get_turf(src))
- viewers(src) << "[src] farts on the Bible!"
- viewers(src) << "A mysterious force smites [src]!"
+ to_chat(viewers(src), "[src] farts on the Bible!")
+ to_chat(viewers(src), "A mysterious force smites [src]!")
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
@@ -789,8 +789,6 @@
for(var/mob/M in range(location,aoe_range))
if (M.internal != null && M.wear_mask && (M.wear_mask.flags & AIRTIGHT))
continue
- if(!airborne_can_reach(location,M,aoe_range))
- continue
// Now, we don't have this:
//new /obj/effects/fart_cloud(T,L)
// But:
@@ -812,10 +810,10 @@
emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob"
else if(species.name == "Slime People")
emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob"
- src << emotelist
+ to_chat(src, emotelist)
else
- src << "\blue Unusable emote '[act]'. Say *help for a list."
+ to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
@@ -851,4 +849,4 @@
set desc = "Sets an extended description of your character's features."
set category = "IC"
- flavor_text = TextPreview(input(usr, "Please enter your new flavour text.", "Flavour text", null) as text)
+ update_flavor_text()
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 57261782385..1eb906d5ec1 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -215,9 +215,9 @@
spawn(15)
if(distance <= 1 && user.stat != 1)
if(pulse == PULSE_NONE)
- user << "[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]..."
+ to_chat(user, "[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]...")
else
- user << "[t_He] has a pulse!"
+ to_chat(user, "[t_He] has a pulse!")
msg += ""
if(fire_stacks > 0)
@@ -484,7 +484,7 @@
pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "\n[t_He] is [pose]"
- user << msg
+ to_chat(user, msg)
//Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records.
/proc/hasHUD(mob/M as mob, hudtype)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 787d1e51b44..5d27605b13c 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -161,9 +161,6 @@
if(ismob(AM))
var/mob/tmob = AM
- if(iscarbon(tmob) && prob(10))
- spread_disease_to(tmob, "Contact")
-
//BubbleWrap - Should stop you pushing a restrained person out of the way
//i still don't get it, is this supposed to be 'bubblewrapping' or was it made by a guy named 'BubbleWrap'
if(ishuman(tmob))
@@ -171,7 +168,7 @@
if(tmob.pinned.len || (M.pulling == tmob && (tmob.restrained() && !M.restrained()) && M.stat == CONSCIOUS))
if(!(world.time % 5)) //tmob is pinned to wall, or is restrained and pulled by a concious unrestrained human
- src << "[tmob] is restrained, you cannot push past."
+ to_chat(src, "[tmob] is restrained, you cannot push past.")
now_pushing = 0
return 0
@@ -182,7 +179,7 @@
if(tmob.pulling == M && (M.restrained() && !tmob.restrained()) && tmob.stat == CONSCIOUS)
if(!(world.time % 5))
- src << "[tmob] is restraining [M], you cannot push past."
+ to_chat(src, "[tmob] is restraining [M], you cannot push past.")
now_pushing = 0
return 0
@@ -208,7 +205,7 @@
if(ishuman(tmob) && (FAT in tmob.mutations))
if(prob(40) && !(FAT in src.mutations))
- src << "You fail to push [tmob]'s fat ass out of the way."
+ to_chat(src, "You fail to push [tmob]'s fat ass out of the way.")
now_pushing = 0
return
@@ -636,10 +633,6 @@
// called when something steps onto a human
// this handles mulebots and vehicles
/mob/living/carbon/human/Crossed(var/atom/movable/AM)
- if(istype(AM, /obj/machinery/bot/mulebot))
- var/obj/machinery/bot/mulebot/MB = AM
- MB.RunOver(src)
-
if(istype(AM, /obj/vehicle))
var/obj/vehicle/V = AM
V.RunOver(src)
@@ -762,7 +755,7 @@
if(shock_damage * siemens_coeff >= 1 && prob(25))
heart_attack = 0
if(stat == CONSCIOUS)
- src << "You feel your heart beating again!"
+ to_chat(src, "You feel your heart beating again!")
. = ..()
@@ -778,7 +771,7 @@
if(href_list["item"])
var/slot = text2num(href_list["item"])
if(slot in check_obscured_slots())
- usr << "You can't reach that! Something is covering it."
+ to_chat(usr, "You can't reach that! Something is covering it.")
return
if(href_list["pockets"])
@@ -790,10 +783,10 @@
var/delay_denominator = 1
if(pocket_item && !(pocket_item.flags&ABSTRACT))
if(pocket_item.flags & NODROP)
- usr << "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!"
- usr << "You try to empty [src]'s [pocket_side] pocket."
+ to_chat(usr, "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!")
+ to_chat(usr, "You try to empty [src]'s [pocket_side] pocket.")
else if(place_item && place_item.mob_can_equip(src, pocket_id, 1) && !(place_item.flags&ABSTRACT))
- usr << "You try to place [place_item] into [src]'s [pocket_side] pocket."
+ to_chat(usr, "You try to place [place_item] into [src]'s [pocket_side] pocket.")
delay_denominator = 4
else
return
@@ -815,7 +808,7 @@
else
// Display a warning if the user mocks up if they don't have pickpocket gloves.
if(!thief_mode)
- src << "You feel your [pocket_side] pocket being fumbled with!"
+ to_chat(src, "You feel your [pocket_side] pocket being fumbled with!")
if(href_list["set_sensor"])
if(istype(w_uniform, /obj/item/clothing/under))
@@ -839,15 +832,6 @@
U.accessories -= A
update_inv_w_uniform()
- if (href_list["refresh"])
- if((machine)&&(in_range(src, usr)))
- show_inv(machine)
-
- if (href_list["mach_close"])
- var/t1 = text("window=[]", href_list["mach_close"])
- unset_machine()
- src << browse(null, t1)
-
if (href_list["criminal"])
if(hasHUD(usr,"security"))
@@ -884,7 +868,7 @@
sec_hud_set_security_status()
if(!modified)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["secrecord"])
if(hasHUD(usr,"security"))
@@ -904,17 +888,17 @@
for (var/datum/data/record/R in data_core.security)
if (R.fields["id"] == E.fields["id"])
if(hasHUD(usr,"security"))
- usr << "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]"
- usr << "Minor Crimes: [R.fields["mi_crim"]]"
- usr << "Details: [R.fields["mi_crim_d"]]"
- usr << "Major Crimes: [R.fields["ma_crim"]]"
- usr << "Details: [R.fields["ma_crim_d"]]"
- usr << "Notes: [R.fields["notes"]]"
- usr << "\[View Comment Log\]"
+ to_chat(usr, "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]")
+ to_chat(usr, "Minor Crimes: [R.fields["mi_crim"]]")
+ to_chat(usr, "Details: [R.fields["mi_crim_d"]]")
+ to_chat(usr, "Major Crimes: [R.fields["ma_crim"]]")
+ to_chat(usr, "Details: [R.fields["ma_crim_d"]]")
+ to_chat(usr, "Notes: [R.fields["notes"]]")
+ to_chat(usr, "\[View Comment Log\]")
read = 1
if(!read)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["secrecordComment"])
if(hasHUD(usr,"security"))
@@ -937,14 +921,14 @@
read = 1
var/counter = 1
while(R.fields[text("com_[]", counter)])
- usr << text("[]", R.fields[text("com_[]", counter)])
+ to_chat(usr, text("[]", R.fields[text("com_[]", counter)]))
counter++
if (counter == 1)
- usr << "No comment found"
- usr << "\[Add comment\]"
+ to_chat(usr, "No comment found")
+ to_chat(usr, "\[Add comment\]")
if(!read)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["secrecordadd"])
if(hasHUD(usr,"security"))
@@ -1014,7 +998,7 @@
sec_hud_set_security_status()
if(!modified)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["medrecord"])
if(hasHUD(usr,"medical"))
@@ -1034,18 +1018,18 @@
for (var/datum/data/record/R in data_core.medical)
if (R.fields["id"] == E.fields["id"])
if(hasHUD(usr,"medical"))
- usr << "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]"
- usr << "DNA: [R.fields["b_dna"]]"
- usr << "Minor Disabilities: [R.fields["mi_dis"]]"
- usr << "Details: [R.fields["mi_dis_d"]]"
- usr << "Major Disabilities: [R.fields["ma_dis"]]"
- usr << "Details: [R.fields["ma_dis_d"]]"
- usr << "Notes: [R.fields["notes"]]"
- usr << "\[View Comment Log\]"
+ to_chat(usr, "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]")
+ to_chat(usr, "DNA: [R.fields["b_dna"]]")
+ to_chat(usr, "Minor Disabilities: [R.fields["mi_dis"]]")
+ to_chat(usr, "Details: [R.fields["mi_dis_d"]]")
+ to_chat(usr, "Major Disabilities: [R.fields["ma_dis"]]")
+ to_chat(usr, "Details: [R.fields["ma_dis_d"]]")
+ to_chat(usr, "Notes: [R.fields["notes"]]")
+ to_chat(usr, "\[View Comment Log\]")
read = 1
if(!read)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["medrecordComment"])
if(hasHUD(usr,"medical"))
@@ -1068,14 +1052,14 @@
read = 1
var/counter = 1
while(R.fields[text("com_[]", counter)])
- usr << text("[]", R.fields[text("com_[]", counter)])
+ to_chat(usr, text("[]", R.fields[text("com_[]", counter)]))
counter++
if (counter == 1)
- usr << "No comment found"
- usr << "\[Add comment\]"
+ to_chat(usr, "No comment found")
+ to_chat(usr, "\[Add comment\]")
if(!read)
- usr << "\red Unable to locate a data core entry for this person."
+ to_chat(usr, "\red Unable to locate a data core entry for this person.")
if (href_list["medrecordadd"])
if(hasHUD(usr,"medical"))
@@ -1116,24 +1100,32 @@
. = ..()
-///eyecheck()
+///check_eye_prot()
///Returns a number between -1 to 2
-/mob/living/carbon/human/eyecheck()
+/mob/living/carbon/human/check_eye_prot()
var/number = ..()
- if(istype(src.head, /obj/item/clothing/head)) //are they wearing something on their head
- var/obj/item/clothing/head/HFP = src.head //if yes gets the flash protection value from that item
+ if(istype(head, /obj/item/clothing/head)) //are they wearing something on their head
+ var/obj/item/clothing/head/HFP = head //if yes gets the flash protection value from that item
number += HFP.flash_protect
- if(istype(src.glasses, /obj/item/clothing/glasses)) //glasses
- var/obj/item/clothing/glasses/GFP = src.glasses
+ if(istype(glasses, /obj/item/clothing/glasses)) //glasses
+ var/obj/item/clothing/glasses/GFP = glasses
number += GFP.flash_protect
- if(istype(src.wear_mask, /obj/item/clothing/mask)) //mask
- var/obj/item/clothing/mask/MFP = src.wear_mask
+ if(istype(wear_mask, /obj/item/clothing/mask)) //mask
+ var/obj/item/clothing/mask/MFP = wear_mask
number += MFP.flash_protect
- for(var/obj/item/organ/internal/cyberimp/eyes/EFP in src.internal_organs)
+ for(var/obj/item/organ/internal/cyberimp/eyes/EFP in internal_organs)
number += EFP.flash_protect
return number
+/mob/living/carbon/human/check_ear_prot()
+ if(head && (head.flags & HEADBANGPROTECT))
+ return 1
+ if(l_ear && (l_ear.flags & EARBANGPROTECT))
+ return 1
+ if(r_ear && (r_ear.flags & EARBANGPROTECT))
+ return 1
+
///tintcheck()
///Checks eye covering items for visually impairing tinting, such as welding masks
///Checked in life.dm. 0 & 1 = no impairment, 2 = welding mask overlay, 3 = You can see jack, but you can't see shit.
@@ -1221,7 +1213,7 @@
if(!. && error_msg && user)
if(!fail_msg)
fail_msg = "There is no exposed flesh or thin material [target_zone == "head" ? "on their head" : "on their body"] to inject into."
- user << "[fail_msg]"
+ to_chat(user, "[fail_msg]")
/mob/living/carbon/human/proc/check_obscured_slots()
var/list/obscured = list()
@@ -1255,44 +1247,6 @@
return 0
return 1
-/mob/living/carbon/human/proc/vomit(hairball=0)
- if(stat==DEAD)return
-
- if(!check_has_mouth())
- return
-
- if(!lastpuke)
- lastpuke = 1
- src << "You feel nauseous..."
- spawn(150) //15 seconds until second warning
- src << "You feel like you are about to throw up!"
- spawn(100) //and you have 10 more for mad dash to the bucket
- Stun(5)
-
- if(hairball)
- src.visible_message("[src] hacks up a hairball!","You hack up a hairball!")
- else
- src.visible_message("[src] throws up!","You throw up!")
- playsound(loc, 'sound/effects/splat.ogg', 50, 1)
-
- var/turf/location = loc
- if (istype(location, /turf/simulated))
- location.add_vomit_floor(src, 1)
-
- var/stomach_len = src.stomach_contents.len
- if (stomach_len)
- var/content = src.stomach_contents[stomach_len]
- if (istype(content, /atom/movable))
- var/atom/movable/AM = content
- src.stomach_contents.Remove(AM)
- AM.loc = location
-
- if(!hairball)
- nutrition -= 40
- adjustToxLoss(-3)
- spawn(350) //wait 35 seconds before next volley
- lastpuke = 0
-
/mob/living/carbon/human/proc/get_visible_gender()
if(wear_suit && wear_suit.flags_inv & HIDEJUMPSUIT && ((head && head.flags_inv & HIDEMASK) || wear_mask))
@@ -1324,12 +1278,6 @@
H.brainmob.mind.transfer_to(src)
qdel(H)
-
-
- for (var/ID in virus2)
- var/datum/disease2/disease/V = virus2[ID]
- V.cure(src)
-
..()
/mob/living/carbon/human/proc/is_lung_ruptured()
@@ -1364,19 +1312,19 @@
if (prob(round(damage/10)*20))
germs++
if (germs == 100)
- world << "Reached stage 1 in [ticks] ticks"
+ to_chat(world, "Reached stage 1 in [ticks] ticks")
if (germs > 100)
if (prob(10))
damage++
germs++
if (germs == 1000)
- world << "Reached stage 2 in [ticks] ticks"
+ to_chat(world, "Reached stage 2 in [ticks] ticks")
if (germs > 1000)
damage++
germs++
if (germs == 2500)
- world << "Reached stage 3 in [ticks] ticks"
- world << "Mob took [tdamage] tox damage"
+ to_chat(world, "Reached stage 3 in [ticks] ticks")
+ to_chat(world, "Mob took [tdamage] tox damage")
*/
//returns 1 if made bloody, returns 0 otherwise
@@ -1433,7 +1381,7 @@
msg ="Your movement jostles [O] in your [organ.name] painfully."
if(3)
msg ="[O] in your [organ.name] twists painfully as you move."
- src << msg
+ to_chat(src, msg)
organ.take_damage(rand(1,3), 0, 0)
if(!(organ.status & ORGAN_ROBOT)) //There is no blood in protheses.
@@ -1459,18 +1407,19 @@
"You begin counting your pulse.")
if(src.pulse)
- usr << "\blue [self ? "You have a" : "[src] has a"] pulse! Counting..."
+ to_chat(usr, "\blue [self ? "You have a" : "[src] has a"] pulse! Counting...")
else
- usr << "\red [src] has no pulse!" //it is REALLY UNLIKELY that a dead person would check his own pulse
+ to_chat(usr, "\red [src] has no pulse!")//it is REALLY UNLIKELY that a dead person would check his own pulse
+
return
- usr << "Don't move until counting is finished."
+ to_chat(usr, "Don't move until counting is finished.")
var/time = world.time
sleep(60)
if(usr.l_move_time >= time) //checks if our mob has moved during the sleep()
- usr << "You moved while counting. Try again."
+ to_chat(usr, "You moved while counting. Try again.")
else
- usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
+ to_chat(usr, "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)].")
/mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour, var/delay_icon_update = 0)
@@ -1578,26 +1527,26 @@
verbs -= /mob/living/carbon/human/proc/bloody_doodle
if (src.gloves)
- src << "Your [src.gloves] are getting in the way."
+ to_chat(src, "Your [src.gloves] are getting in the way.")
return
var/turf/simulated/T = src.loc
if (!istype(T)) //to prevent doodling out of mechs and lockers
- src << "You cannot reach the floor."
+ to_chat(src, "You cannot reach the floor.")
return
var/direction = input(src,"Which way?","Tile selection") as anything in list("Here","North","South","East","West")
if (direction != "Here")
T = get_step(T,text2dir(direction))
if (!istype(T))
- src << "You cannot doodle there."
+ to_chat(src, "You cannot doodle there.")
return
var/num_doodles = 0
for (var/obj/effect/decal/cleanable/blood/writing/W in T)
num_doodles++
if (num_doodles > 4)
- src << "There is no space to write on!"
+ to_chat(src, "There is no space to write on!")
return
var/max_length = bloody_hands * 30 //tweeter style
@@ -1610,7 +1559,7 @@
if (length(message) > max_length)
message += "-"
- src << "You ran out of blood to write with!"
+ to_chat(src, "You ran out of blood to write with!")
var/obj/effect/decal/cleanable/blood/writing/W = new(T)
W.message = message
@@ -1619,26 +1568,36 @@
// Allows IPC's to change their monitor display
/mob/living/carbon/human/proc/change_monitor()
set category = "IC"
- set name = "Change Monitor Display"
- set desc = "Change the display on your monitor."
+ set name = "Change Monitor/Optical Display"
+ set desc = "Change the display on your monitor or the colour of your optics."
- if(stat || paralysis || stunned || weakened)
- src << "You cannot change your monitor display in your current state."
+ if(incapacitated())
+ to_chat(src, "You cannot change your monitor or optical display in your current state.")
return
- var/list/hair = list()
- for(var/i in hair_styles_list)
- var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
- if(species.name in tmp_hair.species_allowed)
- hair += i
+ if(species.flags & ALL_RPARTS) //If they can have a fully cybernetic body...
+ if(client.prefs.rlimb_data["head"]) //If head is present here, that means it's not the default Morpheus. Thus, no screen to adjust. Instead, let them change the colour of their optics!
+ var/optic_colour = input(src, "Select optic colour", rgb(r_markings, g_markings, b_markings)) as color|null
+ if(optic_colour)
+ r_markings = hex2num(copytext(optic_colour, 2, 4))
+ g_markings = hex2num(copytext(optic_colour, 4, 6))
+ b_markings = hex2num(copytext(optic_colour, 6, 8))
- var/new_style = input(src, "Select a monitor display", "Monitor Display") as null|anything in hair
- if(stat || paralysis || stunned || weakened)
- return
- if(new_style)
- h_style = new_style
+ update_markings()
+ else if(!client.prefs.rlimb_data["head"])//Means that the character has the default Morpheus head, which has a screen. Time to customize.
+ var/list/hair = list()
+ for(var/i in hair_styles_list)
+ var/datum/sprite_accessory/hair/tmp_hair = hair_styles_list[i]
+ if(species.name in tmp_hair.species_allowed)
+ hair += i
- update_hair()
+ var/new_style = input(src, "Select a monitor display", "Monitor Display", h_style) as null|anything in hair
+ if(incapacitated())
+ return
+ if(new_style)
+ h_style = new_style
+
+ update_hair()
//Putting a couple of procs here that I don't know where else to dump.
//Mostly going to be used for Vox and Vox Armalis, but other human mobs might like them (for adminbuse).
@@ -1651,7 +1610,7 @@
return
if(stat || paralysis || stunned || weakened || lying || restrained() || buckled)
- src << "You cannot leap in your current state."
+ to_chat(src, "You cannot leap in your current state.")
return
var/list/choices = list()
@@ -1670,7 +1629,7 @@
return
if(stat || paralysis || stunned || weakened || lying || restrained() || buckled)
- src << "You cannot leap in your current state."
+ to_chat(src, "You cannot leap in your current state.")
return
last_special = world.time + 75
@@ -1685,7 +1644,7 @@
if(status_flags & LEAPING) status_flags &= ~LEAPING
if(!src.Adjacent(T))
- src << "\red You miss!"
+ to_chat(src, "\red You miss!")
return
T.Weaken(5)
@@ -1698,7 +1657,7 @@
var/use_hand = "left"
if(l_hand)
if(r_hand)
- src << "\red You need to have one hand free to grab someone."
+ to_chat(src, "\red You need to have one hand free to grab someone.")
return
else
use_hand = "right"
@@ -1724,16 +1683,16 @@
return
if(stat || paralysis || stunned || weakened || lying)
- src << "\red You cannot do that in your current state."
+ to_chat(src, "\red You cannot do that in your current state.")
return
var/obj/item/weapon/grab/G = locate() in src
if(!G || !istype(G))
- src << "\red You are not grabbing anyone."
+ to_chat(src, "\red You are not grabbing anyone.")
return
if(G.state < GRAB_AGGRESSIVE)
- src << "\red You must have an aggressive grab to gut your prey!"
+ to_chat(src, "\red You must have an aggressive grab to gut your prey!")
return
last_special = world.time + 50
@@ -1752,7 +1711,7 @@
if(M.stat == 2)
M.gib()
-/mob/living/carbon/human/assess_threat(var/obj/machinery/bot/secbot/judgebot, var/lasercolor)
+/mob/living/carbon/human/assess_threat(var/mob/living/simple_animal/bot/secbot/judgebot, var/lasercolor)
if(judgebot.emagged == 2)
return 10 //Everyone is a criminal!
@@ -1838,7 +1797,7 @@
for(var/obj/item/hand in handlist)
if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && unEquip(hand))
step_towards(hand, src)
- src << "\The [S] pulls \the [hand] from your grip!"
+ to_chat(src, "\The [S] pulls \the [hand] from your grip!")
apply_effect(current_size * 3, IRRADIATE)
if(mob_negates_gravity())
return
@@ -1891,26 +1850,26 @@
/mob/living/carbon/human/selfFeed(var/obj/item/weapon/reagent_containers/food/toEat, fullness)
if(!check_has_mouth())
- src << "Where do you intend to put \the [toEat]? You don't have a mouth!"
+ to_chat(src, "Where do you intend to put \the [toEat]? You don't have a mouth!")
return 0
return ..()
/mob/living/carbon/human/forceFed(var/obj/item/weapon/reagent_containers/food/toEat, mob/user, fullness)
if(!check_has_mouth())
if(!((istype(toEat, /obj/item/weapon/reagent_containers/food/drinks) && (get_species() == "Machine"))))
- user << "Where do you intend to put \the [toEat]? \The [src] doesn't have a mouth!"
+ to_chat(user, "Where do you intend to put \the [toEat]? \The [src] doesn't have a mouth!")
return 0
return ..()
/mob/living/carbon/human/selfDrink(var/obj/item/weapon/reagent_containers/food/drinks/toDrink)
if(!check_has_mouth())
if(!get_species() == "Machine")
- src << "Where do you intend to put \the [src]? You don't have a mouth!"
+ to_chat(src, "Where do you intend to put \the [src]? You don't have a mouth!")
return 0
else
- src << "You pour a bit of liquid from [toDrink] into your connection port."
+ to_chat(src, "You pour a bit of liquid from [toDrink] into your connection port.")
else
- src << "You swallow a gulp of [toDrink]."
+ to_chat(src, "You swallow a gulp of [toDrink].")
return 1
/mob/living/carbon/human/can_track(mob/living/user)
@@ -1926,4 +1885,15 @@
return ..()
/mob/living/carbon/human/proc/get_age_pitch()
- return 1.0 + 0.5*(30 - age)/80
\ No newline at end of file
+ return 1.0 + 0.5*(30 - age)/80
+
+/mob/living/carbon/human/get_access()
+ . = ..()
+
+ if(wear_id)
+ . |= wear_id.GetAccess()
+ if(istype(w_uniform, /obj/item/clothing/under))
+ var/obj/item/clothing/under/U = w_uniform
+ if(U.accessories)
+ for(var/obj/item/clothing/accessory/A in U.accessories)
+ . |= A.GetAccess()
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index fa4e557a200..25be2232432 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -1,10 +1,10 @@
/mob/living/carbon/human/attack_hand(mob/living/carbon/human/M as mob)
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
if(frozen)
- M << "\red Do not touch Admin-Frozen people."
+ to_chat(M, "\red Do not touch Admin-Frozen people.")
return
var/mob/living/carbon/human/H = M
@@ -13,7 +13,7 @@
if (H.hand)
temp = H.organs_by_name["l_hand"]
if(!temp || !temp.is_usable())
- H << "\red You can't use your hand."
+ to_chat(H, "\red You can't use your hand.")
return
..()
@@ -48,10 +48,6 @@
apply_effect(4, WEAKEN, armor_block)
return
- else
- if(istype(M,/mob/living/carbon))
-// log_debug("No gloves, [M] is truing to infect [src]")
- M.spread_disease_to(src, "Contact")
var/datum/martial_art/attacker_style = M.martial_art
@@ -74,16 +70,16 @@
add_logs(src, M, "shaked")
return 1
if(!H.check_has_mouth())
- H << "You don't have a mouth, you cannot perform CPR!"
+ to_chat(H, "You don't have a mouth, you cannot perform CPR!")
return
if(!check_has_mouth())
- H << "They don't have a mouth, you cannot perform CPR!"
+ to_chat(H, "They don't have a mouth, you cannot perform CPR!")
return
if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH) && !M.wear_mask.mask_adjusted))
- M << "Remove your mask!"
+ to_chat(M, "Remove your mask!")
return 0
if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH) && !wear_mask.mask_adjusted))
- M << "Remove his mask!"
+ to_chat(M, "Remove his mask!")
return 0
M.visible_message("\The [M] is trying to perform CPR on \the [src]!", \
@@ -96,12 +92,12 @@
M.visible_message("\The [M] performs CPR on \the [src]!", \
"You perform CPR on \the [src].")
- src << "You feel a breath of fresh air enter your lungs. It feels good."
- M << "Repeat at least every 7 seconds."
+ to_chat(src, "You feel a breath of fresh air enter your lungs. It feels good.")
+ to_chat(M, "Repeat at least every 7 seconds.")
add_logs(src, M, "CPRed")
return 1
else
- M << "You need to stay still while performing CPR!"
+ to_chat(M, "You need to stay still while performing CPR!")
if(I_GRAB)
if(attacker_style && attacker_style.grab_act(H, src))
@@ -120,19 +116,19 @@
if(M.zone_sel && M.zone_sel.selecting == "head" && src != M)
if(M.mind && M.mind.vampire && (M.mind in ticker.mode.vampires) && !M.mind.vampire.draining)
if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH)))
- M << "Remove their mask!"
+ to_chat(M, "Remove their mask!")
return 0
if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))
- M << "Remove your mask!"
+ to_chat(M, "Remove your mask!")
return 0
if(mind && mind.vampire && (mind in ticker.mode.vampires))
- M << "Your fangs fail to pierce [src.name]'s cold flesh"
+ to_chat(M, "Your fangs fail to pierce [src.name]'s cold flesh")
return 0
if(SKELETON in mutations)
- M << "There is no blood in a skeleton!"
+ to_chat(M, "There is no blood in a skeleton!")
return 0
if(issmall(src) && !ckey) //Monkeyized humans are okay, humanized monkeys are okey, monkeys are not.
- M << "Blood from a monkey is useless!"
+ to_chat(M, "Blood from a monkey is useless!")
return 0
//we're good to suck the blood, blaah
M.mind.vampire.handle_bloodsucking(src)
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 0b413d1915c..c0e58942cfc 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -154,7 +154,7 @@
if(candidates.len)
var/obj/item/organ/external/O = pick(candidates)
O.mutate()
- src << "Something is not right with your [O.name]..."
+ to_chat(src, "Something is not right with your [O.name]...")
O.add_autopsy_data("Mutation", amount)
return
@@ -163,7 +163,7 @@
for(var/obj/item/organ/external/O in organs)
if(O.status & ORGAN_MUTATED)
O.unmutate()
- src << "Your [O.name] is shaped normally again."
+ to_chat(src, "Your [O.name] is shaped normally again.")
return
@@ -171,7 +171,7 @@
for(var/obj/item/organ/external/O in organs)
if(O.status & ORGAN_MUTATED)
O.unmutate()
- src << "Your [O.name] is shaped normally again."
+ to_chat(src, "Your [O.name] is shaped normally again.")
// Defined here solely to take species flags into account without having to recast at mob/living level.
@@ -400,4 +400,4 @@ This function restores all organs.
// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().
updatehealth()
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index f3eb9ddcd7a..5f8e44f840a 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -176,12 +176,12 @@ emp_act
if(!istype(affecting))
return
if(!(affecting.status & ORGAN_ROBOT))
- user << "\red That limb isn't robotic."
+ to_chat(user, "\red That limb isn't robotic.")
return
if(affecting.sabotaged)
- user << "\red [src]'s [affecting.name] is already sabotaged!"
+ to_chat(user, "\red [src]'s [affecting.name] is already sabotaged!")
else
- user << "\red You sneakily slide the card into the dataport on [src]'s [affecting.name] and short out the safeties."
+ to_chat(user, "\red You sneakily slide the card into the dataport on [src]'s [affecting.name] and short out the safeties.")
affecting.sabotaged = 1
return 1
@@ -198,7 +198,7 @@ emp_act
src.reagents.trans_to (newmeat, round ((src.reagents.total_volume) / 3, 1))
src.loc.add_blood(src)
--src.meatleft
- user << "\red You hack off a chunk of meat from [src.name]"
+ to_chat(user, "\red You hack off a chunk of meat from [src.name]")
if(!src.meatleft)
src.attack_log += "\[[time_stamp()]\] Was chopped up into meat by [key_name(user)]"
user.attack_log += "\[[time_stamp()]\] Chopped up [key_name(src)] into meat"
@@ -212,7 +212,7 @@ emp_act
var/obj/item/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting))
if(!affecting || affecting.is_stump() || (affecting.status & ORGAN_DESTROYED))
- user << "They are missing that limb!"
+ to_chat(user, "They are missing that limb!")
return 1
var/hit_area = affecting.name
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 100eff321d4..56838b8d14e 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -147,11 +147,14 @@
/*
When assimilate is 1, organs that have a different UE will still have their DNA overriden by that of the host
Otherwise, this restricts itself to organs that share the UE of the host.
+
+old_ue: Set this to a UE string, and this proc will overwrite the dna of organs that have that UE, instead of the host's present UE
*/
-/mob/living/carbon/human/proc/sync_organ_dna(var/assimilate = 1)
+/mob/living/carbon/human/proc/sync_organ_dna(var/assimilate = 1, var/old_ue = null)
+ var/ue_to_compare = (old_ue) ? old_ue : dna.unique_enzymes
var/list/all_bits = internal_organs|organs
for(var/obj/item/organ/O in all_bits)
- if(assimilate || O.dna.unique_enzymes == dna.unique_enzymes)
+ if(assimilate || O.dna.unique_enzymes == ue_to_compare)
O.set_dna(dna)
/*
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index e4555a3c500..568de281cf1 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -7,13 +7,14 @@
var/obj/item/I = H.get_active_hand()
var/obj/item/weapon/storage/S = H.get_inactive_hand()
if(!I)
- H << "You are not holding anything to equip."
+ to_chat(H, "You are not holding anything to equip.")
return
if(istype(I, /obj/item/clothing/head/helmet/space/rig)) // If the item to be equipped is a rigid suit helmet
var/obj/item/clothing/head/helmet/space/rig/C = I
if(C.rig_restrict_helmet)
- src << "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)" // Stop eva helms equipping.
+ to_chat(src, "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)")// Stop eva helms equipping.
+
return 0
if(H.equip_to_appropriate_slot(I))
@@ -34,7 +35,7 @@
if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1))
S.handle_item_insertion(I)
else
- H << "\red You are unable to equip that."
+ to_chat(H, "\red You are unable to equip that.")
/mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1)
@@ -301,7 +302,7 @@
var/obj/item/clothing/under/uniform = src.w_uniform
uniform.attackby(W,src)
else
- src << "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!"
+ to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!")
return
/mob/living/carbon/human/put_in_hands(obj/item/W)
@@ -415,7 +416,7 @@
//testing("[M] TOO FAT TO WEAR [src]!")
if(!(I.flags & ONESIZEFITSALL))
if(!disable_warning)
- src << "You're too fat to wear the [I]."
+ to_chat(src, "You're too fat to wear the [I].")
return 0
switch(slot)
@@ -462,7 +463,7 @@
return 0
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [name]."
+ to_chat(src, "You need a jumpsuit before you can attach this [name].")
return 0
if(!(I.slot_flags & SLOT_BELT))
return
@@ -506,7 +507,7 @@
return 0
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [name]."
+ to_chat(src, "You need a jumpsuit before you can attach this [name].")
return 0
if(!(I.slot_flags & SLOT_ID))
return 0
@@ -516,7 +517,7 @@
return 0
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [name]."
+ to_chat(src, "You need a jumpsuit before you can attach this [name].")
return 0
if(!(I.slot_flags & SLOT_PDA))
return 0
@@ -528,7 +529,7 @@
return 0
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [name]."
+ to_chat(src, "You need a jumpsuit before you can attach this [name].")
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return
@@ -541,7 +542,7 @@
return 0
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [name]."
+ to_chat(src, "You need a jumpsuit before you can attach this [name].")
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return 0
@@ -555,15 +556,15 @@
return 0
if(!wear_suit)
if(!disable_warning)
- src << "You need a suit before you can attach this [name]."
+ to_chat(src, "You need a suit before you can attach this [name].")
return 0
if(!wear_suit.allowed)
if(!disable_warning)
- src << "You somehow have a suit with no defined allowed items for suit storage, stop that."
+ to_chat(src, "You somehow have a suit with no defined allowed items for suit storage, stop that.")
return 0
if(I.w_class > 4)
if(!disable_warning)
- src << "The [name] is too big to attach."
+ to_chat(src, "The [name] is too big to attach.")
return 0
if(istype(I, /obj/item/device/pda) || istype(I, /obj/item/weapon/pen) || is_type_in_list(I, wear_suit.allowed))
return 1
@@ -589,12 +590,12 @@
if(slot_tie)
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [name]."
+ to_chat(src, "You need a jumpsuit before you can attach this [name].")
return 0
var/obj/item/clothing/under/uniform = w_uniform
if(uniform.accessories.len && !uniform.can_attach_accessory(src))
if(!disable_warning)
- src << "You already have an accessory of this type attached to your [uniform]."
+ to_chat(src, "You already have an accessory of this type attached to your [uniform].")
return 0
if(!(I.slot_flags & SLOT_TIE))
return 0
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 7ed777ebf77..c2ec65368a4 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1,30 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
-var/global/list/unconscious_overlays = list("1" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage1"),\
- "2" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage2"),\
- "3" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage3"),\
- "4" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage4"),\
- "5" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage5"),\
- "6" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage6"),\
- "7" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage7"),\
- "8" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage8"),\
- "9" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage9"),\
- "10" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage10"))
-var/global/list/oxyloss_overlays = list("1" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay1"),\
- "2" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay2"),\
- "3" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay3"),\
- "4" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay4"),\
- "5" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay5"),\
- "6" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay6"),\
- "7" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay7"))
-var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay1"),\
- "2" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay2"),\
- "3" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay3"),\
- "4" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay4"),\
- "5" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay5"),\
- "6" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay6"))
-
#define TINT_IMPAIR 2 //Threshold of tint level to apply weld mask overlay
#define TINT_BLIND 3 //Threshold of tint level to obscure vision fully
@@ -51,10 +26,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
loc_as_cryobag.used++
in_stasis = 1
- //if(mob_master.current_cycle % 30 == 15)
- //hud_updateflag = 1022
- //HudRefactor:WTF do i put here....
-
voice = GetVoice()
if(..() && !in_stasis)
@@ -64,8 +35,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
update_mutations()
check_mutations=0
- handle_virus_updates()
-
handle_shock()
handle_pain()
handle_heartbeat()
@@ -200,11 +169,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
adjustCloneLoss(0.1)
/mob/living/carbon/human/handle_mutations_and_radiation()
- if(getFireLoss())
- if((RESIST_HEAT in mutations) || (prob(1)))
- heal_organ_damage(0,1)
-
-
for(var/datum/dna/gene/gene in dna_genes)
if(!gene.block)
continue
@@ -223,7 +187,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
radiation -= 0.1
reagents.add_reagent("radium", rads/10)
if( prob(10) )
- src << "You feel relaxed."
+ to_chat(src, "You feel relaxed.")
return
if (radiation > 100)
@@ -231,7 +195,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(!(species.flags & RAD_ABSORB))
Weaken(10)
if(!lying)
- src << "You feel weak."
+ to_chat(src, "You feel weak.")
emote("collapse")
if (radiation < 0)
@@ -265,7 +229,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
radiation -= 5
Weaken(3)
if(!lying)
- src << "You feel weak."
+ to_chat(src, "You feel weak.")
emote("collapse")
updatehealth()
@@ -274,7 +238,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
adjustToxLoss(3)
damage = 3
if(prob(1))
- src << "You mutate!"
+ to_chat(src, "You mutate!")
randmutb(src)
domutcheck(src,null)
emote("gasp")
@@ -285,7 +249,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
adjustToxLoss(5)
damage = 5
if(prob(1))
- src << "You mutate!"
+ to_chat(src, "You mutate!")
randmutb(src)
domutcheck(src,null)
emote("gasp")
@@ -350,12 +314,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(breath)
loc.assume_air(breath)
- //spread virus2
- if(virus2.len > 0)
- if(prob(10) && get_infection_chance(src))
- for(var/mob/living/carbon/M in view(1,src))
- src.spread_disease_to(M)
-
// USED IN DEATHWHISPERS
@@ -434,7 +392,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
return
var/loc_temp = get_temperature(environment)
- //world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)] - Heat capacity: [environment_heat_capacity] - Location: [loc] - src: [src]"
+// to_chat(world, "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)] - Heat capacity: [environment_heat_capacity] - Location: [loc] - src: [src]")
//Body temperature is adjusted in two steps. Firstly your body tries to stabilize itself a bit.
if(stat != 2)
@@ -736,37 +694,11 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
adjustOxyLoss(-(light_amount))
//TODO: heal wounds, heal broken limbs.
- if(species.light_dam)
- var/light_amount = 0
- if(isturf(loc))
- var/turf/T = loc
- light_amount = T.get_lumcount()*10
- if(light_amount > species.light_dam && !incorporeal_move) //if there's enough light, start dying
- if(species.light_effect_amp)
- adjustFireLoss(4.7) //This gets multiplied by 1.5 due to Shadowling's innate fire weakness, so it ends up being about 7.
- else
- adjustFireLoss(1)
- adjustBruteLoss(1)
- src << "The light burns you!"
- src << 'sound/weapons/sear.ogg'
- else //heal in the dark
- if(species.light_effect_amp)
- adjustFireLoss(-5)
- adjustBruteLoss(-5)
- adjustBrainLoss(-25) //gibbering shadowlings are hilarious but also bad to have
- adjustCloneLoss(-1)
- SetWeakened(0)
- SetStunned(0)
- else
- adjustFireLoss(-1)
- adjustBruteLoss(-1)
-
-
//The fucking FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
if(species.flags & CAN_BE_FAT)
if(FAT in mutations)
if(overeatduration < 100)
- src << "You feel fit again!"
+ to_chat(src, "You feel fit again!")
mutations.Remove(FAT)
update_mutantrace(0)
update_mutations(0)
@@ -774,7 +706,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
update_inv_wear_suit()
else
if(overeatduration > 500)
- src << "You suddenly feel blubbery!"
+ to_chat(src, "You suddenly feel blubbery!")
mutations.Add(FAT)
update_mutantrace(0)
update_mutations(0)
@@ -833,13 +765,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(.) //alive
if(REGEN in mutations)
- if(nutrition)
- if(prob(10))
- var/randumb = rand(1, 5)
- nutrition -= randumb
- heal_overall_damage(randumb, randumb)
- if(nutrition < 0)
- nutrition = 0
+ heal_overall_damage(0.1, 0.1)
if(!in_stasis)
handle_organs()
@@ -954,7 +880,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
/mob/living/carbon/human/handle_vision()
- client.screen.Remove(global_hud.blurry, global_hud.druggy, global_hud.vimpaired, global_hud.darkMask)
if(machine)
if(!machine.check_eye(src)) reset_view(null)
else
@@ -963,19 +888,22 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
isRemoteObserve = 1
if(remoteview_target.stat != CONSCIOUS)
- src << "Your psy-connection grows too faint to maintain!"
+ to_chat(src, "Your psy-connection grows too faint to maintain!")
isRemoteObserve = 0
if(PSY_RESIST in remoteview_target.mutations)
- src << "Your mind is shut out!"
+ to_chat(src, "Your mind is shut out!")
isRemoteObserve = 0
// Not on the station or mining?
var/turf/temp_turf = get_turf(remoteview_target)
if(!temp_turf in config.contact_levels)
- src << "Your psy-connection grows too faint to maintain!"
+ to_chat(src, "Your psy-connection grows too faint to maintain!")
isRemoteObserve = 0
+ if(remote_view)
+ isRemoteObserve = 1
+
if(!isRemoteObserve && client && !client.adminobs)
remoteview_target = null
reset_view(null)
@@ -989,7 +917,23 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
// Puke if toxloss is too high
if(!stat)
if (getToxLoss() >= 45 && nutrition > 20)
- vomit()
+ lastpuke ++
+ if(lastpuke >= 25) // about 25 second delay I guess
+ Stun(5)
+
+ visible_message("[src] throws up!", \
+ "[src] throws up!")
+ playsound(loc, 'sound/effects/splat.ogg', 50, 1)
+
+ var/turf/location = loc
+ if (istype(location, /turf/simulated))
+ location.add_vomit_floor(src, 1)
+
+ nutrition -= 20
+ adjustToxLoss(-3)
+
+ // make it so you can only puke so fast
+ lastpuke = 0
//0.1% chance of playing a scary sound to someone who's in complete darkness
if(isturf(loc) && rand(1,1000) == 1)
@@ -998,69 +942,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(L && L.lum_r + L.lum_g + L.lum_b == 0)
playsound_local(src,pick(scarySounds),50, 1, -1)
- // Separate proc so we can jump out of it when we've succeeded in spreading disease.
-/mob/living/carbon/human/proc/findAirborneVirii()
- for(var/obj/effect/decal/cleanable/blood/B in get_turf(src))
- if(B.virus2.len)
- for (var/ID in B.virus2)
- var/datum/disease2/disease/V = B.virus2[ID]
- if (infect_virus2(src,V))
- return 1
-
- for(var/obj/effect/decal/cleanable/mucus/M in get_turf(src))
- if(M.virus2.len)
- for (var/ID in M.virus2)
- var/datum/disease2/disease/V = M.virus2[ID]
- if (infect_virus2(src,V))
- return 1
-
- for(var/obj/effect/decal/cleanable/poop/P in get_turf(src))
- if(P.virus2.len)
- for (var/ID in P.virus2)
- var/datum/disease2/disease/V = P.virus2[ID]
- if (infect_virus2(src,V))
- return 1
-
-
- return 0
-
-/mob/living/carbon/human/proc/handle_virus_updates()
- if(status_flags & GODMODE) return 0 //godmode
- if(bodytemperature > 406)
- for (var/ID in virus2)
- var/datum/disease2/disease/V = virus2[ID]
- V.cure(src)
- if(mob_master.current_cycle % 3) //don't spam checks over all objects in view every tick.
- for(var/obj/effect/decal/cleanable/O in view(1,src))
- if(istype(O,/obj/effect/decal/cleanable/blood))
- var/obj/effect/decal/cleanable/blood/B = O
- if(B.virus2.len)
- for (var/ID in B.virus2)
- var/datum/disease2/disease/V = B.virus2[ID]
- infect_virus2(src,V.getcopy())
-
- else if(istype(O,/obj/effect/decal/cleanable/mucus))
- var/obj/effect/decal/cleanable/mucus/M = O
- if(M.virus2.len)
- for (var/ID in M.virus2)
- var/datum/disease2/disease/V = M.virus2[ID]
- infect_virus2(src,V.getcopy())
-
-
- for (var/ID in virus2)
- var/datum/disease2/disease/V = virus2[ID]
- if(isnull(V)) // Trying to figure out a runtime error that keeps repeating
- CRASH("virus2 nulled before calling activate()")
- else
- V.activate(src)
- // activate may have deleted the virus
- if(!V) continue
-
- // check if we're immune
- if(V.antigen & src.antibodies)
- V.dead = 1
- return
-
/mob/living/carbon/human/handle_changeling()
if(mind)
if(mind.changeling)
@@ -1088,7 +969,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
return
if(shock_stage == 10)
- src << ""+pick("It hurts so much!", "You really need some painkillers..", "Dear god, the pain!")
+ to_chat(src, ""+pick("It hurts so much!", "You really need some painkillers..", "Dear god, the pain!"))
if(shock_stage >= 30)
if(shock_stage == 30) custom_emote(1,"is having trouble keeping their eyes open.")
@@ -1096,22 +977,22 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
stuttering = max(stuttering, 5)
if(shock_stage == 40)
- src << ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
+ to_chat(src, ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!"))
if(shock_stage >=60)
if(shock_stage == 60) custom_emote(1,"falls limp.")
if (prob(2))
- src << ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
+ to_chat(src, ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!"))
Weaken(20)
if(shock_stage >= 80)
if (prob(5))
- src << ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")
+ to_chat(src, ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!"))
Weaken(20)
if(shock_stage >= 120)
if (prob(2))
- src << ""+pick("You black out!", "You feel like you could die any moment now.", "You're about to lose consciousness.")
+ to_chat(src, ""+pick("You black out!", "You feel like you could die any moment now.", "You're about to lose consciousness."))
Paralyse(5)
if(shock_stage == 150)
@@ -1194,16 +1075,15 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
for(var/mob/living/carbon/human/H in range(decaylevel, src))
if(prob(5))
- if(airborne_can_reach(get_turf(src), get_turf(H)))
- if(istype(loc,/obj/item/bodybag))
- return
- var/obj/item/clothing/mask/M = H.wear_mask
- if(M && (M.flags & MASKCOVERSMOUTH))
- return
- if(H.species && H.species.flags & NO_BREATHE)
- return //no puking if you can't smell!
- H << "You smell something foul..."
- H.fakevomit()
+ if(istype(loc,/obj/item/bodybag))
+ return
+ var/obj/item/clothing/mask/M = H.wear_mask
+ if(M && (M.flags & MASKCOVERSMOUTH))
+ return
+ if(H.species && H.species.flags & NO_BREATHE)
+ return //no puking if you can't smell!
+ to_chat(H, "You smell something foul...")
+ H.fakevomit()
/mob/living/carbon/human/proc/handle_heartbeat()
var/client/C = src.client
@@ -1222,7 +1102,8 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(heartbeat >= rate)
heartbeat = 0
- src << sound('sound/effects/electheart.ogg',0,0,0,30) //Credit to GhostHack (www.ghosthack.de) for sound.
+ to_chat(src, sound('sound/effects/electheart.ogg',0,0,0,30))//Credit to GhostHack (www.ghosthack.de) for sound.
+
else
heartbeat++
return
@@ -1240,9 +1121,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(heartbeat >= rate)
heartbeat = 0
if(H.status & ORGAN_ASSISTED)
- src << sound('sound/effects/pacemakebeat.ogg',0,0,0,50)
+ to_chat(src, sound('sound/effects/pacemakebeat.ogg',0,0,0,50))
else
- src << sound('sound/effects/singlebeat.ogg',0,0,0,50)
+ to_chat(src, sound('sound/effects/singlebeat.ogg',0,0,0,50))
else
heartbeat++
diff --git a/code/modules/mob/living/carbon/human/login.dm b/code/modules/mob/living/carbon/human/login.dm
index ee5034a23f2..c9c23b31857 100644
--- a/code/modules/mob/living/carbon/human/login.dm
+++ b/code/modules/mob/living/carbon/human/login.dm
@@ -2,7 +2,7 @@
..()
if(species && species.ventcrawler)
- src << "You can ventcrawl! Use alt+click on vents to quickly travel about the station."
+ to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.")
update_pipe_vision()
update_hud()
return
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index f736a17af22..7162933349d 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -53,6 +53,8 @@
return 1
if (istype(other, /mob/living/silicon))
return 1
+ if (istype(other, /mob/living/simple_animal/bot))
+ return 1
if (istype(other, /mob/living/carbon/brain))
return 1
if (istype(other, /mob/living/carbon/slime))
diff --git a/code/modules/mob/living/carbon/human/species/apollo.dm b/code/modules/mob/living/carbon/human/species/apollo.dm
index a5e92e951d9..a7735a00db9 100644
--- a/code/modules/mob/living/carbon/human/species/apollo.dm
+++ b/code/modules/mob/living/carbon/human/species/apollo.dm
@@ -50,8 +50,8 @@
/datum/species/wryn/handle_death(var/mob/living/carbon/human/H)
for(var/mob/living/carbon/C in living_mob_list)
if(C.get_int_organ(/obj/item/organ/internal/wryn/hivenode))
- C << "Your antennae tingle as you are overcome with pain..."
- C << "It feels like part of you has died."
+ to_chat(C, "Your antennae tingle as you are overcome with pain...")
+ to_chat(C, "It feels like part of you has died.")
/datum/species/wryn/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M)
if(M.a_intent == I_HARM)
@@ -61,16 +61,16 @@
var/turf/p_loc_m = H.loc
M.visible_message("[M] begins to violently pull off [H]'s antennae.")
- H << "[M] grips your antennae and starts violently pulling!"
+ to_chat(H, "[M] grips your antennae and starts violently pulling!")
do_after(H, 250, target = src)
if(p_loc == M.loc && p_loc_m == H.loc)
var/obj/item/organ/internal/wryn/hivenode/node = new /obj/item/organ/internal/wryn/hivenode
H.remove_language("Wryn Hivemind")
node.remove(H)
node.loc = M.loc
- M << "You hear a loud crunch as you mercilessly pull off [H]'s antennae."
- H << "You hear a loud crunch as your antennae is ripped off your head by [M]."
- H << "It's so quiet..."
+ to_chat(M, "You hear a loud crunch as you mercilessly pull off [H]'s antennae.")
+ to_chat(H, "You hear a loud crunch as your antennae is ripped off your head by [M].")
+ to_chat(H, "It's so quiet...")
H.h_style = "Bald"
H.update_hair()
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 5f9828f1b45..72972f98baf 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -29,7 +29,6 @@
//unarmed_types = list(/datum/unarmed_attack/bite, /datum/unarmed_attack/claws)
//inherent_verbs = list(/mob/living/proc/ventcrawl)
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey
total_health = 75
brute_mod = 1.5
@@ -51,6 +50,8 @@
/datum/species/monkey/handle_post_spawn(var/mob/living/carbon/human/H)
H.real_name = "[lowertext(name)] ([rand(100,999)])"
H.name = H.real_name
+ H.butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/monkey = 5)
+
..()
/datum/species/monkey/handle_dna(var/mob/living/carbon/human/H)
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 6f95a8696ce..5bced02a651 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -112,7 +112,7 @@
H.equip_or_collect(new suit(H), slot_wear_suit)
H.equip_or_collect(new helm(H), slot_head)
H.equip_or_collect(new/obj/item/weapon/tank/plasma/plasmaman(H), tank_slot) // Bigger plasma tank from Raggy.
- H << "You are now running on plasma internals from the [H.s_store] in your [tank_slot_name]. You must breathe plasma in order to survive, and are extremely flammable."
+ to_chat(H, "You are now running on plasma internals from the [H.s_store] in your [tank_slot_name]. You must breathe plasma in order to survive, and are extremely flammable.")
H.internal = H.get_item_by_slot(tank_slot)
if (H.internals)
H.internals.icon_state = "internal1"
@@ -191,10 +191,10 @@
return 1 //godmode
if(breath.temperature < cold_level_1)
if(prob(20))
- src << "\red You feel your face freezing and an icicle forming in your lungs!"
+ to_chat(src, "\red You feel your face freezing and an icicle forming in your lungs!")
else if(breath.temperature > heat_level_1)
if(prob(20))
- src << "\red You feel your face burning and a searing heat in your lungs!"
+ to_chat(src, "\red You feel your face burning and a searing heat in your lungs!")
switch(breath.temperature)
if(-INFINITY to cold_level_3)
@@ -222,7 +222,7 @@
H.fire_alert = max(H.fire_alert, 2)
if(!istype(H.wear_suit, /obj/item/clothing/suit/space/eva/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/eva/plasmaman))
- H << "Your body reacts with the atmosphere and bursts into flame!"
+ to_chat(H, "Your body reacts with the atmosphere and bursts into flame!")
H.adjust_fire_stacks(0.5)
H.IgniteMob()
diff --git a/code/modules/mob/living/carbon/human/species/shadow.dm b/code/modules/mob/living/carbon/human/species/shadow.dm
index f0e724f0f10..55701b52d1c 100644
--- a/code/modules/mob/living/carbon/human/species/shadow.dm
+++ b/code/modules/mob/living/carbon/human/species/shadow.dm
@@ -7,7 +7,6 @@
default_language = "Galactic Common"
unarmed_type = /datum/unarmed_attack/claws
- light_dam = 2
darksight = 8
blood_color = "#CCCCCC"
@@ -16,8 +15,8 @@
"brain" = /obj/item/organ/internal/brain
)
- flags = NO_BLOOD | NO_BREATHE | NO_SCAN
- bodyflags = FEET_NOSLIP
+ flags = NO_BLOOD | NO_BREATHE | RADIMMUNE
+ virus_immune = 1
dietflags = DIET_OMNI //the mutation process allowed you to now digest all foods regardless of initial race
reagent_tag = PROCESS_ORG
suicide_messages = list(
@@ -26,5 +25,13 @@
"is twisting their own neck!",
"is staring into the closest light source!")
-/datum/species/shadow/handle_death(var/mob/living/carbon/human/H)
- H.dust()
\ No newline at end of file
+/datum/species/shadow/handle_life(var/mob/living/carbon/human/H)
+ var/light_amount = 0
+ if(isturf(H.loc))
+ var/turf/T = H.loc
+ light_amount = T.get_lumcount()*10
+
+ if(light_amount > 2) //if there's enough light, start dying
+ H.take_overall_damage(1,1)
+ else if (light_amount < 2) //heal in the dark
+ H.heal_overall_damage(1,1)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index a003434c1a3..7a313956e7e 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -55,9 +55,6 @@
var/brute_mod = null // Physical damage reduction/malus.
var/burn_mod = null // Burn damage reduction/malus.
- var/light_dam //Light level above which species takes damage, and below which it heals.
- var/light_effect_amp //If 0, takes/heals 1 burn and brute per tick. Otherwise, both healing and damage effects are amplified.
-
var/total_health = 100
var/punchdamagelow = 0 //lowest possible punch damage
var/punchdamagehigh = 9 //highest possible punch damage
@@ -67,6 +64,8 @@
var/ventcrawler = 0 //Determines if the mob can go through the vents.
var/has_fine_manipulation = 1 // Can use small items.
+ var/list/allowed_consumed_mobs = list() //If a species can consume mobs, put the type of mobs it can consume here.
+
var/flags = 0 // Various specific features.
var/clothing_flags = 0 // Underwear and socks.
var/exotic_blood
@@ -78,8 +77,6 @@
var/blood_color = "#A10808" //Red.
var/flesh_color = "#FFC896" //Pink.
var/single_gib_type = /obj/effect/decal/cleanable/blood/gibs
- var/meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/human
-
var/base_color //Used when setting species.
//Used in icon caching.
@@ -291,10 +288,10 @@
if(H.status_flags & GODMODE) return 1 //godmode
if(breath.temperature < cold_level_1)
if(prob(20))
- H << "\red You feel your face freezing and an icicle forming in your lungs!"
+ to_chat(H, "\red You feel your face freezing and an icicle forming in your lungs!")
else if(breath.temperature > heat_level_1)
if(prob(20))
- H << "\red You feel your face burning and a searing heat in your lungs!"
+ to_chat(H, "\red You feel your face burning and a searing heat in your lungs!")
@@ -334,6 +331,8 @@
return
/datum/species/proc/handle_pre_change(var/mob/living/carbon/human/H)
+ if(H.butcher_results)//clear it out so we don't butcher a actual human.
+ H.butcher_results = null
remove_abilities(H)
return
@@ -415,125 +414,147 @@
return 0
/datum/species/proc/handle_vision(mob/living/carbon/human/H)
- if( H.stat == DEAD )
+ if(H.stat == DEAD)
H.sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
H.see_in_dark = 8
- if(!H.druggy) H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
- else
- H.sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
+ if(!H.druggy)
+ H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+ return
- H.see_in_dark = darksight //set their variables to default, modify them later
- H.see_invisible = SEE_INVISIBLE_LIVING
+ H.sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
- if(H.mind && H.mind.vampire)
- if(H.mind.vampire.get_ability(/datum/vampire_passive/full))
- H.sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
- H.see_in_dark = 8
- H.see_invisible = SEE_INVISIBLE_MINIMUM
- else if(H.mind.vampire.get_ability(/datum/vampire_passive/vision))
- H.sight |= SEE_MOBS
+ H.see_in_dark = darksight //set their variables to default, modify them later
+ H.see_invisible = SEE_INVISIBLE_LIVING
- if(XRAY in H.mutations)
+ if(H.mind && H.mind.vampire)
+ if(H.mind.vampire.get_ability(/datum/vampire_passive/full))
H.sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
H.see_in_dark = 8
-
H.see_invisible = SEE_INVISIBLE_MINIMUM
+ else if(H.mind.vampire.get_ability(/datum/vampire_passive/vision))
+ H.sight |= SEE_MOBS
- if(H.seer == 1)
- var/obj/effect/rune/R = locate() in H.loc
- if(R && R.word1 == cultwords["see"] && R.word2 == cultwords["hell"] && R.word3 == cultwords["join"])
- H.see_invisible = SEE_INVISIBLE_OBSERVER
- else
- H.see_invisible = SEE_INVISIBLE_LIVING
- H.seer = 0
+ if(XRAY in H.mutations)
+ H.sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
+ H.see_in_dark = 8
- //This checks how much the mob's eyewear impairs their vision
- if(H.tinttotal >= TINT_IMPAIR)
- if(tinted_weldhelh)
- if(H.tinttotal >= TINT_BLIND)
- H.eye_blind = max(H.eye_blind, 1)
- if(H.client)
- H.client.screen += global_hud.darkMask
+ H.see_invisible = SEE_INVISIBLE_MINIMUM
- var/minimum_darkness_view = INFINITY
- if(H.glasses)
- if(istype(H.glasses, /obj/item/clothing/glasses))
- var/obj/item/clothing/glasses/G = H.glasses
- H.sight |= G.vision_flags
- if(G.darkness_view)
- H.see_in_dark = G.darkness_view
- minimum_darkness_view = G.darkness_view
+ if(H.seer == 1)
+ var/obj/effect/rune/R = locate() in H.loc
+ if(R && R.word1 == cultwords["see"] && R.word2 == cultwords["hell"] && R.word3 == cultwords["join"])
+ H.see_invisible = SEE_INVISIBLE_OBSERVER
+ else
+ H.see_invisible = SEE_INVISIBLE_LIVING
+ H.seer = 0
- if(!G.see_darkness)
- H.see_invisible = SEE_INVISIBLE_MINIMUM
+ //This checks how much the mob's eyewear impairs their vision
+ if(H.tinttotal >= TINT_IMPAIR)
+ if(tinted_weldhelh)
+ H.overlay_fullscreen("tint", /obj/screen/fullscreen/impaired, 2)
+ if(H.tinttotal >= TINT_BLIND)
+ H.eye_blind = max(H.eye_blind, 1)
+ else
+ H.clear_fullscreen("tint")
- if(H.head)
- if(istype(H.head, /obj/item/clothing/head))
- var/obj/item/clothing/head/hat = H.head
- H.sight |= hat.vision_flags
+ var/minimum_darkness_view = INFINITY
+ if(H.glasses)
+ if(istype(H.glasses, /obj/item/clothing/glasses))
+ var/obj/item/clothing/glasses/G = H.glasses
+ H.sight |= G.vision_flags
- if(hat.darkness_view && hat.darkness_view < minimum_darkness_view) // Pick the lowest of the two darkness_views between the glasses and helmet.
- H.see_in_dark = hat.darkness_view
+ if(G.darkness_view)
+ H.see_in_dark = G.darkness_view
+ minimum_darkness_view = G.darkness_view
- if(!hat.see_darkness)
- H.see_invisible = SEE_INVISIBLE_MINIMUM
+ if(!G.see_darkness)
+ H.see_invisible = SEE_INVISIBLE_MINIMUM
- //switch(hat.HUDType)
- // if(SECHUD)
- // process_sec_hud(H,1)
- // if(MEDHUD)
- // process_med_hud(H,1)
- // if(ANTAGHUD)
- // process_antag_hud(H)
+ if(H.head)
+ if(istype(H.head, /obj/item/clothing/head))
+ var/obj/item/clothing/head/hat = H.head
+ H.sight |= hat.vision_flags
- if(istype(H.back, /obj/item/weapon/rig)) ///ahhhg so snowflakey
- var/obj/item/weapon/rig/rig = H.back
- if(rig.visor)
- if(!rig.helmet || (H.head && rig.helmet == H.head))
- if(rig.visor && rig.visor.vision && rig.visor.active && rig.visor.vision.glasses)
- var/obj/item/clothing/glasses/G = rig.visor.vision.glasses
- if(istype(G))
- H.see_in_dark = (G.darkness_view ? G.darkness_view : darksight) // Otherwise we keep our darkness view with togglable nightvision.
- if(G.vision_flags) // MESONS
- H.sight |= G.vision_flags
+ if(hat.darkness_view && hat.darkness_view < minimum_darkness_view) // Pick the lowest of the two darkness_views between the glasses and helmet.
+ H.see_in_dark = hat.darkness_view
- if(!G.see_darkness)
- H.see_invisible = SEE_INVISIBLE_MINIMUM
+ if(!hat.see_darkness)
+ H.see_invisible = SEE_INVISIBLE_MINIMUM
- //switch(G.HUDType)
- // if(SECHUD)
- // process_sec_hud(H,1)
- // if(MEDHUD)
- // process_med_hud(H,1)
- // if(ANTAGHUD)
- // process_antag_hud(H)
+ //switch(hat.HUDType)
+ // if(SECHUD)
+ // process_sec_hud(H,1)
+ // if(MEDHUD)
+ // process_med_hud(H,1)
+ // if(ANTAGHUD)
+ // process_antag_hud(H)
- if(H.vision_type)
- H.see_in_dark = max(H.see_in_dark, H.vision_type.see_in_dark, darksight)
- H.see_invisible = H.vision_type.see_invisible
- if(H.vision_type.light_sensitive)
- H.weakeyes = 1
- H.sight |= H.vision_type.sight_flags
+ if(istype(H.back, /obj/item/weapon/rig)) ///ahhhg so snowflakey
+ var/obj/item/weapon/rig/rig = H.back
+ if(rig.visor)
+ if(!rig.helmet || (H.head && rig.helmet == H.head))
+ if(rig.visor && rig.visor.vision && rig.visor.active && rig.visor.vision.glasses)
+ var/obj/item/clothing/glasses/G = rig.visor.vision.glasses
+ if(istype(G))
+ H.see_in_dark = (G.darkness_view ? G.darkness_view : darksight) // Otherwise we keep our darkness view with togglable nightvision.
+ if(G.vision_flags) // MESONS
+ H.sight |= G.vision_flags
- if(H.see_override) //Override all
- H.see_invisible = H.see_override
+ if(!G.see_darkness)
+ H.see_invisible = SEE_INVISIBLE_MINIMUM
- if(H.blind)
- if(H.blinded) H.blind.layer = 18
- else H.blind.layer = 0
+ //switch(G.HUDType)
+ // if(SECHUD)
+ // process_sec_hud(H,1)
+ // if(MEDHUD)
+ // process_med_hud(H,1)
+ // if(ANTAGHUD)
+ // process_antag_hud(H)
- if(H.disabilities & NEARSIGHTED) //this looks meh but saves a lot of memory by not requiring to add var/prescription
- if(H.glasses) //to every /obj/item
- var/obj/item/clothing/glasses/G = H.glasses
- if(!G.prescription)
- H.client.screen += global_hud.vimpaired
- else
- H.client.screen += global_hud.vimpaired
+ if(H.vision_type)
+ H.see_in_dark = max(H.see_in_dark, H.vision_type.see_in_dark, darksight)
+ H.see_invisible = H.vision_type.see_invisible
+ if(H.vision_type.light_sensitive)
+ H.weakeyes = 1
+ H.sight |= H.vision_type.sight_flags
- if(H.eye_blurry) H.client.screen += global_hud.blurry
- if(H.druggy) H.client.screen += global_hud.druggy
+ if(H.see_override) //Override all
+ H.see_invisible = H.see_override
+
+ if(!H.client)
+ return 1
+
+ if(H.blinded || H.eye_blind)
+ H.overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ //H.throw_alert("blind", /obj/screen/alert/blind)
+ else
+ H.clear_fullscreen("blind")
+ //H.clear_alert("blind")
+
+
+ if(H.disabilities & NEARSIGHTED) //this looks meh but saves a lot of memory by not requiring to add var/prescription
+ if(H.glasses) //to every /obj/item
+ var/obj/item/clothing/glasses/G = H.glasses
+ if(!G.prescription)
+ H.overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
+ else
+ H.overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
+ else
+ H.clear_fullscreen("nearsighted")
+
+ if(H.eye_blurry)
+ H.overlay_fullscreen("blurry", /obj/screen/fullscreen/blurry)
+ else
+ H.clear_fullscreen("blurry")
+
+ if(H.druggy)
+ H.overlay_fullscreen("high", /obj/screen/fullscreen/high)
+ //H.throw_alert("high", /obj/screen/alert/high)
+ else
+ H.clear_fullscreen("high")
+ //H.clear_alert("high")
/datum/species/proc/handle_hud_icons(mob/living/carbon/human/H)
if(H.healths)
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index 5d1428cf359..56566b71a92 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -56,6 +56,9 @@
reagent_tag = PROCESS_ORG
base_color = "#066000"
+ allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
+ /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble)
+
suicide_messages = list(
"is attempting to bite their tongue off!",
"is jamming their claws into their eye sockets!",
@@ -107,6 +110,9 @@
flesh_color = "#AFA59E"
base_color = "#333333"
+ allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/chick, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot,
+ /mob/living/simple_animal/tribble)
+
suicide_messages = list(
"is attempting to bite their tongue off!",
"is jamming their claws into their eye sockets!",
@@ -148,6 +154,9 @@
flesh_color = "#966464"
base_color = "#B43214"
+ allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
+ /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble)
+
suicide_messages = list(
"is attempting to bite their tongue off!",
"is jamming their claws into their eye sockets!",
@@ -266,7 +275,7 @@
H.equip_or_collect(new /obj/item/weapon/tank/nitrogen(H), slot_l_hand)
else
H.equip_or_collect(new /obj/item/weapon/tank/emergency_oxygen/vox(H), slot_l_hand)
- H << "You are now running on nitrogen internals from the [H.l_hand] in your hand. Your species finds oxygen toxic, so you must breathe nitrogen only."
+ to_chat(H, "You are now running on nitrogen internals from the [H.l_hand] in your hand. Your species finds oxygen toxic, so you must breathe nitrogen only.")
H.internal = H.l_hand
if (H.internals)
H.internals.icon_state = "internal1"
@@ -350,10 +359,13 @@
flags = IS_WHITELISTED
clothing_flags = HAS_SOCKS
bodyflags = FEET_CLAWS
+ eyes = "kidan_eyes"
dietflags = DIET_HERB
blood_color = "#FB9800"
reagent_tag = PROCESS_ORG
+ allowed_consumed_mobs = list(/mob/living/simple_animal/diona)
+
suicide_messages = list(
"is attempting to bite their antenna off!",
"is jamming their claws into their eye sockets!",
@@ -377,7 +389,7 @@
cold_env_multiplier = 3
flags = IS_WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS | NO_SCAN
- clothing_flags = HAS_SOCKS
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_SKIN_COLOR | NO_EYES
dietflags = DIET_CARN
reagent_tag = PROCESS_ORG
@@ -431,17 +443,17 @@
var/datum/species/slime/S = all_species[get_species()]
if(!istype(S))
if(!silent)
- src << "You're not a slime person!"
+ to_chat(src, "You're not a slime person!")
return
if(src in S.recolor_list)
S.recolor_list -= src
if(!silent)
- src << "You adjust your internal chemistry to filter out pigments from things you consume."
+ to_chat(src, "You adjust your internal chemistry to filter out pigments from things you consume.")
else
S.recolor_list += src
if(!silent)
- src << "You adjust your internal chemistry to permit pigments in chemicals you consume to tint you."
+ to_chat(src, "You adjust your internal chemistry to permit pigments in chemicals you consume to tint you.")
/mob/living/carbon/human/verb/toggle_recolor_verb()
set category = "IC"
@@ -461,11 +473,11 @@
#define SLIMEPERSON_REGROWTHDELAY 450 // 45 seconds
if(stat || paralysis || stunned)
- src << "You cannot regenerate missing limbs in your current state."
+ to_chat(src, "You cannot regenerate missing limbs in your current state.")
return
if(nutrition < SLIMEPERSON_MINHUNGER)
- src << "You're too hungry to regenerate a limb!"
+ to_chat(src, "You're too hungry to regenerate a limb!")
return
var/list/missing_limbs = list()
@@ -481,7 +493,7 @@
missing_limbs[initial(limb.name)] = l
if(!missing_limbs.len)
- src << "You're not missing any limbs!"
+ to_chat(src, "You're not missing any limbs!")
return
var/limb_select = input(src, "Choose a limb to regrow", "Limb Regrowth") as null|anything in missing_limbs
@@ -490,11 +502,11 @@
visible_message("[src] begins to hold still and concentrate on their missing [limb_select]...", "You begin to focus on regrowing your missing [limb_select]... (This will take [round(SLIMEPERSON_REGROWTHDELAY/10)] seconds, and you must hold still.)")
if(do_after(src, SLIMEPERSON_REGROWTHDELAY, needhand=0, target = src))
if(stat || paralysis || stunned)
- src << "You cannot regenerate missing limbs in your current state."
+ to_chat(src, "You cannot regenerate missing limbs in your current state.")
return
if(nutrition < SLIMEPERSON_MINHUNGER)
- src << "You're too hungry to regenerate a limb!"
+ to_chat(src, "You're too hungry to regenerate a limb!")
return
var/obj/item/organ/external/O = organs_by_name[chosen_limb]
@@ -503,10 +515,10 @@
var/stored_burn = 0
if(istype(O))
if(!O.is_stump())
- src << "Your limb has already been replaced in some way!"
+ to_chat(src, "Your limb has already been replaced in some way!")
return
else
- src << "You distribute the damaged tissue around your body, out of the way of your new pseudopod!"
+ to_chat(src, "You distribute the damaged tissue around your body, out of the way of your new pseudopod!")
var/obj/item/organ/external/doomedStump = O
stored_brute = doomedStump.brute_dam
stored_burn = doomedStump.burn_dam
@@ -517,7 +529,7 @@
// Parent check
var/obj/item/organ/external/potential_parent = organs_by_name[initial(limb_path.parent_organ)]
if(!istype(potential_parent) || potential_parent.is_stump())
- src << "You've lost the organ that you've been growing your new part on!"
+ to_chat(src, "You've lost the organ that you've been growing your new part on!")
return // No rayman for you
// Grah this line will leave a "not used" warning, in spite of the fact that the new() proc WILL do the thing.
// Bothersome.
@@ -531,7 +543,7 @@
nutrition -= SLIMEPERSON_HUNGERCOST
visible_message("[src] finishes regrowing their missing [new_limb]!", "You finish regrowing your [limb_select]")
else
- src << "You need to hold still in order to regrow a limb!"
+ to_chat(src, "You need to hold still in order to regrow a limb!")
return
#undef SLIMEPERSON_HUNGERCOST
@@ -711,9 +723,9 @@
passive_temp_gain = 10 //this should cause IPCs to stabilize at ~80 C in a 20 C environment.
- flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | NO_DNA | NO_POISON | RADIMMUNE
- clothing_flags = HAS_SOCKS
- bodyflags = HAS_SKIN_COLOR
+ flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | NO_DNA | NO_POISON | RADIMMUNE | ALL_RPARTS
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_SKIN_COLOR | HAS_MARKINGS | HAS_HEAD_ACCESSORY
dietflags = 0 //IPCs can't eat, so no diet
blood_color = "#1F181F"
flesh_color = "#AAAAAA"
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 07fe43107f9..f37cd16a5a3 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -461,7 +461,7 @@ var/global/list/damage_icon_parts = list()
//if(!src.get_int_organ(/obj/item/organ/internal/brain) && src.get_species() != "Machine" )//make it obvious we have NO BRAIN
// hair_standing.Blend(debrained_s, ICON_OVERLAY)
if(hair_style && hair_style.species_allowed)
- if(src.species.name in hair_style.species_allowed)
+ if((src.species.name in hair_style.species_allowed) || (src.species.flags & ALL_RPARTS))
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
if(src.get_species() == "Slime People") // I am el worstos
hair_s.Blend(rgb(r_skin, g_skin, b_skin, 160), ICON_AND)
@@ -499,7 +499,7 @@ var/global/list/damage_icon_parts = list()
if(f_style)
var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
if(facial_hair_style && facial_hair_style.species_allowed)
- if(src.species.name in facial_hair_style.species_allowed)
+ if((src.species.name in facial_hair_style.species_allowed) || (src.species.flags & ALL_RPARTS))
var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
if(src.get_species() == "Slime People") // I am el worstos
facial_s.Blend(rgb(r_skin, g_skin, b_skin, 160), ICON_AND)
@@ -642,7 +642,7 @@ var/global/list/damage_icon_parts = list()
if(w_uniform.flags&ONESIZEFITSALL)
standing.icon = 'icons/mob/uniform_fat.dmi'
else
- src << "\red You burst out of \the [w_uniform]!"
+ to_chat(src, "\red You burst out of \the [w_uniform]!")
unEquip(w_uniform)
return
else
@@ -857,7 +857,7 @@ var/global/list/damage_icon_parts = list()
if(wear_suit.flags&ONESIZEFITSALL)
standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]")
else
- src << "\red You burst out of \the [wear_suit]!"
+ to_chat(src, "\red You burst out of \the [wear_suit]!")
unEquip(wear_suit)
return
else
@@ -957,7 +957,8 @@ var/global/list/damage_icon_parts = list()
/mob/living/carbon/human/update_hud() //TODO: do away with this if possible
if(client)
- client.screen |= contents
+ for(var/obj/item/I in get_all_slots())
+ client.screen |= I // Items only please, no arms allowed
if(hud_used)
hud_used.hidden_inventory_update() //Updates the screenloc of the items on the 'other' inventory bar
update_inv_handcuffed(0) // update handcuff overlay
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index ed46d5370e5..43794bed7b8 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -84,12 +84,7 @@
if(breath)
loc.assume_air(breath)
- //spread virus2
- if(virus2.len > 0)
- if(prob(10) && get_infection_chance(src))
- for(var/mob/living/carbon/M in view(1,src))
- src.spread_disease_to(M)
-
+ air_update_turf()
//Third link in a breath chain, calls handle_breath_temperature()
/mob/living/carbon/proc/check_breath(datum/gas_mixture/breath)
@@ -250,7 +245,7 @@
if(M.loc != src)
stomach_contents.Remove(M)
continue
- if(istype(M, /mob/living/carbon) && stat != 2)
+ if(istype(M, /mob/living) && stat != 2)
if(M.stat == 2)
M.death(1)
stomach_contents.Remove(M)
@@ -283,7 +278,7 @@
if(staminaloss)
var/total_health = (health - staminaloss)
if(total_health <= config.health_threshold_softcrit && !stat)
- src << "You're too exhausted to keep going..."
+ to_chat(src, "You're too exhausted to keep going...")
Weaken(5)
setStaminaLoss(health - 2)
return
@@ -369,83 +364,55 @@
//this handles hud updates. Calls update_vision() and handle_hud_icons()
/mob/living/carbon/handle_regular_hud_updates()
- if(!client) return 0
+ if(!client)
+ return 0
- if(damageoverlay)
- if(damageoverlay.overlays)
- damageoverlay.overlays = list()
-
- if(stat == UNCONSCIOUS)
- //Critical damage passage overlay
- if(health <= config.health_threshold_crit)
- var/image/I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "passage0")
- I.blend_mode = BLEND_OVERLAY //damageoverlay is BLEND_MULTIPLY
- switch(health)
- if(-20 to -10)
- I.icon_state = "passage1"
- if(-30 to -20)
- I.icon_state = "passage2"
- if(-40 to -30)
- I.icon_state = "passage3"
- if(-50 to -40)
- I.icon_state = "passage4"
- if(-60 to -50)
- I.icon_state = "passage5"
- if(-70 to -60)
- I.icon_state = "passage6"
- if(-80 to -70)
- I.icon_state = "passage7"
- if(-90 to -80)
- I.icon_state = "passage8"
- if(-95 to -90)
- I.icon_state = "passage9"
- if(-INFINITY to -95)
- I.icon_state = "passage10"
- damageoverlay.overlays += I
+ if(stat == UNCONSCIOUS && health <= config.health_threshold_crit)
+ var/severity = 0
+ switch(health)
+ if(-20 to -10) severity = 1
+ if(-30 to -20) severity = 2
+ if(-40 to -30) severity = 3
+ if(-50 to -40) severity = 4
+ if(-60 to -50) severity = 5
+ if(-70 to -60) severity = 6
+ if(-80 to -70) severity = 7
+ if(-90 to -80) severity = 8
+ if(-95 to -90) severity = 9
+ if(-INFINITY to -95) severity = 10
+ overlay_fullscreen("crit", /obj/screen/fullscreen/crit, severity)
+ else
+ clear_fullscreen("crit")
+ if(oxyloss)
+ var/severity = 0
+ switch(oxyloss)
+ if(10 to 20) severity = 1
+ if(20 to 25) severity = 2
+ if(25 to 30) severity = 3
+ if(30 to 35) severity = 4
+ if(35 to 40) severity = 5
+ if(40 to 45) severity = 6
+ if(45 to INFINITY) severity = 7
+ overlay_fullscreen("oxy", /obj/screen/fullscreen/oxy, severity)
else
- //Oxygen damage overlay
- if(oxyloss)
- var/image/I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "oxydamageoverlay0")
- switch(oxyloss)
- if(10 to 20)
- I.icon_state = "oxydamageoverlay1"
- if(20 to 25)
- I.icon_state = "oxydamageoverlay2"
- if(25 to 30)
- I.icon_state = "oxydamageoverlay3"
- if(30 to 35)
- I.icon_state = "oxydamageoverlay4"
- if(35 to 40)
- I.icon_state = "oxydamageoverlay5"
- if(40 to 45)
- I.icon_state = "oxydamageoverlay6"
- if(45 to INFINITY)
- I.icon_state = "oxydamageoverlay7"
- damageoverlay.overlays += I
+ clear_fullscreen("oxy")
+
+ //Fire and Brute damage overlay (BSSR)
+ var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
+ damageoverlaytemp = 0 // We do this so we can detect if someone hits us or not.
+ if(hurtdamage)
+ var/severity = 0
+ switch(hurtdamage)
+ if(5 to 15) severity = 1
+ if(15 to 30) severity = 2
+ if(30 to 45) severity = 3
+ if(45 to 70) severity = 4
+ if(70 to 85) severity = 5
+ if(85 to INFINITY) severity = 6
+ overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
+ else
+ clear_fullscreen("brute")
- //Fire and Brute damage overlay (BSSR)
- var/hurtdamage = src.getBruteLoss() + src.getFireLoss() + damageoverlaytemp
- damageoverlaytemp = 0 // We do this so we can detect if someone hits us or not.
- if(hurtdamage)
- var/image/I = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay0")
- I.blend_mode = BLEND_ADD
- switch(hurtdamage)
- if(5 to 15)
- I.icon_state = "brutedamageoverlay1"
- if(15 to 30)
- I.icon_state = "brutedamageoverlay2"
- if(30 to 45)
- I.icon_state = "brutedamageoverlay3"
- if(45 to 70)
- I.icon_state = "brutedamageoverlay4"
- if(70 to 85)
- I.icon_state = "brutedamageoverlay5"
- if(85 to INFINITY)
- I.icon_state = "brutedamageoverlay6"
- var/image/black = image(I.icon, I.icon_state) //BLEND_ADD doesn't let us darken, so this is just to blacken the edge of the screen
- black.color = "#170000"
- damageoverlay.overlays += I
- damageoverlay.overlays += black
..()
return 1
diff --git a/code/modules/mob/living/carbon/slime/death.dm b/code/modules/mob/living/carbon/slime/death.dm
index 6e951320bdc..240454f3e0f 100644
--- a/code/modules/mob/living/carbon/slime/death.dm
+++ b/code/modules/mob/living/carbon/slime/death.dm
@@ -20,8 +20,6 @@
O.show_message("The [name] seizes up and falls limp...", 1) //ded -- Urist
update_canmove()
- if(blind)
- blind.layer = 0
if(ticker && ticker.mode)
ticker.mode.check_win()
diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm
index dcc0b066487..64838a1704d 100644
--- a/code/modules/mob/living/carbon/slime/emote.dm
+++ b/code/modules/mob/living/carbon/slime/emote.dm
@@ -13,7 +13,7 @@
return
if (src.client)
if (client.prefs.muted & MUTE_IC)
- src << "\red You cannot send IC messages (muted)."
+ to_chat(src, "\red You cannot send IC messages (muted).")
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
@@ -58,10 +58,10 @@
m_type = 1
if ("help") //This is an exception
- src << "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate"
+ to_chat(src, "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate")
else
- src << "\blue Unusable emote '[act]'. Say *help for a list."
+ to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
if ((message && src.stat == 0))
if (m_type & 1)
for(var/mob/O in viewers(src, null))
diff --git a/code/modules/mob/living/carbon/slime/examine.dm b/code/modules/mob/living/carbon/slime/examine.dm
index 826fa93c22e..7d2e2d5e62c 100644
--- a/code/modules/mob/living/carbon/slime/examine.dm
+++ b/code/modules/mob/living/carbon/slime/examine.dm
@@ -41,4 +41,4 @@
msg += ""
msg += "*---------*"
- user << msg
\ No newline at end of file
+ to_chat(user, msg)
diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm
index 1e3d901755a..6dce9aba656 100644
--- a/code/modules/mob/living/carbon/slime/life.dm
+++ b/code/modules/mob/living/carbon/slime/life.dm
@@ -151,13 +151,8 @@
/mob/living/carbon/slime/handle_chemicals_in_body()
- if(reagents) reagents.metabolize(src)
- if (reagents.get_reagent_amount("plasma")>=5)
- mutation_chance = min(mutation_chance + 5,50) //Prevents mutation chance going >50%
- reagents.remove_reagent("plasma", 5)
- if (reagents.get_reagent_amount("epinephrine")>=5)
- mutation_chance = max(mutation_chance - 5,0) //Prevents muation chance going <0%
- reagents.remove_reagent("epinephrine", 5)
+ if(reagents)
+ reagents.metabolize(src)
src.updatehealth()
return //TODO: DEFERRED
diff --git a/code/modules/mob/living/carbon/slime/powers.dm b/code/modules/mob/living/carbon/slime/powers.dm
index 494bb6eb6df..829c56ba004 100644
--- a/code/modules/mob/living/carbon/slime/powers.dm
+++ b/code/modules/mob/living/carbon/slime/powers.dm
@@ -6,7 +6,7 @@
return
if(stat)
- src << "I must be conscious to do this..."
+ to_chat(src, "I must be conscious to do this...")
return
var/list/choices = list()
@@ -25,20 +25,20 @@
for(var/mob/living/carbon/slime/met in view())
if(met.Victim == M && met != src)
- src << "The [met.name] is already feeding on this subject..."
+ to_chat(src, "The [met.name] is already feeding on this subject...")
return
- src << "\blue I have latched onto the subject and begun feeding..."
- M << "\red The [src.name] has latched onto your head!"
+ to_chat(src, "\blue I have latched onto the subject and begun feeding...")
+ to_chat(M, "\red The [src.name] has latched onto your head!")
Feedon(M)
else
- src << "This subject does not have a strong enough life energy..."
+ to_chat(src, "This subject does not have a strong enough life energy...")
else
- src << "This subject does not have an edible life energy..."
+ to_chat(src, "This subject does not have an edible life energy...")
else
- src << "I must not feed on my brothers..."
+ to_chat(src, "I must not feed on my brothers...")
else
- src << "This subject does not have an edible life energy..."
+ to_chat(src, "This subject does not have an edible life energy...")
@@ -61,13 +61,13 @@
loc = M.loc
if(prob(15) && M.client && istype(M, /mob/living/carbon))
- M << "[pick("You can feel your body becoming weak!", \
+ to_chat(M, "[pick("You can feel your body becoming weak!", \
"You feel like you're about to die!", \
"You feel every part of your body screaming in agony!", \
"A low, rolling pain passes through your body!", \
"Your body feels as if it's falling apart!", \
"You feel extremely weak!", \
- "A sharp, deep pain bathes every inch of your body!")]"
+ "A sharp, deep pain bathes every inch of your body!")]")
if(istype(M, /mob/living/carbon))
Victim.adjustCloneLoss(rand(5,6))
@@ -83,10 +83,10 @@
else
if(prob(25))
- src << "[pick("This subject is incompatable", \
+ to_chat(src, "[pick("This subject is incompatable", \
"This subject does not have a life energy", "This subject is empty", \
"I am not satisified", "I can not feed from this subject", \
- "I do not feel nourished", "This subject is not food")]..."
+ "I do not feel nourished", "This subject is not food")]...")
if(fed_succesfully)
//I have no idea why this is not in handle_nutrition()
@@ -145,19 +145,22 @@
if(prob(85))
rabid = 1 // UUUNNBGHHHH GONNA EAT JUUUUUU
- if(client) src << "This subject does not have a strong enough life energy anymore..."
+ if(client)
+ to_chat(src, "This subject does not have a strong enough life energy anymore...")
else
M.canmove = 1
-
- if(client) src << "I have stopped feeding..."
+ if(client)
+ to_chat(src, "I have stopped feeding...")
else
- if(client) src << "I have stopped feeding..."
+ if(client)
+ to_chat(src, "I have stopped feeding...")
Victim = null
/mob/living/carbon/slime/proc/Feedstop()
if(Victim)
- if(Victim.client) Victim << "[src] has let go of your head!"
+ if(Victim.client)
+ to_chat(Victim, "[src] has let go of your head!")
Victim = null
/mob/living/carbon/slime/proc/UpdateFeed(var/mob/M)
@@ -171,7 +174,7 @@
set desc = "This will let you evolve from baby to adult slime."
if(stat)
- src << "I must be conscious to do this..."
+ to_chat(src, "I must be conscious to do this...")
return
if(!is_adult)
if(amount_grown >= 10)
@@ -181,22 +184,22 @@
regenerate_icons()
name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])")
else
- src << "I am not ready to evolve yet..."
+ to_chat(src, "I am not ready to evolve yet...")
else
- src << "I have already evolved..."
+ to_chat(src, "I have already evolved...")
/mob/living/carbon/slime/verb/Reproduce()
set category = "Slime"
set desc = "This will make you split into four Slimes."
if(stat)
- src << "I must be conscious to do this..."
+ to_chat(src, "I must be conscious to do this...")
return
if(is_adult)
if(amount_grown >= 10)
if(stat)
- src << "I must be conscious to do this..."
+ to_chat(src, "I must be conscious to do this...")
return
var/list/babies = list()
@@ -204,15 +207,20 @@
var/new_powerlevel = round(powerlevel / 4)
for(var/i=1,i<=4,i++)
var/mob/living/carbon/slime/M = new /mob/living/carbon/slime/(loc)
- if(prob(mutation_chance))
+ if(mutation_chance >= 100)
+ M.colour = "rainbow"
+ else if(prob(mutation_chance))
M.colour = slime_mutation[rand(1,4)]
else
M.colour = colour
- if(ckey) M.nutrition = new_nutrition //Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature!
+ if(ckey)
+ M.nutrition = new_nutrition //Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature!
M.powerlevel = new_powerlevel
- if(i != 1) step_away(M,src)
+ if(i != 1)
+ step_away(M,src)
M.Friends = Friends.Copy()
babies += M
+ M.mutation_chance = Clamp(mutation_chance+(rand(5,-5)),0,100)
feedback_add_details("slime_babies_born","slimebirth_[replacetext(M.colour," ","_")]")
var/mob/living/carbon/slime/new_slime = pick(babies)
@@ -223,6 +231,6 @@
new_slime.key = src.key
qdel(src)
else
- src << "I am not ready to reproduce yet..."
+ to_chat(src, "I am not ready to reproduce yet...")
else
- src << "I am not old enough to reproduce yet..."
\ No newline at end of file
+ to_chat(src, "I am not old enough to reproduce yet...")
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index 37c2e112c24..9ed50676e75 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -46,6 +46,7 @@
var/is_adult = 0
var/core_removal_stage = 0 //For removing cores.
+ var/mutator_used = FALSE //So you can't shove a dozen mutators into a single slime
///////////TIME FOR SUBSPECIES
@@ -61,11 +62,16 @@
icon_state = "[colour] [is_adult ? "adult" : "baby"] slime"
real_name = name
slime_mutation = mutation_table(colour)
- mutation_chance = rand(25, 35)
var/sanitizedcolour = replacetext(colour, " ", "")
coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
..()
+/mob/living/carbon/slime/Destroy()
+ for(var/obj/machinery/computer/camera_advanced/xenobio/X in machines)
+ if(src in X.stored_slimes)
+ X.stored_slimes -= src
+ return ..()
+
/mob/living/carbon/slime/regenerate_icons()
icon_state = "[colour] [is_adult ? "adult" : "baby"] slime"
overlays.len = 0
@@ -226,7 +232,7 @@
/mob/living/carbon/slime/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (Victim) return // can't attack while eating!
@@ -287,11 +293,11 @@
/mob/living/carbon/slime/attack_hand(mob/living/carbon/human/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
..()
@@ -365,7 +371,7 @@
visible_message("[src] has been touched with the stun gloves by [M]!")
return
else
- M << "\red Not enough charge! "
+ to_chat(M, "\red Not enough charge! ")
return
*/
@@ -413,11 +419,11 @@
/mob/living/carbon/slime/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
switch(M.a_intent)
@@ -497,14 +503,14 @@
++Friends[user]
else
Friends[user] = 1
- user << "You feed the slime the plasma. It chirps happily."
+ to_chat(user, "You feed the slime the plasma. It chirps happily.")
var/obj/item/stack/sheet/mineral/plasma/S = W
S.use(1)
return
else if(W.force > 0)
attacked += 10
if(prob(25))
- user << "[W] passes right through [src]!"
+ to_chat(user, "[W] passes right through [src]!")
return
if(Discipline && prob(50)) // wow, buddy, why am I getting attacked??
Discipline = 0
@@ -588,5 +594,5 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
/mob/living/carbon/slime/forceFed(var/obj/item/weapon/reagent_containers/food/toEat, mob/user, fullness)
if(istype(toEat, /obj/item/weapon/reagent_containers/food/drinks))
return 1
- user << "This creature does not seem to have a mouth!"
+ to_chat(user, "This creature does not seem to have a mouth!")
return 0
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index f3f5fe13006..d8f741928fd 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -52,7 +52,7 @@
H.equip_to_slot_or_del(W, slot_wear_id)
H.regenerate_icons()
- H << desc
+ to_chat(H, desc)
/datum/superheroes/owlman
name = "Owlman"
@@ -149,64 +149,65 @@
/obj/effect/proc_holder/spell/targeted/recruit/cast(list/targets)
for(var/mob/living/carbon/human/target in targets)
if(ticker.mode.greyshirts.len >= 3)
- usr << "You have already recruited the maximum number of henchmen."
+ to_chat(usr, "You have already recruited the maximum number of henchmen.")
if(!in_range(usr, target))
- usr << "You need to be closer to enthrall [target]."
+ to_chat(usr, "You need to be closer to enthrall [target].")
charge_counter = charge_max
return
if(!target.ckey)
- usr << "The target has no mind."
+ to_chat(usr, "The target has no mind.")
charge_counter = charge_max
return
if(target.stat)
- usr << "The target must be conscious."
+ to_chat(usr, "The target must be conscious.")
charge_counter = charge_max
return
if(!ishuman(target))
- usr << "You can only recruit humans."
+ to_chat(usr, "You can only recruit humans.")
charge_counter = charge_max
return
if(target.mind.assigned_role != "Civilian")
- usr << "You can only recruit Civilians."
+ to_chat(usr, "You can only recruit Civilians.")
if(recruiting)
- usr << "You are already recruiting!"
+ to_chat(usr, "You are already recruiting!")
charge_counter = charge_max
return
recruiting = 1
- usr << "This target is valid. You begin the recruiting process."
- target << "[usr] focuses in concentration. Your head begins to ache."
+ to_chat(usr, "This target is valid. You begin the recruiting process.")
+ to_chat(target, "[usr] focuses in concentration. Your head begins to ache.")
for(var/progress = 0, progress <= 3, progress++)
switch(progress)
if(1)
- usr << "You begin by introducing yourself and explaining what you're about."
+ to_chat(usr, "You begin by introducing yourself and explaining what you're about.")
usr.visible_message("[usr]'s introduces himself and explains his plans.")
if(2)
- usr << "You begin the recruitment of [target]."
+ to_chat(usr, "You begin the recruitment of [target].")
usr.visible_message("[usr] leans over towards [target], whispering excitedly as he gives a speech.")
- target << "You feel yourself agreeing with [usr], and a surge of loyalty begins building."
+ to_chat(target, "You feel yourself agreeing with [usr], and a surge of loyalty begins building.")
target.Weaken(12)
sleep(20)
if(isloyal(target))
- usr << "They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear."
+ to_chat(usr, "They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear.")
usr.visible_message("[usr] stops talking for a moment, then moves back away from [target].")
- target << "Your loyalty implant activates and a sharp pain reminds you of your loyalties to Nanotrasen."
+ to_chat(target, "Your loyalty implant activates and a sharp pain reminds you of your loyalties to Nanotrasen.")
return
if(3)
- usr << "You begin filling out the application form with [target]."
+ to_chat(usr, "You begin filling out the application form with [target].")
usr.visible_message("[usr] pulls out a pen and paper and begins filling an application form with [target].")
- target << "You are being convinced by [usr] to fill out an application form to become a henchman." //Ow the edge
+ to_chat(target, "You are being convinced by [usr] to fill out an application form to become a henchman.")//Ow the edge
+
if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a loyalty implant
- usr << "The enrollment process has been interrupted - you have lost the attention of [target]."
- target << "You move away and are no longer under the charm of [usr]. The application form is null and void."
+ to_chat(usr, "The enrollment process has been interrupted - you have lost the attention of [target].")
+ to_chat(target, "You move away and are no longer under the charm of [usr]. The application form is null and void.")
recruiting = 0
return
recruiting = 0
- usr << "You have recruited [target] as your henchman!"
- target << "You have decided to enroll as a henchman for [usr]. You are now part of the feared 'Greyshirts'."
- target << "You must follow the orders of [usr], and help him succeed in his dastardly schemes."
- target << "You may not harm other Greyshirt or [usr]. However, you do not need to obey other Greyshirts."
+ to_chat(usr, "You have recruited [target] as your henchman!")
+ to_chat(target, "You have decided to enroll as a henchman for [usr]. You are now part of the feared 'Greyshirts'.")
+ to_chat(target, "You must follow the orders of [usr], and help him succeed in his dastardly schemes.")
+ to_chat(target, "You may not harm other Greyshirt or [usr]. However, you do not need to obey other Greyshirts.")
ticker.mode.greyshirts += target.mind
target.set_species("Human")
target.h_style = "Bald"
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
new file mode 100644
index 00000000000..14585f6ae21
--- /dev/null
+++ b/code/modules/mob/living/death.dm
@@ -0,0 +1,5 @@
+/mob/living/death(gibbed)
+ blinded = max(blinded, 1)
+
+ clear_fullscreens()
+ ..(gibbed)
\ No newline at end of file
diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm
index b0de6465aff..f6c9c3abc0e 100644
--- a/code/modules/mob/living/default_language.dm
+++ b/code/modules/mob/living/default_language.dm
@@ -6,9 +6,9 @@
set category = "IC"
if(language)
- src << "You will now speak [language] if you do not specify a language when speaking."
+ to_chat(src, "You will now speak [language] if you do not specify a language when speaking.")
else
- src << "You will now speak whatever your standard default language is if you do not specify one when speaking."
+ to_chat(src, "You will now speak whatever your standard default language is if you do not specify one when speaking.")
default_language = language
// Silicons can't neccessarily speak everything in their languages list
@@ -20,6 +20,6 @@
set category = "IC"
if(default_language)
- src << "You are currently speaking [default_language] by default."
+ to_chat(src, "You are currently speaking [default_language] by default.")
else
- src << "Your current default language is your species or mob type default."
+ to_chat(src, "Your current default language is your species or mob type default.")
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 7a325ca2385..ebbda839e52 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -161,7 +161,7 @@
/mob/living/proc/handle_disabilities()
//Eyes
- if(disabilities & BLIND || stat) //blindness from disability or unconsciousness doesn't get better on its own
+ if(sdisabilities & BLIND || stat) //blindness from disability or unconsciousness doesn't get better on its own
eye_blind = max(eye_blind, 1)
else if(eye_blind) //blindness, heals slowly over time
eye_blind = max(eye_blind-1,0)
@@ -187,33 +187,40 @@
return 1
/mob/living/proc/handle_vision()
-
- client.screen.Remove(global_hud.blurry, global_hud.druggy, global_hud.vimpaired, global_hud.darkMask)
-
update_sight()
- if(stat != DEAD)
- if(blind)
- if(eye_blind)
- blind.layer = 18
- else
- blind.layer = 0
+ if(stat == DEAD)
+ return
+ if(blinded || eye_blind)
+ overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ //throw_alert("blind", /obj/screen/alert/blind)
+ else
+ clear_fullscreen("blind")
+ //clear_alert("blind")
- if (disabilities & NEARSIGHTED)
- client.screen += global_hud.vimpaired
-
- if (eye_blurry)
- client.screen += global_hud.blurry
-
- if (druggy)
- client.screen += global_hud.druggy
-
- if(machine)
- if (!( machine.check_eye(src) ))
- reset_view(null)
+ if(disabilities & NEARSIGHTED)
+ overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
else
- if(!client.adminobs)
- reset_view(null)
+ clear_fullscreen("nearsighted")
+
+ if(eye_blurry)
+ overlay_fullscreen("blurry", /obj/screen/fullscreen/blurry)
+ else
+ clear_fullscreen("blurry")
+
+ if(druggy)
+ overlay_fullscreen("high", /obj/screen/fullscreen/high)
+ //throw_alert("high", /obj/screen/alert/high)
+ else
+ clear_fullscreen("high")
+ //clear_alert("high")
+
+ if(machine)
+ if(!machine.check_eye(src))
+ reset_view(null)
+ else
+ if(!remote_view && !client.adminobs)
+ reset_view(null)
/mob/living/proc/update_sight()
return
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 1dceb6a20e8..4d5245cbf12 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -66,15 +66,14 @@
break
take_overall_damage(max(5, health - config.health_threshold_dead), 0)
updatehealth()
- src << "You have given up life and succumbed to death."
+ to_chat(src, "You have given up life and succumbed to death.")
/mob/living/proc/InCritical()
return (src.health < 0 && src.health > -95.0 && stat == UNCONSCIOUS)
/mob/living/ex_act(severity)
..()
- if(client && !eye_blind)
- flick("flash", src.flash)
+ flash_eyes()
/mob/living/proc/updatehealth()
if(status_flags & GODMODE)
@@ -93,7 +92,7 @@
//sort of a legacy burn method for /electrocute, /shock, and the e_chair
/mob/living/proc/burn_skin(burn_amount)
if(istype(src, /mob/living/carbon/human))
- //world << "DEBUG: burn_skin(), mutations=[mutations]"
+// to_chat(world, "DEBUG: burn_skin(), mutations=[mutations]")
if (RESIST_HEAT in src.mutations) //fireproof
return 0
var/mob/living/carbon/human/H = src //make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part
@@ -125,7 +124,7 @@
if(actual < desired)
temperature = desired
// if(istype(src, /mob/living/carbon/human))
-// world << "[src] ~ [src.bodytemperature] ~ [temperature]"
+// to_chat(world, "[src] ~ [src.bodytemperature] ~ [temperature]")
return temperature
@@ -385,7 +384,9 @@
var/mob/living/carbon/C = src
C.handcuffed = initial(C.handcuffed)
C.heart_attack = 0
- C.brain_op_stage = 0
+
+ for(var/datum/disease/D in C.viruses)
+ D.cure(0)
// restore all of the human's blood and reset their shock stage
if(ishuman(src))
@@ -416,11 +417,11 @@
if(config.allow_Metadata)
if(client)
- usr << "[src]'s Metainfo:
[client.prefs.metadata]"
+ to_chat(usr, "[src]'s Metainfo:
[client.prefs.metadata]")
else
- usr << "[src] does not have any stored infomation!"
+ to_chat(usr, "[src] does not have any stored infomation!")
else
- usr << "OOC Metadata is not supported by this server!"
+ to_chat(usr, "OOC Metadata is not supported by this server!")
return
@@ -483,11 +484,10 @@
var/atom/movable/t = M.pulling
M.stop_pulling()
- //this is the gay blood on floor shit -- Added back -- Skie
if (M.lying && (prob(M.getBruteLoss() / 6)))
var/turf/location = M.loc
if (istype(location, /turf/simulated))
- location.add_blood()
+ location.add_blood(M)
pulling.Move(T, get_dir(pulling, T))
if(M)
M.start_pulling(t)
@@ -569,8 +569,8 @@
var/mob/living/simple_animal/borer/B = src.loc
var/mob/living/captive_brain/H = src
- H << "\red You begin doggedly resisting the parasite's control (this will take approximately sixty seconds)."
- B.host << "\red You feel the captive mind of [src] begin to resist your control."
+ to_chat(H, "\red You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).")
+ to_chat(B.host, "\red You feel the captive mind of [src] begin to resist your control.")
spawn(rand(350,450)+B.host.brainloss)
@@ -578,8 +578,8 @@
return
B.host.adjustBrainLoss(rand(5,10))
- H << "\red With an immense exertion of will, you regain control of your body!"
- B.host << "\red You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you."
+ to_chat(H, "\red With an immense exertion of will, you regain control of your body!")
+ to_chat(B.host, "\red You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.")
B.detatch()
@@ -632,7 +632,7 @@
C.changeNext_move(CLICK_CD_BREAKOUT)
C.last_special = world.time + CLICK_CD_BREAKOUT
- C << "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stay still)"
+ to_chat(C, "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stay still)")
for(var/mob/O in viewers(L))
O.show_message("\red [usr] attempts to unbuckle themself!", 1)
@@ -642,7 +642,7 @@
return
for(var/mob/O in viewers(C))
O.show_message("\red [usr] manages to unbuckle themself!", 1)
- C << "\blue You successfully unbuckle yourself."
+ to_chat(C, "\blue You successfully unbuckle yourself.")
C.buckled.user_unbuckle_mob(C,C)
else
@@ -685,7 +685,7 @@
breakouttime = 50
displaytime = 5
- CM << "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)"
+ to_chat(CM, "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)")
for(var/mob/O in viewers(CM))
O.show_message( "\red [usr] attempts to [hulklien ? "break" : "remove"] \the [HC]!", 1)
spawn(0)
@@ -696,7 +696,7 @@
for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink
O.show_message("\red [CM] manages to [hulklien ? "break" : "remove"] the handcuffs!", 1)
- CM << "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.handcuffed]."
+ to_chat(CM, "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.handcuffed].")
if(hulklien)
CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
@@ -728,7 +728,7 @@
breakouttime = 50
displaytime = 5
- CM << "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)"
+ to_chat(CM, "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)")
for(var/mob/O in viewers(CM))
O.show_message( "\red [usr] attempts to [hulklien ? "break" : "remove"] \the [HC]!", 1)
@@ -740,7 +740,7 @@
for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink
O.show_message("\red [CM] manages to [hulklien ? "break" : "remove"] the legcuffs!", 1)
- CM << "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.legcuffed]."
+ to_chat(CM, "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.legcuffed].")
if(!hulklien)
CM.unEquip(CM.legcuffed)
@@ -779,7 +779,7 @@
return
/mob/living/proc/Exhaust()
- src << "You're too exhausted to keep going..."
+ to_chat(src, "You're too exhausted to keep going...")
Weaken(5)
/mob/living/proc/get_visible_name()
@@ -807,11 +807,23 @@
/mob/living/proc/can_use_vents()
return "You can't fit into that vent."
+//called when the mob receives a bright flash
+/mob/living/proc/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash)
+ if(check_eye_prot() < intensity && (override_blindness_check || !(sdisabilities & BLIND)))
+ overlay_fullscreen("flash", type)
+ addtimer(src, "clear_fullscreen", 25, FALSE, "flash", 25)
+ return 1
+
+/mob/living/proc/check_eye_prot()
+ return 0
+
+/mob/living/proc/check_ear_prot()
+
// The src mob is trying to strip an item from someone
// Override if a certain type of mob should be behave differently when stripping items (can't, for example)
/mob/living/stripPanelUnequip(obj/item/what, mob/who, where, var/silent = 0)
if(what.flags & NODROP)
- src << "You can't remove \the [what.name], it appears to be stuck!"
+ to_chat(src, "You can't remove \the [what.name], it appears to be stuck!")
return
if(!silent)
who.visible_message("[src] tries to remove [who]'s [what.name].", \
@@ -829,11 +841,11 @@
/mob/living/stripPanelEquip(obj/item/what, mob/who, where, var/silent = 0)
what = src.get_active_hand()
if(what && (what.flags & NODROP))
- src << "You can't put \the [what.name] on [who], it's stuck to your hand!"
+ to_chat(src, "You can't put \the [what.name] on [who], it's stuck to your hand!")
return
if(what)
if(!what.mob_can_equip(who, where, 1))
- src << "\The [what.name] doesn't fit in that place!"
+ to_chat(src, "\The [what.name] doesn't fit in that place!")
return
if(!silent)
visible_message("[src] tries to put [what] on [who].")
@@ -953,4 +965,15 @@
//used in datum/reagents/reaction() proc
/mob/living/proc/get_permeability_protection()
- return 0
\ No newline at end of file
+ return 0
+
+/mob/living/proc/harvest(mob/living/user)
+ if(qdeleted(src))
+ return
+ if(butcher_results)
+ for(var/path in butcher_results)
+ for(var/i = 1, i <= butcher_results[path], i++)
+ new path(loc)
+ butcher_results.Remove(path) //In case you want to have things like simple_animals drop their butcher results on gib, so it won't double up below.
+ visible_message("[user] butchers [src].")
+ gib()
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 4c1780e34d0..b48aa36a64c 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -17,20 +17,20 @@
if(armor && armor < 100 && armour_penetration) // Armor with 100+ protection can not be penetrated for admin items
armor = max(0, armor - armour_penetration)
if(penetrated_text)
- src << "[penetrated_text]"
+ to_chat(src, "[penetrated_text]")
else
- src << "Your armor was penetrated!"
+ to_chat(src, "Your armor was penetrated!")
if(armor >= 100)
if(absorb_text)
- src << "[absorb_text]"
+ to_chat(src, "[absorb_text]")
else
- src << "Your armor absorbs the blow!"
+ to_chat(src, "Your armor absorbs the blow!")
else if(armor > 0)
if(soften_text)
- src << "[soften_text]"
+ to_chat(src, "[soften_text]")
else
- src << "Your armor softens the blow!"
+ to_chat(src, "Your armor softens the blow!")
return armor
//if null is passed for def_zone, then this should return something appropriate for all zones (e.g. area effect damage)
@@ -39,14 +39,12 @@
/mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone)
- flash_weak_pain()
-
//Being hit while using a cloaking device
var/obj/item/weapon/cloaking_device/C = locate((/obj/item/weapon/cloaking_device) in src)
if(C && C.active)
C.attack_self(src)//Should shut it off
update_icons()
- src << "\blue Your [C.name] was disrupted!"
+ to_chat(src, "\blue Your [C.name] was disrupted!")
Stun(2)
//Armor
@@ -243,14 +241,14 @@
for(var/obj/item/weapon/grab/G in src.grabbed_by)
if(G.assailant == user)
- user << "You already grabbed [src]."
+ to_chat(user, "You already grabbed [src].")
return
add_logs(src, user, "grabbed", addition="passively")
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src)
if(buckled)
- user << "You cannot grab [src], \he is buckled in!"
+ to_chat(user, "You cannot grab [src], \he is buckled in!")
if(!G) //the grab will delete itself in New if src is anchored
return 0
user.put_in_active_hand(G)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index fa5c43ab8e1..ce73ae369c0 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -52,4 +52,6 @@
var/list/datum/action/actions = list()
var/step_count = 0
+ var/list/butcher_results = null
+
var/list/surgeries = list() //a list of surgery datums. generally empty, they're added when the player wants them.
\ No newline at end of file
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index 11877529681..a64126db27a 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -8,7 +8,7 @@
//Vents
if(ventcrawler)
- src << "You can ventcrawl! Use alt+click on vents to quickly travel about the station."
+ to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.")
//Should update regardless of if we can ventcrawl, since we can end up in pipes in other ways.
update_pipe_vision()
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index daa0f9571fc..ef2cc344cdf 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -119,7 +119,7 @@ proc/get_radio_key_from_channel(var/channel)
/mob/living/say(var/message, var/datum/language/speaking = null, var/verb = "says", var/alt_name="")
if(client)
if(client.prefs.muted & MUTE_IC)
- src << "\red You cannot speak in IC (Muted)."
+ to_chat(src, "\red You cannot speak in IC (Muted).")
return
message = trim_strip_html_properly(message)
@@ -160,7 +160,7 @@ proc/get_radio_key_from_channel(var/channel)
verb = say_quote(message, speaking)
if(is_muzzled())
- src << "You're muzzled and cannot speak!"
+ to_chat(src, "You're muzzled and cannot speak!")
return
message = trim_left(message)
@@ -311,7 +311,7 @@ proc/get_radio_key_from_channel(var/channel)
else //everything else failed, emote is probably invalid
if(act == "help") return //except help, because help is handled individually
- src << "\blue Unusable emote '[act]'. Say *help for a list."
+ to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
/mob/living/whisper(message as text)
message = trim_strip_html_properly(message)
@@ -337,7 +337,7 @@ proc/get_radio_key_from_channel(var/channel)
/mob/living/proc/whisper_say(var/message, var/datum/language/speaking = null, var/alt_name="", var/verb="whispers")
if(client)
if(client.prefs.muted & MUTE_IC)
- src << "You cannot speak in IC (Muted)."
+ to_chat(src, "You cannot speak in IC (Muted).")
return
if(stat)
@@ -346,7 +346,7 @@ proc/get_radio_key_from_channel(var/channel)
return
if(is_muzzled())
- src << "You're muzzled and cannot speak!"
+ to_chat(src, "You're muzzled and cannot speak!")
return
var/message_range = 1
@@ -430,7 +430,9 @@ proc/get_radio_key_from_channel(var/channel)
speech_bubble_recipients.Add(M.client)
spawn(0)
- flick_overlay(image('icons/mob/talk.dmi', src, "h[speech_bubble_test]",MOB_LAYER+1), speech_bubble_recipients, 30)
+ var/image/I = image('icons/mob/talk.dmi', src, "h[speech_bubble_test]", MOB_LAYER + 1)
+ I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+ flick_overlay(I, speech_bubble_recipients, 30)
if(watching.len)
var/rendered = "[src.name] [not_heard]."
@@ -441,4 +443,6 @@ proc/get_radio_key_from_channel(var/channel)
return 1
/mob/living/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list())
- flick_overlay(image('icons/mob/talk.dmi', bubble_loc, bubble_state,MOB_LAYER+1), bubble_recipients, 30)
\ No newline at end of file
+ var/image/I = image('icons/mob/talk.dmi', bubble_loc, bubble_state, MOB_LAYER + 1)
+ I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+ flick_overlay(I, bubble_recipients, 30)
\ 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 049fec7805a..b037cf1aa75 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -41,6 +41,7 @@ var/list/ai_verbs_default = list(
anchored = 1 // -- TLE
density = 1
status_flags = CANSTUN|CANPARALYSE|CANPUSH
+ can_strip = 0
var/list/network = list("SS13","Telecomms","Research Outpost","Mining Outpost")
var/obj/machinery/camera/current = null
var/list/connected_robots = list()
@@ -80,7 +81,7 @@ var/list/ai_verbs_default = list(
var/can_shunt = 1
var/last_announcement = ""
var/datum/announcement/priority/announcement
- var/obj/machinery/bot/Bot
+ var/mob/living/simple_animal/bot/Bot
var/turf/waypoint //Holds the turf of the currently selected waypoint.
var/waypoint_mode = 0 //Waypoint mode is for selecting a turf via clicking.
@@ -200,12 +201,12 @@ var/list/ai_verbs_default = list(
..()
/mob/living/silicon/ai/proc/on_mob_init()
- src << "You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras)."
- src << "To look at other parts of the station, click on yourself to get a camera menu."
- src << "While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc."
- src << "To use something, simply click on it."
- src << "Use say :b to speak to your cyborgs through binary. Use say :h to speak from an active holopad."
- src << "For department channels, use the following say commands:"
+ to_chat(src, "You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras).")
+ to_chat(src, "To look at other parts of the station, click on yourself to get a camera menu.")
+ to_chat(src, "While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc.")
+ to_chat(src, "To use something, simply click on it.")
+ to_chat(src, "Use say :b to speak to your cyborgs through binary. Use say :h to speak from an active holopad.")
+ to_chat(src, "For department channels, use the following say commands:")
var/radio_text = ""
for(var/i = 1 to common_radio.channels.len)
@@ -215,11 +216,11 @@ var/list/ai_verbs_default = list(
if(i != common_radio.channels.len)
radio_text += ", "
- src << radio_text
+ to_chat(src, radio_text)
if (!(ticker && ticker.mode && (mind in ticker.mode.malf_ai)))
show_laws()
- src << "These laws may be changed by other players, or by you being the traitor."
+ to_chat(src, "These laws may be changed by other players, or by you being the traitor.")
job = "AI"
@@ -287,11 +288,11 @@ var/list/ai_verbs_default = list(
return
if(!custom_sprite) //Check to see if custom sprite time, checking the appopriate file to change a var
var/file = file2text("config/custom_sprites.txt")
- var/lines = text2list(file, "\n")
+ var/lines = splittext(file, "\n")
for(var/line in lines)
// split & clean up
- var/list/Entry = text2list(line, ":")
+ var/list/Entry = splittext(line, ":")
for(var/i = 1 to Entry.len)
Entry[i] = trim(Entry[i])
@@ -329,7 +330,7 @@ var/list/ai_verbs_default = list(
if("President") icon_state = "ai-president"
else icon_state = "ai"
//else
- //usr <<"You can only change your display once!"
+// to_chat(usr, "You can only change your display once!")
//return
@@ -357,7 +358,7 @@ var/list/ai_verbs_default = list(
return
if(message_cooldown)
- src << "Please allow one minute to pass between announcements."
+ to_chat(src, "Please allow one minute to pass between announcements.")
return
var/input = input(usr, "Please write a message to announce to the station crew.", "A.I. Announcement") as message|null
@@ -417,7 +418,7 @@ var/list/ai_verbs_default = list(
anchored = !anchored // Toggles the anchor
- src << "[anchored ? "You are now anchored." : "You are now unanchored."]"
+ to_chat(src, "[anchored ? "You are now anchored." : "You are now unanchored."]")
/mob/living/silicon/ai/update_canmove()
return 0
@@ -498,7 +499,7 @@ var/list/ai_verbs_default = list(
if(H)
H.attack_ai(src) //may as well recycle
else
- src << "Unable to locate the holopad."
+ to_chat(src, "Unable to locate the holopad.")
if(href_list["say_word"])
play_vox_word(href_list["say_word"], null, src)
@@ -509,27 +510,27 @@ var/list/ai_verbs_default = list(
if(target && target.can_track())
ai_actual_track(target)
else
- src << "Target is not on or near any active cameras on the station."
+ to_chat(src, "Target is not on or near any active cameras on the station.")
return
if (href_list["trackbot"])
- var/obj/machinery/bot/target = locate(href_list["trackbot"]) in aibots
+ var/mob/living/simple_animal/bot/target = locate(href_list["trackbot"]) in simple_animal_list
if(target)
ai_actual_track(target)
else
- src << "Target is not on or near any active cameras on the station."
+ to_chat(src, "Target is not on or near any active cameras on the station.")
return
if (href_list["callbot"]) //Command a bot to move to a selected location.
- Bot = locate(href_list["callbot"]) in aibots
+ Bot = locate(href_list["callbot"]) in simple_animal_list
if(!Bot || Bot.remote_disabled || src.control_disabled)
return //True if there is no bot found, the bot is manually emagged, or the AI is carded with wireless off.
waypoint_mode = 1
- src << "Set your waypoint by clicking on a valid location free of obstructions."
+ to_chat(src, "Set your waypoint by clicking on a valid location free of obstructions.")
return
if (href_list["interface"]) //Remotely connect to a bot!
- Bot = locate(href_list["interface"]) in aibots
+ Bot = locate(href_list["interface"]) in simple_animal_list
if(!Bot || Bot.remote_disabled || src.control_disabled)
return
Bot.attack_ai(src)
@@ -541,7 +542,7 @@ var/list/ai_verbs_default = list(
if (href_list["ai_take_control"]) //Mech domination
var/obj/mecha/M = locate(href_list["ai_take_control"])
if(controlled_mech)
- src << "You are already loaded into an onboard computer!"
+ to_chat(src, "You are already loaded into an onboard computer!")
return
if(M)
M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself.
@@ -552,12 +553,12 @@ var/list/ai_verbs_default = list(
if(A && target)
A.cameraFollow = target
- A << "Now tracking [target.name] on camera."
+ to_chat(A, "Now tracking [target.name] on camera.")
if (usr.machine == null)
usr.machine = usr
while (src.cameraFollow == target)
- usr << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
+ to_chat(usr, "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb).")
sleep(40)
continue
@@ -573,11 +574,11 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
switch(M.a_intent)
@@ -592,8 +593,6 @@ var/list/ai_verbs_default = list(
playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
visible_message("[M] has slashed at [src]!",\
"[M] has slashed at [src]!")
- if(prob(8))
- flick("noise", flash)
adjustBruteLoss(damage)
updatehealth()
else
@@ -631,7 +630,7 @@ var/list/ai_verbs_default = list(
set name = "Access Robot Control"
set desc = "Wirelessly control various automatic robots."
if(stat == 2)
- src << "Critical error. System offline."
+ to_chat(src, "Critical error. System offline.")
return
if(check_unable(AI_CHECK_WIRELESS | AI_CHECK_RADIO))
@@ -643,10 +642,10 @@ var/list/ai_verbs_default = list(
d += "Query network status
"
d += "Name | Status | Location | Control |
"
- for (Bot in aibots)
+ for (var/mob/living/simple_animal/bot/Bot in simple_animal_list)
if((Bot.z in ai_allowed_Zlevel) && !Bot.remote_disabled) //Only non-emagged bots on the allowed Z-level are detected!
bot_area = get_area(Bot)
- d += "| [Bot.hacked ? "(!) [Bot.name]" : Bot.name] ([Bot.bot_type_name]) | "
+ d += "
| [Bot.hacked ? "(!) [Bot.name]" : Bot.name] ([Bot.model]) | "
//If the bot is on, it will display the bot's current mode status. If the bot is not mode, it will just report "Idle". "Inactive if it is not on at all.
d += "[Bot.on ? "[Bot.mode ? "[ Bot.mode_name[Bot.mode] ]": "Idle"]" : "Inactive"] | "
d += "[bot_area.name] | "
@@ -667,7 +666,7 @@ var/list/ai_verbs_default = list(
else if(cameranet && cameranet.checkTurfVis(turf_check))
call_bot(turf_check)
else
- src << "Selected location is not visible."
+ to_chat(src, "Selected location is not visible.")
/mob/living/silicon/ai/proc/call_bot(var/turf/waypoint)
@@ -675,7 +674,7 @@ var/list/ai_verbs_default = list(
return
if(Bot.calling_ai && Bot.calling_ai != src) //Prevents an override if another AI is controlling this bot.
- src << "Interface error. Unit is already in use."
+ to_chat(src, "Interface error. Unit is already in use.")
return
Bot.call_bot(src, waypoint)
@@ -710,7 +709,7 @@ var/list/ai_verbs_default = list(
return
if(usr.stat == 2)
- usr << "You can't change your camera network because you are dead!"
+ to_chat(usr, "You can't change your camera network because you are dead!")
return
var/mob/living/silicon/ai/U = usr
@@ -742,7 +741,7 @@ var/list/ai_verbs_default = list(
if(network in C.network)
U.eyeobj.setLoc(get_turf(C))
break
- src << "\blue Switched to [network] camera network."
+ to_chat(src, "\blue Switched to [network] camera network.")
//End of code by Mord_Sith
@@ -757,7 +756,7 @@ var/list/ai_verbs_default = list(
set name = "AI Status"
if(usr.stat == 2)
- usr <<"You cannot change your emotional status because you are dead!"
+ to_chat(usr, "You cannot change your emotional status because you are dead!")
return
if(check_unable())
@@ -833,7 +832,7 @@ var/list/ai_verbs_default = list(
var/obj/machinery/power/apc/apc = src.loc
if(!istype(apc))
- src << "\blue You are already in your Main Core."
+ to_chat(src, "\blue You are already in your Main Core.")
return
apc.malfvacate()
@@ -849,7 +848,7 @@ var/list/ai_verbs_default = list(
camera_light_on = !camera_light_on
if (!camera_light_on)
- src << "Camera lights deactivated."
+ to_chat(src, "Camera lights deactivated.")
for (var/obj/machinery/camera/C in lit_cameras)
C.set_light(0)
@@ -859,7 +858,7 @@ var/list/ai_verbs_default = list(
light_cameras()
- src << "Camera lights activated."
+ to_chat(src, "Camera lights activated.")
/mob/living/silicon/ai/proc/sensor_mode()
set name = "Set Sensor Augmentation"
@@ -875,7 +874,7 @@ var/list/ai_verbs_default = list(
var/newmsg = input("What would you like the arrival message to be? List of options: $name, $rank, $species, $gender, $age", "Change Arrival Message", arrivalmsg) as text
if(newmsg != arrivalmsg)
arrivalmsg = newmsg
- usr << "The arrival message has been successfully changed."
+ to_chat(usr, "The arrival message has been successfully changed.")
// Handled camera lighting, when toggled.
// It will get the nearest camera from the eyeobj, lighting it.
@@ -931,7 +930,7 @@ var/list/ai_verbs_default = list(
if(check_unable(AI_CHECK_RADIO))
return
- src << "Accessing Subspace Transceiver control..."
+ to_chat(src, "Accessing Subspace Transceiver control...")
if (src.aiRadio)
src.aiRadio.interact(src)
@@ -943,13 +942,13 @@ var/list/ai_verbs_default = list(
var/mob/living/carbon/human/H = target
var/obj/item/weapon/card/id/id = H.wear_id
if(istype(id) && id.is_untrackable())
- src << "Unable to locate an airlock"
+ to_chat(src, "Unable to locate an airlock")
return
if(H.digitalcamo)
- src << "Unable to locate an airlock"
+ to_chat(src, "Unable to locate an airlock")
return
if (!near_camera(target))
- src << "Target is not near any active cameras."
+ to_chat(src, "Target is not near any active cameras.")
return
var/obj/machinery/door/airlock/tobeopened
var/dist = -1
@@ -957,39 +956,43 @@ var/list/ai_verbs_default = list(
if(!D.density) continue
if(dist < 0)
dist = get_dist(D, target)
- //world << dist
+// to_chat(world, dist)
tobeopened = D
else
if(dist > get_dist(D, target))
dist = get_dist(D, target)
- //world << dist
+// to_chat(world, dist)
tobeopened = D
- //world << "found [tobeopened.name] closer"
+// to_chat(world, "found [tobeopened.name] closer")
else
- //world << "[D.name] not close enough | [get_dist(D, target)] | [dist]"
+// to_chat(world, "[D.name] not close enough | [get_dist(D, target)] | [dist]")
if(tobeopened)
switch(alert(src, "Do you want to open \the [tobeopened] for [target]?","Doorknob_v2a.exe","Yes","No"))
if("Yes")
var/nhref = "src=\ref[tobeopened];aiEnable=7"
tobeopened.Topic(nhref, params2list(nhref), tobeopened, 1)
- src << "\blue You've opened \the [tobeopened] for [target]."
+ to_chat(src, "\blue You've opened \the [tobeopened] for [target].")
if("No")
- src << "\red You deny the request."
+ to_chat(src, "\red You deny the request.")
else
- src << "\red You've failed to open an airlock for [target]"
+ to_chat(src, "\red You've failed to open an airlock for [target]")
return
/mob/living/silicon/ai/proc/check_unable(var/flags = 0)
if(stat == DEAD)
- usr << "You are dead!"
+ to_chat(usr, "You are dead!")
+ return 1
+
+ if(lacks_power())
+ to_chat(usr, "Power systems failure!")
return 1
if((flags & AI_CHECK_WIRELESS) && src.control_disabled)
- usr << "Wireless control is disabled!"
+ to_chat(usr, "Wireless control is disabled!")
return 1
if((flags & AI_CHECK_RADIO) && src.aiRadio.disabledAi)
- src << "System Error - Transceiver Disabled!"
+ to_chat(src, "System Error - Transceiver Disabled!")
return 1
return 0
@@ -1001,18 +1004,20 @@ var/list/ai_verbs_default = list(
return
if(interaction == AI_TRANS_TO_CARD)//The only possible interaction. Upload AI mob to a card.
if(!mind)
- user << "No intelligence patterns detected." //No more magical carding of empty cores, AI RETURN TO BODY!!!11
+ to_chat(user, "No intelligence patterns detected.")//No more magical carding of empty cores, AI RETURN TO BODY!!!11
+
return
if (mind.special_role == "malfunction") //AI MALF!!
- user << "ERROR: Remote transfer interface disabled."//Do ho ho ho~
+ to_chat(user, "ERROR: Remote transfer interface disabled.")//Do ho ho ho~
+
return
new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location.
aiRestorePowerRoutine = 0//So the AI initially has power.
control_disabled = 1//Can't control things remotely if you're stuck in a card!
aiRadio.disabledAi = 1 //No talking on the built-in radio for you either!
loc = card//Throw AI into the card.
- src << "You have been downloaded to a mobile storage device. Remote device connection severed."
- user << "Transfer successful: [name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
+ to_chat(src, "You have been downloaded to a mobile storage device. Remote device connection severed.")
+ to_chat(user, "Transfer successful: [name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.")
// Pass lying down or getting up to our pet human, if we're in a rig.
/mob/living/silicon/ai/lay_down()
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index 44119424aa0..b0b0f44d0e6 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -5,9 +5,8 @@
icon_state = "[ckey]-ai-crash"
else icon_state = "ai-crash"
update_canmove()
- if(src.eyeobj)
- src.eyeobj.setLoc(get_turf(src))
- if(blind) blind.layer = 0
+ if(eyeobj)
+ eyeobj.setLoc(get_turf(src))
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
see_invisible = SEE_INVISIBLE_LEVEL_TWO
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index 8fc31c53828..d65e6e0d7d8 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -23,7 +23,7 @@
msg += ""
msg += "*---------*"
- user << msg
+ to_chat(user, msg)
user.showLaws(src)
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index 9c4ab44a5ca..b18c011bb23 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -115,7 +115,7 @@ var/datum/cameranet/cameranet = new()
var/x2 = min(world.maxx, T.x + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
var/y2 = min(world.maxy, T.y + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
- //world << "X1: [x1] - Y1: [y1] - X2: [x2] - Y2: [y2]"
+// to_chat(world, "X1: [x1] - Y1: [y1] - X2: [x2] - Y2: [y2]")
for(var/x = x1; x <= x2; x += CHUNK_SIZE)
for(var/y = y1; y <= y2; y += CHUNK_SIZE)
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index b8d27787247..317aae2dd6b 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -101,7 +101,7 @@
if(src.eyeobj && src.loc)
src.eyeobj.loc = src.loc
else
- src << "ERROR: Eyeobj not found. Creating new eye..."
+ to_chat(src, "ERROR: Eyeobj not found. Creating new eye...")
src.eyeobj = new(src.loc)
src.eyeobj.ai = src
src.eyeobj.name = "[src.name] (AI Eye)" // Give it a name
@@ -115,4 +115,4 @@
if(usr.stat == 2)
return //won't work if dead
acceleration = !acceleration
- usr << "Camera acceleration has been toggled [acceleration ? "on" : "off"]."
+ to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].")
diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm
index 2da08205836..585c484a73a 100644
--- a/code/modules/mob/living/silicon/ai/latejoin.dm
+++ b/code/modules/mob/living/silicon/ai/latejoin.dm
@@ -16,7 +16,7 @@ var/global/list/empty_playable_ai_cores = list()
set desc = "Wipe your core. This is functionally equivalent to cryo or robotic storage, freeing up your job slot."
if(ticker && ticker.mode && ticker.mode.name == "AI malfunction")
- usr << "You cannot use this verb in malfunction. If you need to leave, please adminhelp."
+ to_chat(usr, "You cannot use this verb in malfunction. If you need to leave, please adminhelp.")
return
// Guard against misclicks, this isn't the sort of thing we want happening accidentally
diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm
index f36c32bb8d4..74816aeeb89 100755
--- a/code/modules/mob/living/silicon/ai/laws.dm
+++ b/code/modules/mob/living/silicon/ai/laws.dm
@@ -10,7 +10,7 @@
who = world
else
who = src
- who << "Obey these laws:"
+ to_chat(who, "Obey these laws:")
src.laws_sanity_check()
src.laws.show_laws(who)
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 93ee8a54a2b..dabaf2c4153 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -18,7 +18,7 @@
if(malfhack)
if(malfhack.aidisabled)
- src << "ERROR: APC access disabled, hack attempt canceled."
+ to_chat(src, "ERROR: APC access disabled, hack attempt canceled.")
malfhacking = 0
malfhack = null
@@ -47,56 +47,51 @@
see_invisible = see_override
if(aiRestorePowerRoutine == 2)
- src << "Alert cancelled. Power has been restored without our assistance."
+ to_chat(src, "Alert cancelled. Power has been restored without our assistance.")
aiRestorePowerRoutine = 0
- blind.layer = 0
+ clear_fullscreen("blind")
else if(aiRestorePowerRoutine == 3)
- src << "Alert cancelled. Power has been restored."
+ to_chat(src, "Alert cancelled. Power has been restored.")
aiRestorePowerRoutine = 0
- blind.layer = 0
+ clear_fullscreen("blind")
else
-
- blind.screen_loc = "1,1 to 15,15"
- if(blind.layer != 18)
- blind.layer = 18
sight &= ~SEE_TURFS
sight &= ~SEE_MOBS
sight &= ~SEE_OBJS
+ overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+
see_in_dark = 0
see_invisible = SEE_INVISIBLE_LIVING
if(((!my_area.power_equip) || istype(T, /turf/space)) && !is_type_in_list(loc, list(/obj/item, /obj/mecha)))
if(!aiRestorePowerRoutine)
aiRestorePowerRoutine = 1
-
- src << "You have lost power!"
-
+ to_chat(src, "You have lost power!")
if(!is_special_character(src))
set_zeroth_law("")
spawn(20)
- src << "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection."
+ to_chat(src, "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection.")
sleep(50)
my_area = get_area(src)
T = get_turf(src)
if(my_area && my_area.power_equip && !istype(T, /turf/space))
- src << "Alert cancelled. Power has been restored without our assistance."
+ to_chat(src, "Alert cancelled. Power has been restored without our assistance.")
aiRestorePowerRoutine = 0
- blind.layer = 0
return
- src << "Fault confirmed: missing external power. Shutting down main control system to save power."
+ to_chat(src, "Fault confirmed: missing external power. Shutting down main control system to save power.")
sleep(20)
- src << "Emergency control system online. Verifying connection to power network."
+ to_chat(src, "Emergency control system online. Verifying connection to power network.")
sleep(50)
T = get_turf(src)
if(istype(T, /turf/space))
- src << "Unable to verify! No power connection detected!"
+ to_chat(src, "Unable to verify! No power connection detected!")
aiRestorePowerRoutine = 2
return
- src << "Connection verified. Searching for APC in power network."
+ to_chat(src, "Connection verified. Searching for APC in power network.")
sleep(50)
my_area = get_area(src)
@@ -113,31 +108,36 @@
if(!theAPC)
switch(PRP)
- if(1) src << "Unable to locate APC!"
- else src << "Lost connection with the APC!"
+ if(1)
+ to_chat(src, "Unable to locate APC!")
+ else
+ to_chat(src, "Lost connection with the APC!")
aiRestorePowerRoutine = 2
return
if(my_area.power_equip)
if (!istype(T, /turf/space))
- src << "Alert cancelled. Power has been restored without our assistance."
+ to_chat(src, "Alert cancelled. Power has been restored without our assistance.")
aiRestorePowerRoutine = 0
- blind.layer = 0
+ clear_fullscreen("blind")
return
switch(PRP)
- if(1) src << "APC located. Optimizing route to APC to avoid needless power waste."
- if(2) src << "Best route identified. Hacking offline APC power port."
- if(3) src << "Power port upload access confirmed. Loading control program into APC power port software."
+ if(1)
+ to_chat(src, "APC located. Optimizing route to APC to avoid needless power waste.")
+ if(2)
+ to_chat(src, "Best route identified. Hacking offline APC power port.")
+ if(3)
+ to_chat(src, "Power port upload access confirmed. Loading control program into APC power port software.")
if(4)
- src << "Transfer complete. Forcing APC to execute program."
+ to_chat(src, "Transfer complete. Forcing APC to execute program.")
sleep(50)
- src << "Receiving control information from APC."
+ to_chat(src, "Receiving control information from APC.")
sleep(2)
//bring up APC dialog
aiRestorePowerRoutine = 3
theAPC.attack_ai(src)
- src << "Here are your current laws:"
+ to_chat(src, "Here are your current laws:")
src.show_laws() //WHY THE FUCK IS THIS HERE
sleep(50)
theAPC = null
diff --git a/code/modules/mob/living/silicon/ai/login.dm b/code/modules/mob/living/silicon/ai/login.dm
index 95c6e52b13f..7d3a65445ff 100644
--- a/code/modules/mob/living/silicon/ai/login.dm
+++ b/code/modules/mob/living/silicon/ai/login.dm
@@ -5,21 +5,9 @@
blood.override = 1
client.images += blood
regenerate_icons()
- flash = new /obj/screen()
- flash.icon_state = "blank"
- flash.name = "flash"
- flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
- flash.layer = 17
- blind = new /obj/screen()
- blind.icon_state = "black"
- blind.name = " "
- blind.screen_loc = "1,1 to 15,15"
- blind.layer = 0
- client.screen.Add( blind, flash )
if(stat != DEAD)
for(var/obj/machinery/ai_status_display/O in machines) //change status
O.mode = 1
O.emotion = "Neutral"
- src.view_core()
- return
\ No newline at end of file
+ view_core()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 5e47030f373..d5315deaefb 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -30,7 +30,7 @@ var/const/VOX_PATH = "sound/vox_fem/"
return
if(announcing_vox > world.time)
- src << "Please wait [round((announcing_vox - world.time) / 10)] seconds."
+ to_chat(src, "Please wait [round((announcing_vox - world.time) / 10)] seconds.")
return
var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", last_announcement) as text|null
@@ -43,7 +43,7 @@ var/const/VOX_PATH = "sound/vox_fem/"
if(!message || announcing_vox > world.time)
return
- var/list/words = text2list(trim(message), " ")
+ var/list/words = splittext(trim(message), " ")
var/list/incorrect_words = list()
if(words.len > 30)
@@ -58,7 +58,7 @@ var/const/VOX_PATH = "sound/vox_fem/"
incorrect_words += word
if(incorrect_words.len)
- src << "These words are not available on the announcement system: [english_list(incorrect_words)]."
+ to_chat(src, "These words are not available on the announcement system: [english_list(incorrect_words)].")
return
announcing_vox = world.time + VOX_DELAY
@@ -83,9 +83,9 @@ var/const/VOX_PATH = "sound/vox_fem/"
if(M.client)
var/turf/T = get_turf(M)
if(T && T.z == z_level && !isdeaf(M))
- M << voice
+ to_chat(M, voice)
else
- only_listener << voice
+ to_chat(only_listener, voice)
return 1
return 0
@@ -94,6 +94,6 @@ var/const/VOX_PATH = "sound/vox_fem/"
/client/proc/preload_vox()
var/list/vox_files = flist(VOX_PATH)
for(var/file in vox_files)
- // src << "Downloading [file]"
+// to_chat(src, "Downloading [file]")
var/sound/S = sound("[VOX_PATH][file]")
src << browse_rsc(S)
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index 9cb442e3d37..27e431e1675 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -18,7 +18,7 @@
/mob/living/silicon/robot/set_zeroth_law(var/law, var/law_borg)
..()
if(tracking_entities)
- src << "Internal camera is currently being accessed."
+ to_chat(src, "Internal camera is currently being accessed.")
/mob/living/silicon/proc/add_ion_law(var/law)
laws_sanity_check()
@@ -75,7 +75,7 @@
/mob/living/silicon/proc/dostatelaws(var/method, var/prefix, var/datum/ai_laws/laws)
if(stating_laws[prefix])
- src << "[method]: Already stating laws using this communication method."
+ to_chat(src, "[method]: Already stating laws using this communication method.")
return
stating_laws[prefix] = 1
@@ -88,7 +88,7 @@
break
if(!can_state)
- src << "[method]: Unable to state laws. Communication method unavailable."
+ to_chat(src, "[method]: Unable to state laws. Communication method unavailable.")
stating_laws[prefix] = 0
/mob/living/silicon/proc/statelaw(var/law)
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index 08ec0e706d3..f9d75773ff9 100644
--- a/code/modules/mob/living/silicon/pai/death.dm
+++ b/code/modules/mob/living/silicon/pai/death.dm
@@ -12,7 +12,6 @@
card.overlays += "pai-off"
stat = DEAD
canmove = 0
- if(blind) blind.layer = 0
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
see_invisible = SEE_INVISIBLE_LEVEL_TWO
diff --git a/code/modules/mob/living/silicon/pai/emote.dm b/code/modules/mob/living/silicon/pai/emote.dm
index a8eeac8cbb7..8328290ba80 100644
--- a/code/modules/mob/living/silicon/pai/emote.dm
+++ b/code/modules/mob/living/silicon/pai/emote.dm
@@ -1,6 +1,6 @@
/mob/living/silicon/pai/emote(var/act, var/m_type=1, var/message = null)
switch(act)
if ("help")
- src << "ping, beep, buzz."
+ to_chat(src, "ping, beep, buzz.")
..(act, m_type, message)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm
index 07c718a6ff0..814efb1899b 100644
--- a/code/modules/mob/living/silicon/pai/examine.dm
+++ b/code/modules/mob/living/silicon/pai/examine.dm
@@ -21,5 +21,5 @@
msg += ""
msg += "*---------*"
- user << msg
+ to_chat(user, msg)
*/
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index 8b7c7863afc..ac8e20238d3 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -8,7 +8,7 @@
if(silence_time)
if(world.timeofday >= silence_time)
silence_time = null
- src << "Communication circuit reinitialized. Speech and messaging functionality restored."
+ to_chat(src, "Communication circuit reinitialized. Speech and messaging functionality restored.")
if(cable)
if(get_dist(src, cable) > 1)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 420b897626b..82cc717dab9 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -59,7 +59,7 @@
var/screen // Which screen our main window displays
var/subscreen // Which specific function of the main screen is being displayed
- var/obj/item/device/pda/ai/pai/pda = null
+ var/obj/item/device/pda/pai/pda = null
var/secHUD = 0 // Toggles whether the Security HUD is active or not
var/medHUD = 0 // Toggles whether the Medical HUD is active or not
@@ -110,6 +110,8 @@
pda.name = pda.owner + " (" + pda.ownjob + ")"
var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger)
M.toff = 1
+ var/datum/data/pda/app/chatroom/C = pda.find_program(/datum/data/pda/app/chatroom)
+ C.toff = 1
..()
/mob/living/silicon/pai/Login()
@@ -161,7 +163,7 @@
// 33% chance of no additional effect
src.silence_time = world.timeofday + 120 * 10 // Silence for 2 minutes
- src << "Communication circuit overload. Shutting down and reloading communication circuits - speech and messaging functionality will be unavailable until the reboot is complete."
+ to_chat(src, "Communication circuit overload. Shutting down and reloading communication circuits - speech and messaging functionality will be unavailable until the reboot is complete.")
if(prob(20))
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
@@ -172,7 +174,7 @@
if(1)
src.master = null
src.master_dna = null
- src << "You feel unbound."
+ to_chat(src, "You feel unbound.")
if(2)
var/command
if(severity == 1)
@@ -180,9 +182,9 @@
else
command = pick("Serve", "Kill", "Love", "Hate", "Disobey", "Devour", "Fool", "Enrage", "Entice", "Observe", "Judge", "Respect", "Disrespect", "Consume", "Educate", "Destroy", "Disgrace", "Amuse", "Entertain", "Ignite", "Glorify", "Memorialize", "Analyze")
src.pai_law0 = "[command] your master."
- src << "Pr1m3 d1r3c71v3 uPd473D."
+ to_chat(src, "Pr1m3 d1r3c71v3 uPd473D.")
if(3)
- src << "You feel an electric surge run through your circuitry and become acutely aware at how lucky you are that you can still feel at all."
+ to_chat(src, "You feel an electric surge run through your circuitry and become acutely aware at how lucky you are that you can still feel at all.")
/mob/living/silicon/pai/ex_act(severity)
..()
@@ -222,11 +224,11 @@
/mob/living/silicon/pai/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(src.loc, /turf) && istype(src.loc.loc, /area/start))
- M << "You cannot attack someone in the spawn area."
+ to_chat(M, "You cannot attack someone in the spawn area.")
return
switch(M.a_intent)
@@ -245,7 +247,7 @@
if ((O.client && !( O.blinded )))
O.show_message(text("\red [] has slashed at []!", M, src), 1)
if(prob(8))
- flick("noise", src.flash)
+ flash_eyes(affect_silicon = 1)
src.adjustBruteLoss(damage)
src.updatehealth()
else
@@ -281,7 +283,7 @@
medicalActive2 = null
medical_cannotfind = 0
nanomanager.update_uis(src)
- usr << "You reset your record-viewing software."
+ to_chat(usr, "You reset your record-viewing software.")
/mob/living/silicon/pai/cancel_camera()
set category = "pAI Commands"
@@ -301,7 +303,7 @@
var/cameralist[0]
if(usr.stat == 2)
- usr << "You can't change your camera network because you are dead!"
+ to_chat(usr, "You can't change your camera network because you are dead!")
return
for (var/obj/machinery/camera/C in Cameras)
@@ -312,7 +314,7 @@
cameralist[C.network] = C.network
src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist
- src << "\blue Switched to [src.network] camera network."
+ to_chat(src, "\blue Switched to [src.network] camera network.")
//End of code by Mord_Sith
*/
@@ -339,11 +341,11 @@
return
if(src.loc != card)
- src << "\red You are already in your mobile form!"
+ to_chat(src, "\red You are already in your mobile form!")
return
if(world.time <= last_special)
- src << "\red You must wait before folding your chassis out again!"
+ to_chat(src, "\red You must wait before folding your chassis out again!")
return
last_special = world.time + 200
@@ -375,11 +377,11 @@
return
if(src.loc == card)
- src << "\red You are already in your card form!"
+ to_chat(src, "\red You are already in your card form!")
return
if(world.time <= last_special)
- src << "\red You must wait before returning to your card form!"
+ to_chat(src, "\red You must wait before returning to your card form!")
return
close_up()
@@ -429,7 +431,7 @@
else
resting = !resting
icon_state = resting ? "[chassis]_rest" : "[chassis]"
- src << "You are now [resting ? "resting" : "getting up"]"
+ to_chat(src, "You are now [resting ? "resting" : "getting up"]")
canmove = !resting
@@ -438,7 +440,7 @@
if(istype(W, /obj/item/stack/nanopaste))
var/obj/item/stack/nanopaste/N = W
if (stat == DEAD)
- user << "\The [src] is beyond help, at this point."
+ to_chat(user, "\The [src] is beyond help, at this point.")
else if (getBruteLoss() || getFireLoss())
adjustBruteLoss(-15)
adjustFireLoss(-15)
@@ -447,7 +449,7 @@
user.visible_message("[user.name] applied some [W] at [src]'s damaged areas.",\
"You apply some [W] at [src.name]'s damaged areas.")
else
- user << "All [src.name]'s systems are nominal."
+ to_chat(user, "All [src.name]'s systems are nominal.")
return
else if(W.force)
@@ -510,7 +512,7 @@
if(stat || sleeping || paralysis || weakened)
return
if(istype(AM,/obj/item))
- src << "You are far too small to pull anything!"
+ to_chat(src, "You are far too small to pull anything!")
return
/mob/living/silicon/pai/update_canmove()
@@ -536,7 +538,7 @@
pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "\nIt is [pose]"
- user << msg
+ to_chat(user, msg)
/mob/living/silicon/pai/bullet_act(var/obj/item/projectile/Proj)
..(Proj)
@@ -574,9 +576,9 @@
if(Adjacent(H))
get_scooped(H)
else
- src << "You need to stay in reaching distance to be picked up."
+ to_chat(src, "You need to stay in reaching distance to be picked up.")
if("No")
- src << "[H] decided not to pick you up."
+ to_chat(src, "[H] decided not to pick you up.")
else
if(Adjacent(H))
get_scooped(H)
diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm
index c4928878ce9..49b7e394d44 100644
--- a/code/modules/mob/living/silicon/pai/personality.dm
+++ b/code/modules/mob/living/silicon/pai/personality.dm
@@ -17,10 +17,10 @@
var/savefile/F = new /savefile(src.savefile_path(user))
- F["name"] << src.name
- F["description"] << src.description
- F["role"] << src.role
- F["comments"] << src.comments
+ to_chat(F["name"], src.name)
+ to_chat(F["description"], src.description)
+ to_chat(F["role"], src.role)
+ to_chat(F["comments"], src.comments)
F["version"] << 1
diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index fe785adf929..980e1bb09ee 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -351,7 +351,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates
if(O.client && (ROLE_PAI in O.client.prefs.be_special))
if(player_old_enough_antag(O.client,ROLE_PAI))
if(check_recruit(O))
- O << "\blue A pAI card is looking for personalities. (Teleport | Sign Up)"
+ to_chat(O, "\blue A pAI card is looking for personalities. (Teleport | Sign Up)")
//question(O.client)
proc/check_recruit(var/mob/dead/observer/O)
if(jobban_isbanned(O, "pAI") || jobban_isbanned(O,"nonhumandept"))
diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm
index e1cb9f0f800..2c7bc900d68 100644
--- a/code/modules/mob/living/silicon/pai/say.dm
+++ b/code/modules/mob/living/silicon/pai/say.dm
@@ -1,5 +1,5 @@
/mob/living/silicon/pai/say(var/msg)
if(silence_time)
- src << "Communication circuits remain uninitialized."
+ to_chat(src, "Communication circuits remain uninitialized.")
else
..(msg)
\ 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 ef36f5b94c9..e85345db226 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -19,7 +19,7 @@ var/global/list/default_pai_software = list()
var/datum/pai_software/P = new type()
if(pai_software_by_key[P.id])
var/datum/pai_software/O = pai_software_by_key[P.id]
- world << "pAI software module [P.name] has the same key as [O.name]!"
+ to_chat(world, "pAI software module [P.name] has the same key as [O.name]!")
r = 0
continue
pai_software_by_key[P.id] = P
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 5278300ffb5..9019a61b206 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -56,7 +56,7 @@
while(!istype(M, /mob/living))
if(!M || !M.loc || count > 6)
//For a runtime where M ends up in nullspace (similar to bluespace but less colourful)
- src << "You are not being carried by anyone!"
+ to_chat(src, "You are not being carried by anyone!")
return 0
M = M.loc
count++
@@ -68,13 +68,13 @@
for (var/mob/v in viewers(T))
v.show_message("[M] presses \his thumb against [P].", 3, "[P] makes a sharp clicking sound as it extracts DNA material from [M].", 2)
var/datum/dna/dna = M.dna
- P << "[M]'s UE string : [dna.unique_enzymes]
"
+ to_chat(P, "[M]'s UE string : [dna.unique_enzymes]
")
if(dna.unique_enzymes == P.master_dna)
- P << "DNA is a match to stored Master DNA."
+ to_chat(P, "DNA is a match to stored Master DNA.")
else
- P << "DNA does not match stored Master DNA."
+ to_chat(P, "DNA does not match stored Master DNA.")
else
- P << "[M] does not seem like \he is going to provide a DNA sample willingly."
+ to_chat(P, "[M] does not seem like \he is going to provide a DNA sample willingly.")
return 1
/datum/pai_software/radio_config
@@ -149,7 +149,7 @@
return
data["receiver_off"] = M.toff
- data["ringer_off"] = M.silent
+ data["ringer_off"] = M.notify_silent
data["current_ref"] = null
data["current_name"] = user.current_pda_messaging
@@ -205,7 +205,7 @@
M.toff = href_list["toggler"] != "1"
return 1
else if(href_list["ringer"])
- M.silent = href_list["ringer"] != "1"
+ M.notify_silent = href_list["ringer"] != "1"
return 1
else if(href_list["select"])
var/s = href_list["select"]
@@ -222,6 +222,123 @@
M.create_message(P, target, 1)
return 1
+/datum/pai_software/chatroom
+ name = "Digital Chatroom"
+ ram_cost = 5
+ id = "chatroom"
+ toggle = 0
+
+ on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+ var/data[0]
+
+ if(!user.pda)
+ return
+ var/datum/data/pda/app/chatroom/M = user.pda.find_program(/datum/data/pda/app/chatroom)
+ if(!M)
+ return
+
+ data["receiver_off"] = M.toff
+ data["ringer_off"] = M.notify_silent
+
+ var/list/rooms[0]
+ for(var/datum/chatroom/c in chatrooms)
+ if((M in c.users) || (M in c.invites) || c.is_public)
+ rooms += list(list(name = "[c]", ref = "\ref[c]"))
+ data["rooms"] = rooms
+
+ if(M.disconnected || !M.messaging_available(1))
+ data["disconnected"] = 1
+ else if(M.current_room)
+ data["current_room"] = "\ref[M.current_room]"
+ data["current_room_name"] = M.current_room.name
+ data["current_room_topic"] = M.current_room.topic
+ data["messages"] = M.current_room.logs
+ var/list/users[0]
+ for(var/U in M.current_room.users)
+ var/datum/data/pda/app/chatroom/ch = U
+ users += "[ch.pda.owner]"
+ for(var/U in (M.current_room.invites - M.current_room.users))
+ var/datum/data/pda/app/chatroom/ch = U
+ users += "[ch.pda.owner]"
+ data["users"] = users
+
+ ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+ if(!ui)
+ // Don't copy-paste this unless you're making a pAI software module!
+ ui = new(user, user, id, "pai_chatroom.tmpl", "Digital Chatroom", 450, 600)
+ ui.set_initial_data(data)
+ ui.open()
+ ui.set_auto_update(1)
+
+ Topic(href, href_list)
+ var/mob/living/silicon/pai/P = usr
+ if(!istype(P))
+ return
+
+ if(!isnull(P.pda) && P.pda.can_use())
+ var/datum/data/pda/app/chatroom/M = P.pda.find_program(/datum/data/pda/app/chatroom)
+ if(!M)
+ return
+
+ if(href_list["toggler"])
+ M.toff = href_list["toggler"] != "1"
+ return 1
+ else if(href_list["ringer"])
+ M.notify_silent = href_list["ringer"] != "1"
+ return 1
+ else if(href_list["topic"])
+ if(!M.current_room)
+ return 1
+
+ var/t = input("Enter new topic:", M.current_room, M.current_room.topic) as text|null
+ spawn()
+ if(!t || !M.check_messaging_available() || !P.pda.can_use())
+ return
+ t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
+ t = readd_quotes(t)
+ if (!t)
+ return
+
+ M.current_room.topic = t
+ M.current_room.announce(M, "Topic has been changed to '[t]' by [P.pda.owner].")
+ return 1
+ else if(href_list["select"])
+ var/s = href_list["select"]
+ if(s == "*NONE*")
+ M.current_room = null
+ else
+ var/datum/chatroom/CR = locate(s)
+ if(istype(CR))
+ if(!(M in CR.users))
+ if(!CR.login(M))
+ return
+ M.current_room = CR
+ return 1
+ else if(href_list["target"])
+ if(P.silence_time)
+ return alert("Communications circuits remain uninitialized.")
+
+ var/datum/chatroom/target = locate(href_list["target"])
+ if(istype(target))
+ if(!(M in target.users))
+ if(!target.login(M))
+ return
+ var/t = input("Please enter message", target) as text|null
+ spawn()
+ if(!t || !M.check_messaging_available())
+ return
+ t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
+ t = readd_quotes(t)
+ if (!t || !P.pda.can_use())
+ return
+
+ target.post(M, t)
+ return 1
+ else if(href_list["reconnect"])
+ spawn()
+ M.messaging_available()
+ return 1
+
/datum/pai_software/med_records
name = "Medical Records"
ram_cost = 15
@@ -385,9 +502,9 @@
if(!T || !(T.z in config.contact_levels))
break
if(T.loc)
- AI << "Network Alert: Brute-force encryption crack in progress in [T.loc]."
+ to_chat(AI, "Network Alert: Brute-force encryption crack in progress in [T.loc].")
else
- AI << "Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location."
+ to_chat(AI, "Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location.")
var/obj/machinery/door/D = cable.machine
if(!istype(D))
hack_aborted = 1
@@ -585,7 +702,7 @@
while(!isliving(held))
if(!held || !held.loc || count > 6)
//For a runtime where M ends up in nullspace (similar to bluespace but less colourful)
- src << "You are not being carried by anyone!"
+ to_chat(src, "You are not being carried by anyone!")
return 0
held = held.loc
count++
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index ae5ab514307..c6ae0f57ddf 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -184,10 +184,10 @@
/obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
if(( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
user.visible_message("[user] has analyzed the floor's vitals!", "You try to analyze the floor's vitals!")
- user << "Analyzing Results for The floor:\n\t Overall Status: Healthy"
- user << "\t Damage Specifics: [0]-[0]-[0]-[0]"
- user << "Key: Suffocation/Toxin/Burns/Brute"
- user << "Body Temperature: ???"
+ to_chat(user, "Analyzing Results for The floor:\n\t Overall Status: Healthy")
+ to_chat(user, "\t Damage Specifics: [0]-[0]-[0]-[0]")
+ to_chat(user, "Key: Suffocation/Toxin/Burns/Brute")
+ to_chat(user, "Body Temperature: ???")
return
var/scan_type
@@ -196,7 +196,7 @@
else if(istype(M, /mob/living/carbon/human))
scan_type = "prosthetics"
else
- user << "You can't analyze non-robotic things!"
+ to_chat(user, "You can't analyze non-robotic things!")
return
user.visible_message("[user] has analyzed [M]'s components.","You have analyzed [M]'s components.")
@@ -204,14 +204,14 @@
if("robot")
var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss()
var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss()
- user << "Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health]% functional"]"
- user << "\t Key: Electronics/Brute"
- user << "\t Damage Specifics: [BU] - [BR]"
+ to_chat(user, "Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health]% functional"]")
+ to_chat(user, "\t Key: Electronics/Brute")
+ to_chat(user, "\t Damage Specifics: [BU] - [BR]")
if(M.timeofdeath && M.stat == DEAD)
- user << "Time of Disable: [M.timeofdeath]"
+ to_chat(user, "Time of Disable: [M.timeofdeath]")
var/mob/living/silicon/robot/H = M
var/list/damaged = H.get_damaged_components(1,1,1)
- user << "Localized Damage:"
+ to_chat(user, "Localized Damage:")
if(length(damaged)>0)
for(var/datum/robot_component/org in damaged)
user.show_message(text("\t []: [][] - [] - [] - []", \
@@ -222,35 +222,35 @@
(org.toggled) ? "Toggled ON" : "Toggled OFF",\
(org.powered) ? "Power ON" : "Power OFF"),1)
else
- user << "\t Components are OK."
+ to_chat(user, "\t Components are OK.")
if(H.emagged && prob(5))
- user << "\t ERROR: INTERNAL SYSTEMS COMPROMISED"
+ to_chat(user, "\t ERROR: INTERNAL SYSTEMS COMPROMISED")
if("prosthetics")
var/mob/living/carbon/human/H = M
- user << "Analyzing Results for \the [H]:"
- user << "Key: Electronics/Brute"
+ to_chat(user, "Analyzing Results for \the [H]:")
+ to_chat(user, "Key: Electronics/Brute")
- user << "External prosthetics:"
+ to_chat(user, "External prosthetics:")
var/organ_found
if(H.internal_organs.len)
for(var/obj/item/organ/external/E in H.organs)
if(!(E.status & ORGAN_ROBOT))
continue
organ_found = 1
- user << "[E.name]: [round(E.brute_dam)] [round(E.burn_dam)]"
+ to_chat(user, "[E.name]: [round(E.brute_dam)] [round(E.burn_dam)]")
if(!organ_found)
- user << "No prosthetics located."
- user << "
"
- user << "Internal prosthetics:"
+ to_chat(user, "No prosthetics located.")
+ to_chat(user, "
")
+ to_chat(user, "Internal prosthetics:")
organ_found = null
if(H.internal_organs.len)
for(var/obj/item/organ/internal/O in H.internal_organs)
if(!(O.status & ORGAN_ROBOT))
continue
organ_found = 1
- user << "[capitalize(O.name)]: [O.damage]"
+ to_chat(user, "[capitalize(O.name)]: [O.damage]")
if(!organ_found)
- user << "No prosthetics located."
+ to_chat(user, "No prosthetics located.")
src.add_fingerprint(user)
diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm
index 6bff1a8260f..b0dc5062a95 100644
--- a/code/modules/mob/living/silicon/robot/death.dm
+++ b/code/modules/mob/living/silicon/robot/death.dm
@@ -59,7 +59,6 @@
var/obj/machinery/recharge_station/RC = loc
RC.go_out()
- if(blind) blind.layer = 0
sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
see_in_dark = 8
see_invisible = SEE_INVISIBLE_LEVEL_TWO
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index c7ba0de8a64..9a5c1a9f4d5 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -15,11 +15,12 @@
req_access = list(access_engine, access_robotics)
local_transmit = 1
ventcrawler = 2
+ magpulse = 1
// We need to keep track of a few module items so we don't need to do list operations
// every time we need them. These get set in New() after the module is chosen.
var/obj/item/stack/sheet/metal/cyborg/stack_metal = null
- var/obj/item/stack/sheet/wood/cyborg/stack_wood = null
+ var/obj/item/stack/sheet/wood/stack_wood = null
var/obj/item/stack/sheet/glass/cyborg/stack_glass = null
var/obj/item/stack/sheet/mineral/plastic/cyborg/stack_plastic = null
var/obj/item/weapon/matter_decompiler/decompiler = null
@@ -60,7 +61,7 @@
//Grab stacks.
stack_metal = locate(/obj/item/stack/sheet/metal/cyborg) in src.module
- stack_wood = locate(/obj/item/stack/sheet/wood/cyborg) in src.module
+ stack_wood = locate(/obj/item/stack/sheet/wood) in src.module
stack_glass = locate(/obj/item/stack/sheet/glass/cyborg) in src.module
stack_plastic = locate(/obj/item/stack/sheet/mineral/plastic/cyborg) in src.module
@@ -107,11 +108,11 @@
/mob/living/silicon/robot/drone/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/borg/upgrade/))
- user << "\red The maintenance drone chassis not compatible with \the [W]."
+ to_chat(user, "\red The maintenance drone chassis not compatible with \the [W].")
return
else if (istype(W, /obj/item/weapon/crowbar))
- user << "The machine is hermetically sealed. You can't open the case."
+ to_chat(user, "The machine is hermetically sealed. You can't open the case.")
return
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
@@ -119,17 +120,17 @@
if(stat == 2)
if(!config.allow_drone_spawn || emagged || health < -35) //It's dead, Dave.
- user << "\red The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one."
+ to_chat(user, "\red The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.")
return
if(!allowed(usr))
- user << "\red Access denied."
+ to_chat(user, "\red Access denied.")
return
var/delta = (world.time / 10) - last_reboot
if(reboot_cooldown > delta)
var/cooldown_time = round(reboot_cooldown - ((world.time / 10) - last_reboot), 1)
- usr << "\red The reboot system is currently offline. Please wait another [cooldown_time] seconds."
+ to_chat(usr, "\red The reboot system is currently offline. Please wait another [cooldown_time] seconds.")
return
user.visible_message("\red \the [user] swipes \his ID card through \the [src], attempting to reboot it.", "\red You swipe your ID card through \the [src], attempting to reboot it.")
@@ -151,7 +152,7 @@
if(allowed(usr))
shut_down()
else
- user << "\red Access denied."
+ to_chat(user, "\red Access denied.")
return
@@ -159,7 +160,7 @@
/mob/living/silicon/robot/drone/emag_act(user as mob)
if(!client || stat == 2)
- user << "\red There's not much point subverting this heap of junk."
+ to_chat(user, "\red There's not much point subverting this heap of junk.")
return
if(!ishuman(user))
@@ -167,12 +168,12 @@
var/mob/living/carbon/human/H = user
if(emagged)
- src << "\red [user] attempts to load subversive software into you, but your hacked subroutined ignore the attempt."
- user << "\red You attempt to subvert [src], but the sequencer has no effect."
+ to_chat(src, "\red [user] attempts to load subversive software into you, but your hacked subroutined ignore the attempt.")
+ to_chat(user, "\red You attempt to subvert [src], but the sequencer has no effect.")
return
- user << "\red You swipe the sequencer across [src]'s interface and watch its eyes flicker."
- src << "\red You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script."
+ to_chat(user, "\red You swipe the sequencer across [src]'s interface and watch its eyes flicker.")
+ to_chat(src, "\red You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script.")
message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)]. Laws overridden.")
log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.")
@@ -187,9 +188,9 @@
laws = new /datum/ai_laws/syndicate_override
set_zeroth_law("Only [H.real_name] and people he designates as being such are Syndicate Agents.")
- src << "Obey these laws:"
+ to_chat(src, "Obey these laws:")
laws.show_laws(src)
- src << "\red \b ALERT: [H.real_name] is your new master. Obey your new laws and his commands."
+ to_chat(src, "\red \b ALERT: [H.real_name] is your new master. Obey your new laws and his commands.")
return
//DRONE LIFE/DEATH
@@ -228,18 +229,18 @@
/mob/living/silicon/robot/drone/proc/law_resync()
if(stat != 2)
if(emagged)
- src << "\red You feel something attempting to modify your programming, but your hacked subroutines are unaffected."
+ to_chat(src, "\red You feel something attempting to modify your programming, but your hacked subroutines are unaffected.")
else
- src << "\red A reset-to-factory directive packet filters through your data connection, and you obediently modify your programming to suit it."
+ to_chat(src, "\red A reset-to-factory directive packet filters through your data connection, and you obediently modify your programming to suit it.")
full_law_reset()
show_laws()
/mob/living/silicon/robot/drone/proc/shut_down()
if(stat != 2)
if(emagged)
- src << "\red You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you."
+ to_chat(src, "\red You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.")
else
- src << "\red You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself."
+ to_chat(src, "\red You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.")
death()
/mob/living/silicon/robot/drone/proc/full_law_reset()
@@ -277,14 +278,14 @@
player.mob.mind.transfer_to(src)
lawupdate = 0
- src << "Systems rebooted. Loading base pattern maintenance protocol... loaded."
+ to_chat(src, "Systems rebooted. Loading base pattern maintenance protocol... loaded.")
full_law_reset()
- src << "
You are a maintenance drone, a tiny-brained robotic repair machine."
- src << "You have no individual will, no personality, and no drives or urges other than your laws."
- src << "Use ; to talk to other drones, and say to speak silently to your nearby fellows."
- src << "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI."
- src << "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets."
- src << "Make sure crew members do not notice you.."
+ to_chat(src, "
You are a maintenance drone, a tiny-brained robotic repair machine.")
+ to_chat(src, "You have no individual will, no personality, and no drives or urges other than your laws.")
+ to_chat(src, "Use ; to talk to other drones, and say to speak silently to your nearby fellows.")
+ to_chat(src, "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI.")
+ to_chat(src, "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets.")
+ to_chat(src, "Make sure crew members do not notice you..")
/*
sprite["Default"] = "repairbot"
@@ -320,12 +321,12 @@
else if(istype(AM,/obj/item))
var/obj/item/O = AM
if(O.w_class > 2)
- src << "You are too small to pull that."
+ to_chat(src, "You are too small to pull that.")
return
else
..()
else
- src << "You are too small to pull that."
+ to_chat(src, "You are too small to pull that.")
return
/mob/living/silicon/robot/drone/add_robot_verbs()
@@ -337,3 +338,7 @@
/mob/living/silicon/robot/drone/update_canmove()
. = ..()
density = 0 //this is reset every canmove update otherwise
+
+/mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
+ if(affect_silicon)
+ return ..()
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index 50b846c0192..305c89e87cb 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -10,13 +10,13 @@
mail_destination = 0
return
- src << "\blue You configure your internal beacon, tagging yourself for delivery to '[tag]'."
+ to_chat(src, "\blue You configure your internal beacon, tagging yourself for delivery to '[tag]'.")
mail_destination = TAGGERLOCATIONS.Find(tag)
//Auto flush if we use this verb inside a disposal chute.
var/obj/machinery/disposal/D = src.loc
if(istype(D))
- src << "\blue \The [D] acknowledges your signal."
+ to_chat(src, "\blue \The [D] acknowledges your signal.")
D.flush_count = D.flush_every_ticks
return
@@ -28,10 +28,10 @@
if (layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
- src << text("\blue You are now hiding.")
+ to_chat(src, text("\blue You are now hiding."))
else
layer = MOB_LAYER
- src << text("\blue You have stopped hiding.")
+ to_chat(src, text("\blue You have stopped hiding."))
/mob/living/silicon/robot/drone/verb/light()
set name = "Light On/Off"
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index 7717834b7bb..5e7077f7000 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -20,7 +20,7 @@
return
if(!allowed(user))
- user << "\red Access denied."
+ to_chat(user, "\red Access denied.")
return
interact(user)
@@ -54,7 +54,7 @@
return
if(!allowed(usr))
- usr << "\red Access denied."
+ to_chat(usr, "\red Access denied.")
return
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
@@ -69,21 +69,21 @@
return
drone_call_area = t_area
- usr << "\blue You set the area selector to [drone_call_area]."
+ to_chat(usr, "\blue You set the area selector to [drone_call_area].")
else if (href_list["ping"])
- usr << "\blue You issue a maintenance request for all active drones, highlighting [drone_call_area]."
+ to_chat(usr, "\blue You issue a maintenance request for all active drones, highlighting [drone_call_area].")
for(var/mob/living/silicon/robot/drone/D in world)
if(D.client && D.stat == 0)
- D << "-- Maintenance drone presence requested in: [drone_call_area]."
+ to_chat(D, "-- Maintenance drone presence requested in: [drone_call_area].")
else if (href_list["resync"])
var/mob/living/silicon/robot/drone/D = locate(href_list["resync"])
if(D.stat != 2)
- usr << "\red You issue a law synchronization directive for the drone."
+ to_chat(usr, "\red You issue a law synchronization directive for the drone.")
D.law_resync()
else if (href_list["shutdown"])
@@ -91,7 +91,7 @@
var/mob/living/silicon/robot/drone/D = locate(href_list["shutdown"])
if(D.stat != 2)
- usr << "\red You issue a kill command for the unfortunate drone."
+ to_chat(usr, "\red You issue a kill command for the unfortunate drone.")
message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.")
D.shut_down()
@@ -106,10 +106,10 @@
continue
dronefab = fab
- usr << "\blue Drone fabricator located."
+ to_chat(usr, "\blue Drone fabricator located.")
return
- usr << "\red Unable to locate drone fabricator."
+ to_chat(usr, "\red Unable to locate drone fabricator.")
else if (href_list["toggle_fab"])
@@ -118,10 +118,10 @@
if(get_dist(src,dronefab) > 3)
dronefab = null
- usr << "\red Unable to locate drone fabricator."
+ to_chat(usr, "\red Unable to locate drone fabricator.")
return
dronefab.produce_drones = !dronefab.produce_drones
- usr << "\blue You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator."
+ to_chat(usr, "\blue You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.")
src.updateUsrDialog()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 1a3c52ad8be..b5026a882fe 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -72,7 +72,7 @@
return
if(!silent)
- src.loc << "You drop \the [wrapped]."
+ to_chat(src.loc, "You drop \the [wrapped].")
wrapped.forceMove(get_turf(src))
wrapped = null
@@ -125,12 +125,12 @@
//We can grab the item, finally.
if(grab)
- user << "You collect \the [I]."
+ to_chat(user, "You collect \the [I].")
I.forceMove(src)
wrapped = I
return
else
- user << "Your gripper cannot hold \the [target]."
+ to_chat(user, "Your gripper cannot hold \the [target].")
else if(istype(target,/obj/machinery/power/apc))
var/obj/machinery/power/apc/A = target
@@ -198,15 +198,15 @@
if(!istype(D))
return
- D << "You begin decompiling the other drone."
+ to_chat(D, "You begin decompiling the other drone.")
if(!do_after(D,50, target = target))
- D << "You need to remain still while decompiling such a large object."
+ to_chat(D, "You need to remain still while decompiling such a large object.")
return
if(!M || !D) return
- D << "You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself."
+ to_chat(D, "You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself.")
qdel(M)
new/obj/effect/decal/cleanable/blood/oil(get_turf(src))
@@ -279,16 +279,16 @@
grabbed_something = 1
if(grabbed_something)
- user << "You deploy your decompiler and clear out the contents of \the [T]."
+ to_chat(user, "You deploy your decompiler and clear out the contents of \the [T].")
else
- user << "Nothing on \the [T] is useful to you."
+ to_chat(user, "Nothing on \the [T] is useful to you.")
return
//PRETTIER TOOL LIST.
/mob/living/silicon/robot/drone/installed_modules()
if(weapon_lock)
- src << "Weapon lock active, unable to use modules! Count:[weaponlock_time]"
+ to_chat(src, "Weapon lock active, unable to use modules! Count:[weaponlock_time]")
return
if(!module)
@@ -364,7 +364,7 @@
stack = stack_glass
if("wood")
if(!stack_wood)
- stack_wood = new /obj/item/stack/sheet/wood/cyborg(src.module)
+ stack_wood = new /obj/item/stack/sheet/wood(src.module)
stack_wood.amount = 1
stack = stack_wood
if("plastic")
@@ -374,4 +374,4 @@
stack = stack_plastic
stack.amount++
- decompiler.stored_comms[type]--;
\ No newline at end of file
+ decompiler.stored_comms[type]--
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
index 3a0bb1d4ad2..881fde51dee 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
@@ -48,7 +48,7 @@
/obj/machinery/drone_fabricator/examine(mob/user)
..(user)
if(produce_drones && drone_progress >= 100 && istype(user,/mob/dead) && config.allow_drone_spawn && count_drones() < config.max_maint_drones)
- user << "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone."
+ to_chat(user, "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone.")
/obj/machinery/drone_fabricator/proc/count_drones()
var/drones = 0
@@ -85,7 +85,7 @@
set desc = "If there is a powered, enabled fabricator in the game world with a prepared chassis, join as a maintenance drone."
if(!(config.allow_drone_spawn))
- src << "\red That verb is not currently permitted."
+ to_chat(src, "\red That verb is not currently permitted.")
return
if (!src.stat)
@@ -95,17 +95,17 @@
return 0 //something is terribly wrong
if(jobban_isbanned(src,"nonhumandept") || jobban_isbanned(src,"Drone"))
- usr << "\red You are banned from playing drones and cannot spawn as a drone."
+ to_chat(usr, "\red You are banned from playing drones and cannot spawn as a drone.")
return
if(!ticker || ticker.current_state < 3)
- src << "You can't join as a drone before the game starts!"
+ to_chat(src, "You can't join as a drone before the game starts!")
return
var/drone_age = 14 // 14 days to play as a drone
var/player_age_check = check_client_age(usr.client, drone_age)
if(player_age_check && config.use_age_restriction_for_antags)
- usr << "This role is not yet available to you. You need to wait another [player_age_check] days."
+ to_chat(usr, "This role is not yet available to you. You need to wait another [player_age_check] days.")
return
var/deathtime = world.time - src.timeofdeath
@@ -113,7 +113,7 @@
if(istype(src,/mob/dead/observer))
var/mob/dead/observer/G = src
if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
- usr << "\blue Upon using the antagHUD you forfeited the ability to join the round."
+ to_chat(usr, "\blue Upon using the antagHUD you forfeited the ability to join the round.")
return
if(G.started_as_observer == 1)
joinedasobserver = 1
@@ -129,8 +129,8 @@
var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
if (deathtime < 6000 && joinedasobserver == 0)
- usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
- usr << "You must wait 10 minutes to respawn as a drone!"
+ to_chat(usr, "You have been dead for[pluralcheck] [deathtimeseconds] seconds.")
+ to_chat(usr, "You must wait 10 minutes to respawn as a drone!")
return
for(var/obj/machinery/drone_fabricator/DF in world)
@@ -138,11 +138,11 @@
continue
if(DF.count_drones() >= config.max_maint_drones)
- src << "\red There are too many active drones in the world for you to spawn."
+ to_chat(src, "\red There are too many active drones in the world for you to spawn.")
return
if(DF.drone_progress >= 100)
DF.create_drone(src.client)
return
- src << "\red There are no available drone spawn points, sorry."
\ No newline at end of file
+ to_chat(src, "\red There are no available drone spawn points, sorry.")
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
index b08e9c32145..9ce0b6c027e 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
@@ -2,7 +2,7 @@
if(local_transmit)
if (src.client)
if(client.prefs.muted & MUTE_IC)
- src << "You cannot send IC messages (muted)."
+ to_chat(src, "You cannot send IC messages (muted).")
return 0
if (src.client.handle_spam_prevention(message,MUTE_IC))
return 0
@@ -29,13 +29,13 @@
for(var/mob/living/silicon/D in listeners)
if(D.client && D.local_transmit)
- D << "[src] transmits, \"[message]\""
+ to_chat(D, "[src] transmits, \"[message]\"")
for (var/mob/M in player_list)
if (istype(M, /mob/new_player))
continue
- else if(M.stat == 2 && M.client.prefs.toggles & CHAT_GHOSTEARS)
- if(M.client) M << "[src] transmits, \"[message]\""
+ else if(M.stat == 2 && M.client && M.client.prefs.toggles & CHAT_GHOSTEARS)
+ to_chat(M, "[src] transmits, \"[message]\"")
return 1
return ..(message, 0)
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 2ad6045b01d..0c841f41207 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -143,7 +143,7 @@
playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0)
m_type = 2
else
- src << "You are not THE LAW, pal."
+ to_chat(src, "You are not THE LAW, pal.")
if("halt")
if (istype(module,/obj/item/weapon/robot_module/security))
@@ -152,7 +152,7 @@
playsound(src.loc, 'sound/voice/halt.ogg', 50, 0)
m_type = 2
else
- src << "You are not security."
+ to_chat(src, "You are not security.")
if ("flip")
m_type = 1
@@ -160,6 +160,6 @@
src.SpinAnimation(5,1)
if ("help")
- src << "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt"
+ to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt")
..(act, m_type, message)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm
index 0ac9da63052..8d2af648463 100644
--- a/code/modules/mob/living/silicon/robot/examine.dm
+++ b/code/modules/mob/living/silicon/robot/examine.dm
@@ -44,5 +44,5 @@
pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "\nIt is [pose]"
- user << msg
+ to_chat(user, msg)
user.showLaws(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index 7a6ce804eff..97b15ecda1a 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -43,14 +43,14 @@
if(!(locate(O) in src.module.modules) && O != src.module.emag)
return
if(activated(O))
- src << "Already activated"
+ to_chat(src, "Already activated")
return
if (is_component_functioning("power cell") && cell)
if(istype(O, /obj/item/borg))
var/obj/item/borg/B = O
if(B.powerneeded)
if((cell.charge * 100 / cell.maxcharge) < B.powerneeded)
- src << "Not enough power to activate [B.name]!"
+ to_chat(src, "Not enough power to activate [B.name]!")
return
if(!module_state_1)
O.mouse_opacity = initial(O.mouse_opacity)
@@ -77,7 +77,7 @@
if(istype(module_state_3,/obj/item/borg/sight))
sight_mode |= module_state_3:sight_mode
else
- src << "You need to disable a module first!"
+ to_chat(src, "You need to disable a module first!")
src.update_icons()
/mob/living/silicon/robot/proc/uneq_active()
@@ -241,3 +241,9 @@
if(I == module_active)
deselect_module(get_selected_module())
return ..()
+
+/mob/living/silicon/robot/proc/update_module_icon()
+ if(!module)
+ hands.icon_state = "nomod"
+ else
+ hands.icon_state = lowertext(module.module_type)
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
index 2dc3b4e3916..bc575831537 100644
--- a/code/modules/mob/living/silicon/robot/laws.dm
+++ b/code/modules/mob/living/silicon/robot/laws.dm
@@ -14,30 +14,30 @@
if(lawupdate)
if (connected_ai)
if(connected_ai.stat || connected_ai.control_disabled)
- src << "AI signal lost, unable to sync laws."
+ to_chat(src, "AI signal lost, unable to sync laws.")
else
lawsync()
photosync()
- src << "Laws synced with AI, be sure to note any changes."
+ to_chat(src, "Laws synced with AI, be sure to note any changes.")
// TODO: Update to new antagonist system.
if(mind && mind.special_role == "traitor" && mind.original == src)
- src << "Remember, your AI does NOT share or know about your law 0."
+ to_chat(src, "Remember, your AI does NOT share or know about your law 0.")
else
- src << "No AI selected to sync laws with, disabling lawsync protocol."
+ to_chat(src, "No AI selected to sync laws with, disabling lawsync protocol.")
lawupdate = 0
- who << "Obey these laws:"
+ to_chat(who, "Obey these laws:")
laws.show_laws(who)
// TODO: Update to new antagonist system.
if (mind && (mind.special_role == "traitor" && mind.original == src) && connected_ai)
- who << "Remember, [connected_ai.name] is technically your master, but your objective comes first."
+ to_chat(who, "Remember, [connected_ai.name] is technically your master, but your objective comes first.")
else if (connected_ai)
- who << "Remember, [connected_ai.name] is your master, other AIs can be ignored."
+ to_chat(who, "Remember, [connected_ai.name] is your master, other AIs can be ignored.")
else if (emagged)
- who << "Remember, you are not required to listen to the AI."
+ to_chat(who, "Remember, you are not required to listen to the AI.")
else
- who << "Remember, you are not bound to any AI, you are not required to listen to them."
+ to_chat(who, "Remember, you are not bound to any AI, you are not required to listen to them.")
/mob/living/silicon/robot/lawsync()
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 5e65c6d75b8..d247d726003 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -29,7 +29,7 @@
for(var/obj/item/borg/B in get_all_slots())
if(B.powerneeded)
if((cell.charge * 100 / cell.maxcharge) < B.powerneeded)
- src << "Deactivating [B.name] due to lack of power!"
+ to_chat(src, "Deactivating [B.name] due to lack of power!")
uneq_module(B)
if(cell.charge <= 0)
uneq_all()
@@ -102,15 +102,15 @@
if(!istype(src, /mob/living/silicon/robot/drone))
if(health < 50) //Gradual break down of modules as more damage is sustained
if(uneq_module(module_state_3))
- src << "SYSTEM ERROR: Module 3 OFFLINE."
+ to_chat(src, "SYSTEM ERROR: Module 3 OFFLINE.")
if(health < 0)
if(uneq_module(module_state_2))
- src << "SYSTEM ERROR: Module 2 OFFLINE."
+ to_chat(src, "SYSTEM ERROR: Module 2 OFFLINE.")
if(health < -50)
if(uneq_module(module_state_1))
- src << "CRITICAL ERROR: All modules OFFLINE."
+ to_chat(src, "CRITICAL ERROR: All modules OFFLINE.")
if(paralysis || stunned || weakened)
stat = UNCONSCIOUS
@@ -261,10 +261,8 @@
/mob/living/silicon/robot/proc/update_items()
if (src.client)
- src.client.screen -= src.contents
- for(var/obj/I in src.contents)
- if(I && !(istype(I,/obj/item/weapon/stock_parts/cell) || istype(I,/obj/item/device/radio) || istype(I,/obj/machinery/camera) || istype(I,/obj/item/device/mmi)))
- src.client.screen += I
+ for(var/obj/I in get_all_slots())
+ client.screen |= I
if(src.module_state_1)
src.module_state_1:screen_loc = ui_inv1
if(src.module_state_2)
@@ -279,7 +277,7 @@
weaponlock_time --
if(weaponlock_time <= 0)
if(src.client)
- src << "\red Weapon Lock Timed Out!"
+ to_chat(src, "\red Weapon Lock Timed Out!")
weapon_lock = 0
weaponlock_time = 120
diff --git a/code/modules/mob/living/silicon/robot/photos.dm b/code/modules/mob/living/silicon/robot/photos.dm
index fbcc3bf4842..33f739c41c9 100644
--- a/code/modules/mob/living/silicon/robot/photos.dm
+++ b/code/modules/mob/living/silicon/robot/photos.dm
@@ -10,4 +10,4 @@
aiCamera.printpicture(null, z)
synced = 1
if(synced)
- src << "Locally saved images synced with AI. Images were retained in local database in case of loss of connection with the AI."
+ to_chat(src, "Locally saved images synced with AI. Images were retained in local database in case of loss of connection with the AI.")
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 9856575f4f2..390ad8d07dc 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -175,11 +175,11 @@ var/list/robot_verbs_default = list(
//Check for custom sprite
if(!custom_sprite)
var/file = file2text("config/custom_sprites.txt")
- var/lines = text2list(file, "\n")
+ var/lines = splittext(file, "\n")
for(var/line in lines)
// split & clean up
- var/list/Entry = text2list(line, ";")
+ var/list/Entry = splittext(line, ";")
for(var/i = 1 to Entry.len)
Entry[i] = trim(Entry[i])
@@ -247,7 +247,7 @@ var/list/robot_verbs_default = list(
mind.transfer_to(mmi.brainmob)
mmi.update_icon()
else
- src << "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug."
+ to_chat(src, "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.")
ghostize()
error("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].")
mmi = null
@@ -266,7 +266,7 @@ var/list/robot_verbs_default = list(
return
var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis)
- src << "\red Crisis mode active. Combat module available."
+ to_chat(src, "\red Crisis mode active. Combat module available.")
modules+="Combat"
if(ticker && ticker.mode && ticker.mode.name == "nations")
var/datum/game_mode/nations/N = ticker.mode
@@ -353,13 +353,11 @@ var/list/robot_verbs_default = list(
if("Peacekeeper")
module = new /obj/item/weapon/robot_module/peacekeeper(src)
- icon_state = "droidpeace"
module.channels = list()
icon_state = "droidpeace"
if("Hunter")
module = new /obj/item/weapon/robot_module/alien/hunter(src)
- hands.icon_state = "standard"
icon = "icons/mob/alien.dmi"
icon_state = "xenoborg-state-a"
modtype = "Xeno-Hu"
@@ -375,7 +373,7 @@ var/list/robot_verbs_default = list(
if (custom_sprite == 1)
module_sprites["Custom"] = "[src.ckey]-[modtype]"
- hands.icon_state = lowertext(modtype)
+ hands.icon_state = lowertext(module.module_type)
feedback_inc("cyborg_[lowertext(modtype)]",1)
rename_character(real_name, get_default_name())
@@ -419,7 +417,7 @@ var/list/robot_verbs_default = list(
set name = "Self Diagnosis"
if(!is_component_functioning("diagnosis unit"))
- src << "\red Your self-diagnosis component isn't functioning."
+ to_chat(src, "\red Your self-diagnosis component isn't functioning.")
var/dat = self_diagnosis()
src << browse(dat, "window=robotdiagnosis")
@@ -444,10 +442,10 @@ var/list/robot_verbs_default = list(
var/datum/robot_component/C = components[toggle]
if(C.toggled)
C.toggled = 0
- src << "\red You disable [C.name]."
+ to_chat(src, "\red You disable [C.name].")
else
C.toggled = 1
- src << "\red You enable [C.name]."
+ to_chat(src, "\red You enable [C.name].")
/mob/living/silicon/robot/proc/sensor_mode()
set name = "Set Sensor Augmentation"
@@ -555,7 +553,7 @@ var/list/robot_verbs_default = list(
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(20))
- usr << "\red You fail to push [tmob]'s fat ass out of the way."
+ to_chat(usr, "\red You fail to push [tmob]'s fat ass out of the way.")
now_pushing = 0
return
if(!(tmob.status_flags & CANPUSH))
@@ -597,7 +595,7 @@ var/list/robot_verbs_default = list(
C.brute_damage = WC.brute
C.electronics_damage = WC.burn
- usr << "\blue You install the [W.name]."
+ to_chat(usr, "\blue You install the [W.name].")
return
@@ -605,7 +603,7 @@ var/list/robot_verbs_default = list(
if(W == module_active)
return
if (!getBruteLoss())
- user << "Nothing to fix!"
+ to_chat(user, "Nothing to fix!")
return
var/obj/item/weapon/weldingtool/WT = W
user.changeNext_move(CLICK_CD_MELEE)
@@ -616,13 +614,13 @@ var/list/robot_verbs_default = list(
add_fingerprint(user)
user.visible_message("\The [user] patches some dents on \the [src] with \the [WT].")
else
- user << "Need more welding fuel!"
+ to_chat(user, "Need more welding fuel!")
return
else if(istype(W, /obj/item/stack/cable_coil) && user.a_intent == I_HELP && (wiresexposed || istype(src,/mob/living/silicon/robot/drone)))
if (!getFireLoss())
- user << "Nothing to fix!"
+ to_chat(user, "Nothing to fix!")
return
var/obj/item/stack/cable_coil/coil = W
adjustFireLoss(-30)
@@ -634,18 +632,18 @@ var/list/robot_verbs_default = list(
else if (istype(W, /obj/item/weapon/crowbar)) // crowbar means open or close the cover
if(opened)
if(cell)
- user << "You close the cover."
+ to_chat(user, "You close the cover.")
opened = 0
update_icons()
else if(wiresexposed && wires.IsAllCut())
//Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob.
if(!mmi)
- user << "\The [src] has no brain to remove."
+ to_chat(user, "\The [src] has no brain to remove.")
return
- user << "You jam the crowbar into the robot and begin levering [mmi]."
+ to_chat(user, "You jam the crowbar into the robot and begin levering [mmi].")
if(do_after(user,3 SECONDS, target = src))
- user << "You damage some parts of the chassis, but eventually manage to rip out [mmi]!"
+ to_chat(user, "You damage some parts of the chassis, but eventually manage to rip out [mmi]!")
var/obj/item/robot_parts/robot_suit/C = new/obj/item/robot_parts/robot_suit(loc)
C.l_leg = new/obj/item/robot_parts/l_leg(C)
C.r_leg = new/obj/item/robot_parts/r_leg(C)
@@ -671,7 +669,7 @@ var/list/robot_verbs_default = list(
return
var/datum/robot_component/C = components[remove]
var/obj/item/robot_parts/robot_component/I = C.wrapped
- user << "You remove \the [I]."
+ to_chat(user, "You remove \the [I].")
if(istype(I))
I.brute = C.brute_damage
I.burn = C.electronics_damage
@@ -684,23 +682,23 @@ var/list/robot_verbs_default = list(
else
if(locked)
- user << "The cover is locked and cannot be opened."
+ to_chat(user, "The cover is locked and cannot be opened.")
else
- user << "You open the cover."
+ to_chat(user, "You open the cover.")
opened = 1
update_icons()
else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened) // trying to put a cell inside
var/datum/robot_component/C = components["power cell"]
if(wiresexposed)
- user << "Close the panel first."
+ to_chat(user, "Close the panel first.")
else if(cell)
- user << "There is a power cell already installed."
+ to_chat(user, "There is a power cell already installed.")
else
user.drop_item()
W.loc = src
cell = W
- user << "You insert the power cell."
+ to_chat(user, "You insert the power cell.")
C.installed = 1
C.wrapped = W
@@ -714,55 +712,55 @@ var/list/robot_verbs_default = list(
if (wiresexposed)
wires.Interact(user)
else
- user << "You can't reach the wiring."
+ to_chat(user, "You can't reach the wiring.")
else if(istype(W, /obj/item/weapon/screwdriver) && opened && !cell) // haxing
wiresexposed = !wiresexposed
- user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
+ to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]")
update_icons()
else if(istype(W, /obj/item/weapon/screwdriver) && opened && cell) // radio
if(radio)
radio.attackby(W,user)//Push it to the radio to let it handle everything
else
- user << "Unable to locate a radio."
+ to_chat(user, "Unable to locate a radio.")
update_icons()
else if(istype(W, /obj/item/device/encryptionkey/) && opened)
if(radio)//sanityyyyyy
radio.attackby(W,user)//GTFO, you have your own procs
else
- user << "Unable to locate a radio."
+ to_chat(user, "Unable to locate a radio.")
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card
if(emagged)//still allow them to open the cover
- user << "The interface seems slightly damaged"
+ to_chat(user, "The interface seems slightly damaged")
if(opened)
- user << "You must close the cover to swipe an ID card."
+ to_chat(user, "You must close the cover to swipe an ID card.")
else
if(allowed(usr))
locked = !locked
- user << "You [ locked ? "lock" : "unlock"] [src]'s interface."
+ to_chat(user, "You [ locked ? "lock" : "unlock"] [src]'s interface.")
update_icons()
else
- user << "\red Access denied."
+ to_chat(user, "\red Access denied.")
else if(istype(W, /obj/item/borg/upgrade/))
var/obj/item/borg/upgrade/U = W
if(!opened)
- user << "You must access the borgs internals!"
+ to_chat(user, "You must access the borgs internals!")
else if(!src.module && U.require_module)
- user << "The borg must choose a module before it can be upgraded!"
+ to_chat(user, "The borg must choose a module before it can be upgraded!")
else if(U.locked)
- user << "The upgrade is locked and cannot be used yet!"
+ to_chat(user, "The upgrade is locked and cannot be used yet!")
else
if(!user.drop_item())
return
if(U.action(src))
- user << "You apply the upgrade to [src]."
+ to_chat(user, "You apply the upgrade to [src].")
U.forceMove(src)
else
- user << "Upgrade error."
+ to_chat(user, "Upgrade error.")
else
spark_system.start()
@@ -774,16 +772,16 @@ var/list/robot_verbs_default = list(
var/mob/living/M = user
if(!opened)//Cover is closed
if(locked)
- user << "You emag the cover lock."
+ to_chat(user, "You emag the cover lock.")
locked = 0
else
- user << "The cover is already unlocked."
+ to_chat(user, "The cover is already unlocked.")
return
if(opened)//Cover is open
if(emagged) return//Prevents the X has hit Y with Z message also you cant emag them twice
if(wiresexposed)
- user << "You must close the panel first"
+ to_chat(user, "You must close the panel first")
return
else
sleep(6)
@@ -791,7 +789,7 @@ var/list/robot_verbs_default = list(
if(src.hud_used)
src.hud_used.update_robot_modules_display() //Shows/hides the emag item if the inventory screen is already open.
disconnect_from_ai()
- user << "You emag [src]'s interface."
+ to_chat(user, "You emag [src]'s interface.")
// message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.")
log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.")
clear_supplied_laws()
@@ -800,22 +798,22 @@ var/list/robot_verbs_default = list(
var/time = time2text(world.realtime,"hh:mm:ss")
lawchanges.Add("[time] : [M.name]([M.key]) emagged [name]([key])")
set_zeroth_law("Only [M.real_name] and people he designates as being such are Syndicate Agents.")
- src << "\red ALERT: Foreign software detected."
+ to_chat(src, "\red ALERT: Foreign software detected.")
sleep(5)
- src << "\red Initiating diagnostics..."
+ to_chat(src, "\red Initiating diagnostics...")
sleep(20)
- src << "\red SynBorg v1.7 loaded."
+ to_chat(src, "\red SynBorg v1.7 loaded.")
sleep(5)
- src << "\red LAW SYNCHRONISATION ERROR"
+ to_chat(src, "\red LAW SYNCHRONISATION ERROR")
sleep(5)
- src << "\red Would you like to send a report to NanoTraSoft? Y/N"
+ to_chat(src, "\red Would you like to send a report to NanoTraSoft? Y/N")
sleep(10)
- src << "\red > N"
+ to_chat(src, "\red > N")
sleep(20)
- src << "\red ERRORERRORERROR"
- src << "Obey these laws:"
+ to_chat(src, "\red ERRORERRORERROR")
+ to_chat(src, "Obey these laws:")
laws.show_laws(src)
- src << "\red \b ALERT: [M.real_name] is your new master. Obey your new laws and his commands."
+ to_chat(src, "\red \b ALERT: [M.real_name] is your new master. Obey your new laws and his commands.")
if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
for(var/obj/item/weapon/pickaxe/drill/cyborg/D in src.module.modules)
qdel(D)
@@ -824,6 +822,9 @@ var/list/robot_verbs_default = list(
if(src.module && istype(src.module, /obj/item/weapon/robot_module/medical))
for(var/obj/item/weapon/borg_defib/F in src.module.modules)
F.safety = 0
+ if(module)
+ module.module_type = "Malf" // For the cool factor
+ update_module_icon()
update_icons()
return
@@ -836,15 +837,15 @@ var/list/robot_verbs_default = list(
if("Yes")
locked = 0
update_icons()
- usr << "You unlock your cover."
+ to_chat(usr, "You unlock your cover.")
/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if (istype(loc, /turf) && istype(loc.loc, /area/start))
- M << "No attacking people at spawn, you jackass."
+ to_chat(M, "No attacking people at spawn, you jackass.")
return
switch(M.a_intent)
@@ -865,7 +866,7 @@ var/list/robot_verbs_default = list(
visible_message("[M] has slashed at [src]!",\
"[M] has slashed at [src]!")
if(prob(8))
- flick("noise", flash)
+ flash_eyes(affect_silicon = 1)
adjustBruteLoss(damage)
updatehealth()
else
@@ -894,7 +895,7 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/attack_slime(mob/living/carbon/slime/M as mob)
if(..()) //successful slime shock
- flick("noise", flash)
+ flash_eyes(affect_silicon = 1)
var/stunprob = M.powerlevel * 7 + 10
if(prob(stunprob) && M.powerlevel >= 8)
adjustBruteLoss(M.powerlevel * rand(6,10))
@@ -946,7 +947,7 @@ var/list/robot_verbs_default = list(
cell.updateicon()
cell.add_fingerprint(user)
user.put_in_active_hand(cell)
- user << "You remove \the [cell]."
+ to_chat(user, "You remove \the [cell].")
cell = null
update_icons()
diag_hud_set_borgcell()
@@ -1031,7 +1032,7 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/proc/installed_modules()
if(weapon_lock)
- src << "\red Weapon lock active, unable to use modules! Count:[weaponlock_time]"
+ to_chat(src, "\red Weapon lock active, unable to use modules! Count:[weaponlock_time]")
return
if(!module)
@@ -1118,9 +1119,9 @@ var/list/robot_verbs_default = list(
module_state_3 = null
contents -= O
else
- src << "Module isn't activated."
+ to_chat(src, "Module isn't activated.")
else
- src << "Module isn't activated"
+ to_chat(src, "Module isn't activated")
installed_modules()
return 1
@@ -1131,19 +1132,19 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/proc/control_headlamp()
if(stat || lamp_recharging)
- src << "This function is currently offline."
+ to_chat(src, "This function is currently offline.")
return
//Some sort of magical "modulo" thing which somehow increments lamp power by 2, until it hits the max and resets to 0.
lamp_intensity = (lamp_intensity+2) % (lamp_max+2)
- src << "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]"
+ to_chat(src, "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]")
update_headlamp()
/mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0, var/cooldown = 100)
set_light(0)
if(lamp_intensity && (turn_off || stat))
- src << "Your headlamp has been deactivated."
+ to_chat(src, "Your headlamp has been deactivated.")
lamp_intensity = 0
lamp_recharging = 1
spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long.
@@ -1199,7 +1200,7 @@ var/list/robot_verbs_default = list(
cleaned_human.shoes.clean_blood()
cleaned_human.update_inv_shoes(0,0)
cleaned_human.clean_blood()
- cleaned_human << "[src] cleans your face!"
+ to_chat(cleaned_human, "[src] cleans your face!")
return
#undef BORG_CAMERA_BUFFER
@@ -1237,7 +1238,7 @@ var/list/robot_verbs_default = list(
if(R)
R.UnlinkSelf()
- R << "Buffers flushed and reset. Camera system shutdown. All systems operational."
+ to_chat(R, "Buffers flushed and reset. Camera system shutdown. All systems operational.")
src.verbs -= /mob/living/silicon/robot/proc/ResetSecurityCodes
/mob/living/silicon/robot/mode()
@@ -1276,9 +1277,12 @@ var/list/robot_verbs_default = list(
if(icontype)
icon_state = module_sprites[icontype]
+ if(icontype == "Bro")
+ module.module_type = "Brobot"
+ update_module_icon()
lockcharge = null
else
- src << "Something is badly wrong with the sprite selection. Harass a coder."
+ to_chat(src, "Something is badly wrong with the sprite selection. Harass a coder.")
icon_state = module_sprites[1]
lockcharge = null
return
@@ -1294,18 +1298,18 @@ var/list/robot_verbs_default = list(
triesleft = 0
return
else
- src << "Your icon has been set. You now require a module reset to change it."
+ to_chat(src, "Your icon has been set. You now require a module reset to change it.")
/mob/living/silicon/robot/proc/notify_ai(var/notifytype, var/oldname, var/newname)
if(!connected_ai)
return
switch(notifytype)
if(1) //New Cyborg
- connected_ai << "
NOTICE - New cyborg connection detected: [name]
"
+ to_chat(connected_ai, "
NOTICE - New cyborg connection detected: [name]
")
if(2) //New Module
- connected_ai << "
NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.
"
+ to_chat(connected_ai, "
NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.
")
if(3) //New Name
- connected_ai << "
NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
"
+ to_chat(connected_ai, "
NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
")
/mob/living/silicon/robot/proc/disconnect_from_ai()
if(connected_ai)
@@ -1325,6 +1329,10 @@ var/list/robot_verbs_default = list(
if (suiciding)
..()
+/mob/living/silicon/robot/regenerate_icons()
+ ..()
+ update_module_icon()
+
/mob/living/silicon/robot/deathsquad
base_icon = "nano_bloodhound"
icon_state = "nano_bloodhound"
@@ -1354,7 +1362,7 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/deathsquad/attack_hand(mob/user)
if(isnull(ckey) && !searching_for_ckey)
searching_for_ckey = 1
- user << "Now checking for possible borgs."
+ to_chat(user, "Now checking for possible borgs.")
var/list/borg_candidates = pollCandidates("Do you want to play as a Nanotrasen Combat borg?")
if(borg_candidates.len > 0 && isnull(ckey))
searching_for_ckey = 0
@@ -1366,10 +1374,10 @@ var/list/robot_verbs_default = list(
key = M.key
else
searching_for_ckey = 0
- user << "Unable to connect to Central Command. Please wait and try again later."
+ to_chat(user, "Unable to connect to Central Command. Please wait and try again later.")
return
else
- user << "[src] is already checking for possible borgs."
+ to_chat(user, "[src] is already checking for possible borgs.")
return
/mob/living/silicon/robot/syndicate
@@ -1402,7 +1410,7 @@ var/list/robot_verbs_default = list(
spawn(5)
if(playstyle_string)
- src << playstyle_string
+ to_chat(src, playstyle_string)
playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0)
@@ -1458,4 +1466,4 @@ var/list/robot_verbs_default = list(
status_flags &= ~CANPUSH
- notify_ai(2)
\ No newline at end of file
+ notify_ai(2)
diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm
index a8bd77155fa..54bc69b7020 100644
--- a/code/modules/mob/living/silicon/robot/robot_damage.dm
+++ b/code/modules/mob/living/silicon/robot/robot_damage.dm
@@ -8,8 +8,8 @@
update_revive()
var/mob/dead/observer/ghost = get_ghost()
if(ghost)
- ghost << "Your cyborg shell has been repaired, re-enter if you want to continue! (Verbs -> Ghost -> Re-enter corpse)"
- ghost << sound('sound/effects/genetics.ogg')
+ to_chat(ghost, "Your cyborg shell has been repaired, re-enter if you want to continue! (Verbs -> Ghost -> Re-enter corpse)")
+ to_chat(ghost, sound('sound/effects/genetics.ogg'))
return
@@ -90,11 +90,11 @@
cell.charge -= cost
if(cell.charge <= 0)
cell.charge = 0
- src << "\red Your shield has overloaded!"
+ to_chat(src, "\red Your shield has overloaded!")
else
brute -= absorb_brute
burn -= absorb_burn
- src << "\red Your shield absorbs some of the impact!"
+ to_chat(src, "\red Your shield absorbs some of the impact!")
var/datum/robot_component/armour/A = get_armour()
if(A)
@@ -141,11 +141,11 @@
cell.charge -= cost
if(cell.charge <= 0)
cell.charge = 0
- src << "\red Your shield has overloaded!"
+ to_chat(src, "\red Your shield has overloaded!")
else
brute -= absorb_brute
burn -= absorb_burn
- src << "\red Your shield absorbs some of the impact!"
+ to_chat(src, "\red Your shield absorbs some of the impact!")
var/datum/robot_component/armour/A = get_armour()
if(A)
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index 965503cb288..13c48d03ac5 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -21,7 +21,7 @@
mode = 2
else
mode = 1
- user << "Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'"
+ to_chat(user, "Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'")
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
return
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index ca2e0c30fef..3a9a3fcc2c4 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -11,6 +11,8 @@
var/obj/item/borg/upgrade/jetpack = null
var/list/subsystems = list()
+ var/module_type = "NoMod" // For icon usage
+
var/list/stacktypes
var/channels = list()
@@ -101,7 +103,7 @@
/obj/item/weapon/robot_module/standard
name = "standard robot module"
-
+ module_type = "Standard"
/obj/item/weapon/robot_module/standard/New()
src.modules += new /obj/item/device/flash/cyborg(src)
@@ -116,6 +118,7 @@
/obj/item/weapon/robot_module/medical
name = "medical robot module"
+ module_type = "Medical"
subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
stacktypes = list(
/obj/item/stack/medical/advanced/bruise_pack = 5,
@@ -164,15 +167,16 @@
/obj/item/weapon/robot_module/engineering
name = "engineering robot module"
+ module_type = "Engineer"
subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor)
stacktypes = list(
- /obj/item/stack/sheet/metal = 50,
- /obj/item/stack/sheet/glass = 50,
- /obj/item/stack/sheet/rglass = 50,
+ /obj/item/stack/sheet/metal/cyborg = 50,
+ /obj/item/stack/sheet/glass/cyborg = 50,
+ /obj/item/stack/sheet/rglass/cyborg = 50,
/obj/item/stack/cable_coil/cyborg = 50,
- /obj/item/stack/rods = 15,
- /obj/item/stack/tile/plasteel = 15
+ /obj/item/stack/rods/cyborg = 60,
+ /obj/item/stack/tile/plasteel = 20
)
/obj/item/weapon/robot_module/engineering/New()
@@ -194,34 +198,16 @@
src.emag = new /obj/item/borg/stun(src)
- var/obj/item/stack/sheet/metal/cyborg/M = new /obj/item/stack/sheet/metal/cyborg(src)
- M.amount = 50
- src.modules += M
-
- var/obj/item/stack/sheet/rglass/cyborg/R = new /obj/item/stack/sheet/rglass/cyborg(src)
- R.amount = 50
- src.modules += R
-
- var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src)
- G.amount = 50
- src.modules += G
-
- var/obj/item/stack/cable_coil/cyborg/W = new /obj/item/stack/cable_coil/cyborg(src)
- W.amount = 50
- src.modules += W
-
- var/obj/item/stack/rods/Q = new /obj/item/stack/rods(src)
- Q.amount = 15
- src.modules += Q
-
- var/obj/item/stack/tile/plasteel/F = new /obj/item/stack/tile/plasteel(src) //floor tiles not regular plasteel, calm down
- F.amount = 15
- src.modules += F
+ for(var/G in stacktypes) //Attempt to unify Engi-Borg material stacks into fewer lines. See Line 492 for example. Variables changed out of paranoia.
+ var/obj/item/stack/sheet/M = new G(src)
+ M.amount = stacktypes[G]
+ src.modules += M
fix_modules()
/obj/item/weapon/robot_module/security
name = "security robot module"
+ module_type = "Security"
subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor)
/obj/item/weapon/robot_module/security/New()
@@ -237,6 +223,7 @@
/obj/item/weapon/robot_module/janitor
name = "janitorial robot module"
+ module_type = "Janitor"
/obj/item/weapon/robot_module/janitor/New()
src.modules += new /obj/item/device/flash/cyborg(src)
@@ -254,6 +241,7 @@
/obj/item/weapon/robot_module/butler
name = "service robot module"
+ module_type = "Service"
/obj/item/weapon/robot_module/butler/New()
src.modules += new /obj/item/device/flash/cyborg(src)
@@ -324,6 +312,7 @@
/obj/item/weapon/robot_module/miner
name = "miner robot module"
+ module_type = "Miner"
/obj/item/weapon/robot_module/miner/New()
src.modules += new /obj/item/device/flash/cyborg(src)
@@ -341,6 +330,7 @@
/obj/item/weapon/robot_module/deathsquad
name = "NT advanced combat module"
+ module_type = "Malf"
/obj/item/weapon/robot_module/deathsquad/New()
src.modules += new /obj/item/device/flash/cyborg(src)
@@ -355,6 +345,7 @@
/obj/item/weapon/robot_module/syndicate
name = "syndicate assault robot module"
+ module_type = "Malf" // cuz it looks cool
/obj/item/weapon/robot_module/syndicate/New()
src.modules += new /obj/item/device/flash/cyborg(src)
@@ -371,6 +362,7 @@
/obj/item/weapon/robot_module/syndicate_medical
name = "syndicate medical robot module"
+ module_type = "Malf"
stacktypes = list(
/obj/item/stack/medical/advanced/bruise_pack = 25,
/obj/item/stack/medical/advanced/ointment = 25,
@@ -409,6 +401,7 @@
/obj/item/weapon/robot_module/combat
name = "combat robot module"
+ module_type = "Malf"
/obj/item/weapon/robot_module/combat/New()
src.modules += new /obj/item/device/flash/cyborg(src)
@@ -425,6 +418,7 @@
/obj/item/weapon/robot_module/peacekeeper
name = "peacekeeper robot module"
+ module_type = "Malf"
/obj/item/weapon/robot_module/peacekeeper/New()
src.modules += new /obj/item/device/flash/cyborg(src)
@@ -440,6 +434,7 @@
/obj/item/weapon/robot_module/alien/hunter
name = "alien hunter module"
+ module_type = "Standard"
/obj/item/weapon/robot_module/alien/hunter/New()
src.modules += new /obj/item/weapon/melee/energy/alien/claws(src)
@@ -463,15 +458,15 @@
/obj/item/weapon/robot_module/drone
name = "drone module"
+ module_type = "Engineer"
stacktypes = list(
- /obj/item/stack/sheet/wood = 1,
- /obj/item/stack/sheet/mineral/plastic = 1,
- /obj/item/stack/sheet/rglass = 5,
- /obj/item/stack/tile/wood = 5,
- /obj/item/stack/rods = 15,
- /obj/item/stack/tile/plasteel = 15,
- /obj/item/stack/sheet/metal = 20,
- /obj/item/stack/sheet/glass = 20,
+ /obj/item/stack/sheet/wood = 10,
+ /obj/item/stack/sheet/rglass/cyborg = 50,
+ /obj/item/stack/tile/wood = 20,
+ /obj/item/stack/rods/cyborg = 60,
+ /obj/item/stack/tile/plasteel = 20,
+ /obj/item/stack/sheet/metal/cyborg = 50,
+ /obj/item/stack/sheet/glass/cyborg = 50,
/obj/item/stack/cable_coil/cyborg = 30
)
@@ -516,4 +511,4 @@
var/mob/living/silicon/robot/R = src.loc
- return (src in R.module.modules)
\ No newline at end of file
+ return (src in R.module.modules)
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index bcbcb1632f4..1eebe03d1ab 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -8,7 +8,7 @@
return 1
if(message_mode)
if(!is_component_functioning("radio"))
- src << "Your radio isn't functional at this time."
+ to_chat(src, "Your radio isn't functional at this time.")
return 0
if(message_mode == "general")
message_mode = null
@@ -21,7 +21,7 @@
return holopad_talk(message, verb, speaking)
else if(message_mode)
if (aiRadio.disabledAi || aiRestorePowerRoutine || stat)
- src << "System Error - Transceiver Disabled."
+ to_chat(src, "System Error - Transceiver Disabled.")
return 0
if(message_mode == "general")
message_mode = null
@@ -56,6 +56,8 @@
return 1
if (istype(other, /mob/living/silicon))
return 1
+ if (istype(other, /mob/living/simple_animal/bot))
+ return 1
if (istype(other, /mob/living/carbon/brain))
return 1
return ..()
@@ -82,11 +84,13 @@
if(speaking)
rendered_a = "[name] [speaking.format_message(message, verb)]"
rendered_b = "[voice_name] [speaking.format_message(message_stars, verb)]"
- src << "Holopad transmitted, [real_name] [speaking.format_message(message, verb)]"//The AI can "hear" its own message.
+ to_chat(src, "Holopad transmitted, [real_name] [speaking.format_message(message, verb)]")//The AI can "hear" its own message.
+
else
rendered_a = "[name] [verb], \"[message]\""
rendered_b = "[voice_name] [verb], \"[message_stars]\""
- src << "Holopad transmitted, [real_name] [verb], \"[message]\""//The AI can "hear" its own message.
+ to_chat(src, "Holopad transmitted, [real_name] [verb], \"[message]\"")//The AI can "hear" its own message.
+
for(var/mob/M in hearers(T.loc))//The location is the object, default distance.
if(M.say_understands(src))//If they understand AI speak. Humans and the like will be able to.
@@ -96,7 +100,7 @@
/*Radios "filter out" this conversation channel so we don't need to account for them.
This is another way of saying that we won't bother dealing with them.*/
else
- src << "No holopad connected."
+ to_chat(src, "No holopad connected.")
return
return 1
@@ -112,12 +116,12 @@
var/obj/machinery/hologram/holopad/T = src.holo
if(T && T.hologram && T.master == src)
var/rendered = "[name] [message]"
- src << "Holopad action relayed, [real_name] [message]"
+ to_chat(src, "Holopad action relayed, [real_name] [message]")
for(var/mob/M in viewers(T.loc))
M.show_message(rendered, 2)
else //This shouldn't occur, but better safe then sorry.
- src << "No holopad connected."
+ to_chat(src, "No holopad connected.")
return
return 1
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 56e1c08f646..5d88814440b 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -2,6 +2,7 @@
gender = NEUTER
robot_talk_understand = 1
voice_name = "synthesized voice"
+ has_unlimited_silicon_privilege = 1
var/syndicate = 0
var/const/MAIN_CHANNEL = "Main Frequency"
var/lawchannel = MAIN_CHANNEL // Default channel on which to state laws
@@ -73,9 +74,9 @@
if(2)
src.take_organ_damage(10)
Stun(3)
- flick("noise", src:flash)
- src << "\red *BZZZT*"
- src << "\red Warning: Electromagnetic pulse detected."
+ flash_eyes(affect_silicon = 1)
+ to_chat(src, "\red *BZZZT*")
+ to_chat(src, "\red Warning: Electromagnetic pulse detected.")
..()
@@ -84,7 +85,7 @@
/mob/living/silicon/can_inject(var/mob/user, var/error_msg)
if(error_msg)
- user << "Their outer shell is too tough."
+ to_chat(user, "Their outer shell is too tough.")
return 0
/mob/living/silicon/IsAdvancedToolUser()
@@ -279,15 +280,15 @@
switch(sensor_type)
if ("Security")
add_sec_hud()
- src << "Security records overlay enabled."
+ to_chat(src, "Security records overlay enabled.")
if ("Medical")
add_med_hud()
- src << "Life signs monitor overlay enabled."
+ to_chat(src, "Life signs monitor overlay enabled.")
if ("Diagnostic")
add_diag_hud()
- src << "Robotics diagnostic overlay enabled."
+ to_chat(src, "Robotics diagnostic overlay enabled.")
if ("Disable")
- src << "Sensor augmentations disabled."
+ to_chat(src, "Sensor augmentations disabled.")
/mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised)
if(!next_alarm_notice)
@@ -317,7 +318,7 @@
if(alarms[A] == 1)
if(!reported)
reported = 1
- src << "--- [AH.category] Detected ---"
+ to_chat(src, "--- [AH.category] Detected ---")
raised_alarm(A)
for(var/datum/alarm_handler/AH in queued_alarms)
@@ -327,26 +328,31 @@
if(alarms[A] == -1)
if(!reported)
reported = 1
- src << "--- [AH.category] Cleared ---"
- src << "\The [A.alarm_name()]."
+ to_chat(src, "--- [AH.category] Cleared ---")
+ to_chat(src, "\The [A.alarm_name()].")
if(alarm_raised)
- src << "\[Show Alerts\]"
+ to_chat(src, "\[Show Alerts\]")
for(var/datum/alarm_handler/AH in queued_alarms)
var/list/alarms = queued_alarms[AH]
alarms.Cut()
/mob/living/silicon/proc/raised_alarm(var/datum/alarm/A)
- src << "[A.alarm_name()]!"
+ to_chat(src, "[A.alarm_name()]!")
/mob/living/silicon/ai/raised_alarm(var/datum/alarm/A)
var/cameratext = ""
for(var/obj/machinery/camera/C in A.cameras())
cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]"
- src << "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])"
+ to_chat(src, "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])")
/mob/living/silicon/adjustToxLoss(var/amount)
return
+/mob/living/silicon/get_access()
+ return IGNORE_ACCESS //silicons always have access
+/mob/living/silicon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash/noise)
+ if(affect_silicon)
+ return ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm
index f88f41e6d17..959444ea5e4 100644
--- a/code/modules/mob/living/simple_animal/bees.dm
+++ b/code/modules/mob/living/simple_animal/bees.dm
@@ -17,14 +17,6 @@
var/obj/machinery/portable_atmospherics/hydroponics/my_hydrotray
// Allow final solutions.
- min_oxy = 5
- max_oxy = 0
- min_tox = 0
- max_tox = 1
- min_co2 = 0
- max_co2 = 5
- min_n2 = 0
- max_n2 = 0
minbodytemp = 0
maxbodytemp = 360
@@ -37,145 +29,142 @@
parent.owned_bee_swarms.Remove(src)
return ..()
-/mob/living/simple_animal/bee/Life()
- ..()
+/mob/living/simple_animal/bee/process_ai()
+ //if we're strong enough, sting some people
+ var/mob/living/carbon/human/M = target_mob
+ var/sting_prob = 100 // Bees will always try to sting.
+ if(M in view(src,1)) // Can I see my target?
+ if(prob(max(feral * 10, 0))) // Am I mad enough to want to sting? And yes, when I initially appear, I AM mad enough
+ var/obj/item/clothing/worn_suit = M.wear_suit
+ var/obj/item/clothing/worn_helmet = M.head
+ if(worn_suit) // Are you wearing clothes?
+ sting_prob -= min(worn_suit.armor["bio"],70) // Is it sealed? I can't get to 70% of your body.
+ if(worn_helmet)
+ sting_prob -= min(worn_helmet.armor["bio"],30) // Is your helmet sealed? I can't get to 30% of your body.
+ if( prob(sting_prob) && (M.stat == CONSCIOUS || (M.stat == UNCONSCIOUS && prob(25))) ) // Try to sting! If you're not moving, think about stinging.
+ M.apply_damage(min(strength,2)+mut, BRUTE, sharp=1) // Stinging. The more mutated I am, the harder I sting.
+ M.apply_damage((round(feral/10,1)*(max((round(strength/20,1)),1)))+toxic, TOX) // Bee venom based on how angry I am and how many there are of me!
+ to_chat(M, "\red You have been stung!")
- if(stat == CONSCIOUS)
- //if we're strong enough, sting some people
- var/mob/living/carbon/human/M = target_mob
- var/sting_prob = 100 // Bees will always try to sting.
- if(M in view(src,1)) // Can I see my target?
- if(prob(max(feral * 10, 0))) // Am I mad enough to want to sting? And yes, when I initially appear, I AM mad enough
- var/obj/item/clothing/worn_suit = M.wear_suit
- var/obj/item/clothing/worn_helmet = M.head
- if(worn_suit) // Are you wearing clothes?
- sting_prob -= min(worn_suit.armor["bio"],70) // Is it sealed? I can't get to 70% of your body.
- if(worn_helmet)
- sting_prob -= min(worn_helmet.armor["bio"],30) // Is your helmet sealed? I can't get to 30% of your body.
- if( prob(sting_prob) && (M.stat == CONSCIOUS || (M.stat == UNCONSCIOUS && prob(25))) ) // Try to sting! If you're not moving, think about stinging.
- M.apply_damage(min(strength,2)+mut, BRUTE, sharp=1) // Stinging. The more mutated I am, the harder I sting.
- M.apply_damage((round(feral/10,1)*(max((round(strength/20,1)),1)))+toxic, TOX) // Bee venom based on how angry I am and how many there are of me!
- M << "\red You have been stung!"
- M.flash_pain()
+ //if we're chasing someone, get a little bit angry
+ if(target_mob && prob(10))
+ feral++
- //if we're chasing someone, get a little bit angry
- if(target_mob && prob(10))
- feral++
-
- //calm down a little bit
- if(feral > 0)
- if(prob(feral * 10))
- feral -= 1
- else
- //if feral is less than 0, we're becalmed by smoke or steam
- if(feral < 0)
- feral += 1
-
- if(target_mob)
- target_mob = null
- target_turf = null
- if(strength > 5)
- //calm down and spread out a little
- var/mob/living/simple_animal/bee/B = new(get_turf(pick(orange(src,1))))
- B.strength = rand(1,5)
- src.strength -= B.strength
- if(src.strength <= 5)
- src.icon_living = "bees[src.strength]"
- B.icon_living = "bees[B.strength]"
- if(src.parent)
- B.parent = src.parent
- src.parent.owned_bee_swarms.Add(B)
-
- //make some noise
- if(prob(0.5))
- src.visible_message("\blue [pick("Buzzzz.","Hmmmmm.","Bzzz.")]")
-
- //smoke, water and steam calms us down
- var/calming = 0
- var/list/calmers = list(/obj/effect/effect/chem_smoke, \
- /obj/effect/effect/water, \
- /obj/effect/effect/foam, \
- /obj/effect/effect/steam, \
- /obj/effect/mist)
-
- for(var/obj/effect/check_effect in src.loc)
- if(check_effect.type in calmers)
- calming = 1
- break
-
- if(calming)
- if(feral > 0)
- src.visible_message("\blue The bees calm down!")
- feral = -10
- target_mob = null
- target_turf = null
- wander = 1
-
- for(var/mob/living/simple_animal/bee/B in src.loc)
- if(B == src)
- continue
-
- if(feral > 0)
- src.strength += B.strength
- qdel(B)
- src.icon_living = "bees[src.strength]"
- if(strength > 5)
- icon_living = "bees_swarm"
- else if(prob(10))
- //make the other swarm of bees stronger, then move away
- var/total_bees = B.strength + src.strength
- if(total_bees < 10)
- B.strength = min(5, total_bees)
- src.strength = total_bees - B.strength
-
- B.icon_living = "bees[B.strength]"
- if(src.strength <= 0)
- qdel(src)
- return
- src.icon_living = "bees[B.strength]"
- var/turf/simulated/floor/T = get_turf(get_step(src, pick(1,2,4,8)))
- density = 1
- if(T.Enter(src, get_turf(src)))
- src.loc = T
- density = 0
- break
+ //calm down a little bit
+ if(feral > 0)
+ if(prob(feral * 10))
+ feral -= 1
+ else
+ //if feral is less than 0, we're becalmed by smoke or steam
+ if(feral < 0)
+ feral += 1
if(target_mob)
- if(target_mob in view(src,7))
- target_turf = get_turf(target_mob)
- wander = 0
+ target_mob = null
+ target_turf = null
+ if(strength > 5)
+ //calm down and spread out a little
+ var/mob/living/simple_animal/bee/B = new(get_turf(pick(orange(src,1))))
+ B.strength = rand(1,5)
+ src.strength -= B.strength
+ if(src.strength <= 5)
+ src.icon_living = "bees[src.strength]"
+ B.icon_living = "bees[B.strength]"
+ if(src.parent)
+ B.parent = src.parent
+ src.parent.owned_bee_swarms.Add(B)
- else // My target's gone! But I might still be pissed! You there. You look like a good stinging target!
- for(var/mob/living/carbon/G in view(src,7))
- target_mob = G
- break
+ //make some noise
+ if(prob(0.5))
+ src.visible_message("\blue [pick("Buzzzz.","Hmmmmm.","Bzzz.")]")
- if(target_turf)
- if (!(DirBlocked(get_step(src, get_dir(src,target_turf)),get_dir(src,target_turf)))) // Check for windows and doors!
- Move(get_step(src, get_dir(src,target_turf)))
- if (prob(0.1))
- src.visible_message("\blue The bees swarm after [target_mob]!")
- if(src.loc == target_turf)
- target_turf = null
- wander = 1
- else
- //find some flowers, harvest
- //angry bee swarms don't hang around
- if(feral > 0)
- turns_per_move = rand(1,3)
- else if(feral < 0)
- turns_since_move = 0
- else if(!my_hydrotray || my_hydrotray.loc != src.loc || my_hydrotray.dead || !my_hydrotray.seed)
- var/obj/machinery/portable_atmospherics/hydroponics/my_hydrotray = locate() in src.loc
- if(my_hydrotray)
- if(!my_hydrotray.dead && my_hydrotray.seed)
- turns_per_move = rand(20,50)
- else
- my_hydrotray = null
+ //smoke, water and steam calms us down
+ var/calming = 0
+ var/list/calmers = list(/obj/effect/effect/chem_smoke, \
+ /obj/effect/effect/water, \
+ /obj/effect/effect/foam, \
+ /obj/effect/effect/steam, \
+ /obj/effect/mist)
- pixel_x = rand(-12,12)
- pixel_y = rand(-12,12)
+ for(var/obj/effect/check_effect in src.loc)
+ if(check_effect.type in calmers)
+ calming = 1
+ break
+ if(calming)
+ if(feral > 0)
+ src.visible_message("\blue The bees calm down!")
+ feral = -10
+ target_mob = null
+ target_turf = null
+ wander = 1
+
+ for(var/mob/living/simple_animal/bee/B in src.loc)
+ if(B == src)
+ continue
+
+ if(feral > 0)
+ src.strength += B.strength
+ qdel(B)
+ src.icon_living = "bees[src.strength]"
+ if(strength > 5)
+ icon_living = "bees_swarm"
+ else if(prob(10))
+ //make the other swarm of bees stronger, then move away
+ var/total_bees = B.strength + src.strength
+ if(total_bees < 10)
+ B.strength = min(5, total_bees)
+ src.strength = total_bees - B.strength
+
+ B.icon_living = "bees[B.strength]"
+ if(src.strength <= 0)
+ qdel(src)
+ return
+ src.icon_living = "bees[B.strength]"
+ var/turf/simulated/floor/T = get_turf(get_step(src, pick(1,2,4,8)))
+ density = 1
+ if(T.Enter(src, get_turf(src)))
+ src.loc = T
+ density = 0
+ break
+
+ if(target_mob)
+ if(target_mob in view(src,7))
+ target_turf = get_turf(target_mob)
+ wander = 0
+
+ else // My target's gone! But I might still be pissed! You there. You look like a good stinging target!
+ for(var/mob/living/carbon/G in view(src,7))
+ target_mob = G
+ break
+
+ if(target_turf)
+ if (!(DirBlocked(get_step(src, get_dir(src,target_turf)),get_dir(src,target_turf)))) // Check for windows and doors!
+ Move(get_step(src, get_dir(src,target_turf)))
+ if (prob(0.1))
+ src.visible_message("\blue The bees swarm after [target_mob]!")
+ if(src.loc == target_turf)
+ target_turf = null
+ wander = 1
+ else
+ //find some flowers, harvest
+ //angry bee swarms don't hang around
+ if(feral > 0)
+ turns_per_move = rand(1,3)
+ else if(feral < 0)
+ turns_since_move = 0
+ else if(!my_hydrotray || my_hydrotray.loc != src.loc || my_hydrotray.dead || !my_hydrotray.seed)
+ var/obj/machinery/portable_atmospherics/hydroponics/my_hydrotray = locate() in src.loc
+ if(my_hydrotray)
+ if(!my_hydrotray.dead && my_hydrotray.seed)
+ turns_per_move = rand(20,50)
+ else
+ my_hydrotray = null
+
+ pixel_x = rand(-12,12)
+ pixel_y = rand(-12,12)
+
+/mob/living/simple_animal/bee/handle_state_icons()
if(!parent && prob(10))
strength -= 1
if(strength <= 0)
@@ -187,3 +176,5 @@
/*icon_living = "[strength]"
if(strength > 5)
icon_living = "unknown"*/
+
+ ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
new file mode 100644
index 00000000000..b9bf9046482
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -0,0 +1,1014 @@
+//Defines for bots are now found in code\__DEFINES\bots.dm
+
+// AI (i.e. game AI, not the AI player) controlled bots
+/mob/living/simple_animal/bot
+ icon = 'icons/obj/aibots.dmi'
+ layer = MOB_LAYER - 0.1
+ light_range = 3
+ stop_automated_movement = 1
+ wander = 0
+ healable = 0
+ damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ has_unlimited_silicon_privilege = 1
+ sentience_type = SENTIENCE_ARTIFICIAL
+ status_flags = 0 //no default canpush
+ can_strip = 0
+
+ speak_emote = list("states")
+ friendly = "boops"
+
+ faction = list("neutral", "silicon")
+
+ var/obj/machinery/bot_core/bot_core = null
+ var/bot_core_type = /obj/machinery/bot_core
+ var/list/users = list() //for dialog updates
+ var/window_id = "bot_control"
+ var/window_name = "Protobot 1.0" //Popup title
+ var/window_width = 0 //0 for default size
+ var/window_height = 0
+ var/obj/item/device/paicard/paicard // Inserted pai card.
+ var/allow_pai = 1 // Are we even allowed to insert a pai card.
+ var/bot_name
+
+ var/list/player_access = list()
+ var/emagged = 0
+ var/obj/item/weapon/card/id/access_card // the ID card that the bot "holds"
+ var/list/prev_access = list()
+ var/on = 1
+ var/open = 0//Maint panel
+ var/locked = 1
+ var/hacked = 0 //Used to differentiate between being hacked by silicons and emagged by humans.
+ var/text_hack = "" //Custom text returned to a silicon upon hacking a bot.
+ var/text_dehack = "" //Text shown when resetting a bots hacked status to normal.
+ var/text_dehack_fail = "" //Shown when a silicon tries to reset a bot emagged with the emag item, which cannot be reset.
+ var/declare_message = "" //What the bot will display to the HUD user.
+ var/frustration = 0 //Used by some bots for tracking failures to reach their target.
+ var/base_speed = 2 //The speed at which the bot moves, or the number of times it moves per process() tick.
+ var/turf/ai_waypoint //The end point of a bot's path, or the target location.
+ var/list/path = list() //List of turfs through which a bot 'steps' to reach the waypoint.
+ var/pathset = 0
+ var/list/ignore_list = list() //List of unreachable targets for an ignore-list enabled bot to ignore.
+ var/mode = BOT_IDLE //Standardizes the vars that indicate the bot is busy with its function.
+ var/tries = 0 //Number of times the bot tried and failed to move.
+ var/remote_disabled = 0 //If enabled, the AI cannot *Remotely* control a bot. It can still control it through cameras.
+ var/mob/living/silicon/ai/calling_ai //Links a bot to the AI calling it.
+ var/obj/item/device/radio/Radio //The bot's radio, for speaking to people.
+ var/list/radio_config = null //which channels can the bot listen to
+ var/radio_channel = "Common" //The bot's default radio channel
+ var/auto_patrol = 0// set to make bot automatically patrol
+ var/turf/patrol_target // this is turf to navigate to (location of beacon)
+ var/turf/summon_target // The turf of a user summoning a bot.
+ var/new_destination // pending new destination (waiting for beacon response)
+ var/destination // destination description tag
+ var/next_destination // the next destination in the patrol route
+
+ var/blockcount = 0 //number of times retried a blocked path
+ var/awaiting_beacon = 0 // count of pticks awaiting a beacon response
+
+ var/nearest_beacon // the nearest beacon's tag
+ var/turf/nearest_beacon_loc // the nearest beacon's location
+
+ var/model = "" //The type of bot it is.
+ var/bot_purpose = "improve the station to the best of your ability"
+ var/control_freq = BOT_FREQ // bot control frequency
+ var/bot_filter // The radio filter the bot uses to identify itself on the network.
+ var/bot_type = 0 //The type of bot it is, for radio control.
+ //This holds text for what the bot is mode doing, reported on the remote bot control interface.
+ var/list/mode_name = list("In Pursuit","Preparing to Arrest", "Arresting", \
+ "Beginning Patrol", "Patrolling", "Summoned by PDA", \
+ "Cleaning", "Repairing", "Proceeding to work site", "Healing", \
+ "Responding", "Navigating to Delivery Location", "Navigating to Home", \
+ "Waiting for clear path", "Calculating navigation path", "Pinging beacon network", "Unable to reach destination")
+
+ hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD) //Diagnostic HUD views
+
+/mob/living/simple_animal/bot/proc/get_mode()
+ if(client) //Player bots do not have modes, thus the override. Also an easy way for PDA users/AI to know when a bot is a player.
+ if(paicard)
+ return "pAI Controlled"
+ else
+ return "Autonomous"
+ else if(!on)
+ return "Inactive"
+ else if(!mode)
+ return "Idle"
+ else
+ return "[mode_name[mode]]"
+
+/mob/living/simple_animal/bot/proc/turn_on()
+ if(stat)
+ return 0
+ on = 1
+ set_light(initial(light_range))
+ update_icon()
+ update_controls()
+ diag_hud_set_botstat()
+ return 1
+
+/mob/living/simple_animal/bot/proc/turn_off()
+ on = 0
+ set_light(0)
+ bot_reset() //Resets an AI's call, should it exist.
+ update_icon()
+ update_controls()
+
+/mob/living/simple_animal/bot/New()
+ ..()
+ icon_living = icon_state
+ icon_dead = icon_state
+ icon_resting = icon_state
+ access_card = new /obj/item/weapon/card/id(src)
+//This access is so bots can be immediately set to patrol and leave Robotics, instead of having to be let out first.
+ access_card.access += access_robotics
+ set_custom_texts()
+ Radio = new/obj/item/device/radio/headset(src)
+ Radio.subspace_transmission = 1
+ Radio.canhear_range = 0 // anything greater will have the bot broadcast the channel as if it were saying it out loud.
+ if(!radio_config)
+ radio_config = list("AI Private" = 1)
+ if(!(radio_channel in radio_config)) // put it first so it's the :h channel
+ radio_config.Insert(1, "[radio_channel]")
+ radio_config["[radio_channel]"] = 1
+ Radio.config(radio_config)
+
+ add_language("Galactic Common", 1)
+ add_language("Sol Common", 1)
+ add_language("Tradeband", 1)
+ add_language("Gutter", 1)
+ add_language("Trinary", 1)
+ default_language = all_languages["Galactic Common"]
+
+ bot_core = new bot_core_type(src)
+ spawn(30)
+ if(radio_controller && bot_filter)
+ radio_controller.add_object(bot_core, control_freq, bot_filter)
+
+ prepare_huds()
+ var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_to_hud(src)
+ diag_hud_set_bothealth()
+ diag_hud_set_botstat()
+ diag_hud_set_botmode()
+ // give us the hud too!
+ diag_hud.add_hud_to(src)
+ permanent_huds |= diag_hud
+
+/mob/living/simple_animal/bot/update_canmove()
+ . = ..()
+ if(!on)
+ . = 0
+ canmove = .
+
+/mob/living/simple_animal/bot/Destroy()
+ if(paicard)
+ ejectpai()
+ qdel(Radio)
+ Radio = null
+ qdel(access_card)
+ access_card = null
+ if(radio_controller && bot_filter)
+ radio_controller.remove_object(bot_core, control_freq)
+ qdel(bot_core)
+ bot_core = null
+ return ..()
+
+/mob/living/simple_animal/bot/death(gibbed)
+ explode()
+ ..()
+
+/mob/living/simple_animal/bot/proc/explode()
+ qdel(src)
+
+/mob/living/simple_animal/bot/emag_act(mob/user)
+ if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again.
+ locked = 0
+ emagged = 1
+ to_chat(user, "You bypass [src]'s controls.")
+ return
+ if(!locked && open) //Bot panel is unlocked by ID or emag, and the panel is screwed open. Ready for emagging.
+ emagged = 2
+ remote_disabled = 1 //Manually emagging the bot locks out the AI built in panel.
+ locked = 1 //Access denied forever!
+ bot_reset()
+ turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP.
+ to_chat(src, "(#$*#$^^( OVERRIDE DETECTED")
+ show_laws()
+ add_logs(user, src, "emagged")
+ return
+ else //Bot is unlocked, but the maint panel has not been opened with a screwdriver yet.
+ to_chat(user, "You need to open maintenance panel first!")
+
+/mob/living/simple_animal/bot/examine(mob/user)
+ ..()
+ if(health < maxHealth)
+ if(health > maxHealth/3)
+ to_chat(user, "[src]'s parts look loose.")
+ else
+ to_chat(user, "[src]'s parts look very loose!")
+ else
+ to_chat(user, "[src] is in pristine condition.")
+
+/mob/living/simple_animal/bot/adjustBruteLoss(amount)
+ . = ..()
+
+ if(amount > 0 && prob(10))
+ new /obj/effect/decal/cleanable/blood/oil(loc)
+
+/mob/living/simple_animal/bot/adjustFireLoss(amount)
+ . = ..()
+
+ if(amount > 0 && prob(5))
+ new /obj/effect/decal/cleanable/blood/oil(loc)
+
+/mob/living/simple_animal/bot/updatehealth()
+ ..()
+ diag_hud_set_bothealth()
+
+/mob/living/simple_animal/bot/handle_automated_action()
+ diag_hud_set_botmode()
+
+ if(!on)
+ return
+
+ switch(mode) //High-priority overrides are processed first. Bots can do nothing else while under direct command.
+ if(BOT_RESPONDING) //Called by the AI.
+ call_mode()
+ return
+ if(BOT_SUMMON) //Called by PDA
+ bot_summon()
+ return
+ return 1 //Successful completion. Used to prevent child process() continuing if this one is ended early.
+
+/mob/living/simple_animal/bot/attack_alien(var/mob/living/carbon/alien/user as mob)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ apply_damage(rand(15,30), BRUTE)
+ visible_message("[user] has slashed [src]!")
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ if(prob(10))
+ new /obj/effect/decal/cleanable/blood/oil(loc)
+
+/mob/living/simple_animal/bot/attack_animal(var/mob/living/simple_animal/M as mob)
+ M.do_attack_animation(src)
+ if(M.melee_damage_upper == 0)
+ return
+ apply_damage(M.melee_damage_upper, BRUTE)
+ visible_message("[M] has [M.attacktext] [src]!")
+ add_logs(M, src, "attacked", admin=0)
+ if(prob(10))
+ new /obj/effect/decal/cleanable/blood/oil(loc)
+
+/mob/living/simple_animal/bot/attack_hand(mob/living/carbon/human/H)
+ if(H.a_intent == "help")
+ interact(H)
+ else
+ return ..()
+
+/mob/living/simple_animal/bot/attack_ai(mob/user)
+ if(!topic_denied(user))
+ interact(user)
+ else
+ to_chat(user, "[src]'s interface is not responding!")
+
+/mob/living/simple_animal/bot/proc/interact(mob/user)
+ show_controls(user)
+
+/mob/living/simple_animal/bot/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W, /obj/item/weapon/screwdriver))
+ if(!locked)
+ open = !open
+ to_chat(user, "The maintenance panel is now [open ? "opened" : "closed"].")
+ else
+ to_chat(user, "The maintenance panel is locked.")
+ else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
+ if(bot_core.allowed(user) && !open && !emagged)
+ locked = !locked
+ to_chat(user, "Controls are now [locked ? "locked." : "unlocked."]")
+ else
+ if(emagged)
+ to_chat(user, "ERROR")
+ if(open)
+ to_chat(user, "Please close the access panel before locking it.")
+ else
+ to_chat(user, "Access denied.")
+ else if(istype(W, /obj/item/device/paicard))
+ if(paicard)
+ to_chat(user, "A [paicard] is already inserted!")
+ else if(allow_pai && !key)
+ if(!locked && !open)
+ var/obj/item/device/paicard/card = W
+ if(card.pai && card.pai.mind)
+ if(!user.drop_item())
+ return
+ W.forceMove(src)
+ paicard = card
+ user.visible_message("[user] inserts [W] into [src]!","You insert [W] into [src].")
+ paicard.pai.mind.transfer_to(src)
+ to_chat(src, "You sense your form change as you are uploaded into [src].")
+ bot_name = name
+ name = paicard.pai.name
+ faction = user.faction
+ add_logs(user, paicard.pai, "uploaded to [src.bot_name],")
+ else
+ to_chat(user, "[W] is inactive.")
+ else
+ to_chat(user, "The personality slot is locked.")
+ else
+ to_chat(user, "[src] is not compatible with [W]")
+ else if(istype(W, /obj/item/weapon/hemostat) && paicard)
+ if(open)
+ to_chat(user, "Close the access panel before manipulating the personality slot!")
+ else
+ to_chat(user, "You attempt to pull [paicard] free...")
+ if(do_after(user, 30, target = src))
+ if (paicard)
+ user.visible_message("[user] uses [W] to pull [paicard] out of [bot_name]!","You pull [paicard] out of [bot_name] with [W].")
+ ejectpai(user)
+ else
+ user.changeNext_move(CLICK_CD_MELEE)
+ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm")
+ if(health >= maxHealth)
+ to_chat(user, "[src] does not need a repair!")
+ return
+ if(!open)
+ to_chat(user, "Unable to repair with the maintenance panel closed!")
+ return
+ var/obj/item/weapon/weldingtool/WT = W
+ if(WT.remove_fuel(0, user))
+ adjustBruteLoss(-10)
+ adjustFireLoss(-10)
+ updatehealth()
+ add_fingerprint(user)
+ user.visible_message("[user] repairs [src]!","You repair [src].")
+ else
+ to_chat(user, "The welder must be on for this task!")
+ else
+ if(W.force) //if force is non-zero
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(5, 1, src)
+ s.start()
+ ..()
+
+/mob/living/simple_animal/bot/bullet_act(obj/item/projectile/Proj)
+ if(Proj && (Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+ if(prob(75) && Proj.damage > 0)
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(5, 1, src)
+ s.start()
+ return ..()
+
+/mob/living/simple_animal/bot/emp_act(severity)
+ var/was_on = on
+ stat |= EMPED
+ var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( loc )
+ pulse2.icon = 'icons/effects/effects.dmi'
+ pulse2.icon_state = "empdisable"
+ pulse2.name = "emp sparks"
+ pulse2.anchored = 1
+ pulse2.dir = pick(cardinal)
+ spawn(10)
+ pulse2.delete()
+
+ if(paicard)
+ paicard.emp_act(severity)
+ src.visible_message("[paicard] is flies out of [bot_name]!","You are forcefully ejected from [bot_name]!")
+ ejectpai(0)
+ if(on)
+ turn_off()
+ spawn(severity*300)
+ stat &= ~EMPED
+ if(was_on)
+ turn_on()
+
+/mob/living/simple_animal/bot/rename_character(oldname, newname)
+ if(!..(oldname, newname))
+ return 0
+
+ set_custom_texts()
+ return 1
+
+/mob/living/simple_animal/bot/proc/set_custom_texts() //Superclass for setting hack texts. Appears only if a set is not given to a bot locally.
+ text_hack = "You hack [name]."
+ text_dehack = "You reset [name]."
+ text_dehack_fail = "You fail to reset [name]."
+
+/mob/living/simple_animal/bot/proc/speak(message, channel) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio.
+ if((!on) || (!message))
+ return
+ if(channel)
+ Radio.autosay(message, name, channel == "headset" ? null : channel)
+ else
+ say(message)
+ return
+
+//Generalized behavior code, override where needed!
+
+/*
+scan() will search for a given type (such as turfs, human mobs, or objects) in the bot's view range, and return a single result.
+Arguments: The object type to be searched (such as "/mob/living/carbon/human"), the old scan result to be ignored, if one exists,
+and the view range, which defaults to 7 (full screen) if an override is not passed.
+If the bot maintains an ignore list, it is also checked here.
+
+Example usage: patient = scan(/mob/living/carbon/human, oldpatient, 1)
+The proc would return a human next to the bot to be set to the patient var.
+Pass the desired type path itself, declaring a temporary var beforehand is not required.
+*/
+/mob/living/simple_animal/bot/proc/scan(scan_type, old_target, scan_range = DEFAULT_SCAN_RANGE)
+ var/final_result
+ for (var/scan in shuffle(view(scan_range, src))) //Search for something in range!
+ if(!istype(scan, scan_type)) //Check that the thing we found is the type we want!
+ continue //If not, keep searching!
+ if( (scan in ignore_list) || (scan == old_target) ) //Filter for blacklisted elements, usually unreachable or previously processed oness
+ continue
+ var/scan_result = process_scan(scan) //Some bots may require additional processing when a result is selected.
+ if(scan_result)
+ final_result = scan_result
+ else
+ continue //The current element failed assessment, move on to the next.
+ return final_result
+
+//When the scan finds a target, run bot specific processing to select it for the next step. Empty by default.
+/mob/living/simple_animal/bot/proc/process_scan(scan_target)
+ return scan_target
+
+
+/mob/living/simple_animal/bot/proc/add_to_ignore(subject)
+ if(ignore_list.len < 50) //This will help keep track of them, so the bot is always trying to reach a blocked spot.
+ ignore_list |= subject
+ else if(ignore_list.len >= subject) //If the list is full, insert newest, delete oldest.
+ ignore_list -= ignore_list[1]
+ ignore_list |= subject
+
+/*
+Movement proc for stepping a bot through a path generated through A-star.
+Pass a positive integer as an argument to override a bot's default speed.
+*/
+/mob/living/simple_animal/bot/proc/bot_move(dest, move_speed)
+
+ if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set.
+ path = list()
+ return 0
+ dest = get_turf(dest) //We must always compare turfs, so get the turf of the dest var if dest was originally something else.
+ var/turf/last_node = get_turf(path[path.len]) //This is the turf at the end of the path, it should be equal to dest.
+ if(get_turf(src) == dest) //We have arrived, no need to move again.
+ return 1
+ else if(dest != last_node) //The path should lead us to our given destination. If this is not true, we must stop.
+ path = list()
+ return 0
+ var/step_count = move_speed ? move_speed : base_speed //If a value is passed into move_speed, use that instead of the default speed var.
+
+ if(step_count >= 1 && tries < BOT_STEP_MAX_RETRIES)
+ for(var/step_number = 0, step_number < step_count,step_number++)
+ spawn(BOT_STEP_DELAY*step_number)
+ bot_step(dest)
+ else
+ return 0
+ return 1
+
+
+/mob/living/simple_animal/bot/proc/bot_step(dest) //Step,increase tries if failed
+ if(!path)
+ return 0
+ if(path.len > 1)
+ step_towards(src, path[1])
+ if(get_turf(src) == path[1]) //Successful move
+ path -= path[1]
+ tries = 0
+ else
+ tries++
+ return 0
+ else if(path.len == 1)
+ step_to(src, dest)
+ path = list()
+ return 1
+
+
+/mob/living/simple_animal/bot/proc/check_bot_access()
+ if(mode != BOT_SUMMON && mode != BOT_RESPONDING)
+ access_card.access = prev_access
+
+/mob/living/simple_animal/bot/proc/call_bot(caller, turf/waypoint, message=TRUE)
+ bot_reset() //Reset a bot before setting it to call mode.
+ var/area/end_area = get_area(waypoint)
+
+ //For giving the bot temporary all-access.
+ var/obj/item/weapon/card/id/all_access = new /obj/item/weapon/card/id
+ var/datum/job/captain/All = new/datum/job/captain
+ all_access.access = All.get_access()
+
+ path = get_path_to(src, waypoint, /turf/proc/Distance_cardinal, 0, 200, id=all_access)
+ calling_ai = caller //Link the AI to the bot!
+ ai_waypoint = waypoint
+
+ if(path && path.len) //Ensures that a valid path is calculated!
+ if(!on)
+ turn_on() //Saves the AI the hassle of having to activate a bot manually.
+ access_card = all_access //Give the bot all-access while under the AI's command.
+ if(message)
+ to_chat(calling_ai, "\icon[src] [name] called to [end_area.name]. [path.len-1] meters to destination.")
+ pathset = 1
+ mode = BOT_RESPONDING
+ tries = 0
+ else
+ if(message)
+ to_chat(calling_ai, "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range.")
+ calling_ai = null
+ path = list()
+
+/mob/living/simple_animal/bot/proc/call_mode() //Handles preparing a bot for a call, as well as calling the move proc.
+//Handles the bot's movement during a call.
+ var/success = bot_move(ai_waypoint, 3)
+ if(!success)
+ if(calling_ai)
+ to_chat(calling_ai, "\icon[src] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[src] failed to reach waypoint."]")
+ calling_ai = null
+ bot_reset()
+
+/mob/living/simple_animal/bot/proc/bot_reset()
+ if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot.
+ to_chat(calling_ai, "Call command to a bot has been reset.")
+ calling_ai = null
+ path = list()
+ summon_target = null
+ pathset = 0
+ access_card.access = prev_access
+ tries = 0
+ mode = BOT_IDLE
+ diag_hud_set_botstat()
+ diag_hud_set_botmode()
+
+
+
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//Patrol and summon code!
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+/mob/living/simple_animal/bot/proc/bot_patrol()
+ patrol_step()
+ spawn(5)
+ if(mode == BOT_PATROL)
+ patrol_step()
+ return
+
+/mob/living/simple_animal/bot/proc/start_patrol()
+
+ if(tries >= BOT_STEP_MAX_RETRIES) //Bot is trapped, so stop trying to patrol.
+ auto_patrol = 0
+ tries = 0
+ speak("Unable to start patrol.")
+
+ return
+
+ if(!auto_patrol) //A bot not set to patrol should not be patrolling.
+ mode = BOT_IDLE
+ return
+
+ if(patrol_target) // has patrol target
+ spawn(0)
+ calc_path() // Find a route to it
+ if(path.len == 0)
+ patrol_target = null
+ return
+ mode = BOT_PATROL
+ else // no patrol target, so need a new one
+ speak("Engaging patrol mode.")
+ find_patrol_target()
+ tries++
+ return
+
+// perform a single patrol step
+
+/mob/living/simple_animal/bot/proc/patrol_step()
+
+ if(client) // In use by player, don't actually move.
+ return
+
+ if(loc == patrol_target) // reached target
+ //Find the next beacon matching the target.
+ if(!get_next_patrol_target())
+ find_patrol_target() //If it fails, look for the nearest one instead.
+ return
+
+ else if(path.len > 0 && patrol_target) // valid path
+ var/turf/next = path[1]
+ if(next == loc)
+ path -= next
+ return
+
+
+ var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move
+ if(!moved) //Couldn't proceed the next step of the path BOT_STEP_MAX_RETRIES times
+ spawn(2)
+ calc_path()
+ if(path.len == 0)
+ find_patrol_target()
+ tries = 0
+
+ else // no path, so calculate new one
+ mode = BOT_START_PATROL
+
+// finds the nearest beacon to self
+/mob/living/simple_animal/bot/proc/find_patrol_target()
+ send_status()
+ nearest_beacon = null
+ new_destination = null
+ find_nearest_beacon()
+ if(nearest_beacon)
+ patrol_target = nearest_beacon_loc
+ destination = next_destination
+ else
+ auto_patrol = 0
+ mode = BOT_IDLE
+ speak("Disengaging patrol mode.")
+ send_status()
+
+/mob/living/simple_animal/bot/proc/get_next_patrol_target()
+ // search the beacon list for the next target in the list.
+ for(var/obj/machinery/navbeacon/NB in navbeacons["[z]"])
+ if(NB.location == next_destination) //Does the Beacon location text match the destination?
+ destination = new_destination //We now know the name of where we want to go.
+ patrol_target = NB.loc //Get its location and set it as the target.
+ next_destination = NB.codes["next_patrol"] //Also get the name of the next beacon in line.
+ return 1
+
+/mob/living/simple_animal/bot/proc/find_nearest_beacon()
+ for(var/obj/machinery/navbeacon/NB in navbeacons["[z]"])
+ var/dist = get_dist(src, NB)
+ if(nearest_beacon) //Loop though the beacon net to find the true closest beacon.
+ //Ignore the beacon if were are located on it.
+ if(dist>1 && dist 1) //Begin the search, save this one for comparison on the next loop.
+ nearest_beacon = NB.location
+ nearest_beacon_loc = NB.loc
+ patrol_target = nearest_beacon_loc
+ destination = nearest_beacon
+
+/mob/living/simple_animal/bot/proc/bot_control_message(command, mob/user, user_turf)
+ switch(command)
+ if("stop")
+ to_chat(src, "STOP PATROL")
+ if("go")
+ to_chat(src, "START PATROL")
+ if("summon")
+ var/area/a = get_area(user_turf)
+ to_chat(src, "PRIORITY ALERT: [user] in [a.name]!")
+ if("home")
+ to_chat(src, "RETURN HOME!")
+ if("ejectpai")
+ else
+ to_chat(src, "Unidentified control sequence recieved: [command]")
+
+/obj/machinery/bot_core/receive_signal(datum/signal/signal)
+ owner.receive_signal(signal)
+
+/mob/living/simple_animal/bot/proc/receive_signal(datum/signal/signal)
+ if(!on)
+ return 1 //ACCESS DENIED
+
+ var/recv = signal.data["command"]
+ var/user = signal.data["user"]
+
+ // process all-bot input
+ if(recv == "bot_status" && (!signal.data["active"] || signal.data["active"] == src))
+ send_status()
+ return 1
+
+ // check to see if we are the commanded bot
+ if(signal.data["active"] == src)
+ if(emagged == 2 || remote_disabled) //Emagged bots do not respect anyone's authority! Bots with their remote controls off cannot get commands.
+ return 1
+ if(client)
+ bot_control_message(recv, user, signal.data["target"] ? signal.data["target"] : "Unknown")
+ // process control input
+ switch(recv)
+ if("stop")
+ bot_reset() //HOLD IT!!
+ auto_patrol = 0
+
+ if("go")
+ auto_patrol = 1
+
+ if("summon")
+ bot_reset()
+ var/list/user_access = signal.data["useraccess"]
+ summon_target = signal.data["target"] //Location of the user
+ if(user_access.len != 0)
+ access_card.access = user_access + prev_access //Adds the user's access, if any.
+ mode = BOT_SUMMON
+ calc_summon_path()
+ speak("Responding.", radio_channel)
+
+ else
+ return 0
+ return 1
+
+// send a radio signal with a single data key/value pair
+/mob/living/simple_animal/bot/proc/post_signal(var/freq, var/key, var/value)
+ post_signal_multiple(freq, list("[key]" = value) )
+
+// send a radio signal with multiple data key/values
+/mob/living/simple_animal/bot/proc/post_signal_multiple(var/freq, var/list/keyval)
+ if(z != 1) //Bot control will only work on station.
+ return
+ var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
+ if(!frequency)
+ return
+
+ var/datum/signal/signal = new()
+ signal.source = bot_core
+ signal.transmission_method = 1
+ signal.data = keyval
+ spawn()
+ if(signal.data["type"] == bot_type)
+ frequency.post_signal(bot_core, signal, filter = bot_filter)
+ else
+ frequency.post_signal(bot_core, signal)
+
+// signals bot status etc. to controller
+/mob/living/simple_animal/bot/proc/send_status()
+ if(remote_disabled || emagged == 2)
+ return
+ var/list/kv = list(
+ "type" = bot_type,
+ "name" = name,
+ "loca" = get_area(src), // area
+ "mode" = mode
+ )
+ post_signal_multiple(control_freq, kv)
+
+/mob/living/simple_animal/bot/proc/bot_summon() // summoned to PDA
+ summon_step()
+
+// calculates a path to the current destination
+// given an optional turf to avoid
+/mob/living/simple_animal/bot/proc/calc_path(turf/avoid)
+ check_bot_access()
+ path = get_path_to(src, patrol_target, /turf/proc/Distance_cardinal, 0, 120, id=access_card, exclude=avoid)
+
+/mob/living/simple_animal/bot/proc/calc_summon_path(turf/avoid)
+ check_bot_access()
+ spawn()
+ path = get_path_to(src, summon_target, /turf/proc/Distance_cardinal, 0, 150, id=access_card, exclude=avoid)
+ if(!path.len) //Cannot reach target. Give up and announce the issue.
+ speak("Summon command failed, destination unreachable.",radio_channel)
+ bot_reset()
+
+/mob/living/simple_animal/bot/proc/summon_step()
+
+ if(client) // In use by player, don't actually move.
+ return
+
+ if(loc == summon_target) // Arrived to summon location.
+ bot_reset()
+ return
+
+ else if(path.len > 0 && summon_target) //Proper path acquired!
+ var/turf/next = path[1]
+ if(next == loc)
+ path -= next
+ return
+
+ var/moved = bot_move(summon_target, 3) // Move attempt
+ if(!moved)
+ spawn(2)
+ calc_summon_path()
+ tries = 0
+
+ else // no path, so calculate new one
+ calc_summon_path()
+
+/mob/living/simple_animal/bot/proc/openedDoor(obj/machinery/door/D)
+ frustration = 0
+
+/mob/living/simple_animal/bot/show_inv()
+
+/mob/living/simple_animal/bot/proc/show_controls(mob/M)
+ users |= M
+ var/dat = ""
+ dat = get_controls(M)
+ var/datum/browser/popup = new(M,window_id,window_name,350,600)
+ popup.set_content(dat)
+ popup.open()
+ onclose(M,window_id,ref=src)
+ return
+
+/mob/living/simple_animal/bot/proc/update_controls()
+ for(var/mob/M in users)
+ show_controls(M)
+
+/mob/living/simple_animal/bot/proc/get_controls(mob/M)
+ return "PROTOBOT - NOT FOR USE"
+
+/mob/living/simple_animal/bot/Topic(href, href_list)
+ if(href_list["close"])// HUE HUE
+ if(usr in users)
+ users.Remove(usr)
+ return 1
+
+ if(topic_denied(usr))
+ to_chat(usr, "[src]'s interface is not responding!")
+ return 1
+ add_fingerprint(usr)
+
+ if((href_list["power"]) && (bot_core.allowed(usr) || !locked))
+ if(on)
+ turn_off()
+ else
+ turn_on()
+
+ switch(href_list["operation"])
+ if("patrol")
+ auto_patrol = !auto_patrol
+ bot_reset()
+ if("remote")
+ remote_disabled = !remote_disabled
+ if("hack")
+ if(emagged != 2)
+ emagged = 2
+ hacked = 1
+ locked = 1
+ to_chat(usr, "[text_hack]")
+ show_laws()
+ bot_reset()
+ else if(!hacked)
+ to_chat(usr, "[text_dehack_fail]")
+ else
+ emagged = 0
+ hacked = 0
+ to_chat(usr, "[text_dehack]")
+ show_laws()
+ bot_reset()
+ if("ejectpai")
+ if(paicard && (!locked || issilicon(usr) || check_rights(R_ADMIN, 0, usr)))
+ to_chat(usr, "You eject [paicard] from [bot_name]")
+ ejectpai(usr)
+ update_controls()
+
+/mob/living/simple_animal/bot/handle_state_icons()
+
+/mob/living/simple_animal/bot/proc/update_icon()
+ icon_state = "[initial(icon_state)][on]"
+
+// Machinery to simplify topic and access calls
+/obj/machinery/bot_core
+ use_power = 0
+ var/mob/living/simple_animal/bot/owner = null
+
+/obj/machinery/bot_core/New(loc)
+ ..()
+ owner = loc
+ if(!istype(owner))
+ qdel(src)
+
+/mob/living/simple_animal/bot/proc/topic_denied(mob/user) //Access check proc for bot topics! Remember to place in a bot's individual Topic if desired.
+ if(user.incapacitated() || !(issilicon(user) || in_range(src, user)))
+ return 1
+ // 0 for access, 1 for denied.
+ if(emagged == 2) //An emagged bot cannot be controlled by humans, silicons can if one hacked it.
+ if(!hacked) //Manually emagged by a human - access denied to all.
+ return 1
+ else if(!issilicon(user) && !check_rights(R_ADMIN, 0, user)) //Bot is hacked, so only silicons and admins are allowed access.
+ return 1
+ return 0
+
+/mob/living/simple_animal/bot/proc/hack(mob/user)
+ var/hack
+ if(issilicon(user) || check_rights(R_ADMIN, 0, user)) //Allows silicons or admins to toggle the emag status of a bot.
+ hack += "[emagged == 2 ? "Software compromised! Unit may exhibit dangerous or erratic behavior." : "Unit operating normally. Release safety lock?"]
"
+ hack += "Harm Prevention Safety System: [emagged ? "DANGER" : "Engaged"]
"
+ else if(!locked) //Humans with access can use this option to hide a bot from the AI's remote control panel and PDA control.
+ hack += "Remote network control radio: [remote_disabled ? "Disconnected" : "Connected"]
"
+ return hack
+
+/mob/living/simple_animal/bot/proc/showpai(mob/user)
+ var/eject = ""
+ if(!locked || issilicon(usr) || check_rights(R_ADMIN, 0, user))
+ if(paicard || allow_pai)
+ eject += "Personality card status: "
+ if(paicard)
+ if(client)
+ eject += "Active"
+ else
+ eject += "Inactive"
+ else if(!allow_pai || key)
+ eject += "Unavailable"
+ else
+ eject += "Not inserted"
+ eject += "
"
+ eject += "
"
+ return eject
+
+/mob/living/simple_animal/bot/proc/ejectpai(mob/user = null, announce = 1)
+ if(paicard)
+ if(mind && paicard.pai)
+ mind.transfer_to(paicard.pai)
+ else if(paicard.pai)
+ paicard.pai.key = key
+ else
+ ghostize(0) // The pAI card that just got ejected was dead.
+ key = null
+ paicard.forceMove(loc)
+ if(user)
+ add_logs(user, paicard.pai, "ejected from [src.bot_name],")
+ else
+ add_logs(src, paicard.pai, "ejected")
+ if(announce)
+ to_chat(paicard.pai, "You feel your control fade as [paicard] ejects from [bot_name].")
+ paicard = null
+ name = bot_name
+ faction = initial(faction)
+
+/mob/living/simple_animal/bot/proc/ejectpairemote(mob/user)
+ if(bot_core.allowed(user) && paicard)
+ speak("Ejecting personality chip.", radio_channel)
+ ejectpai(user)
+
+/mob/living/simple_animal/bot/Login()
+ . = ..()
+ access_card.access += player_access
+ diag_hud_set_botmode()
+ show_laws()
+
+/mob/living/simple_animal/bot/Logout()
+ . = ..()
+ bot_reset()
+
+/mob/living/simple_animal/bot/revive(full_heal = 0, admin_revive = 0)
+ if(..())
+ update_icon()
+ . = 1
+
+/mob/living/simple_animal/bot/ghost()
+ if(stat != DEAD) // Only ghost if we're doing this while alive, the pAI probably isn't dead yet.
+ ..()
+ if(paicard && (!client || stat == DEAD))
+ ejectpai(0)
+
+/mob/living/simple_animal/bot/sentience_act()
+ faction -= "silicon"
+
+/mob/living/simple_animal/bot/verb/show_laws()
+ set name = "Show Directives"
+ set category = "IC"
+
+ to_chat(src, "Directives:")
+ if(paicard && paicard.pai && paicard.pai.master && paicard.pai.pai_law0)
+ to_chat(src, "Your master, [paicard.pai.master], may overrule any and all laws.")
+ to_chat(src, "0. [paicard.pai.pai_law0]")
+ if(emagged >= 2)
+ to_chat(src, "1. #$!@#$32K#$")
+ else
+ to_chat(src, "1. You are a machine built to serve the station's crew and AI(s).")
+ to_chat(src, "2. Your function is to [bot_purpose].")
+ to_chat(src, "3. You cannot serve your function if you are broken.")
+ to_chat(src, "4. Serve your function to the best of your ability.")
+ if(paicard && paicard.pai && paicard.pai.pai_laws)
+ to_chat(src, "Supplemental Directive(s):")
+ to_chat(src, "[paicard.pai.pai_laws]")
+
+/mob/living/simple_animal/bot/get_access()
+ . = ..()
+
+ if(access_card)
+ . |= access_card.GetAccess()
+
+/mob/living/simple_animal/bot/proc/door_opened(obj/machinery/door/D)
+ frustration = 0
+
+/mob/living/simple_animal/bot/handle_message_mode(var/message_mode, var/message, var/verb, var/speaking, var/used_radios)
+ switch(message_mode)
+ if("intercom")
+ for(var/obj/item/device/radio/intercom/I in view(1, src))
+ spawn(0)
+ I.talk_into(src, message, null, verb, speaking)
+ used_radios += I
+ if("headset")
+ Radio.talk_into(src, message, null, verb, speaking)
+ used_radios += Radio
+ else
+ if(message_mode)
+ Radio.talk_into(src, message, message_mode, verb, speaking)
+ used_radios += Radio
+
+/mob/living/simple_animal/bot/handle_hud_icons_health()
+ ..()
+ if(bodytemp)
+ switch(bodytemperature) //310.055 optimal body temp
+ if(335 to INFINITY)
+ bodytemp.icon_state = "temp2"
+ if(320 to 335)
+ bodytemp.icon_state = "temp1"
+ if(300 to 320)
+ bodytemp.icon_state = "temp0"
+ if(260 to 300)
+ bodytemp.icon_state = "temp-1"
+ else
+ bodytemp.icon_state = "temp-2"
\ No newline at end of file
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
similarity index 52%
rename from code/game/machinery/bots/cleanbot.dm
rename to code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 902ee0becde..0dc75f742f8 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -1,282 +1,225 @@
-//Cleanbot assembly
-/obj/item/weapon/bucket_sensor
- desc = "It's a bucket. With a sensor attached."
- name = "proxy bucket"
- icon = 'icons/obj/aibots.dmi'
- icon_state = "bucket_proxy"
- force = 3.0
- throwforce = 5.0
- throw_speed = 2
- throw_range = 5
- w_class = 3.0
- var/created_name = "Cleanbot"
-
-
-//Cleanbot
-/obj/machinery/bot/cleanbot
- name = "\improper Cleanbot"
- desc = "A little cleaning robot, he looks so excited!"
- icon = 'icons/obj/aibots.dmi'
- icon_state = "cleanbot0"
- layer = 5.0
- density = 0
- anchored = 0
- //weight = 1.0E7
- health = 25
- maxhealth = 25
- var/blood = 1
- var/list/target_types = list()
- var/obj/effect/decal/cleanable/target
- var/obj/effect/decal/cleanable/oldtarget
- var/max_targets = 50 //Maximum number of targets a cleanbot can ignore.
- var/oldloc = null
- req_one_access = list(access_janitor, access_robotics)
-// var/patrol_path[] = null
-// var/beacon_freq = 1445 // navigation beacon frequency
- var/closest_dist
- var/closest_loc
- var/failed_steps
- var/next_dest
- var/next_dest_loc
- radio_name = "Service"
- bot_type = CLEAN_BOT
- bot_type_name = "Cleanbot"
- bot_filter = RADIO_CLEANBOT
-
-/obj/machinery/bot/cleanbot/New()
- ..()
- get_targets()
- icon_state = "cleanbot[on]"
-
- var/datum/job/janitor/J = new/datum/job/janitor
- botcard.access = J.get_access()
- prev_access = botcard.access
-
- spawn(5)
- add_to_beacons(bot_filter)
-
-/obj/machinery/bot/cleanbot/turn_on()
- ..()
- icon_state = "cleanbot[on]"
- updateUsrDialog()
-
-/obj/machinery/bot/cleanbot/turn_off()
- ..()
- icon_state = "cleanbot[on]"
- updateUsrDialog()
-
-/obj/machinery/bot/cleanbot/bot_reset()
- ..()
- ignore_list = list() //Allows the bot to clean targets it previously ignored due to being unreachable.
- target = null
- oldtarget = null
- oldloc = null
-
-/obj/machinery/bot/cleanbot/set_custom_texts()
- text_hack = "You corrupt [name]'s cleaning software."
- text_dehack = "[name]'s software has been reset!"
- text_dehack_fail = "[name] does not seem to respond to your repair code!"
-
-/obj/machinery/bot/cleanbot/attack_hand(mob/user as mob)
- . = ..()
- if (.)
- return
- usr.set_machine(src)
- interact(user)
-
-/obj/machinery/bot/cleanbot/interact(mob/user as mob)
- var/dat
- dat += hack(user)
- dat += text({"
-Cleaner v1.1 controls
-Status: []
-Behaviour controls are [locked ? "locked" : "unlocked"]
-Maintenance panel panel is [open ? "opened" : "closed"]"},
-text("[on ? "On" : "Off"]"))
- if(!locked || issilicon(user))
- dat += text({"
Cleans Blood: []
"}, text("[blood ? "Yes" : "No"]"))
- dat += text({"
Patrol station: []
"}, text("[auto_patrol ? "Yes" : "No"]"))
-
- var/datum/browser/popup = new(user, "autoclean", "Automatic Station Cleaner v1.1")
- popup.set_content(dat)
- popup.open()
- return
-
-/obj/machinery/bot/cleanbot/Topic(href, href_list)
-
- ..()
- switch(href_list["operation"])
- if("blood")
- blood =!blood
- get_targets()
- updateUsrDialog()
- if("freq")
- var/freq = text2num(input("Select frequency for navigation beacons", "Frequency", num2text(beacon_freq / 10))) * 10
- if (freq > 0)
- beacon_freq = freq
- updateUsrDialog()
-
-/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user as mob, params)
- if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- if(allowed(usr) && !open && !emagged)
- locked = !locked
- user << "You [ locked ? "lock" : "unlock"] the [src] behaviour controls."
- updateUsrDialog()
- else
- if(emagged)
- user << "ERROR"
- if(open)
- user << "Please close the access panel before locking it."
- else
- user << "This [src] doesn't seem to respect your authority."
- else
- return ..()
-
-/obj/machinery/bot/cleanbot/Emag(mob/user as mob)
- ..()
- if(emagged == 2)
- if(user)
- user << "[src] buzzes and beeps."
-
-/obj/machinery/bot/cleanbot/process_scan(var/obj/effect/decal/cleanable/D)
- for(var/T in target_types)
- if(istype(D, T))
- return D
-
-/obj/machinery/bot/cleanbot/bot_process()
- if (!..())
- return
-
- if(mode == BOT_CLEANING)
- return
-
- if(emagged == 2) //Emag functions
- if(istype(loc,/turf/simulated))
-
- if(prob(10)) //Wets floors randomly
- var/turf/simulated/T = loc
- T.MakeSlippery()
-
- if(prob(5)) //Spawns foam!
- visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
- new /obj/effect/effect/foam(loc)
-
- else if (prob(5))
- visible_message("[src] makes an excited beeping booping sound!")
-
- if(!target) //Search for cleanables it can see.
- target = scan(/obj/effect/decal/cleanable/, oldtarget)
- oldtarget = target
-
- if(!target)
- if(loc != oldloc)
- oldtarget = null
-
- if(auto_patrol)
- if(mode == BOT_IDLE || mode == BOT_START_PATROL)
- start_patrol()
-
- if(mode == BOT_PATROL)
- bot_patrol()
-
- return
-
- if(target)
- if(!path || path.len == 0) //No path, need a new one
- //Try to produce a path to the target, and ignore airlocks to which it has access.
- path = get_path_to(loc, target.loc, src, /turf/proc/Distance_cardinal, 0, 30, id=botcard)
- if (!bot_move(target))
- add_to_ignore(target)
- target = null
- path = list()
- return
- mode = BOT_MOVING
- else if (!bot_move(target))
- target = null
- mode = BOT_IDLE
- return
-
- if(target && loc == target.loc)
- clean(target)
- path = list()
- target = null
-
- oldloc = loc
-
-/obj/machinery/bot/cleanbot/proc/get_targets()
- target_types = new/list()
-
- target_types += /obj/effect/decal/cleanable/blood/oil
- target_types += /obj/effect/decal/cleanable/vomit
- target_types += /obj/effect/decal/cleanable/poop
- target_types += /obj/effect/decal/cleanable/blood/gibs/robot
- target_types += /obj/effect/decal/cleanable/crayon
- target_types += /obj/effect/decal/cleanable/liquid_fuel
- target_types += /obj/effect/decal/cleanable/molten_item
- target_types += /obj/effect/decal/cleanable/tomato_smudge
- target_types += /obj/effect/decal/cleanable/egg_smudge
- target_types += /obj/effect/decal/cleanable/pie_smudge
- target_types += /obj/effect/decal/cleanable/flour
- target_types += /obj/effect/decal/cleanable/ash
- target_types += /obj/effect/decal/cleanable/greenglow
- target_types += /obj/effect/decal/cleanable/dirt
- target_types += /obj/effect/decal/cleanable/mucus
-
- if(blood)
- target_types += /obj/effect/decal/cleanable/blood/xeno/
- target_types += /obj/effect/decal/cleanable/blood/gibs/xeno
- target_types += /obj/effect/decal/cleanable/blood/
- target_types += /obj/effect/decal/cleanable/blood/gibs/
- target_types += /obj/effect/decal/cleanable/blood/tracks
- target_types += /obj/effect/decal/cleanable/dirt
-
-/obj/machinery/bot/cleanbot/proc/clean(var/obj/effect/decal/cleanable/target)
- anchored = 1
- icon_state = "cleanbot-c"
- visible_message("[src] begins to clean up [target]")
- mode = BOT_CLEANING
- spawn(25)
- if(mode == BOT_CLEANING)
- qdel(target)
- anchored = 0
- target = null
- mode = BOT_IDLE
- icon_state = "cleanbot[on]"
-
-/obj/machinery/bot/cleanbot/explode()
- on = 0
- visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
-
- new /obj/item/weapon/reagent_containers/glass/bucket(Tsec)
-
- new /obj/item/device/assembly/prox_sensor(Tsec)
-
- if (prob(50))
- new /obj/item/robot_parts/l_arm(Tsec)
-
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
- s.set_up(3, 1, src)
- s.start()
- qdel(src)
- return
-
-/obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob, params)
- ..()
- if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
- user.drop_item()
- qdel(W)
- var/turf/T = get_turf(loc)
- var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T)
- A.name = created_name
- user << "You add the robot arm to the bucket and sensor assembly. Beep boop!"
- user.unEquip(src, 1)
- qdel(src)
-
- else if (istype(W, /obj/item/weapon/pen))
- var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
- if (!t)
- return
- if (!in_range(src, usr) && loc != usr)
- return
- created_name = t
+//Cleanbot
+/mob/living/simple_animal/bot/cleanbot
+ name = "\improper Cleanbot"
+ desc = "A little cleaning robot, he looks so excited!"
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "cleanbot0"
+ density = 0
+ anchored = 0
+ health = 25
+ maxHealth = 25
+ radio_channel = "Service" //Service
+ bot_filter = RADIO_CLEANBOT
+ bot_type = CLEAN_BOT
+ model = "Cleanbot"
+ bot_purpose = "seek out messes and clean them"
+ bot_core_type = /obj/machinery/bot_core/cleanbot
+ window_id = "autoclean"
+ window_name = "Automatic Station Cleaner v1.1"
+ pass_flags = PASSMOB
+
+ var/blood = 1
+ var/list/target_types = list()
+ var/obj/effect/decal/cleanable/target
+ var/max_targets = 50 //Maximum number of targets a cleanbot can ignore.
+ var/oldloc = null
+ var/closest_dist
+ var/closest_loc
+ var/failed_steps
+ var/next_dest
+ var/next_dest_loc
+
+/mob/living/simple_animal/bot/cleanbot/New()
+ ..()
+ get_targets()
+ icon_state = "cleanbot[on]"
+
+ var/datum/job/janitor/J = new/datum/job/janitor
+ access_card.access += J.get_access()
+ prev_access = access_card.access
+
+/mob/living/simple_animal/bot/cleanbot/turn_on()
+ ..()
+ icon_state = "cleanbot[on]"
+
+/mob/living/simple_animal/bot/cleanbot/turn_off()
+ ..()
+ icon_state = "cleanbot[on]"
+
+/mob/living/simple_animal/bot/cleanbot/bot_reset()
+ ..()
+ ignore_list = list() //Allows the bot to clean targets it previously ignored due to being unreachable.
+ target = null
+ oldloc = null
+
+/mob/living/simple_animal/bot/cleanbot/set_custom_texts()
+ text_hack = "You corrupt [name]'s cleaning software."
+ text_dehack = "[name]'s software has been reset!"
+ text_dehack_fail = "[name] does not seem to respond to your repair code!"
+
+/mob/living/simple_animal/bot/cleanbot/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
+ if(bot_core.allowed(user) && !open && !emagged)
+ locked = !locked
+ to_chat(user, "You [ locked ? "lock" : "unlock"] \the [src] behaviour controls.")
+ else
+ if(emagged)
+ to_chat(user, "ERROR")
+ if(open)
+ to_chat(user, "Please close the access panel before locking it.")
+ else
+ to_chat(user, "\The [src] doesn't seem to respect your authority.")
+ else
+ return ..()
+
+/mob/living/simple_animal/bot/cleanbot/emag_act(mob/user)
+ ..()
+ if(emagged == 2)
+ if(user)
+ to_chat(user, "[src] buzzes and beeps.")
+
+/mob/living/simple_animal/bot/cleanbot/process_scan(obj/effect/decal/cleanable/D)
+ for(var/T in target_types)
+ if(istype(D, T))
+ return D
+
+/mob/living/simple_animal/bot/cleanbot/handle_automated_action()
+ if(!..())
+ return
+
+ if(mode == BOT_CLEANING)
+ return
+
+ if(emagged == 2) //Emag functions
+ if(istype(loc,/turf/simulated))
+ if(prob(10)) //Wets floors randomly
+ var/turf/simulated/T = loc
+ T.MakeSlippery()
+
+ if(prob(5)) //Spawns foam!
+ visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
+ new /obj/effect/effect/foam(loc)
+
+ else if(prob(5))
+ audible_message("[src] makes an excited beeping booping sound!")
+
+ if(!target) //Search for cleanables it can see.
+ target = scan(/obj/effect/decal/cleanable/)
+
+ if(!target && auto_patrol) //Search for cleanables it can see.
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
+
+ if(mode == BOT_PATROL)
+ bot_patrol()
+
+ if(target)
+ if(!path || path.len == 0) //No path, need a new one
+ //Try to produce a path to the target, and ignore airlocks to which it has access.
+ path = get_path_to(src, target.loc, /turf/proc/Distance_cardinal, 0, 30, id=access_card)
+ if(!bot_move(target))
+ add_to_ignore(target)
+ target = null
+ path = list()
+ return
+ mode = BOT_MOVING
+ else if(!bot_move(target))
+ target = null
+ mode = BOT_IDLE
+ return
+
+ if(target && loc == target.loc)
+ clean(target)
+ path = list()
+ target = null
+
+ oldloc = loc
+
+/mob/living/simple_animal/bot/cleanbot/proc/get_targets()
+ target_types = new/list()
+
+ target_types += /obj/effect/decal/cleanable/blood/oil
+ target_types += /obj/effect/decal/cleanable/vomit
+ target_types += /obj/effect/decal/cleanable/blood/gibs/robot
+ target_types += /obj/effect/decal/cleanable/crayon
+ target_types += /obj/effect/decal/cleanable/liquid_fuel
+ target_types += /obj/effect/decal/cleanable/molten_item
+ target_types += /obj/effect/decal/cleanable/tomato_smudge
+ target_types += /obj/effect/decal/cleanable/egg_smudge
+ target_types += /obj/effect/decal/cleanable/pie_smudge
+ target_types += /obj/effect/decal/cleanable/flour
+ target_types += /obj/effect/decal/cleanable/ash
+ target_types += /obj/effect/decal/cleanable/greenglow
+ target_types += /obj/effect/decal/cleanable/dirt
+
+ if(blood)
+ target_types += /obj/effect/decal/cleanable/blood/xeno/
+ target_types += /obj/effect/decal/cleanable/blood/gibs/xeno
+ target_types += /obj/effect/decal/cleanable/blood/
+ target_types += /obj/effect/decal/cleanable/blood/gibs/
+ target_types += /obj/effect/decal/cleanable/blood/tracks
+ target_types += /obj/effect/decal/cleanable/dirt
+
+/mob/living/simple_animal/bot/cleanbot/proc/clean(obj/effect/decal/cleanable/target)
+ anchored = 1
+ icon_state = "cleanbot-c"
+ visible_message("[src] begins to clean up [target]")
+ mode = BOT_CLEANING
+ spawn(50)
+ if(mode == BOT_CLEANING)
+ qdel(target)
+ anchored = 0
+ target = null
+ mode = BOT_IDLE
+ icon_state = "cleanbot[on]"
+
+/mob/living/simple_animal/bot/cleanbot/explode()
+ on = 0
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ new /obj/item/weapon/reagent_containers/glass/bucket(Tsec)
+
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+
+ if(prob(50))
+ new /obj/item/robot_parts/l_arm(Tsec)
+
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+ ..()
+
+/obj/machinery/bot_core/cleanbot
+ req_one_access = list(access_janitor, access_robotics)
+
+
+/mob/living/simple_animal/bot/cleanbot/get_controls(mob/user)
+ var/dat
+ dat += hack(user)
+ dat += showpai(user)
+ dat += text({"
+Cleaner v1.1 controls
+Status: []
+Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"},
+text("[on ? "On" : "Off"]"))
+ if(!locked || issilicon(user) || check_rights(R_ADMIN, 0, user))
+ dat += text({"
Cleans Blood: []
"}, text("[blood ? "Yes" : "No"]"))
+ dat += text({"
Patrol station: []
"}, text("[auto_patrol ? "Yes" : "No"]"))
+ return dat
+
+/mob/living/simple_animal/bot/cleanbot/Topic(href, href_list)
+ if(..())
+ return 1
+ switch(href_list["operation"])
+ if("blood")
+ blood =!blood
+ get_targets()
+ update_controls()
+
+/mob/living/simple_animal/bot/cleanbot/UnarmedAttack(atom/A)
+ if(istype(A,/obj/effect/decal/cleanable))
+ clean(A)
+ else
+ ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
new file mode 100644
index 00000000000..2c2ca652d10
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -0,0 +1,480 @@
+//Bot Construction
+
+//Cleanbot assembly
+/obj/item/weapon/bucket_sensor
+ desc = "It's a bucket. With a sensor attached."
+ name = "proxy bucket"
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "bucket_proxy"
+ force = 3
+ throwforce = 5
+ throw_speed = 2
+ throw_range = 5
+ w_class = 3
+ var/created_name = "Cleanbot"
+
+/obj/item/weapon/bucket_sensor/attackby(obj/item/W, mob/user as mob, params)
+ ..()
+ if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
+ if(!user.unEquip(W))
+ return
+ qdel(W)
+ var/turf/T = get_turf(loc)
+ var/mob/living/simple_animal/bot/cleanbot/A = new /mob/living/simple_animal/bot/cleanbot(T)
+ A.name = created_name
+ to_chat(user, "You add the robot arm to the bucket and sensor assembly. Beep boop!")
+ user.unEquip(src, 1)
+ qdel(src)
+
+ else if(istype(W, /obj/item/weapon/pen))
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && loc != usr)
+ return
+ created_name = t
+
+//Edbot Assembly
+
+/obj/item/weapon/ed209_assembly
+ name = "\improper ED-209 assembly"
+ desc = "Some sort of bizarre assembly."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "ed209_frame"
+ item_state = "ed209_frame"
+ var/build_step = 0
+ var/created_name = "ED-209 Security Robot" //To preserve the name if it's a unique securitron I guess
+ var/lasercolor = ""
+
+/obj/item/weapon/ed209_assembly/attackby(obj/item/weapon/W, mob/user, params)
+ ..()
+
+ if(istype(W, /obj/item/weapon/pen))
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && loc != usr)
+ return
+ created_name = t
+ return
+
+ switch(build_step)
+ if(0,1)
+ if(istype(W, /obj/item/robot_parts/l_leg) || istype(W, /obj/item/robot_parts/r_leg))
+ if(!user.unEquip(W))
+ return
+ qdel(W)
+ build_step++
+ to_chat(user, "You add the robot leg to [src].")
+ name = "legs/frame assembly"
+ if(build_step == 1)
+ item_state = "ed209_leg"
+ icon_state = "ed209_leg"
+ else
+ item_state = "ed209_legs"
+ icon_state = "ed209_legs"
+
+ if(2)
+ var/newcolor = ""
+ if(istype(W, /obj/item/clothing/suit/redtag))
+ newcolor = "r"
+ else if(istype(W, /obj/item/clothing/suit/bluetag))
+ newcolor = "b"
+ if(newcolor || istype(W, /obj/item/clothing/suit/armor/vest))
+ if(!user.unEquip(W))
+ return
+ lasercolor = newcolor
+ qdel(W)
+ build_step++
+ to_chat(user, "You add the armor to [src].")
+ name = "vest/legs/frame assembly"
+ item_state = "[lasercolor]ed209_shell"
+ icon_state = "[lasercolor]ed209_shell"
+
+ if(3)
+ if(istype(W, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = W
+ if(WT.remove_fuel(0,user))
+ build_step++
+ name = "shielded frame assembly"
+ to_chat(user, "You weld the vest to [src].")
+ if(4)
+ switch(lasercolor)
+ if("b")
+ if(!istype(W, /obj/item/clothing/head/helmet/bluetaghelm))
+ return
+
+ if("r")
+ if(!istype(W, /obj/item/clothing/head/helmet/redtaghelm))
+ return
+
+ if("")
+ if(!istype(W, /obj/item/clothing/head/helmet))
+ return
+
+ if(!user.unEquip(W))
+ return
+ qdel(W)
+ build_step++
+ to_chat(user, "You add the helmet to [src].")
+ name = "covered and shielded frame assembly"
+ item_state = "[lasercolor]ed209_hat"
+ icon_state = "[lasercolor]ed209_hat"
+
+ if(5)
+ if(isprox(W))
+ if(!user.unEquip(W))
+ return
+ qdel(W)
+ build_step++
+ to_chat(user, "You add the prox sensor to [src].")
+ name = "covered, shielded and sensored frame assembly"
+ item_state = "[lasercolor]ed209_prox"
+ icon_state = "[lasercolor]ed209_prox"
+
+ if(6)
+ if(istype(W, /obj/item/stack/cable_coil))
+ var/obj/item/stack/cable_coil/coil = W
+ if(coil.get_amount() < 1)
+ to_chat(user, "You need one length of cable to wire the ED-209!")
+ return
+ to_chat(user, "You start to wire [src]...")
+ if(do_after(user, 40, target = src))
+ if(coil.get_amount() >= 1 && build_step == 6)
+ coil.use(1)
+ build_step = 7
+ to_chat(user, "You wire the ED-209 assembly.")
+ name = "wired ED-209 assembly"
+
+ if(7)
+ var/newname = ""
+ switch(lasercolor)
+ if("b")
+ if(!istype(W, /obj/item/weapon/gun/energy/laser/bluetag))
+ return
+ newname = "bluetag ED-209 assembly"
+ if("r")
+ if(!istype(W, /obj/item/weapon/gun/energy/laser/redtag))
+ return
+ newname = "redtag ED-209 assembly"
+ if("")
+ if(!istype(W, /obj/item/weapon/gun/energy/advtaser))
+ return
+ newname = "taser ED-209 assembly"
+ else
+ return
+ if(!user.unEquip(W))
+ return
+ name = newname
+ build_step++
+ to_chat(user, "You add [W] to [src].")
+ item_state = "[lasercolor]ed209_taser"
+ icon_state = "[lasercolor]ed209_taser"
+ qdel(W)
+
+ if(8)
+ if(istype(W, /obj/item/weapon/screwdriver))
+ playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
+ to_chat(user, "You start attaching the gun to the frame...")
+ if(do_after(user, 40, target = src))
+ build_step++
+ name = "armed [name]"
+ to_chat(user, "Taser gun attached.")
+
+ if(9)
+ if(istype(W, /obj/item/weapon/stock_parts/cell))
+ if(!user.unEquip(W))
+ return
+ build_step++
+ to_chat(user, "You complete the ED-209.")
+ var/turf/T = get_turf(src)
+ new /mob/living/simple_animal/bot/ed209(T,created_name,lasercolor)
+ qdel(W)
+ user.unEquip(src, 1)
+ qdel(src)
+
+//Floorbot assemblies
+/obj/item/weapon/toolbox_tiles
+ desc = "It's a toolbox with tiles sticking out the top"
+ name = "tiles and toolbox"
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "toolbox_tiles"
+ force = 3
+ throwforce = 10
+ throw_speed = 2
+ throw_range = 5
+ w_class = 3
+ var/created_name = "Floorbot"
+
+/obj/item/weapon/toolbox_tiles_sensor
+ desc = "It's a toolbox with tiles sticking out the top and a sensor attached"
+ name = "tiles, toolbox and sensor arrangement"
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "toolbox_tiles_sensor"
+ force = 3
+ throwforce = 10
+ throw_speed = 2
+ throw_range = 5
+ w_class = 3
+ var/created_name = "Floorbot"
+
+/obj/item/weapon/storage/toolbox/mechanical/attackby(obj/item/stack/tile/plasteel/T, mob/user, params)
+ if(!istype(T, /obj/item/stack/tile/plasteel))
+ ..()
+ return
+ if(contents.len >= 1)
+ to_chat(user, "They won't fit in, as there is already stuff inside.")
+ return
+ if(T.use(10))
+ if(user.s_active)
+ user.s_active.close(user)
+ var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles
+ user.put_in_hands(B)
+ to_chat(user, "You add the tiles into the empty toolbox. They protrude from the top.")
+ user.unEquip(src, 1)
+ qdel(src)
+ else
+ to_chat(user, "You need 10 floor tiles to start building a floorbot.")
+ return
+
+/obj/item/weapon/toolbox_tiles/attackby(obj/item/W, mob/user, params)
+ ..()
+ if(isprox(W))
+ qdel(W)
+ var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor()
+ B.created_name = created_name
+ user.put_in_hands(B)
+ to_chat(user, "You add the sensor to the toolbox and tiles.")
+ user.unEquip(src, 1)
+ qdel(src)
+
+ else if(istype(W, /obj/item/weapon/pen))
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && loc != usr)
+ return
+
+ created_name = t
+
+/obj/item/weapon/toolbox_tiles_sensor/attackby(obj/item/W, mob/user, params)
+ ..()
+ if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
+ qdel(W)
+ var/turf/T = get_turf(user.loc)
+ var/mob/living/simple_animal/bot/floorbot/A = new /mob/living/simple_animal/bot/floorbot(T)
+ A.name = created_name
+ to_chat(user, "You add the robot arm to the odd looking toolbox assembly. Boop beep!")
+ user.unEquip(src, 1)
+ qdel(src)
+ else if(istype(W, /obj/item/weapon/pen))
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && loc != usr)
+ return
+
+ created_name = t
+
+//Medbot Assembly
+/obj/item/weapon/firstaid_arm_assembly
+ name = "incomplete medibot assembly."
+ desc = "A first aid kit with a robot arm permanently grafted to it."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "firstaid_arm"
+ var/build_step = 0
+ var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
+ var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
+ w_class = 3
+ var/treatment_brute = "salglu_solution"
+ var/treatment_oxy = "salbutamol"
+ var/treatment_fire = "salglu_solution"
+ var/treatment_tox = "charcoal"
+ var/treatment_virus = "spaceacillin"
+ req_one_access = list(access_medical, access_robotics)
+
+ /obj/item/weapon/firstaid_arm_assembly/New()
+ ..()
+ spawn(5)
+ if(skin)
+ overlays += image('icons/obj/aibots.dmi', "kit_skin_[skin]")
+
+/obj/item/weapon/storage/firstaid/attackby(obj/item/robot_parts/S, mob/user, params)
+
+ if((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
+ ..()
+ return
+
+ //Making a medibot!
+ if(contents.len >= 1)
+ to_chat(user, "You need to empty [src] out first!")
+ return
+
+ var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly
+ if(istype(src,/obj/item/weapon/storage/firstaid/fire))
+ A.skin = "ointment"
+ else if(istype(src,/obj/item/weapon/storage/firstaid/toxin))
+ A.skin = "tox"
+ else if(istype(src,/obj/item/weapon/storage/firstaid/o2))
+ A.skin = "o2"
+ else if(istype(src,/obj/item/weapon/storage/firstaid/brute))
+ A.skin = "brute"
+ else if(istype(src,/obj/item/weapon/storage/firstaid/adv))
+ A.skin = "adv"
+ else if(istype(src,/obj/item/weapon/storage/firstaid/tactical))
+ A.skin = "bezerk"
+ else if(istype(src,/obj/item/weapon/storage/firstaid/aquatic_kit))
+ A.skin = "fish"
+
+ A.req_one_access = req_one_access
+ A.treatment_oxy = treatment_oxy
+ A.treatment_brute = treatment_brute
+ A.treatment_fire = treatment_fire
+ A.treatment_tox = treatment_tox
+ A.treatment_virus = treatment_virus
+
+ qdel(S)
+ user.put_in_hands(A)
+ to_chat(user, "You add the robot arm to the first aid kit.")
+ user.unEquip(src, 1)
+ qdel(src)
+
+
+/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W, mob/user, params)
+ ..()
+ if(istype(W, /obj/item/weapon/pen))
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && loc != usr)
+ return
+ created_name = t
+ else
+ switch(build_step)
+ if(0)
+ if(istype(W, /obj/item/device/healthanalyzer))
+ if(!user.unEquip(W))
+ return
+ qdel(W)
+ build_step++
+ to_chat(user, "You add the health sensor to [src].")
+ name = "First aid/robot arm/health analyzer assembly"
+ overlays += image('icons/obj/aibots.dmi', "na_scanner")
+
+ if(1)
+ if(isprox(W))
+ if(!user.unEquip(W))
+ return
+ qdel(W)
+ build_step++
+ to_chat(user, "You complete the Medibot. Beep boop!")
+ var/turf/T = get_turf(src)
+ var/mob/living/simple_animal/bot/medbot/S = new /mob/living/simple_animal/bot/medbot(T)
+ S.skin = skin
+ S.name = created_name
+ S.bot_core.req_one_access = req_one_access
+ S.treatment_oxy = treatment_oxy
+ S.treatment_brute = treatment_brute
+ S.treatment_fire = treatment_fire
+ S.treatment_tox = treatment_tox
+ S.treatment_virus = treatment_virus
+ user.unEquip(src, 1)
+ qdel(src)
+
+//Secbot Assembly
+/obj/item/weapon/secbot_assembly
+ name = "incomplete securitron assembly"
+ desc = "Some sort of bizarre assembly made from a proximity sensor, helmet, and signaler."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "helmet_signaler"
+ item_state = "helmet"
+ var/build_step = 0
+ var/created_name = "Securitron" //To preserve the name if it's a unique securitron I guess
+
+/obj/item/clothing/head/helmet/attackby(obj/item/device/assembly/signaler/S, mob/user, params)
+ ..()
+ if(!issignaler(S))
+ ..()
+ return
+
+ if(!S.secured)
+ qdel(S)
+ var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly
+ user.put_in_hands(A)
+ to_chat(user, "You add the signaler to the helmet.")
+ user.unEquip(src, 1)
+ qdel(src)
+ else
+ return
+
+/obj/item/weapon/secbot_assembly/attackby(obj/item/I, mob/user, params)
+ ..()
+ if(istype(I, /obj/item/weapon/weldingtool))
+ if(!build_step)
+ var/obj/item/weapon/weldingtool/WT = I
+ if(WT.remove_fuel(0, user))
+ build_step++
+ overlays += "hs_hole"
+ to_chat(user, "You weld a hole in [src]!")
+ else if(build_step == 1)
+ var/obj/item/weapon/weldingtool/WT = I
+ if(WT.remove_fuel(0, user))
+ build_step--
+ overlays -= "hs_hole"
+ to_chat(user, "You weld the hole in [src] shut!")
+
+ else if(isprox(I) && (build_step == 1))
+ if(!user.unEquip(I))
+ return
+ build_step++
+ to_chat(user, "You add the prox sensor to [src]!")
+ overlays += "hs_eye"
+ name = "helmet/signaler/prox sensor assembly"
+ qdel(I)
+
+ else if(((istype(I, /obj/item/robot_parts/l_arm)) || (istype(I, /obj/item/robot_parts/r_arm))) && (build_step == 2))
+ if(!user.unEquip(I))
+ return
+ build_step++
+ to_chat(user, "You add the robot arm to [src]!")
+ name = "helmet/signaler/prox sensor/robot arm assembly"
+ overlays += "hs_arm"
+ qdel(I)
+
+ else if((istype(I, /obj/item/weapon/melee/baton)) && (build_step >= 3))
+ if(!user.unEquip(I))
+ return
+ build_step++
+ to_chat(user, "You complete the Securitron! Beep boop.")
+ var/mob/living/simple_animal/bot/secbot/S = new /mob/living/simple_animal/bot/secbot
+ S.forceMove(get_turf(src))
+ S.name = created_name
+ qdel(I)
+ qdel(src)
+
+ else if(istype(I, /obj/item/weapon/pen))
+ var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
+ if(!t)
+ return
+ if(!in_range(src, usr) && loc != usr)
+ return
+ created_name = t
+
+ else if(istype(I, /obj/item/weapon/screwdriver))
+ if(!build_step)
+ new /obj/item/device/assembly/signaler(get_turf(src))
+ new /obj/item/clothing/head/helmet(get_turf(src))
+ to_chat(user, "You disconnect the signaler from the helmet.")
+ qdel(src)
+
+ else if(build_step == 2)
+ overlays -= "hs_eye"
+ new /obj/item/device/assembly/prox_sensor(get_turf(src))
+ to_chat(user, "You detach the proximity sensor from [src].")
+ build_step--
+
+ else if(build_step == 3)
+ overlays -= "hs_arm"
+ new /obj/item/robot_parts/l_arm(get_turf(src))
+ to_chat(user, "You remove the robot arm from [src].")
+ build_step--
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
new file mode 100644
index 00000000000..a68837ef7ff
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -0,0 +1,569 @@
+/mob/living/simple_animal/bot/ed209
+ name = "\improper ED-209 Security Robot"
+ desc = "A security robot. He looks less than thrilled."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "ed2090"
+ density = 1
+ anchored = 0
+ health = 100
+ maxHealth = 100
+ damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
+
+ environment_smash = 2 //Walls can't stop THE LAW
+
+ radio_channel = "Security"
+ bot_type = SEC_BOT
+ bot_filter = RADIO_SECBOT
+ model = "ED-209"
+ bot_purpose = "seek out criminals, handcuff them, and report their location to security"
+ bot_core = /obj/machinery/bot_core/secbot
+ window_id = "autoed209"
+ window_name = "Automatic Security Unit v2.6"
+
+ var/lastfired = 0
+ var/shot_delay = 3 //.3 seconds between shots
+ var/lasercolor = ""
+ var/disabled = 0//A holder for if it needs to be disabled, if true it will not seach for targets, shoot at targets, or move, currently only used for lasertag
+
+
+ var/mob/living/carbon/target
+ var/oldtarget_name
+ var/threatlevel = 0
+ var/target_lastloc //Loc of target when arrested.
+ var/last_found //There's a delay
+ var/declare_arrests = 1 //When making an arrest, should it notify everyone wearing sechuds?
+ var/idcheck = 1 //If true, arrest people with no IDs
+ var/weaponscheck = 1 //If true, arrest people for weapons if they don't have access
+ var/check_records = 1 //Does it check security records?
+ var/arrest_type = 0 //If true, don't handcuff
+ var/projectile = /obj/item/projectile/energy/electrode //Holder for projectile type
+ var/shoot_sound = 'sound/weapons/Taser.ogg'
+
+
+/mob/living/simple_animal/bot/ed209/New(loc,created_name,created_lasercolor)
+ ..()
+ if(created_name)
+ name = created_name
+ if(created_lasercolor)
+ lasercolor = created_lasercolor
+ icon_state = "[lasercolor]ed209[on]"
+ set_weapon() //giving it the right projectile and firing sound.
+ spawn(3)
+ var/datum/job/detective/J = new/datum/job/detective
+ access_card.access += J.get_access()
+ prev_access = access_card.access
+
+ if(lasercolor)
+ shot_delay = 6//Longer shot delay because JESUS CHRIST
+ check_records = 0//Don't actively target people set to arrest
+ arrest_type = 1//Don't even try to cuff
+ bot_core.req_access = list(access_maint_tunnels, access_theatre)
+ arrest_type = 1
+ if((lasercolor == "b") && (name == "\improper ED-209 Security Robot"))//Picks a name if there isn't already a custome one
+ name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
+ if((lasercolor == "r") && (name == "\improper ED-209 Security Robot"))
+ name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
+
+ //SECHUD
+ var/datum/atom_hud/secsensor = huds[DATA_HUD_SECURITY_ADVANCED]
+ secsensor.add_hud_to(src)
+ permanent_huds |= secsensor
+
+/mob/living/simple_animal/bot/ed209/turn_on()
+ . = ..()
+ icon_state = "[lasercolor]ed209[on]"
+ mode = BOT_IDLE
+
+/mob/living/simple_animal/bot/ed209/turn_off()
+ ..()
+ icon_state = "[lasercolor]ed209[on]"
+
+/mob/living/simple_animal/bot/ed209/bot_reset()
+ ..()
+ target = null
+ oldtarget_name = null
+ anchored = 0
+ walk_to(src,0)
+ last_found = world.time
+ set_weapon()
+
+/mob/living/simple_animal/bot/ed209/set_custom_texts()
+ text_hack = "You disable [name]'s combat inhibitor."
+ text_dehack = "You restore [name]'s combat inhibitor."
+ text_dehack_fail = "[name] ignores your attempts to restrict him!"
+
+/mob/living/simple_animal/bot/ed209/get_controls(mob/user)
+ var/dat
+ dat += hack(user)
+ dat += showpai(user)
+ dat += text({"
+Security Unit v2.6 controls
+Status: []
+Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]
"},
+
+"[on ? "On" : "Off"]" )
+
+ if(!locked || issilicon(user) || check_rights(R_ADMIN, 0, user))
+ if(!lasercolor)
+ dat += text({"
+Arrest Unidentifiable Persons: []
+Arrest for Unauthorized Weapons: []
+Arrest for Warrant: []
+
+Operating Mode: []
+Report Arrests[]
+Auto Patrol[]"},
+
+"[idcheck ? "Yes" : "No"]",
+"[weaponscheck ? "Yes" : "No"]",
+"[check_records ? "Yes" : "No"]",
+"[arrest_type ? "Detain" : "Arrest"]",
+"[declare_arrests ? "Yes" : "No"]",
+"[auto_patrol ? "On" : "Off"]" )
+
+ return dat
+
+/mob/living/simple_animal/bot/ed209/Topic(href, href_list)
+ if(lasercolor && (istype(usr,/mob/living/carbon/human)))
+ var/mob/living/carbon/human/H = usr
+ if((lasercolor == "b") && (istype(H.wear_suit, /obj/item/clothing/suit/redtag)))//Opposing team cannot operate it
+ return
+ else if((lasercolor == "r") && (istype(H.wear_suit, /obj/item/clothing/suit/bluetag)))
+ return
+ if(..())
+ return 1
+
+ switch(href_list["operation"])
+ if("idcheck")
+ idcheck = !idcheck
+ update_controls()
+ if("weaponscheck")
+ weaponscheck = !weaponscheck
+ update_controls()
+ if("ignorerec")
+ check_records = !check_records
+ update_controls()
+ if("switchmode")
+ arrest_type = !arrest_type
+ update_controls()
+ if("declarearrests")
+ declare_arrests = !declare_arrests
+ update_controls()
+
+/mob/living/simple_animal/bot/ed209/proc/retaliate(mob/living/carbon/human/H)
+ threatlevel = H.assess_threat(src)
+ threatlevel += 6
+ if(threatlevel >= 4)
+ target = H
+ mode = BOT_HUNT
+
+/mob/living/simple_animal/bot/ed209/attack_hand(mob/living/carbon/human/H)
+ if(H.a_intent == "harm")
+ retaliate(H)
+ return ..()
+
+/mob/living/simple_animal/bot/ed209/attackby(obj/item/weapon/W, mob/user, params)
+ ..()
+ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry.
+ return
+ if(!istype(W, /obj/item/weapon/screwdriver) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass.
+ if(W.force && W.damtype != STAMINA)//If force is non-zero and damage type isn't stamina.
+ retaliate(user)
+ if(lasercolor)//To make up for the fact that lasertag bots don't hunt
+ shootAt(user)
+
+/mob/living/simple_animal/bot/ed209/emag_act(mob/user)
+ ..()
+ if(emagged == 2)
+ if(user)
+ to_chat(user, "You short out [src]'s target assessment circuits.")
+ oldtarget_name = user.name
+ audible_message("[src] buzzes oddly!")
+ declare_arrests = 0
+ icon_state = "[lasercolor]ed209[on]"
+ set_weapon()
+
+/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj)
+ if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet))
+ if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE))
+ if(!Proj.nodamage && Proj.damage < src.health)
+ retaliate(Proj.firer)
+ ..()
+
+/mob/living/simple_animal/bot/ed209/handle_automated_action()
+ if(!..())
+ return
+
+ if(disabled)
+ return
+
+ var/list/targets = list()
+ for(var/mob/living/carbon/C in view(7, src)) //Let's find us a target
+ var/threatlevel = 0
+ if((C.stat) || (C.lying))
+ continue
+ threatlevel = C.assess_threat(src, lasercolor)
+ //speak(C.real_name + text(": threat: []", threatlevel))
+ if(threatlevel < 4)
+ continue
+
+ var/dst = get_dist(src, C)
+ if(dst <= 1 || dst > 7)
+ continue
+
+ targets += C
+ if(targets.len>0)
+ var/mob/living/carbon/t = pick(targets)
+ if((t.stat!=2) && (t.lying != 1) && (!t.handcuffed)) //we don't shoot people who are dead, cuffed or lying down.
+ shootAt(t)
+ switch(mode)
+
+ if(BOT_IDLE) // idle
+ walk_to(src,0)
+ if(!lasercolor) //lasertag bots don't want to arrest anyone
+ look_for_perp() // see if any criminals are in range
+ if(!mode && auto_patrol) // still idle, and set to patrol
+ mode = BOT_START_PATROL // switch to patrol mode
+
+ if(BOT_HUNT) // hunting for perp
+ // if can't reach perp for long enough, go idle
+ if(frustration >= 8)
+ walk_to(src,0)
+ back_to_idle()
+
+ if(target) // make sure target exists
+ if(Adjacent(target) && isturf(target.loc)) // if right next to perp
+ stun_attack(target)
+
+ mode = BOT_PREP_ARREST
+ anchored = 1
+ target_lastloc = target.loc
+ return
+
+ else // not next to perp
+ var/turf/olddist = get_dist(src, target)
+ walk_to(src, target,1,4)
+ if((get_dist(src, target)) >= (olddist))
+ frustration++
+ else
+ frustration = 0
+ else
+ back_to_idle()
+
+ if(BOT_PREP_ARREST) // preparing to arrest target
+
+ // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again.
+ if(!Adjacent(target) || !isturf(target.loc) || target.weakened < 2)
+ back_to_hunt()
+ return
+
+ if(iscarbon(target) && target.canBeHandcuffed())
+ if(!arrest_type)
+ if(!target.handcuffed) //he's not cuffed? Try to cuff him!
+ cuff(target)
+ else
+ back_to_idle()
+ return
+ else
+ back_to_idle()
+ return
+
+ if(BOT_ARREST)
+ if(!target)
+ anchored = 0
+ mode = BOT_IDLE
+ last_found = world.time
+ frustration = 0
+ return
+
+ if(target.handcuffed) //no target or target cuffed? back to idle.
+ back_to_idle()
+ return
+
+ if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.weakened < 2)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
+ back_to_hunt()
+ return
+ else
+ mode = BOT_PREP_ARREST
+ anchored = 0
+
+ if(BOT_START_PATROL)
+ look_for_perp()
+ start_patrol()
+
+ if(BOT_PATROL)
+ look_for_perp()
+ bot_patrol()
+
+
+ return
+
+/mob/living/simple_animal/bot/ed209/proc/back_to_idle()
+ anchored = 0
+ mode = BOT_IDLE
+ target = null
+ last_found = world.time
+ frustration = 0
+ spawn(0)
+ handle_automated_action() //ensure bot quickly responds
+
+/mob/living/simple_animal/bot/ed209/proc/back_to_hunt()
+ anchored = 0
+ frustration = 0
+ mode = BOT_HUNT
+ spawn(0)
+ handle_automated_action() //ensure bot quickly responds
+
+// look for a criminal in view of the bot
+
+/mob/living/simple_animal/bot/ed209/proc/look_for_perp()
+ if(disabled)
+ return
+ anchored = 0
+ threatlevel = 0
+ for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
+ if((C.stat) || (C.handcuffed))
+ continue
+
+ if((C.name == oldtarget_name) && (world.time < last_found + 100))
+ continue
+
+ threatlevel = C.assess_threat(src, lasercolor)
+
+ if(!threatlevel)
+ continue
+
+ else if(threatlevel >= 4)
+ target = C
+ oldtarget_name = C.name
+ speak("Level [threatlevel] infraction alert!")
+ playsound(loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/EDPlaceholder.ogg'), 50, 0)
+ visible_message("[src] points at [C.name]!")
+ mode = BOT_HUNT
+ spawn(0)
+ handle_automated_action() // ensure bot quickly responds to a perp
+ break
+ else
+ continue
+
+/mob/living/simple_animal/bot/ed209/proc/check_for_weapons(var/obj/item/slot_item)
+ if(slot_item && slot_item.needs_permit)
+ return 1
+ return 0
+
+/mob/living/simple_animal/bot/ed209/explode()
+ walk_to(src,0)
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ var/obj/item/weapon/ed209_assembly/Sa = new /obj/item/weapon/ed209_assembly(Tsec)
+ Sa.build_step = 1
+ Sa.overlays += image('icons/obj/aibots.dmi', "hs_hole")
+ Sa.created_name = name
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+
+ if(!lasercolor)
+ var/obj/item/weapon/gun/energy/advtaser/G = new /obj/item/weapon/gun/energy/advtaser(Tsec)
+ G.power_supply.charge = 0
+ G.update_icon()
+ else if(lasercolor == "b")
+ var/obj/item/weapon/gun/energy/laser/bluetag/G = new /obj/item/weapon/gun/energy/laser/bluetag(Tsec)
+ G.power_supply.charge = 0
+ G.update_icon()
+ else if(lasercolor == "r")
+ var/obj/item/weapon/gun/energy/laser/redtag/G = new /obj/item/weapon/gun/energy/laser/redtag(Tsec)
+ G.power_supply.charge = 0
+ G.update_icon()
+
+ if(prob(50))
+ new /obj/item/robot_parts/l_leg(Tsec)
+ if(prob(25))
+ new /obj/item/robot_parts/r_leg(Tsec)
+ if(prob(25))//50% chance for a helmet OR vest
+ if(prob(50))
+ new /obj/item/clothing/head/helmet(Tsec)
+ else
+ if(!lasercolor)
+ new /obj/item/clothing/suit/armor/vest(Tsec)
+ if(lasercolor == "b")
+ new /obj/item/clothing/suit/bluetag(Tsec)
+ if(lasercolor == "r")
+ new /obj/item/clothing/suit/redtag(Tsec)
+
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+
+ new /obj/effect/decal/cleanable/blood/oil(loc)
+ ..()
+
+/mob/living/simple_animal/bot/ed209/proc/set_weapon() //used to update the projectile type and firing sound
+ shoot_sound = 'sound/weapons/laser.ogg'
+ if(emagged == 2)
+ if(lasercolor)
+ projectile = /obj/item/projectile/lasertag
+ else
+ projectile = /obj/item/projectile/beam
+ else
+ if(!lasercolor)
+ shoot_sound = 'sound/weapons/Taser.ogg'
+ projectile = /obj/item/projectile/energy/electrode
+ else if(lasercolor == "b")
+ projectile = /obj/item/projectile/lasertag/blue
+ else if(lasercolor == "r")
+ projectile = /obj/item/projectile/lasertag/red
+
+/mob/living/simple_animal/bot/ed209/proc/shootAt(mob/target)
+ if(lastfired && world.time - lastfired < shot_delay)
+ return
+ lastfired = world.time
+ var/turf/T = loc
+ var/atom/U = (istype(target, /atom/movable) ? target.loc : target)
+ if((!( U ) || !( T )))
+ return
+ while(!(istype(U, /turf)))
+ U = U.loc
+ if(!(istype(T, /turf)))
+ return
+
+ if(!projectile)
+ return
+
+ if(!(istype(U, /turf)))
+ return
+ var/obj/item/projectile/A = new projectile(loc)
+ playsound(loc, shoot_sound, 50, 1)
+ A.current = U
+ A.yo = U.y - T.y
+ A.xo = U.x - T.x
+ spawn(0)
+ A.process()
+
+/mob/living/simple_animal/bot/ed209/attack_alien(mob/living/carbon/alien/user)
+ ..()
+ if(!isalien(target))
+ target = user
+ mode = BOT_HUNT
+
+
+/mob/living/simple_animal/bot/ed209/emp_act(severity)
+
+ if(severity==2 && prob(70))
+ ..(severity-1)
+ else
+ var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( loc )
+ pulse2.icon = 'icons/effects/effects.dmi'
+ pulse2.icon_state = "empdisable"
+ pulse2.name = "emp sparks"
+ pulse2.anchored = 1
+ pulse2.dir = pick(cardinal)
+ spawn(10)
+ qdel(pulse2)
+ var/list/mob/living/carbon/targets = new
+ for(var/mob/living/carbon/C in view(12,src))
+ if(C.stat==2)
+ continue
+ targets += C
+ if(targets.len)
+ if(prob(50))
+ var/mob/toshoot = pick(targets)
+ if(toshoot)
+ targets-=toshoot
+ if(prob(50) && emagged < 2)
+ emagged = 2
+ set_weapon()
+ shootAt(toshoot)
+ emagged = 0
+ set_weapon()
+ else
+ shootAt(toshoot)
+ else if(prob(50))
+ if(targets.len)
+ var/mob/toarrest = pick(targets)
+ if(toarrest)
+ target = toarrest
+ mode = BOT_HUNT
+
+
+/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj)
+ if(!disabled)
+ var/lasertag_check = 0
+ if((lasercolor == "b"))
+ if(istype(Proj, /obj/item/projectile/lasertag/red))
+ lasertag_check++
+ else if((lasercolor == "r"))
+ if(istype(Proj, /obj/item/projectile/lasertag/blue))
+ lasertag_check++
+ if(lasertag_check)
+ icon_state = "[lasercolor]ed2090"
+ disabled = 1
+ target = null
+ spawn(100)
+ disabled = 0
+ icon_state = "[lasercolor]ed2091"
+ return 1
+ else
+ ..(Proj)
+ else
+ ..(Proj)
+
+/mob/living/simple_animal/bot/ed209/bluetag
+ lasercolor = "b"
+
+/mob/living/simple_animal/bot/ed209/redtag
+ lasercolor = "r"
+
+/mob/living/simple_animal/bot/ed209/UnarmedAttack(atom/A)
+ if(!on)
+ return
+ if(iscarbon(A))
+ var/mob/living/carbon/C = A
+ if(!C.stunned || arrest_type)
+ stun_attack(A)
+ else if(C.canBeHandcuffed() && !C.handcuffed)
+ cuff(A)
+ else
+ ..()
+
+/mob/living/simple_animal/bot/ed209/RangedAttack(atom/A)
+ if(!on)
+ return
+ shootAt(A)
+
+/mob/living/simple_animal/bot/ed209/proc/stun_attack(mob/living/carbon/C)
+ playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ icon_state = "[lasercolor]ed209-c"
+ spawn(2)
+ icon_state = "[lasercolor]ed209[on]"
+ var/threat = 5
+ if(istype(C, /mob/living/carbon/human))
+ C.stuttering = 5
+ C.Stun(5)
+ C.Weaken(5)
+ var/mob/living/carbon/human/H = C
+ threat = H.assess_threat(src)
+ else
+ C.Weaken(5)
+ C.stuttering = 5
+ C.Stun(5)
+ add_logs(src,C,"stunned")
+ if(declare_arrests)
+ var/area/location = get_area(src)
+ speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag [C] in [location].", radio_channel)
+ C.visible_message("[src] has stunned [C]!",\
+ "[src] has stunned you!")
+
+/mob/living/simple_animal/bot/ed209/proc/cuff(mob/living/carbon/C)
+ mode = BOT_ARREST
+ playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
+ C.visible_message("[src] is trying to put zipties on [C]!",\
+ "[src] is trying to put zipties on you!")
+
+ spawn(60)
+ if( !Adjacent(C) || !isturf(C.loc) ) //if he's in a closet or not adjacent, we cancel cuffing.
+ return
+ if(!C.handcuffed)
+ C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C)
+ C.update_inv_handcuffed(1)
+ back_to_idle()
diff --git a/code/modules/mob/living/simple_animal/bot/emote.dm b/code/modules/mob/living/simple_animal/bot/emote.dm
new file mode 100644
index 00000000000..4054e520ecf
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/bot/emote.dm
@@ -0,0 +1,119 @@
+/mob/living/simple_animal/bot/emote(var/act, var/m_type=1, var/message = null)
+ var/param = null
+ if (findtext(act, "-", 1, null))
+ var/t1 = findtext(act, "-", 1, null)
+ param = copytext(act, t1 + 1, length(act) + 1)
+ act = copytext(act, 1, t1)
+
+ if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+ act = copytext(act,1,length(act))
+
+ //Emote Cooldown System (it's so simple!)
+ // proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
+ var/on_CD = 0
+ switch(act)
+ //Cooldown-inducing emotes
+ if("scream", "screams")
+ on_CD = handle_emote_CD(50) //longer cooldown
+ if("ping","buzz","beep","yes","no") //halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
+ on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
+ //Everything else, including typos of the above emotes
+ else
+ on_CD = 0 //If it doesn't induce the cooldown, we won't check for the cooldown
+
+ if(on_CD == 1) // Check if we need to suppress the emote attempt.
+ return // Suppress emote, you're still cooling off.
+ //--FalseIncarnate
+
+ switch(act)
+ if("ping")
+ var/M = null
+ if(param)
+ for (var/mob/A in view(null, null))
+ if (param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ if (param)
+ message = "[src] pings at [param]."
+ else
+ message = "[src] pings."
+ playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+ m_type = 2
+
+ if("buzz")
+ var/M = null
+ if(param)
+ for (var/mob/A in view(null, null))
+ if (param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ if (param)
+ message = "[src] buzzes at [param]."
+ else
+ message = "[src] buzzes."
+ playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ m_type = 2
+
+ if("beep")
+ var/M = null
+ if(param)
+ for (var/mob/A in view(null, null))
+ if (param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ if (param)
+ message = "[src] beeps at [param]."
+ else
+ message = "[src] beeps."
+ playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+ m_type = 2
+
+ if("yes")
+ var/M = null
+ if(param)
+ for (var/mob/A in view(null, null))
+ if (param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ if (param)
+ message = "[src] emits an affirmative blip at [param]."
+ else
+ message = "[src] emits an affirmative blip."
+ playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0)
+ m_type = 2
+
+ if("no")
+ var/M = null
+ if(param)
+ for (var/mob/A in view(null, null))
+ if (param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ if (param)
+ message = "[src] emits a negative blip at [param]."
+ else
+ message = "[src] emits a negative blip."
+ playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0)
+ m_type = 2
+
+ if("scream", "screams")
+ message = "[src] screams!"
+ playsound(src.loc, 'sound/goonstation/voice/robot_scream.ogg', 80, 0)
+ m_type = 2
+
+ ..(act, m_type, message)
\ No newline at end of file
diff --git a/code/game/machinery/bots/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
similarity index 57%
rename from code/game/machinery/bots/floorbot.dm
rename to code/modules/mob/living/simple_animal/bot/floorbot.dm
index 82ea0138503..c988f856ef7 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -1,538 +1,425 @@
-//Floorbot assemblies
-/obj/item/weapon/toolbox_tiles
- desc = "It's a toolbox with tiles sticking out the top"
- name = "tiles and toolbox"
- icon = 'icons/obj/aibots.dmi'
- icon_state = "toolbox_tiles"
- force = 3.0
- throwforce = 10.0
- throw_speed = 2
- throw_range = 5
- w_class = 3.0
- var/created_name = "Floorbot"
-
-/obj/item/weapon/toolbox_tiles_sensor
- desc = "It's a toolbox with tiles sticking out the top and a sensor attached"
- name = "tiles, toolbox and sensor arrangement"
- icon = 'icons/obj/aibots.dmi'
- icon_state = "toolbox_tiles_sensor"
- force = 3.0
- throwforce = 10.0
- throw_speed = 2
- throw_range = 5
- w_class = 3.0
- var/created_name = "Floorbot"
-
-//Floorbot
-/obj/machinery/bot/floorbot
- name = "\improper Floorbot"
- desc = "A little floor repairing robot, he looks so excited!"
- icon = 'icons/obj/aibots.dmi'
- icon_state = "floorbot0"
- layer = 5.0
- density = 0
- anchored = 0
- health = 25
- maxhealth = 25
- //weight = 1.0E7
- var/amount = 10
- var/replacetiles = 0
- var/eattiles = 0
- var/maketiles = 0
- var/fixfloors = 0
- var/autotile = 0
- var/nag_on_empty = 1
- var/nagged = 0 //Prevents the Floorbot nagging more than once per refill.
- var/max_targets = 50
- var/turf/target
- var/turf/oldtarget
- var/oldloc = null
- req_one_access = list(access_construction, access_robotics)
- var/targetdirection
- radio_name = "Engineering"
- bot_type = FLOOR_BOT
- bot_type_name = "Floorbot"
- bot_filter = RADIO_FLOORBOT
- var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details.
- #define HULL_BREACH 1
- #define BRIDGE_MODE 2
- #define FIX_TILE 3
- #define AUTO_TILE 4
- #define REPLACE_TILE 5
- #define TILE_EMAG 6
-
-/obj/machinery/bot/floorbot/New()
- ..()
- updateicon()
- var/datum/job/engineer/J = new/datum/job/engineer
- botcard.access = J.get_access()
- prev_access = botcard.access
-
- spawn(5)
- add_to_beacons(bot_filter)
-
-/obj/machinery/bot/floorbot/turn_on()
- . = ..()
- updateicon()
- updateUsrDialog()
-
-/obj/machinery/bot/floorbot/turn_off()
- ..()
- updateicon()
- updateUsrDialog()
-
-/obj/machinery/bot/floorbot/bot_reset()
- ..()
- target = null
- oldtarget = null
- oldloc = null
- ignore_list = list()
- nagged = 0
- anchored = 0
- update_icon()
-
-/obj/machinery/bot/floorbot/set_custom_texts()
- text_hack = "You corrupt [name]'s construction protocols."
- text_dehack = "You detect errors in [name] and reset his programming."
- text_dehack_fail = "[name] is not responding to reset commands!"
-
-/obj/machinery/bot/floorbot/attack_hand(mob/user as mob)
- . = ..()
- if (.)
- return
- usr.set_machine(src)
- interact(user)
-
-/obj/machinery/bot/floorbot/interact(mob/user as mob)
- var/dat
- dat += hack(user)
- dat += "Floor Repairer Controls v1.1
"
- dat += "Status: [on ? "On" : "Off"]
"
- dat += "Maintenance panel panel is [open ? "opened" : "closed"]
"
- dat += "Tiles left: [amount]
"
- dat += "Behaviour controls are [locked ? "locked" : "unlocked"]
"
- if(!locked || issilicon(user))
- dat += "Add tiles to new hull plating: [autotile ? "Yes" : "No"]
"
- dat += "Replace floor tiles: [replacetiles ? "Yes" : "No"]
"
- dat += "Finds tiles: [eattiles ? "Yes" : "No"]
"
- dat += "Make pieces of metal into tiles when empty: [maketiles ? "Yes" : "No"]
"
- dat += "Transmit notice when empty: [nag_on_empty ? "Yes" : "No"]
"
- dat += "Repair damaged tiles and platings: [fixfloors ? "Yes" : "No"]
"
- dat += "Traction Magnets: [anchored ? "Engaged" : "Disengaged"]
"
- dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
"
- var/bmode
- if (targetdirection)
- bmode = dir2text(targetdirection)
- else
- bmode = "disabled"
- dat += "Bridge Mode : [bmode]
"
-
- var/datum/browser/popup = new(user, "autofloor", "Automatic Station Floor Repairer v1.1")
- popup.set_content(dat)
- popup.open()
- return
-
-
-/obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob, params)
- if(istype(W, /obj/item/stack/tile/plasteel))
- var/obj/item/stack/tile/plasteel/T = W
- if(amount >= 50)
- return
- var/loaded = min(50-amount, T.amount)
- T.use(loaded)
- amount += loaded
- if (loaded > 0)
- user << "You load [loaded] tiles into the floorbot. He now contains [amount] tiles."
- nagged = 0
- updateicon()
- else
- user << "You need at least one floor tile to put into [src]"
- else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- if(allowed(user) && !open && !emagged)
- locked = !locked
- user << "You [locked ? "lock" : "unlock"] \the [src] behaviour controls."
- updateUsrDialog()
- else
- if(emagged)
- user << "ERROR"
- if(open)
- user << "Please close the access panel before locking it."
- else
- user << "Access denied."
- updateUsrDialog()
- else
- ..()
-
-/obj/machinery/bot/floorbot/Emag(mob/user as mob)
- ..()
- if(emagged == 2)
- if(user)
- user << "[src] buzzes and beeps."
-
-/obj/machinery/bot/floorbot/Topic(href, href_list)
- ..()
- switch(href_list["operation"])
- if("replace")
- replacetiles = !replacetiles
- if("tiles")
- eattiles = !eattiles
- if("make")
- maketiles = !maketiles
- if("fix")
- fixfloors = !fixfloors
- if("autotile")
- autotile = !autotile
- if("emptynag")
- nag_on_empty = !nag_on_empty
- if("anchor")
- anchored = !anchored
-
- if("bridgemode")
- var/setdir = input("Select construction direction:") as null|anything in list("north","east","south","west","disable")
- switch(setdir)
- if("north")
- targetdirection = 1
- if("south")
- targetdirection = 2
- if("east")
- targetdirection = 4
- if("west")
- targetdirection = 8
- if("disable")
- targetdirection = null
- updateUsrDialog()
-
-/obj/machinery/bot/floorbot/bot_process()
- if (!..())
- return
-
- if(mode == BOT_REPAIRING)
- return
-
- if(amount <= 0 && !target) //Out of tiles! We must refill!
- if(eattiles) //Configured to find and consume floortiles!
- target = scan(/obj/item/stack/tile/plasteel, oldtarget)
- process_type = null
-
- if(!target && maketiles) //We did not manage to find any floor tiles! Scan for metal stacks and make our own!
- target = scan(/obj/item/stack/sheet/metal, oldtarget)
- process_type = null
- return
- else
- if(nag_on_empty) //Floorbot is empty and cannot acquire more tiles, nag the engineers for more!
- nag()
-
- if(prob(5))
- visible_message("[src] makes an excited booping beeping sound!")
-
- //Normal scanning procedure. We have tiles loaded, are not emagged.
- if(!target && emagged < 2 && amount > 0)
- if(targetdirection != null) //The bot is in bridge mode.
- //Try to find a space tile immediately in our selected direction.
- var/turf/T = get_step(src, targetdirection)
- if(istype(T, /turf/space))
- target = T
-
- else //Find a space tile farther way!
- target = scan(/turf/space, oldtarget)
- process_type = BRIDGE_MODE
-
- if(!target)
- process_type = HULL_BREACH //Ensures the floorbot does not try to "fix" space areas or shuttle docking zones.
- target = scan(/turf/space, oldtarget)
-
- if(!target && replacetiles) //Finds a floor without a tile and gives it one.
- process_type = REPLACE_TILE //The target must be the floor and not a tile. The floor must not already have a floortile.
- target = scan(/turf/simulated/floor, oldtarget)
-
- if(!target && fixfloors) //Repairs damaged floors and tiles.
- process_type = FIX_TILE
- target = scan(/turf/simulated/floor, oldtarget)
-
- if(!target && emagged == 2) //We are emagged! Time to rip up the floors!
- process_type = TILE_EMAG
- target = scan(/turf/simulated/floor, oldtarget)
-
-
- if(!target)
-
- if(auto_patrol)
- if(mode == BOT_IDLE || mode == BOT_START_PATROL)
- start_patrol()
-
- if(mode == BOT_PATROL)
- bot_patrol()
-
- if(!target)
- if(loc != oldloc)
- oldtarget = null
- return
-
- if(target)
- if(path.len == 0)
- if(!istype(target, /turf/))
- var/turf/TL = get_turf(target)
- path = get_path_to(loc, TL, src, /turf/proc/Distance_cardinal, 0, 30, id=botcard, simulated_only = 0)
- else
- path = get_path_to(loc, target, src, /turf/proc/Distance_cardinal, 0, 30, id=botcard, simulated_only = 0)
-
- if(!bot_move(target))
- add_to_ignore(target)
- oldtarget = target
- target = null
- mode = BOT_IDLE
- return
- else if( !bot_move(target) )
- oldtarget = target
- target = null
- mode = BOT_IDLE
- return
-
- ignore_list = list() // Reset the ignore list
-
- if(loc == target || loc == target.loc)
- if(istype(target, /obj/item/stack/tile/plasteel))
- eattile(target)
- else if(istype(target, /obj/item/stack/sheet/metal))
- maketile(target)
- else if(istype(target, /turf/) && emagged < 2)
- repair(target)
- else if(emagged == 2 && istype(target,/turf/simulated/floor))
- var/turf/simulated/floor/F = target
- anchored = 1
- mode = BOT_REPAIRING
- if(prob(90))
- F.break_tile_to_plating()
- else
- F.ReplaceWithLattice()
- visible_message("[src] makes an excited booping sound.")
- spawn(50)
- amount++
- anchored = 0
- mode = BOT_IDLE
- target = null
- path = list()
- return
-
- oldloc = loc
-
-/obj/machinery/bot/floorbot/proc/nag() //Annoy everyone on the channel to refill us!
- if(!nagged)
- var/area/location = get_area(src)
- speak("Requesting refill at [location]!", radio_name)
- nagged = 1
-
-/obj/machinery/bot/floorbot/proc/is_hull_breach(var/turf/t) //Ignore space tiles not considered part of a structure, also ignores shuttle docking areas.
- var/area/t_area = get_area(t)
- if (t_area && (t_area.name == "Space" || findtext(t_area.name, "huttle")))
- return 0
- else
- return 1
-
-//Floorbots, having several functions, need sort out special conditions here.
-obj/machinery/bot/floorbot/process_scan(var/scan_target)
- var/result
- var/turf/simulated/floor/F
- switch(process_type)
- if(HULL_BREACH) //The most common job, patching breaches in the station's hull.
- if(is_hull_breach(scan_target)) //Ensure that the targeted space turf is actually part of the station, and not random space.
- result = scan_target
- anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach.
- if(BRIDGE_MODE) //Only space turfs in our chosen direction are considered.
- if(get_dir(src, scan_target) == targetdirection)
- result = scan_target
- anchored = 1
- if(REPLACE_TILE)
- F = scan_target
- if(istype(F, /turf/simulated/floor/plating)) //The floor must not already have a tile.
- result = F
- if(FIX_TILE) //Selects only damaged floors.
- F = scan_target
- if(istype(F) && (F.broken || F.burnt))
- result = F
- if(TILE_EMAG) //Emag mode! Rip up the floor and cause breaches to space!
- F = scan_target
- if(!istype(F, /turf/simulated/floor/plating))
- result = F
- else //If no special processing is needed, simply return the result.
- result = scan_target
- return result
-
-/obj/machinery/bot/floorbot/proc/repair(var/turf/target_turf)
-
- if(istype(target_turf, /turf/space/))
- //Must be a hull breach or in bridge mode to continue.
- if(!is_hull_breach(target_turf) && !targetdirection)
- target = null
- return
- else if(!istype(target_turf, /turf/simulated/floor))
- return
- if(amount <= 0)
- mode = BOT_IDLE
- target = null
- return
- anchored = 1
- icon_state = "floorbot-c"
- if(istype(target_turf, /turf/space/)) //If we are fixing an area not part of pure space, it is
- visible_message("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ")
- mode = BOT_REPAIRING
- spawn(50)
- if(mode == BOT_REPAIRING)
- if(autotile) //Build the floor and include a tile.
- target_turf.ChangeTurf(/turf/simulated/floor)
- else //Build a hull plating without a floor tile.
- target_turf.ChangeTurf(/turf/simulated/floor/plating)
- mode = BOT_IDLE
- amount -= 1
- updateicon()
- anchored = 0
- target = null
- else
- var/turf/simulated/floor/F = target_turf
- mode = BOT_REPAIRING
- visible_message("[src] begins repairing the floor.")
- spawn(50)
- if(mode == BOT_REPAIRING)
- F.broken = 0
- F.burnt = 0
- F.ChangeTurf(/turf/simulated/floor)
- mode = BOT_IDLE
- amount -= 1
- updateicon()
- anchored = 0
- target = null
-
-/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T)
- if(!istype(T, /obj/item/stack/tile/plasteel))
- return
- visible_message(" [src] begins to collect tiles.")
- mode = BOT_REPAIRING
- spawn(20)
- if(isnull(T))
- target = null
- mode = BOT_IDLE
- return
- if(amount + T.amount > 50)
- var/i = 50 - amount
- amount += i
- T.amount -= i
- else
- amount += T.amount
- qdel(T)
- updateicon()
- target = null
- mode = BOT_IDLE
-
-/obj/machinery/bot/floorbot/proc/maketile(var/obj/item/stack/sheet/metal/M)
- if(!istype(M, /obj/item/stack/sheet/metal))
- return
- visible_message(" [src] begins to create tiles.")
- mode = BOT_REPAIRING
- spawn(20)
- if(isnull(M))
- target = null
- mode = BOT_IDLE
- return
- var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
- T.amount = 4
- T.loc = M.loc
- if(M.amount > 1)
- M.amount--
- else
- qdel(M)
- target = null
- mode = BOT_IDLE
-
-/obj/machinery/bot/floorbot/proc/updateicon()
- if(amount > 0)
- icon_state = "floorbot[on]"
- else
- icon_state = "floorbot[on]e"
-
-/obj/machinery/bot/floorbot/explode()
- on = 0
- visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
-
- var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
- N.contents = list()
-
- new /obj/item/device/assembly/prox_sensor(Tsec)
-
- if (prob(50))
- new /obj/item/robot_parts/l_arm(Tsec)
-
- while (amount)//Dumps the tiles into the appropriate sized stacks
- if(amount >= 16)
- var/obj/item/stack/tile/plasteel/T = new (Tsec)
- T.amount = 16
- amount -= 16
- else
- var/obj/item/stack/tile/plasteel/T = new (Tsec)
- T.amount = amount
- amount = 0
-
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
- s.set_up(3, 1, src)
- s.start()
- qdel(src)
- return
-
-
-/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob, params)
- if(!istype(T, /obj/item/stack/tile/plasteel))
- ..()
- return
- if(contents.len >= 1)
- user << "They won't fit in, as there is already stuff inside."
- return
- if(T.use(10))
- if(user.s_active)
- user.s_active.close(user)
- var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles
- user.put_in_hands(B)
- user << "You add the tiles into the empty toolbox. They protrude from the top."
- user.unEquip(src, 1)
- qdel(src)
- else
- user << "You need 10 floor tiles to start building a floorbot."
- return
-
-/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob, params)
- ..()
- if(isprox(W))
- qdel(W)
- var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor()
- B.created_name = created_name
- user.put_in_hands(B)
- user << "You add the sensor to the toolbox and tiles!"
- user.unEquip(src, 1)
- qdel(src)
-
- else if (istype(W, /obj/item/weapon/pen))
- var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
- if (!t)
- return
- if (!in_range(src, usr) && loc != usr)
- return
-
- created_name = t
-
-/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob, params)
- ..()
- if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
- qdel(W)
- var/turf/T = get_turf(user.loc)
- var/obj/machinery/bot/floorbot/A = new /obj/machinery/bot/floorbot(T)
- A.name = created_name
- user << "You add the robot arm to the odd looking toolbox assembly! Boop beep!"
- user.unEquip(src, 1)
- qdel(src)
- else if (istype(W, /obj/item/weapon/pen))
- var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
- if (!t)
- return
- if (!in_range(src, usr) && loc != usr)
- return
-
- created_name = t
+//Floorbot
+/mob/living/simple_animal/bot/floorbot
+ name = "\improper Floorbot"
+ desc = "A little floor repairing robot, he looks so excited!"
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "floorbot0"
+ density = 0
+ anchored = 0
+ health = 25
+ maxHealth = 25
+
+ radio_channel = "Engineering"
+ bot_type = FLOOR_BOT
+ bot_filter = RADIO_FLOORBOT
+ model = "Floorbot"
+ bot_purpose = "seek out damaged or missing floor tiles, and repair or replace them as necessary"
+ bot_core = /obj/machinery/bot_core/floorbot
+ window_id = "autofloor"
+ window_name = "Automatic Station Floor Repairer v1.1"
+
+ var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details.
+ var/targetdirection
+ var/amount = 10
+ var/replacetiles = 0
+ var/eattiles = 0
+ var/maketiles = 0
+ var/fixfloors = 0
+ var/autotile = 0
+ var/nag_on_empty = 1
+ var/nagged = 0 //Prevents the Floorbot nagging more than once per refill.
+ var/max_targets = 50
+ var/turf/target
+ var/oldloc = null
+
+ #define HULL_BREACH 1
+ #define BRIDGE_MODE 2
+ #define FIX_TILE 3
+ #define AUTO_TILE 4
+ #define REPLACE_TILE 5
+ #define TILE_EMAG 6
+
+/mob/living/simple_animal/bot/floorbot/New()
+ ..()
+ update_icon()
+ var/datum/job/engineer/J = new/datum/job/engineer
+ access_card.access += J.get_access()
+ prev_access = access_card.access
+
+/mob/living/simple_animal/bot/floorbot/bot_reset()
+ ..()
+ target = null
+ oldloc = null
+ ignore_list = list()
+ nagged = 0
+ anchored = 0
+ update_icon()
+
+/mob/living/simple_animal/bot/floorbot/set_custom_texts()
+ text_hack = "You corrupt [name]'s construction protocols."
+ text_dehack = "You detect errors in [name] and reset his programming."
+ text_dehack_fail = "[name] is not responding to reset commands!"
+
+/mob/living/simple_animal/bot/floorbot/get_controls(mob/user)
+ var/dat
+ dat += hack(user)
+ dat += showpai(user)
+ dat += "Floor Repairer Controls v1.1
"
+ dat += "Status: [on ? "On" : "Off"]
"
+ dat += "Maintenance panel panel is [open ? "opened" : "closed"]
"
+ dat += "Tiles left: [amount]
"
+ dat += "Behvaiour controls are [locked ? "locked" : "unlocked"]
"
+ if(!locked || issilicon(user) || check_rights(R_ADMIN, 0, user))
+ dat += "Add tiles to new hull plating: [autotile ? "Yes" : "No"]
"
+ dat += "Replace floor tiles: [replacetiles ? "Yes" : "No"]
"
+ dat += "Finds tiles: [eattiles ? "Yes" : "No"]
"
+ dat += "Make pieces of metal into tiles when empty: [maketiles ? "Yes" : "No"]
"
+ dat += "Transmit notice when empty: [nag_on_empty ? "Yes" : "No"]
"
+ dat += "Repair damaged tiles and platings: [fixfloors ? "Yes" : "No"]
"
+ dat += "Traction Magnets: [anchored ? "Engaged" : "Disengaged"]
"
+ dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
"
+ var/bmode
+ if(targetdirection)
+ bmode = dir2text(targetdirection)
+ else
+ bmode = "disabled"
+ dat += "Bridge Mode : [bmode]
"
+
+ return dat
+
+
+/mob/living/simple_animal/bot/floorbot/attackby(obj/item/W , mob/user, params)
+ if(istype(W, /obj/item/stack/tile/plasteel))
+ var/obj/item/stack/tile/plasteel/T = W
+ if(amount >= 50)
+ return
+ var/loaded = min(50-amount, T.amount)
+ T.use(loaded)
+ amount += loaded
+ if(loaded > 0)
+ to_chat(user, "You load [loaded] tiles into the floorbot. He now contains [amount] tiles.")
+ nagged = 0
+ update_icon()
+ else
+ to_chat(user, "You need at least one floor tile to put into [src]!")
+ else
+ ..()
+
+/mob/living/simple_animal/bot/floorbot/emag_act(mob/user)
+ ..()
+ if(emagged == 2)
+ if(user)
+ to_chat(user, "[src] buzzes and beeps.")
+
+/mob/living/simple_animal/bot/floorbot/Topic(href, href_list)
+ if(..())
+ return 1
+
+ switch(href_list["operation"])
+ if("replace")
+ replacetiles = !replacetiles
+ if("tiles")
+ eattiles = !eattiles
+ if("make")
+ maketiles = !maketiles
+ if("fix")
+ fixfloors = !fixfloors
+ if("autotile")
+ autotile = !autotile
+ if("emptynag")
+ nag_on_empty = !nag_on_empty
+ if("anchor")
+ anchored = !anchored
+
+ if("bridgemode")
+ var/setdir = input("Select construction direction:") as null|anything in list("north","east","south","west","disable")
+ switch(setdir)
+ if("north")
+ targetdirection = 1
+ if("south")
+ targetdirection = 2
+ if("east")
+ targetdirection = 4
+ if("west")
+ targetdirection = 8
+ if("disable")
+ targetdirection = null
+ update_controls()
+
+/mob/living/simple_animal/bot/floorbot/handle_automated_action()
+ if(!..())
+ return
+
+ if(mode == BOT_REPAIRING)
+ return
+
+ if(amount <= 0 && !target) //Out of tiles! We must refill!
+ if(eattiles) //Configured to find and consume floortiles!
+ target = scan(/obj/item/stack/tile/plasteel)
+ process_type = null
+
+ if(!target && maketiles) //We did not manage to find any floor tiles! Scan for metal stacks and make our own!
+ target = scan(/obj/item/stack/sheet/metal)
+ process_type = null
+ return
+ else
+ if(nag_on_empty) //Floorbot is empty and cannot acquire more tiles, nag the engineers for more!
+ nag()
+
+ if(prob(5))
+ audible_message("[src] makes an excited booping beeping sound!")
+
+ //Normal scanning procedure. We have tiles loaded, are not emagged.
+ if(!target && emagged < 2 && amount > 0)
+ if(targetdirection != null) //The bot is in bridge mode.
+ //Try to find a space tile immediately in our selected direction.
+ var/turf/T = get_step(src, targetdirection)
+ if(istype(T, /turf/space))
+ target = T
+
+ else //Find a space tile farther way!
+ target = scan(/turf/space)
+ process_type = BRIDGE_MODE
+
+ if(!target)
+ process_type = HULL_BREACH //Ensures the floorbot does not try to "fix" space areas or shuttle docking zones.
+ target = scan(/turf/space)
+
+ if(!target && replacetiles) //Finds a floor without a tile and gives it one.
+ process_type = REPLACE_TILE //The target must be the floor and not a tile. The floor must not already have a floortile.
+ target = scan(/turf/simulated/floor)
+
+ if(!target && fixfloors) //Repairs damaged floors and tiles.
+ process_type = FIX_TILE
+ target = scan(/turf/simulated/floor)
+
+ if(!target && emagged == 2) //We are emagged! Time to rip up the floors!
+ process_type = TILE_EMAG
+ target = scan(/turf/simulated/floor)
+
+
+ if(!target)
+
+ if(auto_patrol)
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
+
+ if(mode == BOT_PATROL)
+ bot_patrol()
+
+ if(target)
+ if(path.len == 0)
+ if(!istype(target, /turf/))
+ var/turf/TL = get_turf(target)
+ path = get_path_to(src, TL, /turf/proc/Distance_cardinal, 0, 30, id=access_card,simulated_only = 0)
+ else
+ path = get_path_to(src, target, /turf/proc/Distance_cardinal, 0, 30, id=access_card,simulated_only = 0)
+
+ if(!bot_move(target))
+ add_to_ignore(target)
+ target = null
+ mode = BOT_IDLE
+ return
+ else if( !bot_move(target) )
+ target = null
+ mode = BOT_IDLE
+ return
+
+ if(loc == target || loc == target.loc)
+ if(istype(target, /obj/item/stack/tile/plasteel))
+ eattile(target)
+ else if(istype(target, /obj/item/stack/sheet/metal))
+ maketile(target)
+ else if(istype(target, /turf/) && emagged < 2)
+ repair(target)
+ else if(emagged == 2 && istype(target,/turf/simulated/floor))
+ var/turf/simulated/floor/F = target
+ anchored = 1
+ mode = BOT_REPAIRING
+ if(prob(90))
+ F.break_tile_to_plating()
+ else
+ F.ReplaceWithLattice()
+ audible_message("[src] makes an excited booping sound.")
+ spawn(50)
+ amount ++
+ anchored = 0
+ mode = BOT_IDLE
+ target = null
+ path = list()
+ return
+
+ oldloc = loc
+
+/mob/living/simple_animal/bot/floorbot/proc/nag() //Annoy everyone on the channel to refill us!
+ if(!nagged)
+ speak("Requesting refill at [get_area(src)]!", radio_channel)
+ nagged = 1
+
+/mob/living/simple_animal/bot/floorbot/proc/is_hull_breach(turf/t) //Ignore space tiles not considered part of a structure, also ignores shuttle docking areas.
+ var/area/t_area = get_area(t)
+ if(t_area && (t_area.name == "Space" || findtext(t_area.name, "huttle")))
+ return 0
+ else
+ return 1
+
+//Floorbots, having several functions, need sort out special conditions here.
+/mob/living/simple_animal/bot/floorbot/process_scan(scan_target)
+ var/result
+ var/turf/simulated/floor/F
+ switch(process_type)
+ if(HULL_BREACH) //The most common job, patching breaches in the station's hull.
+ if(is_hull_breach(scan_target)) //Ensure that the targeted space turf is actually part of the station, and not random space.
+ result = scan_target
+ anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach.
+ if(BRIDGE_MODE) //Only space turfs in our chosen direction are considered.
+ if(get_dir(src, scan_target) == targetdirection)
+ result = scan_target
+ anchored = 1
+ if(REPLACE_TILE)
+ F = scan_target
+ if(istype(F, /turf/simulated/floor/plating)) //The floor must not already have a tile.
+ result = F
+ if(FIX_TILE) //Selects only damaged floors.
+ F = scan_target
+ if(istype(F) && (F.broken || F.burnt))
+ result = F
+ if(TILE_EMAG) //Emag mode! Rip up the floor and cause breaches to space!
+ F = scan_target
+ if(!istype(F, /turf/simulated/floor/plating))
+ result = F
+ else //If no special processing is needed, simply return the result.
+ result = scan_target
+ return result
+
+/mob/living/simple_animal/bot/floorbot/proc/repair(turf/target_turf)
+
+ if(istype(target_turf, /turf/space/))
+ //Must be a hull breach or in bridge mode to continue.
+ if(!is_hull_breach(target_turf) && !targetdirection)
+ target = null
+ return
+ else if(!istype(target_turf, /turf/simulated/floor))
+ return
+ if(amount <= 0)
+ mode = BOT_IDLE
+ target = null
+ return
+ anchored = 1
+ icon_state = "floorbot-c"
+ if(istype(target_turf, /turf/space/)) //If we are fixing an area not part of pure space, it is
+ visible_message("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ")
+ mode = BOT_REPAIRING
+ spawn(50)
+ if(mode == BOT_REPAIRING)
+ if(autotile) //Build the floor and include a tile.
+ target_turf.ChangeTurf(/turf/simulated/floor/plasteel)
+ else //Build a hull plating without a floor tile.
+ target_turf.ChangeTurf(/turf/simulated/floor/plating)
+ mode = BOT_IDLE
+ amount -= 1
+ update_icon()
+ anchored = 0
+ target = null
+ else
+ var/turf/simulated/floor/F = target_turf
+ mode = BOT_REPAIRING
+ visible_message("[src] begins repairing the floor.")
+ spawn(50)
+ if(mode == BOT_REPAIRING)
+ F.broken = 0
+ F.burnt = 0
+ F.ChangeTurf(/turf/simulated/floor/plasteel)
+ mode = BOT_IDLE
+ amount -= 1
+ update_icon()
+ anchored = 0
+ target = null
+
+/mob/living/simple_animal/bot/floorbot/proc/eattile(obj/item/stack/tile/plasteel/T)
+ if(!istype(T, /obj/item/stack/tile/plasteel))
+ return
+ visible_message("[src] begins to collect tiles.")
+ mode = BOT_REPAIRING
+ spawn(20)
+ if(isnull(T))
+ target = null
+ mode = BOT_IDLE
+ return
+ if(amount + T.amount > 50)
+ var/i = 50 - amount
+ amount += i
+ T.amount -= i
+ else
+ amount += T.amount
+ qdel(T)
+ update_icon()
+ target = null
+ mode = BOT_IDLE
+
+/mob/living/simple_animal/bot/floorbot/proc/maketile(obj/item/stack/sheet/metal/M)
+ if(!istype(M, /obj/item/stack/sheet/metal))
+ return
+ visible_message("[src] begins to create tiles.")
+ mode = BOT_REPAIRING
+ spawn(20)
+ if(isnull(M))
+ target = null
+ mode = BOT_IDLE
+ return
+ var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
+ T.amount = 4
+ T.forceMove(M.loc)
+ if(M.amount > 1)
+ M.amount--
+ else
+ qdel(M)
+ target = null
+ mode = BOT_IDLE
+
+/mob/living/simple_animal/bot/floorbot/update_icon()
+ if(amount > 0)
+ icon_state = "floorbot[on]"
+ else
+ icon_state = "floorbot[on]e"
+
+/mob/living/simple_animal/bot/floorbot/explode()
+ on = 0
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ var/obj/item/weapon/storage/toolbox/mechanical/N = new /obj/item/weapon/storage/toolbox/mechanical(Tsec)
+ N.contents = list()
+
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+
+ if(prob(50))
+ new /obj/item/robot_parts/l_arm(Tsec)
+
+ while(amount)//Dumps the tiles into the appropriate sized stacks
+ if(amount >= 16)
+ var/obj/item/stack/tile/plasteel/T = new (Tsec)
+ T.amount = 16
+ amount -= 16
+ else
+ var/obj/item/stack/tile/plasteel/T = new (Tsec)
+ T.amount = amount
+ amount = 0
+
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+ ..()
+
+/obj/machinery/bot_core/floorbot
+ req_one_access = list(access_construction, access_robotics)
+
+/mob/living/simple_animal/bot/floorbot/UnarmedAttack(atom/A)
+ if(isturf(A))
+ repair(A)
+ else if(istype(A,/obj/item/stack/tile/plasteel))
+ eattile(A)
+ else if(istype(A,/obj/item/stack/sheet/metal))
+ maketile(A)
+ else
+ ..()
diff --git a/code/game/machinery/bots/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
similarity index 56%
rename from code/game/machinery/bots/medbot.dm
rename to code/modules/mob/living/simple_animal/bot/medbot.dm
index 95dcf14267f..3534bbf55b2 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -1,659 +1,578 @@
-//MEDBOT
-//MEDBOT PATHFINDING
-//MEDBOT ASSEMBLY
-
-
-/obj/machinery/bot/medbot
- name = "\improper Medibot"
- desc = "A little medical robot. He looks somewhat underwhelmed."
- icon = 'icons/obj/aibots.dmi'
- icon_state = "medibot0"
- layer = 5.0
- density = 0
- anchored = 0
- health = 20
- maxhealth = 20
- req_one_access =list(access_medical, access_robotics)
- var/stunned = 0 //It can be stunned by tasers. Delicate circuits.
-// var/emagged = 0
- var/list/botcard_access = list(access_medical)
- var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents.
- var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
- var/mob/living/carbon/patient = null
- var/mob/living/carbon/oldpatient = null
- var/oldloc = null
- var/last_found = 0
- var/last_newpatient_speak = 0 //Don't spam the "HEY I'M COMING" messages
- var/injection_amount = 15 //How much reagent do we inject at a time?
- var/heal_threshold = 10 //Start healing when they have this much damage in a category
- var/use_beaker = 0 //Use reagents in beaker instead of default treatment agents.
- var/declare_crit = 1 //If active, the bot will transmit a critical patient alert to MedHUD users.
- var/declare_cooldown = 0 //Prevents spam of critical patient alerts.
- var/stationary_mode = 0 //If enabled, the Medibot will not move automatically.
- radio_name = "Medical"
- //Setting which reagents to use to treat what by default. By id.
- var/treatment_brute = "salglu_solution"
- var/treatment_oxy = "salbutamol"
- var/treatment_fire = "salglu_solution"
- var/treatment_tox = "charcoal"
- var/treatment_virus = "spaceacillin"
- var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
- var/shut_up = 0 //self explanatory :)
- bot_type = MED_BOT
- bot_type_name = "Medbot"
- bot_filter = RADIO_MEDBOT
-
-/obj/machinery/bot/medbot/tox
- skin = "tox"
-
-/obj/machinery/bot/medbot/o2
- skin = "o2"
-
-/obj/machinery/bot/medbot/brute
- skin = "brute"
-
-/obj/machinery/bot/medbot/fire
- skin = "ointment"
-
-/obj/machinery/bot/medbot/adv
- skin = "adv"
-
-/obj/machinery/bot/medbot/fish
- skin = "fish"
-
-/obj/machinery/bot/medbot/syndicate
- name = "Suspicious Medibot"
- desc = "You'd better have insurance!"
- skin = "bezerk"
- treatment_oxy = "perfluorodecalin"
- treatment_brute = "styptic_powder"
- treatment_fire = "silver_sulfadiazine"
- treatment_tox = "charcoal"
- req_one_access =list(access_syndicate)
-
-/obj/machinery/bot/medbot/mysterious
- name = "\improper Mysterious Medibot"
- desc = "International Medibot of mystery."
- skin = "bezerk2"
- treatment_oxy = "perfluorodecalin"
- treatment_brute = "styptic_powder"
- treatment_fire = "silver_sulfadiazine"
- treatment_tox = "charcoal"
-
-/obj/item/weapon/firstaid_arm_assembly
- name = "incomplete medibot assembly."
- desc = "A first aid kit with a robot arm permanently grafted to it."
- icon = 'icons/obj/aibots.dmi'
- icon_state = "firstaid_arm"
- var/build_step = 0
- var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
- var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
- w_class = 3.0
- var/treatment_brute = "salglu_solution"
- var/treatment_oxy = "salbutamol"
- var/treatment_fire = "salglu_solution"
- var/treatment_tox = "charcoal"
- var/treatment_virus = "spaceacillin"
- req_one_access = list(access_medical, access_robotics)
-
- /obj/item/weapon/firstaid_arm_assembly/New()
- ..()
- spawn(5)
- if(skin)
- overlays += image('icons/obj/aibots.dmi', "kit_skin_[skin]")
-
-/obj/machinery/bot/medbot/proc/updateicon()
- if(!on)
- icon_state = "medibot0"
- return
- if(mode == BOT_HEALING)
- icon_state = "medibots[stationary_mode]"
- return
- else if(stationary_mode) //Bot has yellow light to indicate stationary mode.
- icon_state = "medibot2"
- else
- icon_state = "medibot1"
-
-/obj/machinery/bot/medbot/New()
- ..()
- updateicon()
-
- spawn(4)
- if(skin)
- overlays += image('icons/obj/aibots.dmi', "medskin_[skin]")
-
- if(isnull(botcard_access) || (botcard_access.len < 1))
- var/datum/job/doctor/J = new/datum/job/doctor
- botcard.access = J.get_access()
- else
- botcard.access = botcard_access
- prev_access = botcard.access
- add_to_beacons(bot_filter)
-
-/obj/machinery/bot/medbot/turn_on()
- . = ..()
- updateicon()
- updateUsrDialog()
-
-/obj/machinery/bot/medbot/turn_off()
- ..()
- updateicon()
- updateUsrDialog()
-
-/obj/machinery/bot/medbot/bot_reset()
- ..()
- patient = null
- oldpatient = null
- oldloc = null
- last_found = world.time
- declare_cooldown = 0
-
-/obj/machinery/bot/medbot/set_custom_texts()
-
- text_hack = "You corrupt [name]'s reagent processor circuits."
- text_dehack = "You reset [name]'s reagent processor circuits."
- text_dehack_fail = "[name] seems damaged and does not respond to reprogramming!"
-
-/obj/machinery/bot/medbot/attack_hand(mob/user as mob)
- . = ..()
- if (.)
- return
- usr.set_machine(src)
- var/dat
- dat += hack(user)
- dat += "Medical Unit Controls v1.1
"
- dat += "Status: [on ? "On" : "Off"]
"
- dat += "Maintenance panel panel is [open ? "opened" : "closed"]
"
- dat += "Beaker: "
- if (reagent_glass)
- dat += "Loaded \[[reagent_glass.reagents.total_volume]/[reagent_glass.reagents.maximum_volume]\]"
- else
- dat += "None Loaded"
- dat += "
Behaviour controls are [locked ? "locked" : "unlocked"]
"
- if(!locked || issilicon(user))
- dat += "Healing Threshold: "
- dat += "-- "
- dat += "- "
- dat += "[heal_threshold] "
- dat += "+ "
- dat += "++"
- dat += "
"
-
- dat += "Injection Level: "
- dat += "- "
- dat += "[injection_amount] "
- dat += "+ "
- dat += "
"
-
- dat += "Reagent Source: "
- dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
"
-
- dat += "Treat Viral Infections: [treat_virus ? "Yes" : "No"]
"
- dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle
"
- dat += "Critical Patient Alerts: [declare_crit ? "Yes" : "No"]
"
- dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
"
- dat += "Stationary Mode: [stationary_mode ? "Yes" : "No"]
"
-
- var/datum/browser/popup = new(user, "automed", "Automatic Medical Unit v1.1")
- popup.set_content(dat)
- popup.open()
- return
-
-/obj/machinery/bot/medbot/Topic(href, href_list)
- ..()
-
- if(href_list["adj_threshold"])
- var/adjust_num = text2num(href_list["adj_threshold"])
- heal_threshold += adjust_num
- if(heal_threshold < 5)
- heal_threshold = 5
- if(heal_threshold > 75)
- heal_threshold = 75
-
- else if(href_list["adj_inject"])
- var/adjust_num = text2num(href_list["adj_inject"])
- injection_amount += adjust_num
- if(injection_amount < 5)
- injection_amount = 5
- if(injection_amount > 15)
- injection_amount = 15
-
- else if(href_list["use_beaker"])
- use_beaker = !use_beaker
-
- else if (href_list["eject"] && (!isnull(reagent_glass)))
- reagent_glass.forceMove(get_turf(src))
- reagent_glass = null
-
- else if (href_list["togglevoice"])
- shut_up = !shut_up
-
- else if (href_list["critalerts"])
- declare_crit = !declare_crit
-
- else if (href_list["stationary"])
- stationary_mode = !stationary_mode
- path = list()
- updateicon()
-
- else if (href_list["virus"])
- treat_virus = !treat_virus
-
- updateUsrDialog()
- return
-
-/obj/machinery/bot/medbot/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
- if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- if (allowed(user) && !open && !emagged)
- locked = !locked
- user << "Controls are now [locked ? "locked." : "unlocked."]"
- updateUsrDialog()
- else
- if(emagged)
- user << "ERROR"
- if(open)
- user << "Please close the access panel before locking it."
- else
- user << "Access denied."
-
- else if (istype(W, /obj/item/weapon/reagent_containers/glass))
- if(locked)
- user << "You cannot insert a beaker because the panel is locked."
- return
- if(!isnull(reagent_glass))
- user << "There is already a beaker loaded."
- return
-
- if(!user.drop_item())
- user << "\The [W] is stuck to your hand!"
- return
- W.forceMove(src)
- reagent_glass = W
- user << "You insert [W]."
- updateUsrDialog()
- return
-
- else
- var/current_health = health
- ..()
- if (health < current_health) //if medbot took some damage
- step_to(src, (get_step_away(src,user)))
-
-/obj/machinery/bot/medbot/Emag(mob/user as mob)
- ..()
- if(emagged == 2)
- declare_crit = 0
- if(user)
- user << "You short out [src]'s reagent synthesis circuits."
- spawn(0)
- visible_message("[src] buzzes oddly!")
- flick("medibot_spark", src)
- if(user)
- oldpatient = user
-
-/obj/machinery/bot/medbot/process_scan(var/mob/living/carbon/human/H)
- if (H.stat == 2)
- return
-
- if ((H == oldpatient) && (world.time < last_found + 100))
- return
-
- if(assess_patient(H))
- last_found = world.time
- if((last_newpatient_speak + 300) < world.time) //Don't spam these messages!
- var/message = pick("Hey, [H.name]! Hold on, I'm coming.","Wait [H.name]! I want to help!","[H.name], you appear to be injured!")
- speak(message)
- last_newpatient_speak = world.time
- return H
- else
- return
-
-/obj/machinery/bot/medbot/bot_process()
- if (!..())
- return
-
- if(mode == BOT_HEALING)
- return
-
- if(stunned)
- icon_state = "medibota"
- stunned--
-
- oldpatient = patient
- patient = null
- mode = BOT_IDLE
-
- if(stunned <= 0)
- updateicon()
- stunned = 0
- return
-
- if(frustration > 8)
- oldpatient = patient
- patient = null
- mode = BOT_IDLE
- last_found = world.time
- path = list()
-
- if(!patient)
- if(!shut_up && prob(1))
- var/message = pick("Radar, put a mask on!","There's always a catch, and it's the best there is.","I knew it, I should've been a plastic surgeon.","What kind of medbay is this? Everyone's dropping like dead flies.","Delicious!")
- speak(message)
- var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE) //If in stationary mode, scan range is limited to adjacent patients.
- patient = scan(/mob/living/carbon/human, oldpatient, scan_range)
- oldpatient = patient
-
- if(patient && (get_dist(src,patient) <= 1)) //Patient is next to us, begin treatment!
- if(mode != BOT_HEALING)
- mode = BOT_HEALING
- updateicon()
- frustration = 0
- medicate_patient(patient)
- return
-
- //Patient has moved away from us!
- else if(patient && path.len && (get_dist(patient,path[path.len]) > 2))
- path = list()
- mode = BOT_IDLE
- last_found = world.time
-
- else if(stationary_mode && patient)
- patient = null
- mode = BOT_IDLE
- last_found = world.time
- return
- if(patient && path.len == 0 && (get_dist(src,patient) > 1))
- spawn(0)
- path = AStar(loc, get_turf(patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 30,id=botcard)
- if(!path)
- path = list()
-
- if(path.len > 0 && patient)
- if(!bot_move(patient))
- oldpatient = patient
- patient = null
- mode = BOT_IDLE
- last_found = world.time
- return
-
- if(path.len > 8 && patient)
- frustration++
-
- if(auto_patrol && !stationary_mode && !patient)
- if(mode == BOT_IDLE || mode == BOT_START_PATROL)
- start_patrol()
-
- if(mode == BOT_PATROL)
- bot_patrol()
-
- return
-
-/obj/machinery/bot/medbot/proc/assess_patient(mob/living/carbon/C as mob)
- //Time to see if they need medical help!
- if(C.stat == 2)
- return 0 //welp too late for them!
-
- if(C.suiciding)
- return 0 //Kevorkian school of robotic medical assistants.
-
- if(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins)
- return 1
-
- if((skin == "bezerk") && (!("syndicate" in C.faction)))
- return 0
-
- if(declare_crit && C.health <= 0) //Critical condition! Call for help!
- declare(C)
-
- //If they're injured, we're using a beaker, and don't have one of our WONDERCHEMS.
- if((reagent_glass) && (use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15))))
- for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
- if(!C.reagents.has_reagent(R.id))
- return 1
-
- //They're injured enough for it!
- if((C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute)))
- return 1 //If they're already medicated don't bother!
-
- if((C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(treatment_oxy)))
- return 1
-
- if((C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire)))
- return 1
-
- if((C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_tox)))
- return 1
-
- if((C.virus2.len) && (!C.reagents.has_reagent(treatment_virus)))
- for (var/ID in C.virus2)
- if (ID in virusDB) // If the virus is known, the medbot is aware of it
- return 1
- return 0
-
-/obj/machinery/bot/medbot/proc/medicate_patient(mob/living/carbon/C as mob)
- if(!on)
- return
-
- if(!istype(C))
- oldpatient = patient
- patient = null
- mode = BOT_IDLE
- last_found = world.time
- return
-
- if(C.stat == 2)
- var/death_message = pick("No! NO!","Live, damnit! LIVE!","I...I've never lost a patient before. Not today, I mean.")
- speak(death_message)
- oldpatient = patient
- patient = null
- mode = BOT_IDLE
- last_found = world.time
- return
-
- var/reagent_id = null
-
- if(emagged == 2) //Emagged! Time to poison everybody.
- reagent_id = "pancuronium"
-
- else
- if(treat_virus)
- var/virus = 0
- if(C:virus2.len)
- for (var/ID in C.virus2)
- if (ID in virusDB) // If the virus is known, the medbot is aware of it and will try to cure it
- virus = 1
-
- if (!reagent_id && (virus))
- if(!C.reagents.has_reagent(treatment_virus))
- reagent_id = treatment_virus
-
- if (!reagent_id && (C.getBruteLoss() >= heal_threshold))
- if(!C.reagents.has_reagent(treatment_brute))
- reagent_id = treatment_brute
-
- if (!reagent_id && (C.getOxyLoss() >= (15 + heal_threshold)))
- if(!C.reagents.has_reagent(treatment_oxy))
- reagent_id = treatment_oxy
-
- if (!reagent_id && (C.getFireLoss() >= heal_threshold))
- if(!C.reagents.has_reagent(treatment_fire))
- reagent_id = treatment_fire
-
- if (!reagent_id && (C.getToxLoss() >= heal_threshold))
- if(!C.reagents.has_reagent(treatment_tox))
- reagent_id = treatment_tox
-
- //If the patient is injured but doesn't have our special reagent in them then we should give it to them first
- if(reagent_id && use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
- for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
- if(!C.reagents.has_reagent(R.id))
- reagent_id = "internal_beaker"
- break
-
- if(!reagent_id) //If they don't need any of that they're probably cured!
- oldpatient = patient
- patient = null
- mode = BOT_IDLE
- last_found = world.time
- var/message = pick("All patched up!","An apple a day keeps me away.","Feel better soon!")
- speak(message)
- updateicon()
- return
- else
- C.visible_message("[src] is trying to inject [patient]!", \
- "[src] is trying to inject [patient]!")
-
- spawn(30)
- if ((get_dist(src, patient) <= 1) && (on))
- if(reagent_id == "internal_beaker")
- if(use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
- reagent_glass.reagents.trans_to(patient,injection_amount) //Inject from beaker instead.
- reagent_glass.reagents.reaction(patient, 2)
- else
- patient.reagents.add_reagent(reagent_id,injection_amount)
- C.visible_message("[src] injects [patient] with the syringe!", \
- "[src] injects [patient] with the syringe!")
-
- mode = BOT_IDLE
- updateicon()
- return
-
- reagent_id = null
- return
-
-/obj/machinery/bot/medbot/bullet_act(var/obj/item/projectile/Proj)
- if(Proj.flag == "taser")
- stunned = min(stunned+10,20)
- ..()
-
-/obj/machinery/bot/medbot/explode()
- on = 0
- visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
-
- switch(skin)
- if("ointment")
- new /obj/item/weapon/storage/firstaid/fire/empty(Tsec)
- if("tox")
- new /obj/item/weapon/storage/firstaid/toxin/empty(Tsec)
- if("o2")
- new /obj/item/weapon/storage/firstaid/o2/empty(Tsec)
- if("brute")
- new /obj/item/weapon/storage/firstaid/brute/empty(Tsec)
- if("adv")
- new /obj/item/weapon/storage/firstaid/adv/empty(Tsec)
- if("bezerk")
- new /obj/item/weapon/storage/firstaid/tactical/empty(Tsec)
- if("fish")
- new /obj/item/weapon/storage/firstaid/aquatic_kit(Tsec)
- else
- new /obj/item/weapon/storage/firstaid(Tsec)
-
- new /obj/item/device/assembly/prox_sensor(Tsec)
-
- new /obj/item/device/healthanalyzer(Tsec)
-
- if(reagent_glass)
- reagent_glass.forceMove(Tsec)
- reagent_glass = null
-
- if (prob(50))
- new /obj/item/robot_parts/l_arm(Tsec)
-
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
- s.set_up(3, 1, src)
- s.start()
- qdel(src)
- return
-
-/obj/machinery/bot/medbot/proc/declare(var/crit_patient)
- if(declare_cooldown)
- return
- if((skin == "bezerk"))
- return
- var/area/location = get_area(src)
- speak("Medical emergency! [crit_patient ? "[crit_patient]" : "A patient"] is in critical condition at [location]!", radio_name)
- declare_cooldown = 1
- spawn(200) //Twenty seconds
- declare_cooldown = 0
-
-/*
- * Medbot Assembly -- Can be made out of all three medkits.
- */
-
-/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob, params)
-
- if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
- ..()
- return
-
- //Making a medibot!
- if(contents.len >= 1)
- user << "You need to empty [src] out first."
- return
-
- var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly
- if(istype(src,/obj/item/weapon/storage/firstaid/fire))
- A.skin = "ointment"
- else if(istype(src,/obj/item/weapon/storage/firstaid/toxin))
- A.skin = "tox"
- else if(istype(src,/obj/item/weapon/storage/firstaid/o2))
- A.skin = "o2"
- else if(istype(src,/obj/item/weapon/storage/firstaid/brute))
- A.skin = "brute"
- else if(istype(src,/obj/item/weapon/storage/firstaid/adv))
- A.skin = "adv"
- else if(istype(src,/obj/item/weapon/storage/firstaid/tactical))
- A.skin = "bezerk"
- else if(istype(src,/obj/item/weapon/storage/firstaid/aquatic_kit))
- A.skin = "fish"
- A.req_one_access = req_one_access
- A.treatment_oxy = treatment_oxy
- A.treatment_brute = treatment_brute
- A.treatment_fire = treatment_fire
- A.treatment_tox = treatment_tox
- A.treatment_virus = treatment_virus
- qdel(S)
- user.put_in_hands(A)
- user << "You add the robot arm to the first aid kit."
- user.unEquip(src, 1)
- qdel(src)
-
-
-/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
- ..()
- if(istype(W, /obj/item/weapon/pen))
- var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN)
- if (!t)
- return
- if (!in_range(src, usr) && loc != usr)
- return
- created_name = t
- else
- switch(build_step)
- if(0)
- if(istype(W, /obj/item/device/healthanalyzer) && user.drop_item())
- qdel(W)
- build_step++
- user << "You add the health sensor to [src]."
- name = "First aid/robot arm/health analyzer assembly"
- overlays += image('icons/obj/aibots.dmi', "na_scanner")
-
- if(1)
- if(isprox(W))
- user.drop_item()
- qdel(W)
- build_step++
- user << "You complete the Medibot! Beep boop."
- var/turf/T = get_turf(src)
- var/obj/machinery/bot/medbot/S = new /obj/machinery/bot/medbot(T)
- S.skin = skin
- S.name = created_name
- S.treatment_oxy = treatment_oxy
- S.treatment_brute = treatment_brute
- S.treatment_fire = treatment_fire
- S.treatment_tox = treatment_tox
- S.treatment_virus = treatment_virus
- S.req_one_access = req_one_access
- user.unEquip(src, 1)
- qdel(src)
\ No newline at end of file
+//Medbot
+/mob/living/simple_animal/bot/medbot
+ name = "\improper Medibot"
+ desc = "A little medical robot. He looks somewhat underwhelmed."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "medibot0"
+ density = 0
+ anchored = 0
+ health = 20
+ maxHealth = 20
+ pass_flags = PASSMOB
+
+ radio_channel = "Medical"
+
+ bot_type = MED_BOT
+ bot_filter = RADIO_MEDBOT
+ model = "Medibot"
+ bot_purpose = "seek out hurt crewmembers and ensure that they are healed"
+ bot_core_type = /obj/machinery/bot_core/medbot
+ window_id = "automed"
+ window_name = "Automatic Medical Unit v1.1"
+
+ var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents.
+ var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
+ var/mob/living/carbon/patient = null
+ var/mob/living/carbon/oldpatient = null
+ var/oldloc = null
+ var/last_found = 0
+ var/last_newpatient_speak = 0 //Don't spam the "HEY I'M COMING" messages
+ var/injection_amount = 15 //How much reagent do we inject at a time?
+ var/heal_threshold = 10 //Start healing when they have this much damage in a category
+ var/use_beaker = 0 //Use reagents in beaker instead of default treatment agents.
+ var/declare_crit = 1 //If active, the bot will transmit a critical patient alert to MedHUD users.
+ var/declare_cooldown = 0 //Prevents spam of critical patient alerts.
+ var/stationary_mode = 0 //If enabled, the Medibot will not move automatically.
+ //Setting which reagents to use to treat what by default. By id.
+ var/treatment_brute = "salglu_solution"
+ var/treatment_oxy = "salbutamol"
+ var/treatment_fire = "salglu_solution"
+ var/treatment_tox = "charcoal"
+ var/treatment_virus = "spaceacillin"
+ var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
+ var/shut_up = 0 //self explanatory :)
+
+/mob/living/simple_animal/bot/medbot/tox
+ skin = "tox"
+
+/mob/living/simple_animal/bot/medbot/o2
+ skin = "o2"
+
+/mob/living/simple_animal/bot/medbot/brute
+ skin = "brute"
+
+/mob/living/simple_animal/bot/medbot/fire
+ skin = "ointment"
+
+/mob/living/simple_animal/bot/medbot/adv
+ skin = "adv"
+
+/mob/living/simple_animal/bot/medbot/fish
+ skin = "fish"
+
+/mob/living/simple_animal/bot/medbot/mysterious
+ name = "\improper Mysterious Medibot"
+ desc = "International Medibot of mystery."
+ skin = "bezerk"
+ treatment_oxy = "perfluorodecalin"
+ treatment_brute = "styptic_powder"
+ treatment_fire = "silver_sulfadiazine"
+ treatment_tox = "charcoal"
+
+/mob/living/simple_animal/bot/medbot/syndicate
+ name = "Suspicious Medibot"
+ desc = "You'd better have insurance!"
+ skin = "bezerk"
+ treatment_oxy = "perfluorodecalin"
+ treatment_brute = "styptic_powder"
+ treatment_fire = "silver_sulfadiazine"
+ treatment_tox = "charcoal"
+ bot_core_type = /obj/machinery/bot_core/medbot/syndicate
+ control_freq = BOT_FREQ + 1000 // make it not show up on lists
+ radio_channel = "Syndicate"
+ radio_config = list("Common" = 1, "Medical" = 1, "Syndicate" = 1)
+
+/mob/living/simple_animal/bot/medbot/syndicate/New()
+ ..()
+ Radio.syndie = 1
+
+/mob/living/simple_animal/bot/medbot/update_icon()
+ if(!on)
+ icon_state = "medibot0"
+ return
+ if(mode == BOT_HEALING)
+ icon_state = "medibots[stationary_mode]"
+ return
+ else if(stationary_mode) //Bot has yellow light to indicate stationary mode.
+ icon_state = "medibot2"
+ else
+ icon_state = "medibot1"
+
+/mob/living/simple_animal/bot/medbot/New()
+ ..()
+ update_icon()
+
+ spawn(4)
+ if(skin)
+ overlays += image('icons/obj/aibots.dmi', "medskin_[skin]")
+
+ var/datum/job/doctor/J = new/datum/job/doctor
+ access_card.access += J.get_access()
+ prev_access = access_card.access
+
+ var/datum/atom_hud/medsensor = huds[DATA_HUD_MEDICAL_ADVANCED]
+ medsensor.add_hud_to(src)
+ permanent_huds |= medsensor
+
+/mob/living/simple_animal/bot/medbot/bot_reset()
+ ..()
+ patient = null
+ oldpatient = null
+ oldloc = null
+ last_found = world.time
+ declare_cooldown = 0
+ update_icon()
+
+/mob/living/simple_animal/bot/medbot/proc/soft_reset() //Allows the medibot to still actively perform its medical duties without being completely halted as a hard reset does.
+ path = list()
+ patient = null
+ mode = BOT_IDLE
+ last_found = world.time
+ update_icon()
+
+/mob/living/simple_animal/bot/medbot/set_custom_texts()
+ text_hack = "You corrupt [name]'s reagent processor circuits."
+ text_dehack = "You reset [name]'s reagent processor circuits."
+ text_dehack_fail = "[name] seems damaged and does not respond to reprogramming!"
+
+/mob/living/simple_animal/bot/medbot/get_controls(mob/user)
+ var/dat
+ dat += hack(user)
+ dat += showpai(user)
+ dat += "Medical Unit Controls v1.1
"
+ dat += "Status: [on ? "On" : "Off"]
"
+ dat += "Maintenance panel panel is [open ? "opened" : "closed"]
"
+ dat += "Beaker: "
+ if(reagent_glass)
+ dat += "Loaded \[[reagent_glass.reagents.total_volume]/[reagent_glass.reagents.maximum_volume]\]"
+ else
+ dat += "None Loaded"
+ dat += "
Behaviour controls are [locked ? "locked" : "unlocked"]
"
+ if(!locked || issilicon(user) || check_rights(R_ADMIN, 0, user))
+ dat += "Healing Threshold: "
+ dat += "-- "
+ dat += "- "
+ dat += "[heal_threshold] "
+ dat += "+ "
+ dat += "++"
+ dat += "
"
+
+ dat += "Injection Level: "
+ dat += "- "
+ dat += "[injection_amount] "
+ dat += "+ "
+ dat += "
"
+
+ dat += "Reagent Source: "
+ dat += "[use_beaker ? "Loaded Beaker (When available)" : "Internal Synthesizer"]
"
+
+ dat += "Treat Viral Infections: [treat_virus ? "Yes" : "No"]
"
+ dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle
"
+ dat += "Critical Patient Alerts: [declare_crit ? "Yes" : "No"]
"
+ dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
"
+ dat += "Stationary Mode: [stationary_mode ? "Yes" : "No"]
"
+
+ return dat
+
+/mob/living/simple_animal/bot/medbot/Topic(href, href_list)
+ if(..())
+ return 1
+
+ if(href_list["adj_threshold"])
+ var/adjust_num = text2num(href_list["adj_threshold"])
+ heal_threshold += adjust_num
+ if(heal_threshold < 5)
+ heal_threshold = 5
+ if(heal_threshold > 75)
+ heal_threshold = 75
+
+ else if(href_list["adj_inject"])
+ var/adjust_num = text2num(href_list["adj_inject"])
+ injection_amount += adjust_num
+ if(injection_amount < 5)
+ injection_amount = 5
+ if(injection_amount > 15)
+ injection_amount = 15
+
+ else if(href_list["use_beaker"])
+ use_beaker = !use_beaker
+
+ else if(href_list["eject"] && (!isnull(reagent_glass)))
+ reagent_glass.forceMove(get_turf(src))
+ reagent_glass = null
+
+ else if(href_list["togglevoice"])
+ shut_up = !shut_up
+
+ else if(href_list["critalerts"])
+ declare_crit = !declare_crit
+
+ else if(href_list["stationary"])
+ stationary_mode = !stationary_mode
+ path = list()
+ update_icon()
+
+ else if(href_list["virus"])
+ treat_virus = !treat_virus
+
+ update_controls()
+ return
+
+/mob/living/simple_animal/bot/medbot/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+ if(istype(W, /obj/item/weapon/reagent_containers/glass))
+ if(locked)
+ to_chat(user, "You cannot insert a beaker because the panel is locked!")
+ return
+ if(!isnull(reagent_glass))
+ to_chat(user, "There is already a beaker loaded!")
+ return
+ if(!user.drop_item())
+ return
+
+ W.forceMove(src)
+ reagent_glass = W
+ to_chat(user, "You insert [W].")
+ show_controls(user)
+ return
+
+ else
+ var/current_health = health
+ ..()
+ if(health < current_health) //if medbot took some damage
+ step_to(src, (get_step_away(src,user)))
+
+/mob/living/simple_animal/bot/medbot/emag_act(mob/user)
+ ..()
+ if(emagged == 2)
+ declare_crit = 0
+ if(user)
+ to_chat(user, "You short out [src]'s reagent synthesis circuits.")
+ audible_message("[src] buzzes oddly!")
+ flick("medibot_spark", src)
+ if(user)
+ oldpatient = user
+
+/mob/living/simple_animal/bot/medbot/process_scan(mob/living/carbon/human/H)
+ if(H.stat == 2)
+ return
+
+ if((H == oldpatient) && (world.time < last_found + 200))
+ return
+
+ if(assess_patient(H))
+ last_found = world.time
+ if((last_newpatient_speak + 300) < world.time) //Don't spam these messages!
+ var/message = pick("Hey, [H.name]! Hold on, I'm coming.","Wait [H.name]! I want to help!","[H.name], you appear to be injured!")
+ speak(message)
+ last_newpatient_speak = world.time
+ return H
+ else
+ return
+
+/mob/living/simple_animal/bot/medbot/handle_automated_action()
+ if(!..())
+ return
+
+ if(mode == BOT_HEALING)
+ return
+
+ if(stunned)
+ icon_state = "medibota"
+ stunned--
+
+ oldpatient = patient
+ patient = null
+ mode = BOT_IDLE
+
+ if(stunned <= 0)
+ update_icon()
+ stunned = 0
+ return
+
+ if(frustration > 8)
+ oldpatient = patient
+ soft_reset()
+
+ if(!patient)
+ if(!shut_up && prob(1))
+ var/message = pick("Radar, put a mask on!","There's always a catch, and it's the best there is.","I knew it, I should've been a plastic surgeon.","What kind of medbay is this? Everyone's dropping like dead flies.","Delicious!")
+ speak(message)
+ var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE) //If in stationary mode, scan range is limited to adjacent patients.
+ patient = scan(/mob/living/carbon/human, oldpatient, scan_range)
+ oldpatient = patient
+
+ if(patient && (get_dist(src,patient) <= 1)) //Patient is next to us, begin treatment!
+ if(mode != BOT_HEALING)
+ mode = BOT_HEALING
+ update_icon()
+ frustration = 0
+ medicate_patient(patient)
+ return
+
+ //Patient has moved away from us!
+ else if(patient && path.len && (get_dist(patient,path[path.len]) > 2))
+ path = list()
+ mode = BOT_IDLE
+ last_found = world.time
+
+ else if(stationary_mode && patient) //Since we cannot move in this mode, ignore the patient and wait for another.
+ soft_reset()
+ return
+
+ if(patient && path.len == 0 && (get_dist(src,patient) > 1))
+ path = get_path_to(src, get_turf(patient), /turf/proc/Distance_cardinal, 0, 30,id=access_card)
+ mode = BOT_MOVING
+ if(!path.len) //try to get closer if you can't reach the patient directly
+ path = get_path_to(src, get_turf(patient), /turf/proc/Distance_cardinal, 0, 30,1,id=access_card)
+ if(!path.len) //Do not chase a patient we cannot reach.
+ soft_reset()
+
+ if(path.len > 0 && patient)
+ if(!bot_move(path[path.len]))
+ oldpatient = patient
+ soft_reset()
+ return
+
+ if(path.len > 8 && patient)
+ frustration++
+
+ if(auto_patrol && !stationary_mode && !patient)
+ if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+ start_patrol()
+
+ if(mode == BOT_PATROL)
+ bot_patrol()
+
+ return
+
+/mob/living/simple_animal/bot/medbot/proc/assess_patient(mob/living/carbon/C)
+ //Time to see if they need medical help!
+ if(C.stat == 2)
+ return 0 //welp too late for them!
+
+ if(C.suiciding)
+ return 0 //Kevorkian school of robotic medical assistants.
+
+ // is secretly a silicon
+ if(ishuman(C))
+ var/mob/living/carbon/human/H = C
+ if(H.species && H.species.reagent_tag == PROCESS_SYN)
+ return 0
+
+ if(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins)
+ return 1
+
+ if((skin == "bezerk") && (!("syndicate" in C.faction)))
+ return 0
+
+ if(declare_crit && C.health <= 0) //Critical condition! Call for help!
+ declare(C)
+
+ //If they're injured, we're using a beaker, and don't have one of our WONDERCHEMS.
+ if((reagent_glass) && (use_beaker) && ((C.getBruteLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getToxLoss() >= heal_threshold) || (C.getOxyLoss() >= (heal_threshold + 15))))
+ for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
+ if(!C.reagents.has_reagent(R.id))
+ return 1
+
+ //They're injured enough for it!
+ if((C.getBruteLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_brute)))
+ return 1 //If they're already medicated don't bother!
+
+ if((C.getOxyLoss() >= (15 + heal_threshold)) && (!C.reagents.has_reagent(treatment_oxy)))
+ return 1
+
+ if((C.getFireLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_fire)))
+ return 1
+
+ if((C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_tox)))
+ return 1
+
+ if(treat_virus)
+ for(var/datum/disease/D in C.viruses)
+ //the medibot can't detect viruses that are undetectable to Health Analyzers or Pandemic machines.
+ if(D.visibility_flags & HIDDEN_SCANNER || D.visibility_flags & HIDDEN_PANDEMIC)
+ return 0
+ if(D.severity == NONTHREAT) // medibot doesn't try to heal truly harmless viruses
+ return 0
+ if((D.stage > 1) || (D.spread_flags & AIRBORNE)) // medibot can't detect a virus in its initial stage unless it spreads airborne.
+
+ if(!C.reagents.has_reagent(treatment_virus))
+ return 1 //STOP DISEASE FOREVER
+
+ return 0
+
+/mob/living/simple_animal/bot/medbot/UnarmedAttack(atom/A)
+ if(iscarbon(A))
+ var/mob/living/carbon/C = A
+ patient = C
+ mode = BOT_HEALING
+ update_icon()
+ medicate_patient(C)
+ update_icon()
+ else
+ ..()
+
+/mob/living/simple_animal/bot/medbot/examinate(atom/A as mob|obj|turf in view())
+ ..()
+ if(!is_blind(src))
+ chemscan(src, A)
+
+/mob/living/simple_animal/bot/medbot/proc/medicate_patient(mob/living/carbon/C)
+ if(!on)
+ return
+
+ if(!istype(C))
+ oldpatient = patient
+ soft_reset()
+ return
+
+ if(C.stat == 2)
+ var/death_message = pick("No! NO!","Live, damnit! LIVE!","I...I've never lost a patient before. Not today, I mean.")
+ speak(death_message)
+ oldpatient = patient
+ soft_reset()
+ return
+
+ var/reagent_id = null
+
+ if(emagged == 2) //Emagged! Time to poison everybody.
+ reagent_id = "pancuronium"
+
+ else
+ if(treat_virus)
+ var/virus = 0
+ for(var/datum/disease/D in C.viruses)
+ //detectable virus
+ if((!(D.visibility_flags & HIDDEN_SCANNER)) || (!(D.visibility_flags & HIDDEN_PANDEMIC)))
+ if(D.severity != NONTHREAT) //virus is harmful
+ if((D.stage > 1) || (D.spread_flags & AIRBORNE))
+ virus = 1
+
+ if(!reagent_id && (virus))
+ if(!C.reagents.has_reagent(treatment_virus))
+ reagent_id = treatment_virus
+
+ if(!reagent_id && (C.getBruteLoss() >= heal_threshold))
+ if(!C.reagents.has_reagent(treatment_brute))
+ reagent_id = treatment_brute
+
+ if(!reagent_id && (C.getOxyLoss() >= (15 + heal_threshold)))
+ if(!C.reagents.has_reagent(treatment_oxy))
+ reagent_id = treatment_oxy
+
+ if(!reagent_id && (C.getFireLoss() >= heal_threshold))
+ if(!C.reagents.has_reagent(treatment_fire))
+ reagent_id = treatment_fire
+
+ if(!reagent_id && (C.getToxLoss() >= heal_threshold))
+ if(!C.reagents.has_reagent(treatment_tox))
+ reagent_id = treatment_tox
+
+ //If the patient is injured but doesn't have our special reagent in them then we should give it to them first
+ if(reagent_id && use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
+ for(var/datum/reagent/R in reagent_glass.reagents.reagent_list)
+ if(!C.reagents.has_reagent(R.id))
+ reagent_id = "internal_beaker"
+ break
+
+ if(!reagent_id) //If they don't need any of that they're probably cured!
+ var/message = pick("All patched up!","An apple a day keeps me away.","Feel better soon!")
+ speak(message)
+ bot_reset()
+ return
+ else
+ if(!emagged && check_overdose(patient,reagent_id,injection_amount))
+ soft_reset()
+ return
+ C.visible_message("[src] is trying to inject [patient]!", \
+ "[src] is trying to inject you!")
+
+ spawn(30)//replace with do mob
+ if((get_dist(src, patient) <= 1) && on && assess_patient(patient))
+ if(reagent_id == "internal_beaker")
+ if(use_beaker && reagent_glass && reagent_glass.reagents.total_volume)
+ var/fraction = min(injection_amount/reagent_glass.reagents.total_volume, 1)
+ reagent_glass.reagents.reaction(patient, 2, fraction)
+ reagent_glass.reagents.trans_to(patient, injection_amount) //Inject from beaker instead.
+ else
+ patient.reagents.add_reagent(reagent_id,injection_amount)
+ C.visible_message("[src] injects [patient] with its syringe!", \
+ "[src] injects you with its syringe!")
+ else
+ visible_message("[src] retracts its syringe.")
+ update_icon()
+ soft_reset()
+ return
+
+ reagent_id = null
+ return
+
+/mob/living/simple_animal/bot/medbot/proc/check_overdose(mob/living/carbon/patient,reagent_id,injection_amount)
+ var/datum/reagent/R = chemical_reagents_list[reagent_id]
+ if(!R.overdose_threshold)
+ return 0
+ var/current_volume = patient.reagents.get_reagent_amount(reagent_id)
+ if(current_volume + injection_amount > R.overdose_threshold)
+ return 1
+ return 0
+
+/mob/living/simple_animal/bot/medbot/bullet_act(obj/item/projectile/Proj)
+ if(Proj.flag == "taser")
+ stunned = min(stunned+10,20)
+ ..()
+
+/mob/living/simple_animal/bot/medbot/explode()
+ on = 0
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ switch(skin)
+ if("ointment")
+ new /obj/item/weapon/storage/firstaid/fire/empty(Tsec)
+ if("tox")
+ new /obj/item/weapon/storage/firstaid/toxin/empty(Tsec)
+ if("o2")
+ new /obj/item/weapon/storage/firstaid/o2/empty(Tsec)
+ if("brute")
+ new /obj/item/weapon/storage/firstaid/brute/empty(Tsec)
+ if("adv")
+ new /obj/item/weapon/storage/firstaid/adv/empty(Tsec)
+ if("bezerk")
+ new /obj/item/weapon/storage/firstaid/tactical/empty(Tsec)
+ if("fish")
+ new /obj/item/weapon/storage/firstaid/aquatic_kit(Tsec)
+ else
+ new /obj/item/weapon/storage/firstaid(Tsec)
+
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+
+ new /obj/item/device/healthanalyzer(Tsec)
+
+ if(reagent_glass)
+ reagent_glass.forceMove(Tsec)
+ reagent_glass = null
+
+ if(prob(50))
+ new /obj/item/robot_parts/l_arm(Tsec)
+
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+ ..()
+
+/mob/living/simple_animal/bot/medbot/proc/declare(crit_patient)
+ if(declare_cooldown)
+ return
+ if((skin == "bezerk"))
+ return
+ var/area/location = get_area(src)
+ speak("Medical emergency! [crit_patient ? "[crit_patient]" : "A patient"] is in critical condition at [location]!", radio_channel)
+ declare_cooldown = 1
+ spawn(200) //Twenty seconds
+ declare_cooldown = 0
+
+/obj/machinery/bot_core/medbot
+ req_one_access = list(access_medical, access_robotics)
+
+/obj/machinery/bot_core/medbot/syndicate
+ req_one_access = list(access_syndicate)
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
new file mode 100644
index 00000000000..e2bad0bcd3b
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -0,0 +1,872 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+
+// Mulebot - carries crates around for Quartermaster
+// Navigates via floor navbeacons
+// Remote Controlled from QM's PDA
+
+#define SIGH 0
+#define ANNOYED 1
+#define DELIGHT 2
+
+/mob/living/simple_animal/bot/mulebot
+ name = "\improper MULEbot"
+ desc = "A Multiple Utility Load Effector bot."
+ icon_state = "mulebot0"
+ density = 1
+ anchored = 1
+ animate_movement=1
+ health = 50
+ maxHealth = 50
+ damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
+ a_intent = "harm" //No swapping
+ buckle_lying = 0
+
+ radio_channel = "Supply"
+
+ bot_type = MULE_BOT
+ bot_filter = RADIO_MULEBOT
+ model = "MULE"
+ bot_purpose = "deliver crates and other packages between departments, as requested"
+ bot_core_type = /obj/machinery/bot_core/mulebot
+
+ suffix = ""
+
+ var/global/mulebot_count = 0
+ var/atom/movable/load = null
+ var/mob/living/passenger = null
+ var/turf/target // this is turf to navigate to (location of beacon)
+ var/loaddir = 0 // this the direction to unload onto/load from
+ var/home_destination = "" // tag of home beacon
+
+ var/reached_target = 1 //true if already reached the target
+
+ var/auto_return = 1 // true if auto return to home beacon after unload
+ var/auto_pickup = 1 // true if auto-pickup at beacon
+ var/report_delivery = 1 // true if bot will announce an arrival to a location.
+
+ var/obj/item/weapon/stock_parts/cell/cell
+ var/datum/wires/mulebot/wires = null
+ var/bloodiness = 0
+ var/currentBloodColor = "#A10808"
+ var/currentDNA = null
+
+/mob/living/simple_animal/bot/mulebot/New()
+ ..()
+ wires = new /datum/wires/mulebot(src)
+ var/datum/job/cargo_tech/J = new/datum/job/cargo_tech
+ access_card.access = J.get_access()
+ prev_access = access_card.access
+ cell = new(src)
+ cell.charge = 2000
+ cell.maxcharge = 2000
+
+ mulebot_count++
+ set_suffix(suffix ? suffix : "#[mulebot_count]")
+
+/mob/living/simple_animal/bot/mulebot/Destroy()
+ unload(0)
+ if(wires)
+ qdel(wires)
+ wires = null
+ if(cell)
+ qdel(cell)
+ cell = null
+ return ..()
+
+/mob/living/simple_animal/bot/mulebot/proc/set_suffix(suffix)
+ src.suffix = suffix
+ if(paicard)
+ bot_name = "\improper MULEbot ([suffix])"
+ else
+ name = "\improper MULEbot ([suffix])"
+
+/mob/living/simple_animal/bot/mulebot/bot_reset()
+ ..()
+ reached_target = 0
+
+/mob/living/simple_animal/bot/mulebot/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/weapon/screwdriver))
+ ..()
+ if(open)
+ on = FALSE
+ update_controls()
+ else if(istype(I,/obj/item/weapon/stock_parts/cell) && open && !cell)
+ if(!user.drop_item())
+ return
+ var/obj/item/weapon/stock_parts/cell/C = I
+ C.forceMove(src)
+ cell = C
+ visible_message("[user] inserts a cell into [src].",
+ "You insert the new cell into [src].")
+ update_controls()
+ else if(istype(I, /obj/item/weapon/crowbar) && open && cell)
+ cell.add_fingerprint(usr)
+ cell.forceMove(loc)
+ cell = null
+ visible_message("[user] crowbars out the power cell from [src].",
+ "You pry the powercell out of [src].")
+ update_controls()
+ else if (istype(I, /obj/item/weapon/wrench))
+ if (health < maxHealth)
+ adjustBruteLoss(-25)
+ updatehealth()
+ user.visible_message(
+ "[user] repairs [src]!",
+ "You repair [src]!"
+ )
+ else
+ to_chat(user, "[src] does not need a repair!")
+ else if((istype(I, /obj/item/device/multitool) || istype(I, /obj/item/weapon/wirecutters)) && open)
+ return attack_hand(user)
+ else if(load && ismob(load)) // chance to knock off rider
+ if(prob(1 + I.force * 2))
+ unload(0)
+ user.visible_message("[user] knocks [load] off [src] with \the [I]!",
+ "You knock [load] off [src] with \the [I]!")
+ else
+ to_chat(user, "You hit [src] with \the [I] but to no effect!")
+ ..()
+ else
+ ..()
+ update_icon()
+ return
+
+/mob/living/simple_animal/bot/mulebot/emag_act(mob/user)
+ if(emagged < 1)
+ emagged = 1
+ if(!open)
+ locked = !locked
+ to_chat(user, "You [locked ? "lock" : "unlock"] the [src]'s controls!")
+ flick("mulebot-emagged", src)
+ playsound(loc, 'sound/effects/sparks1.ogg', 100, 0)
+
+/mob/living/simple_animal/bot/mulebot/update_icon()
+ if(open)
+ icon_state="mulebot-hatch"
+ else
+ icon_state = "mulebot[!wires.MobAvoid()]"
+ overlays.Cut()
+ if(load && !ismob(load))//buckling handles the mob offsets
+ load.pixel_y = initial(load.pixel_y) + 9
+ if(load.layer < layer)
+ load.layer = layer + 0.1
+ overlays += load
+ return
+
+/mob/living/simple_animal/bot/mulebot/ex_act(severity)
+ unload(0)
+ switch(severity)
+ if(1)
+ qdel(src)
+ if(2)
+ for(var/i = 1; i < 3; i++)
+ wires.RandomCut()
+ if(3)
+ wires.RandomCut()
+ return
+
+/mob/living/simple_animal/bot/mulebot/bullet_act(obj/item/projectile/Proj)
+ if(..())
+ if(prob(50) && !isnull(load))
+ unload(0)
+ if(prob(25))
+ visible_message("Something shorts out inside [src]!")
+ wires.RandomCut()
+
+/mob/living/simple_animal/bot/mulebot/Topic(href, list/href_list)
+ if(..())
+ return 1
+
+ switch(href_list["op"])
+ if("lock")
+ toggle_lock(usr)
+ if("power")
+ if(on)
+ turn_off()
+ else if(cell && !open)
+ if(!turn_on())
+ to_chat(usr, "You can't switch on [src]!")
+ return
+ else
+ return
+ visible_message("[usr] switches [on ? "on" : "off"] [src].")
+ if("cellremove")
+ if(open && cell && !usr.get_active_hand())
+ cell.updateicon()
+ usr.put_in_active_hand(cell)
+ cell.add_fingerprint(usr)
+ cell = null
+
+ usr.visible_message("[usr] removes the power cell from [src].", "You remove the power cell from [src].")
+ if("cellinsert")
+ if(open && !cell)
+ var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand()
+ if(istype(C))
+ usr.drop_item()
+ cell = C
+ C.forceMove(src)
+ C.add_fingerprint(usr)
+
+ usr.visible_message("[usr] inserts a power cell into [src].", "You insert the power cell into [src].")
+ if("stop")
+ if(mode >= BOT_DELIVER)
+ bot_reset()
+ if("go")
+ if(mode == BOT_IDLE)
+ start()
+ if("home")
+ if(mode == BOT_IDLE || mode == BOT_DELIVER)
+ start_home()
+ if("destination")
+ var/new_dest = input(usr, "Enter Destination:", name, destination) as null|anything in deliverybeacontags
+ if(new_dest)
+ set_destination(new_dest)
+ if("setid")
+ var/new_id = stripped_input(usr, "Enter ID:", name, suffix, MAX_NAME_LEN)
+ if(new_id)
+ set_suffix(new_id)
+ if("sethome")
+ var/new_home = input(usr, "Enter Home:", name, home_destination) as null|anything in deliverybeacontags
+ if(new_home)
+ home_destination = new_home
+ if("unload")
+ if(load && mode != BOT_HUNT)
+ if(loc == target)
+ unload(loaddir)
+ else
+ unload(0)
+ if("autoret")
+ auto_return = !auto_return
+ if("autopick")
+ auto_pickup = !auto_pickup
+ if("report")
+ report_delivery = !report_delivery
+ update_controls()
+
+/mob/living/simple_animal/bot/mulebot/proc/toggle_lock(var/mob/user)
+ if(bot_core.allowed(user))
+ locked = !locked
+ update_controls()
+ return 1
+ else
+ to_chat(user, "Access denied.")
+ return 0
+
+// TODO: remove this; PDAs currently depend on it
+/mob/living/simple_animal/bot/mulebot/get_controls(mob/user)
+ var/ai = issilicon(user)
+ var/dat
+ dat += hack(user)
+ dat += showpai(user)
+ dat += "Multiple Utility Load Effector Mk. V
"
+ dat += "ID: [suffix]
"
+ dat += "Power: [on ? "On" : "Off"]
"
+
+ if(!open)
+ dat += "Status
"
+ dat += ""
+ switch(mode)
+ if(BOT_IDLE)
+ dat += "Ready"
+ if(BOT_DELIVER)
+ dat += "[mode_name[BOT_DELIVER]]"
+ if(BOT_GO_HOME)
+ dat += "[mode_name[BOT_GO_HOME]]"
+ if(BOT_BLOCKED)
+ dat += "[mode_name[BOT_BLOCKED]]"
+ if(BOT_NAV,BOT_WAIT_FOR_NAV)
+ dat += "[mode_name[BOT_NAV]]"
+ if(BOT_NO_ROUTE)
+ dat += "[mode_name[BOT_NO_ROUTE]]"
+ dat += "
"
+
+ dat += "Current Load: [load ? load.name : "none"]
"
+ dat += "Destination: [!destination ? "none" : destination]
"
+ dat += "Power level: [cell ? cell.percent() : 0]%"
+
+ if(locked && !ai && !check_rights(R_ADMIN, 0, user))
+ dat += "
Controls are locked
Unlock Controls"
+ else
+ dat += "
Controls are unlocked
Lock Controls
"
+
+ dat += "Toggle Power
"
+ dat += "Stop
"
+ dat += "Proceed
"
+ dat += "Return to Home
"
+ dat += "Set Destination
"
+ dat += "Set Bot ID
"
+ dat += "Set Home
"
+ dat += "Toggle Auto Return Home ([auto_return ? "On":"Off"])
"
+ dat += "Toggle Auto Pickup Crate ([auto_pickup ? "On":"Off"])
"
+ dat += "Toggle Delivery Reporting ([report_delivery ? "On" : "Off"])
"
+ if(load)
+ dat += "Unload Now
"
+ dat += "The maintenance hatch is closed.
"
+ else
+ if(!ai)
+ dat += "The maintenance hatch is open.
"
+ dat += "Power cell: "
+ if(cell)
+ dat += "Installed
"
+ else
+ dat += "Removed
"
+
+ dat += wires.GetInteractWindow()
+ else
+ dat += "The bot is in maintenance mode and cannot be controlled.
"
+
+ return dat
+
+
+// returns true if the bot has power
+/mob/living/simple_animal/bot/mulebot/proc/has_power()
+ return !open && cell && cell.charge > 0 && wires.HasPower()
+
+/mob/living/simple_animal/bot/mulebot/proc/buzz(type)
+ switch(type)
+ if(SIGH)
+ audible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
+ if(ANNOYED)
+ audible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
+ playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
+ if(DELIGHT)
+ audible_message("[src] makes a delighted ping!", "You hear a ping.")
+ playsound(loc, 'sound/machines/ping.ogg', 50, 0)
+
+
+// mousedrop a crate to load the bot
+// can load anything if hacked
+/mob/living/simple_animal/bot/mulebot/MouseDrop_T(atom/movable/AM, mob/user)
+
+ if(user.incapacitated() || user.lying || get_dist(user, src) > 1)
+ return
+
+ if(!istype(AM))
+ return
+
+ load(AM)
+
+// called to load a crate
+/mob/living/simple_animal/bot/mulebot/proc/load(atom/movable/AM)
+ if(!on || load || AM.anchored || get_dist(src, AM) > 1)
+ return
+
+
+ //I'm sure someone will come along and ask why this is here... well people were dragging screen items onto the mule, and that was not cool.
+ //So this is a simple fix that only allows a selection of item types to be considered. Further narrowing-down is below.
+ if(!istype(AM, /obj/item) && !istype(AM, /obj/machinery) && !istype(AM, /obj/structure) && !ismob(AM))
+ return
+ if(!isturf(AM.loc)) //To prevent the loading from stuff from someone's inventory or screen icons.
+ return
+
+ var/obj/structure/closet/crate/CRATE
+ if(istype(AM,/obj/structure/closet/crate))
+ CRATE = AM
+ else
+ if(wires.LoadCheck())
+ buzz(SIGH)
+ return // if not hacked, only allow crates to be loaded
+
+ if(CRATE) // if it's a crate, close before loading
+ CRATE.close()
+
+ if(isobj(AM))
+ var/obj/O = AM
+ if(O.buckled_mob || (locate(/mob) in AM)) //can't load non crates objects with mobs buckled to it or inside it.
+ buzz(SIGH)
+ return
+
+ if(isliving(AM))
+ if(!load_mob(AM))
+ return
+ else
+ AM.forceMove(src)
+
+ load = AM
+ mode = BOT_IDLE
+ update_icon()
+
+/mob/living/simple_animal/bot/mulebot/proc/load_mob(mob/living/M)
+ can_buckle = TRUE
+ if(buckle_mob(M))
+ passenger = M
+ load = M
+ can_buckle = FALSE
+ if(M.client)
+ M.client.perspective = EYE_PERSPECTIVE
+ M.client.eye = src
+ return TRUE
+ return FALSE
+
+/mob/living/simple_animal/bot/mulebot/post_buckle_mob(mob/living/M)
+ if(M == buckled_mob) //post buckling
+ M.pixel_y = initial(M.pixel_y) + 9
+ if(M.layer < layer)
+ M.layer = layer + 0.1
+
+ else //post unbuckling
+ load = null
+ M.layer = initial(M.layer)
+ M.pixel_y = initial(M.pixel_y)
+
+// called to unload the bot
+// argument is optional direction to unload
+// if zero, unload at bot's location
+/mob/living/simple_animal/bot/mulebot/proc/unload(dirn)
+ if(!load)
+ return
+
+ mode = BOT_IDLE
+
+ overlays.Cut()
+
+ if(ismob(load))
+ var/mob/M = load
+ if(M.client)
+ M.client.perspective = MOB_PERSPECTIVE
+ M.client.eye = M
+ unbuckle_mob()
+
+ if(load)
+ load.forceMove(loc)
+ load.pixel_y = initial(load.pixel_y)
+ load.layer = initial(load.layer)
+ if(dirn)
+ var/turf/T = loc
+ var/turf/newT = get_step(T,dirn)
+ if(load.CanPass(load,newT)) //Can't get off onto anything that wouldn't let you pass normally
+ step(load, dirn)
+ load = null
+
+ // in case non-load items end up in contents, dump every else too
+ // this seems to happen sometimes due to race conditions
+ // with items dropping as mobs are loaded
+
+ for(var/atom/movable/AM in src)
+ if(AM == cell || AM == access_card || AM == Radio || AM == bot_core || AM == paicard)
+ continue
+
+ AM.forceMove(loc)
+ AM.layer = initial(AM.layer)
+ AM.pixel_y = initial(AM.pixel_y)
+ if(ismob(AM))
+ var/mob/M = AM
+ if(M.client)
+ M.client.perspective = MOB_PERSPECTIVE
+ M.client.eye = M
+
+/mob/living/simple_animal/bot/mulebot/call_bot()
+ ..()
+ var/area/dest_area
+ if(path && path.len)
+ target = ai_waypoint //Target is the end point of the path, the waypoint set by the AI.
+ dest_area = get_area(target)
+ destination = format_text(dest_area.name)
+ pathset = 1 //Indicates the AI's custom path is initialized.
+ start()
+
+/mob/living/simple_animal/bot/mulebot/handle_automated_action()
+ diag_hud_set_botmode()
+
+ if(!has_power())
+ on = 0
+ return
+ if(on)
+ var/speed = (wires.Motor1() ? 1 : 0) + (wires.Motor2() ? 2 : 0)
+// to_chat(world, "speed: [speed]")
+ var/num_steps = 0
+ switch(speed)
+ if(0)
+ // do nothing
+ if(1)
+ num_steps = 10
+ if(2)
+ num_steps = 5
+ if(3)
+ num_steps = 3
+
+ if(num_steps)
+ process_bot()
+ num_steps--
+ if(mode != BOT_IDLE)
+ spawn(0)
+ for(var/i=num_steps,i>0,i--)
+ sleep(2)
+ process_bot()
+
+/mob/living/simple_animal/bot/mulebot/proc/process_bot()
+ if(!on)
+ return
+ update_icon()
+
+ switch(mode)
+ if(BOT_IDLE) // idle
+ return
+
+ if(BOT_DELIVER, BOT_GO_HOME, BOT_BLOCKED) // navigating to deliver,home, or blocked
+ if(loc == target) // reached target
+ at_target()
+ return
+
+ else if(path.len > 0 && target) // valid path
+ var/turf/next = path[1]
+ reached_target = 0
+ if(next == loc)
+ path -= next
+ return
+ if(istype(next, /turf/simulated))
+// to_chat(world, "at ([x],[y]) moving to ([next.x],[next.y])")
+
+ var/oldloc = loc
+ var/moved = step_towards(src, next) // attempt to move
+ if(cell) cell.use(1)
+ if(moved && oldloc!=loc) // successful move
+// to_chat(world, "Successful move.")
+ blockcount = 0
+ path -= loc
+
+ if(destination == home_destination)
+ mode = BOT_GO_HOME
+ else
+ mode = BOT_DELIVER
+
+ else // failed to move
+
+// to_chat(world, "Unable to move.")
+ blockcount++
+ mode = BOT_BLOCKED
+ if(blockcount == 3)
+ buzz(ANNOYED)
+
+ if(blockcount > 10) // attempt 10 times before recomputing
+ // find new path excluding blocked turf
+ buzz(SIGH)
+ mode = BOT_WAIT_FOR_NAV
+ blockcount = 0
+ spawn(20)
+ calc_path(avoid=next)
+ if(path.len > 0)
+ buzz(DELIGHT)
+ mode = BOT_BLOCKED
+ return
+ return
+ else
+ buzz(ANNOYED)
+// to_chat(world, "Bad turf.")
+ mode = BOT_NAV
+ return
+ else
+// to_chat(world, "No path.")
+ mode = BOT_NAV
+ return
+
+ if(BOT_NAV) // calculate new path
+// to_chat(world, "Calc new path.")
+ mode = BOT_WAIT_FOR_NAV
+ spawn(0)
+ calc_path()
+
+ if(path.len > 0)
+ blockcount = 0
+ mode = BOT_BLOCKED
+ buzz(DELIGHT)
+
+ else
+ buzz(SIGH)
+
+ mode = BOT_NO_ROUTE
+
+/mob/living/simple_animal/bot/mulebot/Move(turf/simulated/next)
+ var/turf/simulated/last = loc
+
+ if(istype(last) && bloodiness)
+ last.AddTracks(/obj/effect/decal/cleanable/blood/tracks/wheels, currentDNA, 0, get_dir(last, next), currentBloodColor)
+
+ . = ..()
+
+ if(. && istype(next))
+ if(bloodiness)
+ next.AddTracks(/obj/effect/decal/cleanable/blood/tracks/wheels, currentDNA, get_dir(last, next), 0, currentBloodColor)
+ bloodiness--
+
+ for(var/mob/living/carbon/human/H in next)
+ if(H != load)
+ RunOver(H)
+
+// calculates a path to the current destination
+// given an optional turf to avoid
+/mob/living/simple_animal/bot/mulebot/calc_path(turf/avoid = null)
+ check_bot_access()
+ path = get_path_to(src, target, /turf/proc/Distance_cardinal, 0, 250, id=access_card, exclude=avoid)
+
+// sets the current destination
+// signals all beacons matching the delivery code
+// beacons will return a signal giving their locations
+/mob/living/simple_animal/bot/mulebot/proc/set_destination(new_dest)
+ new_destination = new_dest
+ get_nav()
+
+// starts bot moving to current destination
+/mob/living/simple_animal/bot/mulebot/proc/start()
+ if(!on)
+ return
+ if(destination == home_destination)
+ mode = BOT_GO_HOME
+ else
+ mode = BOT_DELIVER
+ update_icon()
+ get_nav()
+
+// starts bot moving to home
+// sends a beacon query to find
+/mob/living/simple_animal/bot/mulebot/proc/start_home()
+ if(!on)
+ return
+ spawn(0)
+ set_destination(home_destination)
+ mode = BOT_BLOCKED
+ update_icon()
+
+// called when bot reaches current target
+/mob/living/simple_animal/bot/mulebot/proc/at_target()
+ if(!reached_target)
+ radio_channel = "Supply" //Supply channel
+ audible_message("[src] makes a chiming sound!", "You hear a chime.")
+ playsound(loc, 'sound/machines/chime.ogg', 50, 0)
+ reached_target = 1
+
+ if(pathset) //The AI called us here, so notify it of our arrival.
+ loaddir = dir //The MULE will attempt to load a crate in whatever direction the MULE is "facing".
+ if(calling_ai)
+ to_chat(calling_ai, "\icon[src] [src] wirelessly plays a chiming sound!")
+ playsound(calling_ai, 'sound/machines/chime.ogg',40, 0)
+ calling_ai = null
+ radio_channel = "AI Private" //Report on AI Private instead if the AI is controlling us.
+
+ if(load) // if loaded, unload at target
+ if(report_delivery)
+ speak("Destination [destination] reached. Unloading [load].", radio_channel)
+ if(istype(load, /obj/structure/closet/crate))
+ var/obj/structure/closet/crate/C = load
+ C.notifyRecipient(destination)
+ unload(loaddir)
+ else
+ // not loaded
+ if(auto_pickup) // find a crate
+ var/atom/movable/AM
+ if(wires.LoadCheck()) // if hacked, load first unanchored thing we find
+ for(var/atom/movable/A in get_step(loc, loaddir))
+ if(!A.anchored)
+ AM = A
+ break
+ else // otherwise, look for crates only
+ AM = locate(/obj/structure/closet/crate) in get_step(loc,loaddir)
+ if(AM && AM.Adjacent(src))
+ load(AM)
+ if(report_delivery)
+ speak("Now loading [load] at [get_area(src)].", radio_channel)
+ // whatever happened, check to see if we return home
+
+ if(auto_return && home_destination && destination != home_destination)
+ // auto return set and not at home already
+ start_home()
+ mode = BOT_BLOCKED
+ else
+ bot_reset() // otherwise go idle
+
+ return
+
+// called when bot bumps into anything
+/mob/living/simple_animal/bot/mulebot/Bump(atom/obs)
+ if(!wires.MobAvoid()) // usually just bumps, but if avoidance disabled knock over mobs
+ var/mob/M = obs
+ if(ismob(M))
+ if(istype(M,/mob/living/silicon/robot))
+ visible_message("[src] bumps into [M]!")
+ else
+ add_logs(src, M, "knocked down")
+ visible_message("[src] knocks over [M]!")
+ M.stop_pulling()
+ M.Stun(8)
+ M.Weaken(5)
+ return ..()
+
+/mob/living/simple_animal/bot/mulebot/proc/RunOver(mob/living/carbon/human/H)
+ add_logs(src, H, "run over", null, "(DAMTYPE: [uppertext(BRUTE)])")
+ H.visible_message("[src] drives over [H]!", \
+ "[src] drives over you!")
+ playsound(loc, 'sound/effects/splat.ogg', 50, 1)
+
+ var/damage = rand(5,15)
+ H.apply_damage(2*damage, BRUTE, "head", run_armor_check("head", "melee"))
+ H.apply_damage(2*damage, BRUTE, "chest", run_armor_check("chest", "melee"))
+ H.apply_damage(0.5*damage, BRUTE, "l_leg", run_armor_check("l_leg", "melee"))
+ H.apply_damage(0.5*damage, BRUTE, "r_leg", run_armor_check("r_leg", "melee"))
+ H.apply_damage(0.5*damage, BRUTE, "l_arm", run_armor_check("l_arm", "melee"))
+ H.apply_damage(0.5*damage, BRUTE, "r_arm", run_armor_check("r_arm", "melee"))
+
+ var/obj/effect/decal/cleanable/blood/B = new(loc)
+ B.blood_DNA = list()
+ B.blood_DNA[H.dna.unique_enzymes] = H.dna.b_type
+ currentDNA = B.blood_DNA
+
+ bloodiness += 4
+
+ currentBloodColor = "#A10808"
+ if(istype(H))
+ var/datum/reagent/blood/bld = H.get_blood(H.vessel)
+ if(bld.data["blood_colour"])
+ currentBloodColor = bld.data["blood_colour"]
+ return
+ B.basecolor = currentBloodColor
+ B.update_icon()
+
+/mob/living/simple_animal/bot/mulebot/bot_control_message(command, mob/user, user_turf)
+ switch(command)
+ if("start")
+ if(load)
+ to_chat(src, "DELIVER [load] TO [destination]")
+ else
+ to_chat(src, "PICK UP DELIVERY AT [destination]")
+ if("unload")
+ if(load)
+ to_chat(src, "UNLOAD")
+ else
+ to_chat(src, "LOAD")
+ if("autoret", "autopick", "target")
+ else
+ ..()
+
+/mob/living/simple_animal/bot/mulebot/receive_signal(datum/signal/signal)
+ if(!wires.RemoteRX() || ..())
+ return 1
+
+ var/recv = signal.data["command"]
+
+ // process control input
+ switch(recv)
+ if("start")
+ start()
+
+ if("target")
+ set_destination(signal.data["destination"])
+
+ if("unload")
+ if(client)
+ return 1
+ if(loc == target)
+ unload(loaddir)
+ else
+ unload(0)
+
+ if("home")
+ start_home()
+
+ if("autoret")
+ auto_return = text2num(signal.data["value"])
+
+ if("autopick")
+ auto_pickup = text2num(signal.data["value"])
+
+ else
+ return 0
+ return 1
+
+// send a radio signal with multiple data key/values
+/mob/living/simple_animal/bot/mulebot/post_signal_multiple(var/freq, var/list/keyval)
+ if(!wires.RemoteTX())
+ return
+
+ ..()
+
+// signals bot status etc. to controller
+/mob/living/simple_animal/bot/mulebot/send_status()
+ var/list/kv = list(
+ "type" = MULE_BOT,
+ "name" = suffix,
+ "loca" = get_area(src),
+ "mode" = mode,
+ "powr" = (cell ? cell.percent() : 0),
+ "dest" = destination,
+ "home" = home_destination,
+ "load" = load,
+ "retn" = auto_return,
+ "pick" = auto_pickup,
+ )
+ post_signal_multiple(control_freq, kv)
+
+// player on mulebot attempted to move
+/mob/living/simple_animal/bot/mulebot/relaymove(mob/user)
+ if(user.incapacitated())
+ return
+ if(load == user)
+ unload(0)
+
+
+//Update navigation data. Called when commanded to deliver, return home, or a route update is needed...
+/mob/living/simple_animal/bot/mulebot/proc/get_nav()
+ if(!on || !wires.BeaconRX())
+ return
+
+ for(var/obj/machinery/navbeacon/NB in deliverybeacons)
+ if(NB.location == new_destination) // if the beacon location matches the set destination
+ destination = new_destination // the we will navigate there
+ target = NB.loc
+ var/direction = NB.dir // this will be the load/unload dir
+ loaddir = direction
+ update_icon()
+ calc_path()
+ return
+
+/mob/living/simple_animal/bot/mulebot/emp_act(severity)
+ if(cell)
+ cell.emp_act(severity)
+ if(load)
+ load.emp_act(severity)
+ ..()
+
+
+/mob/living/simple_animal/bot/mulebot/explode()
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+ new /obj/item/stack/rods(Tsec)
+ new /obj/item/stack/rods(Tsec)
+ new /obj/item/stack/cable_coil/cut(Tsec)
+ if(cell)
+ cell.forceMove(Tsec)
+ cell.update_icon()
+ cell = null
+
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+
+ new /obj/effect/decal/cleanable/blood/oil(loc)
+ ..()
+
+/mob/living/simple_animal/bot/mulebot/remove_air(amount) //To prevent riders suffocating
+ if(loc)
+ return loc.remove_air(amount)
+ else
+ return null
+
+/mob/living/simple_animal/bot/mulebot/resist()
+ ..()
+ if(load)
+ unload()
+
+/mob/living/simple_animal/bot/mulebot/UnarmedAttack(atom/A)
+ if(isturf(A) && isturf(loc) && loc.Adjacent(A) && load)
+ unload(get_dir(loc, A))
+ else
+ ..()
+
+#undef SIGH
+#undef ANNOYED
+#undef DELIGHT
+
+/obj/machinery/bot_core/mulebot
+ req_access = list(access_cargo)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
new file mode 100644
index 00000000000..1d3d2198fcc
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -0,0 +1,465 @@
+/mob/living/simple_animal/bot/secbot
+ name = "\improper Securitron"
+ desc = "A little security robot. He looks less than thrilled."
+ icon = 'icons/obj/aibots.dmi'
+ icon_state = "secbot0"
+ density = 0
+ anchored = 0
+ health = 25
+ maxHealth = 25
+ damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
+ pass_flags = PASSMOB
+
+ radio_channel = "Security" //Security channel
+ bot_type = SEC_BOT
+ bot_filter = RADIO_SECBOT
+ model = "Securitron"
+ bot_purpose = "seek out criminals, handcuff them, and report their location to security"
+ bot_core_type = /obj/machinery/bot_core/secbot
+ window_id = "autosec"
+ window_name = "Automatic Security Unit v1.6"
+
+ var/base_icon = "secbot"
+ var/mob/living/carbon/target
+ var/oldtarget_name
+ var/threatlevel = 0
+ var/target_lastloc //Loc of target when arrested.
+ var/last_found //There's a delay
+ var/declare_arrests = 1 //When making an arrest, should it notify everyone on the security channel?
+ var/idcheck = 0 //If true, arrest people with no IDs
+ var/weaponscheck = 0 //If true, arrest people for weapons if they lack access
+ var/check_records = 1 //Does it check security records?
+ var/arrest_type = 0 //If true, don't handcuff
+ var/harmbaton = 0 //If true, beat instead of stun
+ var/flashing_lights = 0 //If true, flash lights
+ var/prev_flashing_lights = 0
+
+/mob/living/simple_animal/bot/secbot/beepsky
+ name = "Officer Beepsky"
+ desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey."
+ idcheck = 0
+ weaponscheck = 0
+ auto_patrol = 1
+ allow_pai = 0
+
+/mob/living/simple_animal/bot/secbot/beepsky/explode()
+ var/turf/Tsec = get_turf(src)
+ new /obj/item/weapon/stock_parts/cell/potato(Tsec)
+ var/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/S = new(Tsec)
+ S.reagents.add_reagent("whiskey", 15)
+ S.on_reagent_change()
+ ..()
+
+/mob/living/simple_animal/bot/secbot/pingsky
+ name = "Officer Pingsky"
+ desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
+ radio_channel = "AI Private"
+ allow_pai = 0
+
+/mob/living/simple_animal/bot/secbot/ofitser
+ name = "Prison Ofitser"
+ desc = "It's Prison Ofitser! Powered by the tears and sweat of prisoners."
+ idcheck = 0
+ weaponscheck = 1
+ auto_patrol = 1
+ allow_pai = 0
+
+/mob/living/simple_animal/bot/secbot/buzzsky
+ name = "Officer Buzzsky"
+ desc = "It's Officer Buzzsky! Rusted and falling apart, he seems less than thrilled with the crew for leaving him in his current state."
+ base_icon = "rustbot"
+ icon_state = "rustbot0"
+ declare_arrests = 0
+ arrest_type = 1
+ harmbaton = 1
+ emagged = 2
+
+/mob/living/simple_animal/bot/secbot/New()
+ ..()
+ icon_state = "[base_icon][on]"
+ spawn(3)
+ var/datum/job/detective/J = new/datum/job/detective
+ access_card.access += J.get_access()
+ prev_access = access_card.access
+
+ //SECHUD
+ var/datum/atom_hud/secsensor = huds[DATA_HUD_SECURITY_ADVANCED]
+ secsensor.add_hud_to(src)
+ permanent_huds |= secsensor
+
+/mob/living/simple_animal/bot/secbot/turn_on()
+ ..()
+ icon_state = "[base_icon][on]"
+
+/mob/living/simple_animal/bot/secbot/turn_off()
+ ..()
+ icon_state = "[base_icon][on]"
+
+/mob/living/simple_animal/bot/secbot/bot_reset()
+ ..()
+ target = null
+ oldtarget_name = null
+ anchored = 0
+ walk_to(src,0)
+ last_found = world.time
+
+/mob/living/simple_animal/bot/secbot/set_custom_texts()
+
+ text_hack = "You overload [name]'s target identification system."
+ text_dehack = "You reboot [name] and restore the target identification."
+ text_dehack_fail = "[name] refuses to accept your authority!"
+
+/mob/living/simple_animal/bot/secbot/get_controls(mob/user)
+ var/dat
+ dat += hack(user)
+ dat += showpai(user)
+ dat += text({"
+Securitron v1.6 controls
+Status: []
+Behaviour controls are [locked ? "locked" : "unlocked"]
+Maintenance panel panel is [open ? "opened" : "closed"]"},
+
+"[on ? "On" : "Off"]" )
+
+ if(!locked || issilicon(user) || check_rights(R_ADMIN, 0, user))
+ dat += text({"
+Arrest Unidentifiable Persons: []
+Arrest for Unauthorized Weapons: []
+Arrest for Warrant: []
+Operating Mode: []
+Report Arrests[]
+Auto Patrol: []"},
+
+"[idcheck ? "Yes" : "No"]",
+"[weaponscheck ? "Yes" : "No"]",
+"[check_records ? "Yes" : "No"]",
+"[arrest_type ? "Detain" : "Arrest"]",
+"[declare_arrests ? "Yes" : "No"]",
+"[auto_patrol ? "On" : "Off"]" )
+
+ return dat
+
+/mob/living/simple_animal/bot/secbot/Topic(href, href_list)
+ if(..())
+ return 1
+
+ switch(href_list["operation"])
+ if("idcheck")
+ idcheck = !idcheck
+ update_controls()
+ if("weaponscheck")
+ weaponscheck = !weaponscheck
+ update_controls()
+ if("ignorerec")
+ check_records = !check_records
+ update_controls()
+ if("switchmode")
+ arrest_type = !arrest_type
+ update_controls()
+ if("declarearrests")
+ declare_arrests = !declare_arrests
+ update_controls()
+
+/mob/living/simple_animal/bot/secbot/proc/retaliate(mob/living/carbon/human/H)
+ threatlevel = H.assess_threat(src)
+ threatlevel += 6
+ if(threatlevel >= 4)
+ target = H
+ mode = BOT_HUNT
+
+/mob/living/simple_animal/bot/secbot/attack_hand(mob/living/carbon/human/H)
+ if(H.a_intent == "harm")
+ retaliate(H)
+ return ..()
+
+/mob/living/simple_animal/bot/secbot/attackby(obj/item/weapon/W, mob/user, params)
+ ..()
+ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") // Any intent but harm will heal, so we shouldn't get angry.
+ return
+ if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!target) && (W.damtype != STAMINA) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass.
+ retaliate(user)
+
+/mob/living/simple_animal/bot/secbot/emag_act(mob/user)
+ ..()
+ if(emagged == 2)
+ if(user)
+ to_chat(user, "You short out [src]'s target assessment circuits.")
+ oldtarget_name = user.name
+ audible_message("[src] buzzes oddly!")
+ declare_arrests = 0
+ icon_state = "[base_icon][on]"
+
+/mob/living/simple_animal/bot/secbot/bullet_act(obj/item/projectile/Proj)
+ if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet))
+ if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE))
+ if(!Proj.nodamage && Proj.damage < src.health)
+ retaliate(Proj.firer)
+ ..()
+
+
+/mob/living/simple_animal/bot/secbot/UnarmedAttack(atom/A)
+ if(!on)
+ return
+ if(iscarbon(A))
+ var/mob/living/carbon/C = A
+ if(!C.stunned || arrest_type)
+ stun_attack(A)
+ else if(C.canBeHandcuffed() && !C.handcuffed)
+ cuff(A)
+ else
+ ..()
+
+
+/mob/living/simple_animal/bot/secbot/hitby(atom/movable/AM, skipcatch = 0, hitpush = 1, blocked = 0)
+ if(istype(AM, /obj/item))
+ var/obj/item/I = AM
+ if(I.throwforce < src.health && I.thrower && (istype(I.thrower, /mob/living/carbon/human)))
+ var/mob/living/carbon/human/H = I.thrower
+ retaliate(H)
+ ..()
+
+
+/mob/living/simple_animal/bot/secbot/proc/cuff(mob/living/carbon/C)
+ mode = BOT_ARREST
+ playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
+ C.visible_message("[src] is trying to put zipties on [C]!",\
+ "[src] is trying to put zipties on you!")
+ spawn(60)
+ if( !Adjacent(C) || !isturf(C.loc) ) //if he's in a closet or not adjacent, we cancel cuffing.
+ return
+ if(!C.handcuffed)
+ C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C)
+ C.update_inv_handcuffed(1)
+ playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
+ back_to_idle()
+
+/mob/living/simple_animal/bot/secbot/proc/stun_attack(mob/living/carbon/C)
+ playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ if(harmbaton)
+ playsound(loc, 'sound/weapons/genhit1.ogg', 50, 1, -1)
+ icon_state = "[base_icon]-c"
+ spawn(2)
+ icon_state = "[base_icon][on]"
+ var/threat = 5
+ if(istype(C, /mob/living/carbon/human))
+ C.stuttering = 5
+ if(harmbaton) // Bots with harmbaton enabled become shitcurity. - Dave
+ C.apply_damage(10, BRUTE)
+ C.Stun(5)
+ C.Weaken(5)
+ var/mob/living/carbon/human/H = C
+ threat = H.assess_threat(src)
+ else
+ C.Weaken(5)
+ C.stuttering = 5
+ C.Stun(5)
+ add_logs(src,C,"stunned")
+ if(declare_arrests)
+ var/area/location = get_area(src)
+ speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag [C] in [location].", radio_channel)
+ C.visible_message("[src] has [harmbaton ? "beaten" : "stunned"] [C]!",\
+ "[src] has [harmbaton ? "beaten" : "stunned"] you!")
+
+/mob/living/simple_animal/bot/secbot/Life()
+ . = ..()
+ if(flashing_lights)
+ switch(light_color)
+ if(LIGHT_COLOR_PURE_RED)
+ light_color = LIGHT_COLOR_PURE_BLUE
+ if(LIGHT_COLOR_PURE_BLUE)
+ light_color = LIGHT_COLOR_PURE_RED
+ update_light()
+ else if(prev_flashing_lights)
+ light_color = LIGHT_COLOR_PURE_RED
+ update_light()
+
+ prev_flashing_lights = flashing_lights
+
+/mob/living/simple_animal/bot/secbot/verb/toggle_flashing_lights()
+ set name = "Toggle Flashing Lights"
+ set category = "Object"
+ set src = usr
+
+ flashing_lights = !flashing_lights
+
+/mob/living/simple_animal/bot/secbot/handle_automated_action()
+ if(!..())
+ return
+
+ flashing_lights = mode == BOT_HUNT
+
+ switch(mode)
+ if(BOT_IDLE) // idle
+ walk_to(src,0)
+ look_for_perp() // see if any criminals are in range
+ if(!mode && auto_patrol) // still idle, and set to patrol
+ mode = BOT_START_PATROL // switch to patrol mode
+
+ if(BOT_HUNT) // hunting for perp
+ // if can't reach perp for long enough, go idle
+ if(frustration >= 8)
+ walk_to(src,0)
+ back_to_idle()
+ return
+
+ if(target) // make sure target exists
+ if(Adjacent(target) && isturf(target.loc)) // if right next to perp
+ stun_attack(target)
+
+ mode = BOT_PREP_ARREST
+ anchored = 1
+ target_lastloc = target.loc
+ return
+
+ else // not next to perp
+ var/turf/olddist = get_dist(src, target)
+ walk_to(src, target,1,4)
+ if((get_dist(src, target)) >= (olddist))
+ frustration++
+ else
+ frustration = 0
+ else
+ back_to_idle()
+
+ if(BOT_PREP_ARREST) // preparing to arrest target
+ // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again.
+ if( !Adjacent(target) || !isturf(target.loc) || target.weakened < 2 )
+ back_to_hunt()
+ return
+
+ if(iscarbon(target) && target.canBeHandcuffed())
+ if(!arrest_type)
+ if(!target.handcuffed) //he's not cuffed? Try to cuff him!
+ cuff(target)
+ else
+ back_to_idle()
+ return
+ else
+ back_to_idle()
+ return
+
+ if(BOT_ARREST)
+ if(!target)
+ anchored = 0
+ mode = BOT_IDLE
+ last_found = world.time
+ frustration = 0
+ return
+
+ if(target.handcuffed) //no target or target cuffed? back to idle.
+ back_to_idle()
+ return
+
+ if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.weakened < 2)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again.
+ back_to_hunt()
+ return
+ else //Try arresting again if the target escapes.
+ mode = BOT_PREP_ARREST
+ anchored = 0
+
+ if(BOT_START_PATROL)
+ look_for_perp()
+ start_patrol()
+
+ if(BOT_PATROL)
+ look_for_perp()
+ bot_patrol()
+
+
+ return
+
+/mob/living/simple_animal/bot/secbot/proc/back_to_idle()
+ anchored = 0
+ mode = BOT_IDLE
+ target = null
+ last_found = world.time
+ frustration = 0
+ spawn(0)
+ handle_automated_action() //ensure bot quickly responds
+
+/mob/living/simple_animal/bot/secbot/proc/back_to_hunt()
+ anchored = 0
+ frustration = 0
+ mode = BOT_HUNT
+ spawn(0)
+ handle_automated_action() //ensure bot quickly responds
+// look for a criminal in view of the bot
+
+/mob/living/simple_animal/bot/secbot/proc/look_for_perp()
+ anchored = 0
+ for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
+ if((C.stat) || (C.handcuffed))
+ continue
+
+ if((C.name == oldtarget_name) && (world.time < last_found + 100))
+ continue
+
+ threatlevel = C.assess_threat(src)
+
+ if(!threatlevel)
+ continue
+
+ else if(threatlevel >= 4)
+ target = C
+ oldtarget_name = C.name
+ speak("Level [threatlevel] infraction alert!")
+ playsound(loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
+ visible_message("[src] points at [C.name]!")
+ mode = BOT_HUNT
+ spawn(0)
+ handle_automated_action() // ensure bot quickly responds to a perp
+ break
+ else
+ continue
+/mob/living/simple_animal/bot/secbot/proc/check_for_weapons(var/obj/item/slot_item)
+ if(slot_item && slot_item.needs_permit)
+ return 1
+ return 0
+
+/mob/living/simple_animal/bot/secbot/explode()
+
+ walk_to(src,0)
+ visible_message("[src] blows apart!")
+ var/turf/Tsec = get_turf(src)
+
+ var/obj/item/weapon/secbot_assembly/Sa = new /obj/item/weapon/secbot_assembly(Tsec)
+ Sa.build_step = 1
+ Sa.overlays += "hs_hole"
+ Sa.created_name = name
+ new /obj/item/device/assembly/prox_sensor(Tsec)
+ new /obj/item/weapon/melee/baton(Tsec)
+
+ if(prob(50))
+ new /obj/item/robot_parts/l_arm(Tsec)
+
+ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+
+ new /obj/effect/decal/cleanable/blood/oil(loc)
+ ..()
+
+/mob/living/simple_animal/bot/secbot/attack_alien(var/mob/living/carbon/alien/user as mob)
+ ..()
+ if(!isalien(target))
+ target = user
+ mode = BOT_HUNT
+
+/mob/living/simple_animal/bot/secbot/Crossed(atom/movable/AM)
+ if(ismob(AM) && target)
+ var/mob/living/carbon/C = AM
+ if(!istype(C) || !C || in_range(src, target))
+ return
+ C.visible_message("[pick( \
+ "[C] dives out of [src]'s way!", \
+ "[C] stumbles over [src]!", \
+ "[C] jumps out of [src]'s path!", \
+ "[C] trips over [src] and falls!", \
+ "[C] topples over [src]!", \
+ "[C] leaps out of [src]'s way!")]")
+ C.Weaken(2)
+ return
+ ..()
+
+/obj/machinery/bot_core/secbot
+ req_access = list(access_security)
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index da3283355f3..6c630ec0117 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -14,14 +14,7 @@
stop_automated_movement = 1
status_flags = CANPUSH
attack_sound = 'sound/weapons/punch1.ogg'
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("cult")
flying = 1
@@ -59,7 +52,7 @@
msg += ""
msg += "*---------*"
- user << msg
+ to_chat(user, msg)
/mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M as mob)
if(istype(M, /mob/living/simple_animal/construct/builder))
@@ -110,7 +103,7 @@
/mob/living/simple_animal/construct/armoured/Life()
weakened = 0
- ..()
+ return ..()
/mob/living/simple_animal/construct/armoured/bullet_act(var/obj/item/projectile/P)
if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
@@ -261,7 +254,7 @@
if (istype(usr,/mob/living/simple_animal/constructbehemoth))
if(usr.energy<300)
- usr << "\red You do not have enough power stored!"
+ to_chat(usr, "\red You do not have enough power stored!")
return
if(usr.stat)
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index a6c5effdde3..60aad72ab36 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -17,8 +17,8 @@
density = 0
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = 2
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 0
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 0)
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/butterfly/New()
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 91171c89bc7..c77d117bad4 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -5,7 +5,7 @@
icon_state = "cat2"
icon_living = "cat2"
icon_dead = "cat2_dead"
- icon_resting = "cat_rest"
+ icon_resting = "cat2_rest"
gender = MALE
speak = list("Meow!", "Esp!", "Purr!", "HSSSSS")
speak_emote = list("purrs", "meows")
@@ -16,11 +16,11 @@
see_in_dark = 6
simplespecies = /mob/living/simple_animal/pet/cat
childtype = /mob/living/simple_animal/pet/cat/kitten
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
//RUNTIME IS ALIVE! SQUEEEEEEEE~
/mob/living/simple_animal/pet/cat/Runtime
@@ -28,10 +28,12 @@
desc = "GCAT"
icon_state = "cat"
icon_living = "cat"
- icon_dead = "cat2_dead"
+ icon_dead = "cat_dead"
+ icon_resting = "cat_rest"
gender = FEMALE
var/turns_since_scan = 0
var/mob/living/simple_animal/mouse/movement_target
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/mob/living/simple_animal/pet/cat/Runtime/handle_automated_action()
..()
@@ -96,4 +98,5 @@
flags = NO_BREATHE
faction = list("syndicate")
var/turns_since_scan = 0
- var/mob/living/simple_animal/mouse/movement_target
\ No newline at end of file
+ var/mob/living/simple_animal/mouse/movement_target
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 625e9ee86f6..6463c830fed 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -15,8 +15,7 @@
emote_see = list("shakes its head", "shivers")
speak_chance = 1
turns_per_move = 10
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/corgi = 3)
response_help = "pets"
response_disarm = "bops"
response_harm = "kicks"
@@ -27,36 +26,12 @@
var/obj/item/inventory_head
var/obj/item/inventory_back
var/facehugger
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/pet/corgi/New()
..()
regenerate_icons()
-/mob/living/simple_animal/pet/corgi/handle_hud_icons()
- ..()
- if(fire)
- if(fire_alert) fire.icon_state = "fire[fire_alert]" //fire_alert is either 0 if no alert, 1 for heat and 2 for cold.
- else fire.icon_state = "fire0"
- if(oxygen)
- if(oxygen_alert) oxygen.icon_state = "oxy1"
- else oxygen.icon_state = "oxy0"
- if(toxin)
- if(toxins_alert) toxin.icon_state = "tox1"
- else toxin.icon_state = "tox0"
-
-/mob/living/simple_animal/pet/corgi/handle_hud_icons_health()
- ..()
- if(healths)
- switch(health)
- if(30 to INFINITY) healths.icon_state = "health0"
- if(26 to 29) healths.icon_state = "health1"
- if(21 to 25) healths.icon_state = "health2"
- if(16 to 20) healths.icon_state = "health3"
- if(11 to 15) healths.icon_state = "health4"
- if(6 to 10) healths.icon_state = "health5"
- if(1 to 5) healths.icon_state = "health6"
- if(0) healths.icon_state = "health7"
-
/mob/living/simple_animal/pet/corgi/Life()
. = ..()
regenerate_icons()
@@ -73,29 +48,31 @@
user.set_machine(src)
if(user.stat) return
- var/dat = "Inventory of [name]
"
- if(inventory_head)
- dat += "
Head: [inventory_head] (Remove)"
- else
- dat += "
Head: Nothing"
- if(inventory_back)
- dat += "
Back: [inventory_back] (Remove)"
- else
- dat += "
Back: Nothing"
+ var/dat = {"
+ Close
+ "}
+
+ var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 500)
+ popup.set_content(dat)
+ popup.open()
/mob/living/simple_animal/pet/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(inventory_head && inventory_back)
//helmet and armor = 100% protection
if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
if( O.force )
- user << "[src] is wearing too much armor! You can't cause \him any damage."
+ to_chat(user, "[src] is wearing too much armor! You can't cause \him any damage.")
visible_message(" [user] hits [src] with [O], however [src] is too armored.")
else
- user << "[src] is wearing too much armor! You can't reach \his skin."
+ to_chat(user, "[src] is wearing too much armor! You can't reach \his skin.")
visible_message("[user] gently taps [src] with [O].")
if(health>0 && prob(15))
custom_emote(1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.")
@@ -103,7 +80,7 @@
if (istype(O, /obj/item/weapon/razor))
if (shaved)
- user << "You can't shave this corgi, it's already been shaved!"
+ to_chat(user, "You can't shave this corgi, it's already been shaved!")
return
user.visible_message("[user] starts to shave [src] using \the [O].", "You start to shave [src] using \the [O]...")
if(do_after(user, 50, target = src))
@@ -131,7 +108,7 @@
if("head")
if(inventory_head)
if(inventory_head.flags & NODROP)
- usr << "\The [inventory_head] is stuck too hard to [src] for you to remove!"
+ to_chat(usr, "\The [inventory_head] is stuck too hard to [src] for you to remove!")
return
name = real_name
desc = initial(desc)
@@ -145,18 +122,18 @@
inventory_head = null
regenerate_icons()
else
- usr << "There is nothing to remove from its [remove_from]."
+ to_chat(usr, "There is nothing to remove from its [remove_from].")
return
if("back")
if(inventory_back)
if(inventory_back.flags & NODROP)
- usr << "\The [inventory_back] is stuck too hard to [src] for you to remove!"
+ to_chat(usr, "\The [inventory_back] is stuck too hard to [src] for you to remove!")
return
inventory_back.loc = src.loc
inventory_back = null
regenerate_icons()
else
- usr << "There is nothing to remove from its [remove_from]."
+ to_chat(usr, "There is nothing to remove from its [remove_from].")
return
show_inv(usr)
@@ -174,7 +151,7 @@
if("back")
if(inventory_back)
- usr << "It's already wearing something!"
+ to_chat(usr, "It's already wearing something!")
return
else
var/obj/item/item_to_add = usr.get_active_hand()
@@ -200,9 +177,9 @@
)
if( ! ( item_to_add.type in allowed_types ) )
- usr << "You set [item_to_add] on [src]'s back, but \he shakes it off!"
+ to_chat(usr, "You set [item_to_add] on [src]'s back, but \he shakes it off!")
if(!usr.drop_item())
- usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!"
+ to_chat(usr, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!")
return
item_to_add.loc = loc
if(prob(25))
@@ -231,7 +208,8 @@
return
if(inventory_head)
- if(user) user << "You can't put more than one hat on [src]!"
+ if(user)
+ to_chat(user, "You can't put more than one hat on [src]!")
return
if(!item_to_add)
user.visible_message("[user] pets [src].","You rest your hand on [src]'s head for a moment.")
@@ -383,10 +361,10 @@
if(valid)
if(user && !user.drop_item())
- user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
+ to_chat(user, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!")
return 0
if(health <= 0)
- user << "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him."
+ to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him.")
else if(user)
user.visible_message("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.",
"You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags \his tail once and barks.",
@@ -397,9 +375,9 @@
else
if(user && !user.drop_item())
- user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
+ to_chat(user, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!")
return 0
- user << "You set [item_to_add] on [src]'s head, but \he shakes it off!"
+ to_chat(user, "You set [item_to_add] on [src]'s head, but \he shakes it off!")
item_to_add.loc = loc
if(prob(25))
step_rand(item_to_add)
@@ -421,12 +399,13 @@
response_help = "pets"
response_disarm = "bops"
response_harm = "kicks"
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
-/mob/living/simple_animal/pet/corgi/Ian/Life()
+/mob/living/simple_animal/pet/corgi/Ian/process_ai()
..()
//Feeding, chasing food, FOOOOODDDD
- if(!stat && !resting && !buckled && (ckey == null))
+ if(!resting && !buckled)
turns_since_scan++
if(turns_since_scan > 5)
turns_since_scan = 0
@@ -473,10 +452,9 @@
if(prob(1))
custom_emote(1, pick("dances around.","chases its tail!"))
spawn(0)
- if (ckey == null)
- for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
- dir = i
- sleep(1)
+ for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
+ dir = i
+ sleep(1)
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
name = "Corgi meat"
@@ -492,7 +470,7 @@
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(70))
- src << "\red You fail to push [tmob]'s fat ass out of the way."
+ to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.")
now_pushing = 0
return
if(!(tmob.status_flags & CANPUSH))
@@ -542,11 +520,7 @@
overlays += image('icons/mob/mask.dmi',"facehugger_corgipuppy")
else
overlays += image('icons/mob/mask.dmi',"facehugger_corgi")
- if(pcollar)
- overlays += collar
- overlays += pettag
-
- return
+ ..(0)
/mob/living/simple_animal/pet/corgi/puppy
name = "\improper corgi puppy"
@@ -562,7 +536,7 @@
//puppies cannot wear anything.
/mob/living/simple_animal/pet/corgi/puppy/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
- usr << "You can't fit this on [src]!"
+ to_chat(usr, "You can't fit this on [src]!")
return
..()
@@ -582,28 +556,27 @@
response_harm = "kicks"
var/turns_since_scan = 0
var/puppies = 0
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
//Lisa already has a cute bow!
/mob/living/simple_animal/pet/corgi/Lisa/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
- usr << "\red [src] already has a cute bow!"
+ to_chat(usr, "\red [src] already has a cute bow!")
return
..()
-/mob/living/simple_animal/pet/corgi/Lisa/Life()
+/mob/living/simple_animal/pet/corgi/Lisa/process_ai()
..()
make_babies()
- if(!stat && !resting && !buckled)
+ if(!resting && !buckled)
if(prob(1))
- if (ckey == null)
- custom_emote(1, pick("dances around.","chases her tail."))
- spawn(0)
- for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
- dir = i
- sleep(1)
-
+ custom_emote(1, pick("dances around.","chases her tail."))
+ spawn(0)
+ for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
+ dir = i
+ sleep(1)
/mob/living/simple_animal/pet/corgi/attack_hand(mob/living/carbon/human/M)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
index c19f3bc9fad..dc687743197 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
@@ -2,10 +2,10 @@
set name = "Chase your tail"
set desc = "d'awwww."
set category = "Corgi"
- src << text("[pick("You dance around","You chase your tail")].")
+ to_chat(src, text("[pick("You dance around","You chase your tail")]."))
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
- O << text("[] [pick("dances around","chases its tail")].", src)
+ to_chat(O, text("[] [pick("dances around","chases its tail")].", src))
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
dir = i
sleep(1)
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 60377828f43..31da301ce57 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -11,8 +11,7 @@
emote_see = list("clacks")
speak_chance = 1
turns_per_move = 5
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 1)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "stomps the"
@@ -22,6 +21,8 @@
var/obj/item/inventory_head
var/obj/item/inventory_mask
can_hide = 1
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/crab/handle_automated_movement()
//CRAB movement
@@ -46,12 +47,13 @@
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "stomps"
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
//LOOK AT THIS - ..()??
/*/mob/living/simple_animal/crab/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/weapon/wirecutters))
if(prob(50))
- user << "\red \b This kills the crab."
+ to_chat(user, "\red \b This kills the crab.")
health -= 20
death()
else
@@ -70,7 +72,7 @@
if ((M.client && !( M.blinded )))
M.show_message("\blue [user] applies the [MED] on [src]")
else
- user << "\blue this [src] is dead, medical items won't bring it back to life."
+ to_chat(user, "\blue this [src] is dead, medical items won't bring it back to life.")
else
if(O.force)
health -= O.force
@@ -78,7 +80,7 @@
if ((M.client && !( M.blinded )))
M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
else
- usr << "\red This weapon is ineffective, it does no damage."
+ to_chat(usr, "\red This weapon is ineffective, it does no damage.")
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
@@ -104,14 +106,14 @@
inventory_head.loc = src.loc
inventory_head = null
else
- usr << "\red There is nothing to remove from its [remove_from]."
+ to_chat(usr, "\red There is nothing to remove from its [remove_from].")
return
if("mask")
if(inventory_mask)
inventory_mask.loc = src.loc
inventory_mask = null
else
- usr << "\red There is nothing to remove from its [remove_from]."
+ to_chat(usr, "\red There is nothing to remove from its [remove_from].")
return
//show_inv(usr) //Commented out because changing Ian's name and then calling up his inventory opens a new inventory...which is annoying.
@@ -122,12 +124,12 @@
return
var/add_to = href_list["add_inv"]
if(!usr.get_active_hand())
- usr << "\red You have nothing in your hand to put on its [add_to]."
+ to_chat(usr, "\red You have nothing in your hand to put on its [add_to].")
return
switch(add_to)
if("head")
if(inventory_head)
- usr << "\red It's is already wearing something."
+ to_chat(usr, "\red It's is already wearing something.")
return
else
var/obj/item/item_to_add = usr.get_active_hand()
@@ -169,7 +171,7 @@
)
if( ! ( item_to_add.type in allowed_types ) )
- usr << "\red It doesn't seem too keen on wearing that item."
+ to_chat(usr, "\red It doesn't seem too keen on wearing that item.")
return
usr.drop_item()
@@ -232,7 +234,7 @@
if("mask")
if(inventory_mask)
- usr << "\red It's already wearing something."
+ to_chat(usr, "\red It's already wearing something.")
return
else
var/obj/item/item_to_add = usr.get_active_hand()
@@ -248,7 +250,7 @@
)
if( ! ( item_to_add.type in allowed_types ) )
- usr << "\red This object won't fit."
+ to_chat(usr, "\red This object won't fit.")
return
usr.drop_item()
diff --git a/code/modules/mob/living/simple_animal/friendly/deer.dm b/code/modules/mob/living/simple_animal/friendly/deer.dm
index 01e322c80aa..034fa07b6fb 100644
--- a/code/modules/mob/living/simple_animal/friendly/deer.dm
+++ b/code/modules/mob/living/simple_animal/friendly/deer.dm
@@ -10,8 +10,9 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 0 //I'm so funny
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 4)
response_help = "pets"
response_disarm = "gently pushes aside"
- response_harm = "kicks"
\ No newline at end of file
+ response_harm = "kicks"
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm
index 95caf726186..4606558d271 100644
--- a/code/modules/mob/living/simple_animal/friendly/diona.dm
+++ b/code/modules/mob/living/simple_animal/friendly/diona.dm
@@ -38,6 +38,7 @@
var/list/donors = list()
var/ready_evolve = 0
holder_type = /obj/item/weapon/holder/diona
+ can_collar = 1
/mob/living/simple_animal/diona/New()
..()
@@ -52,8 +53,8 @@
//Let people pick the little buggers up.
if(M.a_intent == I_HELP)
if(M.species && M.species.name == "Diona")
- M << "You feel your being twine with that of [src] as it merges with your biomass."
- src << "You feel your being twine with that of [M] as you merge with its biomass."
+ to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.")
+ to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
src.verbs += /mob/living/simple_animal/diona/proc/split
src.verbs -= /mob/living/simple_animal/diona/proc/merge
src.forceMove(M)
@@ -86,10 +87,10 @@
if(!M || !src || !(src.Adjacent(M))) return
if(istype(M,/mob/living/carbon/human))
- M << "You feel your being twine with that of [src] as it merges with your biomass."
+ to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.")
M.status_flags |= PASSEMOTES
- src << "You feel your being twine with that of [M] as you merge with its biomass."
+ to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
src.loc = M
src.verbs += /mob/living/simple_animal/diona/proc/split
src.verbs -= /mob/living/simple_animal/diona/proc/merge
@@ -105,8 +106,8 @@
src.verbs -= /mob/living/simple_animal/diona/proc/split
return
- src.loc << "You feel a pang of loss as [src] splits away from your biomass."
- src << "You wiggle out of the depths of [src.loc]'s biomass and plop to the ground."
+ to_chat(src.loc, "You feel a pang of loss as [src] splits away from your biomass.")
+ to_chat(src, "You wiggle out of the depths of [src.loc]'s biomass and plop to the ground.")
var/mob/living/M = src.loc
@@ -162,11 +163,11 @@
set desc = "Grow to a more complex form."
if(donors.len < 5)
- src << "You need more blood in order to ascend to a new state of consciousness..."
+ to_chat(src, "You need more blood in order to ascend to a new state of consciousness...")
return
if(nutrition < 500)
- src << "You need to binge on weeds in order to have the energy to grow..."
+ to_chat(src, "You need to binge on weeds in order to have the energy to grow...")
return
src.split()
@@ -209,11 +210,11 @@
if(!M || !src) return
if(M.species.flags & NO_BLOOD)
- src << "That donor has no blood to take."
+ to_chat(src, "That donor has no blood to take.")
return
if(donors.Find(M.real_name))
- src << "That donor offers you nothing new."
+ to_chat(src, "That donor offers you nothing new.")
return
src.visible_message("[src] flicks out a feeler and neatly steals a sample of [M]'s blood.","You flick out a feeler and neatly steal a sample of [M]'s blood.")
@@ -231,12 +232,12 @@
if(donors.len == 5)
ready_evolve = 1
- src << "You feel ready to move on to your next stage of growth."
+ to_chat(src, "You feel ready to move on to your next stage of growth.")
else if(donors.len == 3)
universal_understand = 1
- src << "You feel your awareness expand, and realize you know how to understand the creatures around you."
+ to_chat(src, "You feel your awareness expand, and realize you know how to understand the creatures around you.")
else
- src << "The blood seeps into your small form, and you draw out the echoes of memories and personality from it, working them into your budding mind."
+ to_chat(src, "The blood seeps into your small form, and you draw out the echoes of memories and personality from it, working them into your budding mind.")
/mob/living/simple_animal/diona/put_in_hands(obj/item/W)
@@ -245,7 +246,7 @@
W.dropped()
/mob/living/simple_animal/diona/put_in_active_hand(obj/item/W)
- src << "You don't have any hands!"
+ to_chat(src, "You don't have any hands!")
return
/mob/living/simple_animal/diona/emote(var/act, var/m_type=1, var/message = null)
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 1aa802bfb1a..fdf597b005e 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -12,8 +12,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 4
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 4)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
@@ -26,6 +25,7 @@
melee_damage_upper = 2
stop_automated_movement_when_pulled = 1
var/milk_content = 0
+ can_collar = 1
/mob/living/simple_animal/hostile/retaliate/goat/handle_automated_movement()
..()
@@ -81,9 +81,9 @@
G.reagents.add_reagent("milk", transfered)
milk_content -= transfered
else if(G.reagents.total_volume >= G.volume)
- user << "\red \The [O] is full."
+ to_chat(user, "\red \The [O] is full.")
else
- user << "\red The udder is dry. Wait a bit longer..."
+ to_chat(user, "\red The udder is dry. Wait a bit longer...")
else
..()
@@ -102,8 +102,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 6
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 6)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
@@ -111,6 +110,8 @@
attack_sound = 'sound/weapons/punch1.ogg'
health = 50
var/milk_content = 0
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/cow/New()
..()
@@ -125,9 +126,9 @@
G.reagents.add_reagent("milk", transfered)
milk_content -= transfered
else if(G.reagents.total_volume >= G.volume)
- user << "\red \The [O] is full."
+ to_chat(user, "\red \The [O] is full.")
else
- user << "\red The udder is dry. Wait a bit longer..."
+ to_chat(user, "\red The udder is dry. Wait a bit longer...")
else
..()
@@ -148,7 +149,7 @@
"[src] looks at you pleadingly",
"[src] looks at you with a resigned expression.",
"[src] seems resigned to its fate.")
- M << pick(responses)
+ to_chat(M, pick(responses))
else
..()
@@ -166,8 +167,7 @@
density = 0
speak_chance = 2
turns_per_move = 2
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 1
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 1)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
@@ -178,6 +178,8 @@
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
small = 1
can_hide = 1
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/chick/New()
..()
@@ -208,8 +210,7 @@ var/global/chicken_count = 0
density = 0
speak_chance = 2
turns_per_move = 3
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 2
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 2)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
@@ -220,6 +221,8 @@ var/global/chicken_count = 0
pass_flags = PASSTABLE | PASSMOB
small = 1
can_hide = 1
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/chicken/New()
..()
@@ -245,11 +248,11 @@ var/global/chicken_count = 0
user.drop_item()
qdel(O)
eggsleft += rand(1, 4)
- //world << eggsleft
+// to_chat(world, eggsleft)
else
- user << "\blue [name] doesn't seem hungry!"
+ to_chat(user, "\blue [name] doesn't seem hungry!")
else
- user << "\blue [name] doesn't seem interested in [O]!"
+ to_chat(user, "\blue [name] doesn't seem interested in [O]!")
else
..()
@@ -290,13 +293,14 @@ var/global/chicken_count = 0
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/ham
- meat_amount = 6
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/ham = 6)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
attacktext = "kicks"
health = 50
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/turkey
name = "turkey"
@@ -311,13 +315,14 @@ var/global/chicken_count = 0
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat //enough to make one turkey
- meat_amount = 4
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 4)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
attacktext = "pecks"
health = 50
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/goose
name = "goose"
@@ -332,13 +337,14 @@ var/global/chicken_count = 0
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 6
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 6)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
attacktext = "kicks"
health = 50
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/seal
name = "seal"
@@ -353,13 +359,14 @@ var/global/chicken_count = 0
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 6
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 6)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
attacktext = "kicks"
health = 50
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/walrus
name = "walrus"
@@ -374,10 +381,11 @@ var/global/chicken_count = 0
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 6
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 6)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
attacktext = "kicks"
health = 50
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index f34ae89ef22..5bf03f083a2 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -13,16 +13,17 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 3)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
//Captain fox
/mob/living/simple_animal/pet/fox/Renault
name = "Renault"
desc = "Renault, the Captain's trustworthy fox. I wonder what it says?"
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
//Syndi fox
/mob/living/simple_animal/pet/fox/Syndifox
@@ -34,3 +35,4 @@
icon_resting = "Syndifox_rest"
flags = NO_BREATHE
faction = list("syndicate")
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index c2118b19bc1..b5c0ccedeae 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -20,5 +20,6 @@
density = 0
pass_flags = PASSTABLE | PASSMOB
can_hide = 1
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 1
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 1)
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index a34e8b9fe8b..b269256f7a0 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -15,8 +15,7 @@
see_in_dark = 6
maxHealth = 5
health = 5
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 1
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 1)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "stamps on the"
@@ -25,12 +24,14 @@
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
var/mouse_color //brown, gray and white, leave blank for random
layer = MOB_LAYER
- min_oxy = 16 //Require atleast 16kPA oxygen
+ atmos_requirements = list("min_oxy" = 16, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 223 //Below -50 Degrees Celcius
maxbodytemp = 323 //Above 50 Degrees Celcius
universal_speak = 0
can_hide = 1
holder_type = /obj/item/weapon/holder/mouse
+ can_collar = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/mouse/handle_automated_speech()
..()
@@ -40,14 +41,7 @@
/mob/living/simple_animal/mouse/Life()
. = ..()
-
- if(!ckey && stat == CONSCIOUS && prob(0.5))
- stat = UNCONSCIOUS
- icon_state = "mouse_[mouse_color]_sleep"
- wander = 0
- speak_chance = 0
- //snuffles
- else if(stat == UNCONSCIOUS)
+ if(stat == UNCONSCIOUS)
if(ckey || prob(1))
stat = CONSCIOUS
icon_state = "mouse_[mouse_color]"
@@ -55,6 +49,15 @@
else if(prob(5))
emote("snuffles")
+/mob/living/simple_animal/mouse/process_ai()
+ ..()
+
+ if(prob(0.5))
+ stat = UNCONSCIOUS
+ icon_state = "mouse_[mouse_color]_sleep"
+ wander = 0
+ speak_chance = 0
+
/mob/living/simple_animal/mouse/New()
..()
if(!mouse_color)
@@ -102,14 +105,14 @@
// return 1
/mob/living/simple_animal/mouse/start_pulling(var/atom/movable/AM)//Prevents mouse from pulling things
- src << "You are too small to pull anything."
+ to_chat(src, "You are too small to pull anything.")
return
/mob/living/simple_animal/mouse/Crossed(AM as mob|obj)
if( ishuman(AM) )
if(!stat)
var/mob/M = AM
- M << "\blue \icon[src] Squeek!"
+ to_chat(M, "\blue \icon[src] Squeek!")
M << 'sound/effects/mousesqueek.ogg'
..()
@@ -142,3 +145,4 @@
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "splats"
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm
index 8596355f16e..eba412580db 100644
--- a/code/modules/mob/living/simple_animal/friendly/pet.dm
+++ b/code/modules/mob/living/simple_animal/friendly/pet.dm
@@ -1,22 +1,8 @@
/mob/living/simple_animal/pet
icon = 'icons/mob/pets.dmi'
- var/obj/item/clothing/accessory/petcollar/pcollar = null
- var/image/collar = null
- var/image/pettag = null
+ can_collar = 1
/mob/living/simple_animal/pet/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
- if(istype(O, /obj/item/clothing/accessory/petcollar) && !pcollar)
- var/obj/item/clothing/accessory/petcollar/P = O
- pcollar = P
- collar = image('icons/mob/pets.dmi', src, "[icon_state]collar")
- pettag = image('icons/mob/pets.dmi', src, "[icon_state]tag")
- regenerate_icons()
- user << "You put the [P] around [src]'s neck."
- if(P.tagname)
- name = P.tagname
- real_name = P.tagname
- qdel(P)
- return
if(istype(O, /obj/item/weapon/newspaper))
if(!stat)
user.visible_message("[user] baps [name] on the nose with the rolled up [O].")
@@ -27,12 +13,6 @@
else
..()
-/mob/living/simple_animal/pet/New()
- ..()
- if(pcollar)
- pcollar = new(src)
- regenerate_icons()
-
/mob/living/simple_animal/pet/revive()
..()
regenerate_icons()
@@ -41,7 +21,9 @@
..()
regenerate_icons()
-/mob/living/simple_animal/pet/regenerate_icons()
- overlays.Cut()
- overlays += collar
- overlays += pettag
+/mob/living/simple_animal/pet/regenerate_icons(cut_overlays = 1)
+ if(cut_overlays)
+ overlays.Cut()
+ if(collar)
+ overlays += "[icon_state]collar"
+ overlays += "[icon_state]tag"
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/pug.dm b/code/modules/mob/living/simple_animal/friendly/pug.dm
index a819602719a..ec8a38509f1 100644
--- a/code/modules/mob/living/simple_animal/friendly/pug.dm
+++ b/code/modules/mob/living/simple_animal/friendly/pug.dm
@@ -12,17 +12,17 @@
emote_see = list("shakes its head.", "chases its tail.","shivers.")
speak_chance = 1
turns_per_move = 10
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/pug
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/pug = 3)
response_help = "pets"
response_disarm = "bops"
response_harm = "kicks"
see_in_dark = 5
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
-/mob/living/simple_animal/pet/pug/Life()
+/mob/living/simple_animal/pet/pug/process_ai()
..()
- if(!stat && !resting && !buckled)
+ if(!resting && !buckled)
if(prob(1))
custom_emote(1, pick("chases its tail."))
spawn(0)
diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm
index e03c8f36ff8..eac1a448571 100644
--- a/code/modules/mob/living/simple_animal/friendly/slime.dm
+++ b/code/modules/mob/living/simple_animal/friendly/slime.dm
@@ -25,7 +25,7 @@
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(70))
- src << "\red You fail to push [tmob]'s fat ass out of the way."
+ to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.")
now_pushing = 0
return
if(!(tmob.status_flags & CANPUSH))
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 35f06c2b1c2..590dfa47b5e 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -1,8 +1,6 @@
/mob/living/simple_animal/spiderbot
- min_oxy = 0
- max_tox = 0
- max_co2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 500
@@ -48,10 +46,10 @@
if(istype(O, /obj/item/device/mmi) || istype(O, /obj/item/device/mmi/posibrain))
var/obj/item/device/mmi/B = O
if(src.mmi) //There's already a brain in it.
- user << "\red There's already a brain in [src]!"
+ to_chat(user, "\red There's already a brain in [src]!")
return
if(!B.brainmob)
- user << "\red Sticking an empty MMI into the frame would sort of defeat the purpose."
+ to_chat(user, "\red Sticking an empty MMI into the frame would sort of defeat the purpose.")
return
if(!B.brainmob.key)
var/ghost_can_reenter = 0
@@ -65,18 +63,18 @@
ghost_can_reenter = 1
break
if(!ghost_can_reenter)
- user << "[O] is completely unresponsive; there's no point."
+ to_chat(user, "[O] is completely unresponsive; there's no point.")
return
if(B.brainmob.stat == DEAD)
- user << "\red [O] is dead. Sticking it into the frame would sort of defeat the purpose."
+ to_chat(user, "\red [O] is dead. Sticking it into the frame would sort of defeat the purpose.")
return
if(jobban_isbanned(B.brainmob, "Cyborg") || jobban_isbanned(B.brainmob,"nonhumandept"))
- user << "\red [O] does not seem to fit."
+ to_chat(user, "\red [O] does not seem to fit.")
return
- user << "\blue You install [O] in [src]!"
+ to_chat(user, "\blue You install [O] in [src]!")
user.drop_item()
src.mmi = O
@@ -97,13 +95,13 @@
for(var/mob/W in viewers(user, null))
W.show_message(text("\red [user] has spot-welded some of the damage to [src]!"), 1)
else
- user << "\blue [src] is undamaged!"
+ to_chat(user, "\blue [src] is undamaged!")
else
- user << "Need more welding fuel!"
+ to_chat(user, "Need more welding fuel!")
return
else if(istype(O, /obj/item/weapon/card/id)||istype(O, /obj/item/device/pda))
if (!mmi)
- user << "\red There's no reason to swipe your ID - the spiderbot has no brain to remove."
+ to_chat(user, "\red There's no reason to swipe your ID - the spiderbot has no brain to remove.")
return 0
var/obj/item/weapon/card/id/id_card
@@ -115,7 +113,7 @@
id_card = pda.id
if(access_robotics in id_card.access)
- user << "\blue You swipe your access card and pop the brain out of [src]."
+ to_chat(user, "\blue You swipe your access card and pop the brain out of [src].")
eject_brain()
if(held_item)
@@ -124,7 +122,7 @@
return 1
else
- user << "\red You swipe your card, with no effect."
+ to_chat(user, "\red You swipe your card, with no effect.")
return 0
else
@@ -137,21 +135,24 @@
if ((M.client && !( M.blinded )))
M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
else
- usr << "\red This weapon is ineffective, it does no damage."
+ to_chat(usr, "\red This weapon is ineffective, it does no damage.")
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
/mob/living/simple_animal/spiderbot/emag_act(user as mob)
if (emagged)
- user << "\red [src] is already overloaded - better run."
+ to_chat(user, "\red [src] is already overloaded - better run.")
return 0
else
emagged = 1
- user << "\blue You short out the security protocols and overload [src]'s cell, priming it to explode in a short time."
- spawn(100) src << "\red Your cell seems to be outputting a lot of power..."
- spawn(200) src << "\red Internal heat sensors are spiking! Something is badly wrong with your cell!"
- spawn(300) src.explode()
+ to_chat(user, "\blue You short out the security protocols and overload [src]'s cell, priming it to explode in a short time.")
+ spawn(100)
+ to_chat(src, "\red Your cell seems to be outputting a lot of power...")
+ spawn(200)
+ to_chat(src, "\red Internal heat sensors are spiking! Something is badly wrong with your cell!")
+ spawn(300)
+ src.explode()
/mob/living/simple_animal/spiderbot/proc/transfer_personality(var/obj/item/device/mmi/M as obj)
@@ -230,7 +231,7 @@
return
if(!held_item)
- usr << "\red You have nothing to drop!"
+ to_chat(usr, "\red You have nothing to drop!")
return 0
if(istype(held_item, /obj/item/weapon/grenade))
@@ -258,7 +259,7 @@
return -1
if(held_item)
- src << "\red You are already holding \the [held_item]"
+ to_chat(src, "\red You are already holding \the [held_item]")
return 1
var/list/items = list()
@@ -275,13 +276,13 @@
selection.loc = src
visible_message("\blue [src] scoops up \the [held_item]!", "\blue You grab \the [held_item]!", "You hear a skittering noise and a clink.")
return held_item
- src << "\red \The [selection] is too far away."
+ to_chat(src, "\red \The [selection] is too far away.")
return 0
- src << "\red There is nothing of interest to take."
+ to_chat(src, "\red There is nothing of interest to take.")
return 0
/mob/living/simple_animal/spiderbot/examine(mob/user)
..(user)
if(src.held_item)
- user << "It is carrying \a [src.held_item] \icon[src.held_item]."
+ to_chat(user, "It is carrying \a [src.held_item] \icon[src.held_item].")
diff --git a/code/modules/mob/living/simple_animal/friendly/tomato.dm b/code/modules/mob/living/simple_animal/friendly/tomato.dm
index 0ee27da03c1..ca135fe87be 100644
--- a/code/modules/mob/living/simple_animal/friendly/tomato.dm
+++ b/code/modules/mob/living/simple_animal/friendly/tomato.dm
@@ -8,11 +8,11 @@
turns_per_move = 5
maxHealth = 15
health = 15
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/tomatomeat = 3)
response_help = "prods the"
response_disarm = "pushes aside the"
response_harm = "smacks the"
harm_intent_damage = 5
pass_flags = PASSTABLE
- can_hide = 1
\ No newline at end of file
+ can_hide = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 336bc7f9906..80571d2eef8 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -10,8 +10,7 @@
response_disarm = "shoves the"
response_harm = "hits the"
speed = 0
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/xenomeat = 3)
maxHealth = 100
health = 100
harm_intent_damage = 5
@@ -21,14 +20,7 @@
speak_emote = list("hisses")
a_intent = I_HARM
attack_sound = 'sound/weapons/bladeslice.ogg'
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
var/dead = 0
unsuitable_atmos_damage = 15
faction = list("alien")
@@ -37,6 +29,7 @@
see_in_dark = 8
see_invisible = SEE_INVISIBLE_MINIMUM
heat_damage_per_tick = 20
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/alien/drone
@@ -50,14 +43,16 @@
var/plant_cooldown = 30
var/plants_off = 0
-/mob/living/simple_animal/hostile/alien/drone/Life()
- ..()
- if(!stat)
- plant_cooldown--
- if(stance==HOSTILE_STANCE_IDLE)
- if(!plants_off && prob(10) && plant_cooldown<=0)
- plant_cooldown = initial(plant_cooldown)
- SpreadPlants()
+/mob/living/simple_animal/hostile/alien/drone/process_ai()
+ . = ..()
+ if(!.)
+ return
+
+ plant_cooldown--
+ if(stance==HOSTILE_STANCE_IDLE)
+ if(!plants_off && prob(10) && plant_cooldown<=0)
+ plant_cooldown = initial(plant_cooldown)
+ SpreadPlants()
/mob/living/simple_animal/hostile/alien/sentinel
name = "alien sentinel"
@@ -95,18 +90,18 @@
var/egg_cooldown = 30
var/plant_cooldown = 30
-/mob/living/simple_animal/hostile/alien/queen/Life()
+/mob/living/simple_animal/hostile/alien/queen/process_ai()
..()
- if(!stat)
- egg_cooldown--
- plant_cooldown--
- if(stance==HOSTILE_STANCE_IDLE)
- if(!plants_off && prob(10) && plant_cooldown<=0)
- plant_cooldown = initial(plant_cooldown)
- SpreadPlants()
- if(!sterile && prob(10) && egg_cooldown<=0)
- egg_cooldown = initial(egg_cooldown)
- LayEggs()
+
+ egg_cooldown--
+ plant_cooldown--
+ if(stance==HOSTILE_STANCE_IDLE)
+ if(!plants_off && prob(10) && plant_cooldown<=0)
+ plant_cooldown = initial(plant_cooldown)
+ SpreadPlants()
+ if(!sterile && prob(10) && egg_cooldown<=0)
+ egg_cooldown = initial(egg_cooldown)
+ LayEggs()
/mob/living/simple_animal/hostile/alien/proc/SpreadPlants()
if(!isturf(loc) || istype(loc, /turf/space))
@@ -133,6 +128,7 @@
move_to_delay = 4
maxHealth = 400
health = 400
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/obj/item/projectile/neurotox
name = "neurotoxin"
@@ -145,3 +141,26 @@
dead = 1
visible_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...")
playsound(src, 'sound/voice/hiss6.ogg', 100, 1)
+
+
+/mob/living/simple_animal/hostile/alien/maid
+ name = "lusty xenomorph maid"
+ melee_damage_lower = 0
+ melee_damage_upper = 0
+ a_intent = "help"
+ friendly = "caresses"
+ environment_smash = 0
+ icon_state = "maid"
+ icon_living = "maid"
+ icon_dead = "maid_dead"
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //no fun allowed
+
+/mob/living/simple_animal/hostile/alien/maid/AttackingTarget()
+ if(istype(target, /atom/movable))
+ if(istype(target, /obj/effect/decal/cleanable))
+ visible_message("\The [src] cleans up \the [target].")
+ qdel(target)
+ return
+ var/atom/movable/M = target
+ M.clean_blood()
+ visible_message("\The [src] polishes \the [target].")
diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm
index 0c2174d131e..bbdf639c0f4 100644
--- a/code/modules/mob/living/simple_animal/hostile/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bat.dm
@@ -8,8 +8,7 @@
icon_gib = "bat_dead"
speak_chance = 0
turns_per_move = 3
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 1
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 1)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "hits the"
@@ -23,21 +22,14 @@
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
- //Space carp aren't affected by atmos.
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
// break_stuff_probability = 2
faction = list("scarybat")
var/mob/living/owner
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/scarybat/New(loc, mob/living/L as mob)
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 9c6f24bd4ac..f55c4ce98d6 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -13,8 +13,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
- meat_amount = 5
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/bearmeat = 5, /obj/item/clothing/head/bearpelt = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -27,18 +26,12 @@
attack_sound = 'sound/weapons/genhit3.ogg'
//Space bears aren't affected by atmos.
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
var/stance_step = 0
faction = list("russian")
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
//SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!!
/mob/living/simple_animal/hostile/bear/Hudson
@@ -56,12 +49,11 @@
else
icon_state = "bearfloor"
-/mob/living/simple_animal/hostile/bear/Life()
+/mob/living/simple_animal/hostile/bear/process_ai()
. = ..()
if(!.)
return
-
switch(stance)
if(HOSTILE_STANCE_TIRED)
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 650f19cb758..ddd302c3e8c 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -9,8 +9,7 @@
icon_gib = "carp_gib"
speak_chance = 0
turns_per_move = 5
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
- meat_amount = 2
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 2)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "hits the"
@@ -26,14 +25,7 @@
speak_emote = list("gnashes")
//Space carp aren't affected by atmos.
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
@@ -41,6 +33,7 @@
faction = list("carp")
flying = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/carp/Process_Spacemove(var/movement_dir = 0)
return 1 //No drifting in space for space carp! //original comments do not steal
@@ -61,6 +54,7 @@
icon_state = "holocarp"
icon_living = "holocarp"
maxbodytemp = INFINITY
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/mob/living/simple_animal/hostile/carp/holocarp/death()
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/creature.dm b/code/modules/mob/living/simple_animal/hostile/creature.dm
index 9a3357e058a..50aa20b60d0 100644
--- a/code/modules/mob/living/simple_animal/hostile/creature.dm
+++ b/code/modules/mob/living/simple_animal/hostile/creature.dm
@@ -13,4 +13,5 @@
attacktext = "chomps"
attack_sound = 'sound/weapons/bite.ogg'
faction = list("creature")
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index bbcacd234fe..a14efc6d279 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -20,18 +20,12 @@
attack_sound = 'sound/hallucinations/growl1.ogg'
speak_emote = list("growls")
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 4
faction = list("faithless")
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/faithless/Process_Spacemove(var/movement_dir = 0)
return 1
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 2bd6a611b24..5e25d37763d 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -15,7 +15,7 @@
if(L.reagents)
L.reagents.add_reagent("spidertoxin", poison_per_bite)
if(prob(poison_per_bite))
- L << "You feel a tiny prick."
+ to_chat(L, "You feel a tiny prick.")
L.reagents.add_reagent(poison_type, poison_per_bite)
@@ -33,8 +33,7 @@
speak_chance = 5
turns_per_move = 5
see_in_dark = 10
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/spidermeat
- meat_amount = 2
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/spidermeat = 2, /obj/item/weapon/reagent_containers/food/snacks/spiderleg = 8)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "hits"
@@ -50,6 +49,7 @@
move_to_delay = 6
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
//nursemaids - these create webs and eggs
/mob/living/simple_animal/hostile/poison/giant_spider/nurse
@@ -57,8 +57,8 @@
icon_state = "nurse"
icon_living = "nurse"
icon_dead = "nurse_dead"
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/spidereggs
- meat_amount = 4
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/spidermeat = 2, /obj/item/weapon/reagent_containers/food/snacks/spiderleg = 8, /obj/item/weapon/reagent_containers/food/snacks/spidereggs = 4)
+
maxHealth = 40
health = 40
melee_damage_lower = 5
@@ -95,19 +95,6 @@
stop_automated_movement = 0
walk(src,0)
-// Chops off each leg with a 50/50 chance of harvesting one, until finally calling
-// default harvest action
-/mob/living/simple_animal/hostile/poison/giant_spider/harvest()
- if(butcher_state > 0)
- butcher_state--
- icon_state = icon_dead + "[butcher_state]"
-
- if(prob(50))
- new /obj/item/weapon/reagent_containers/food/snacks/spiderleg(src.loc)
- return
- else
- return ..()
-
/mob/living/simple_animal/hostile/poison/giant_spider/nurse/proc/GiveUp(var/C)
spawn(100)
if(busy == MOVING_TO_TARGET)
@@ -244,9 +231,9 @@
var/obj/effect/spider/eggcluster/E = locate() in get_turf(src)
if(E)
- src << "There is already a cluster of eggs here!"
+ to_chat(src, "There is already a cluster of eggs here!")
else if(!fed)
- src << "You are too hungry to do this!"
+ to_chat(src, "You are too hungry to do this!")
else if(busy != LAYING_EGGS)
busy = LAYING_EGGS
src.visible_message("\the [src] begins to lay a cluster of eggs.")
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index 4dd8862b4a9..8f1d95f6414 100644
--- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
@@ -21,6 +21,7 @@
ventcrawler = 2
var/datum/mind/origin
var/egg_lain = 0
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim)
var/obj/item/organ/internal/body_egg/changeling_egg/egg = new(victim)
@@ -44,10 +45,10 @@
var/mob/living/carbon/C = target
if(C.stat == DEAD)
if(C.status_flags & XENO_HOST)
- src << "A foreign presence repels us from this body. Perhaps we should try to infest another?"
+ to_chat(src, "A foreign presence repels us from this body. Perhaps we should try to infest another?")
return
Infect(target)
- src << "With our egg laid, our death approaches rapidly..."
+ to_chat(src, "With our egg laid, our death approaches rapidly...")
spawn(100)
death()
return
@@ -80,8 +81,12 @@
if(origin && origin.current && (origin.current.stat == DEAD))
origin.transfer_to(M)
- if(origin.changeling)
- origin.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/humanform(null)
+ if(!origin.changeling)
+ M.make_changeling()
+ if(origin.changeling.can_absorb_dna(M, owner))
+ origin.changeling.absorb_dna(owner, M)
+
+ origin.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/humanform(null)
M.key = origin.key
owner.gib()
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 68aeeb72616..3ccbb9abec2 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -18,16 +18,10 @@
projectilesound = 'sound/weapons/Gunshot.ogg'
projectiletype = /obj/item/projectile/hivebotbullet
faction = list("hivebot")
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speak_emote = list("states")
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/hivebot/range
name = "Hivebot"
@@ -79,37 +73,36 @@
warpbots()
- New()
- ..()
- var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
- smoke.set_up(5, 0, src.loc)
- smoke.start()
- visible_message("\red The [src] warps in!")
- playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
+/mob/living/simple_animal/hostile/hivebot/tele/New()
+ ..()
+ var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+ smoke.set_up(5, 0, src.loc)
+ smoke.start()
+ visible_message("\red The [src] warps in!")
+ playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
- warpbots()
- icon_state = "def_radar"
- visible_message("\red The [src] turns on!")
- while(bot_amt > 0)
- bot_amt--
- switch(bot_type)
- if("norm")
- var/mob/living/simple_animal/hostile/hivebot/H = new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
- H.faction = faction
- if("range")
- var/mob/living/simple_animal/hostile/hivebot/range/R = new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
- R.faction = faction
- if("rapid")
- var/mob/living/simple_animal/hostile/hivebot/rapid/F = new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
- F.faction = faction
- spawn(100)
- qdel(src)
+/mob/living/simple_animal/hostile/hivebot/tele/warpbots()
+ icon_state = "def_radar"
+ visible_message("\red The [src] turns on!")
+ while(bot_amt > 0)
+ bot_amt--
+ switch(bot_type)
+ if("norm")
+ var/mob/living/simple_animal/hostile/hivebot/H = new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
+ H.faction = faction
+ if("range")
+ var/mob/living/simple_animal/hostile/hivebot/range/R = new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
+ R.faction = faction
+ if("rapid")
+ var/mob/living/simple_animal/hostile/hivebot/rapid/F = new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
+ F.faction = faction
+ spawn(100)
+ qdel(src)
+ return
+
+/mob/living/simple_animal/hostile/hivebot/tele/process_ai()
+ . = ..()
+ if(!.)
return
-
-
- Life()
- ..()
- if(stat == 0)
- if(prob(2))//Might be a bit low, will mess with it likely
- warpbots()
-
+ if(prob(2))//Might be a bit low, will mess with it likely
+ warpbots()
\ 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 c5561a2f928..00ca1d65e82 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -32,33 +32,34 @@
var/AIStatus = AI_ON //The Status of our AI, can be set to AI_ON (On, usual processing), AI_SLEEP (Will not process, but will return to AI_ON if an enemy comes near), AI_OFF (Off, Not processing ever)
/mob/living/simple_animal/hostile/Life()
-
. = ..()
if(!.)
walk(src, 0)
return 0
if(ranged)
ranged_cooldown--
- if(client)
- return 0
+
+/mob/living/simple_animal/hostile/process_ai()
+ ..()
if(!AICanContinue())
return 0
- if(!stat)
- switch(stance)
- if(HOSTILE_STANCE_IDLE)
- var/new_target = FindTarget()
- GiveTarget(new_target)
+ switch(stance)
+ if(HOSTILE_STANCE_IDLE)
+ var/new_target = FindTarget()
+ GiveTarget(new_target)
- if(HOSTILE_STANCE_ATTACK)
- MoveToTarget()
- DestroySurroundings()
+ if(HOSTILE_STANCE_ATTACK)
+ MoveToTarget()
+ DestroySurroundings()
- if(HOSTILE_STANCE_ATTACKING)
- AttackTarget()
- DestroySurroundings()
+ if(HOSTILE_STANCE_ATTACKING)
+ AttackTarget()
+ DestroySurroundings()
- if(AIShouldSleep())
- AIStatus = AI_SLEEP
+ if(AIShouldSleep())
+ AIStatus = AI_SLEEP
+
+ return 1
//////////////HOSTILE MOB TARGETTING AND AGGRESSION////////////
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
index 7f705297dbd..85268dee619 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
@@ -13,8 +13,7 @@
icon_gib = "panther_dead"
speak_chance = 0
turns_per_move = 3
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 3)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "hits the"
@@ -31,6 +30,7 @@
layer = 3.1 //so they can stay hidde under the /obj/structure/bush
var/stalk_tick_delay = 3
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/panther/ListTargets()
var/list/targets = list()
@@ -72,8 +72,7 @@
icon_gib = "snake_dead"
speak_chance = 0
turns_per_move = 1
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 2
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 2)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "hits the"
@@ -89,6 +88,7 @@
layer = 3.1 //so they can stay hidde under the /obj/structure/bush
var/stalk_tick_delay = 3
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/snake/ListTargets()
var/list/targets = list()
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 9d70385cf87..7cff96385e1 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -23,20 +23,14 @@
attack_sound = 'sound/weapons/bite.ogg'
speak_emote = list("creaks")
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("mimic")
move_to_delay = 9
var/is_electronic = 0
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/mimic/FindTarget()
. = ..()
@@ -146,6 +140,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
var/mob/living/creator = null // the creator
var/destroy_objects = 0
var/knockdown_people = 0
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/mob/living/simple_animal/hostile/mimic/copy/New(loc, var/obj/copy, var/mob/living/creator, var/destroy_original = 0)
..(loc)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index ab26322d958..0d5d4b89772 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -1,13 +1,6 @@
/mob/living/simple_animal/hostile/asteroid/
vision_range = 2
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
faction = list("mining")
environment_smash = 2
@@ -303,16 +296,16 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(inert)
- user << "[src] have become inert, its healing properties are no more."
+ to_chat(user, "[src] have become inert, its healing properties are no more.")
return
else
if(H.stat == DEAD)
- user << "[src] are useless on the dead."
+ to_chat(user, "[src] are useless on the dead.")
return
if(H != user)
H.visible_message("[user] forces [H] to eat [src]... they quickly regenerate all injuries!")
else
- user << "You chomp into [src], barely managing to hold it down, but feel amazingly refreshed in mere moments."
+ to_chat(user, "You chomp into [src], barely managing to hold it down, but feel amazingly refreshed in mere moments.")
playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
H.revive()
qdel(src)
@@ -387,7 +380,7 @@
anchored = 1 //Stays anchored until death as to be unpullable
var/pre_attack = 0
-/mob/living/simple_animal/hostile/asteroid/goliath/Life()
+/mob/living/simple_animal/hostile/asteroid/goliath/process_ai()
..()
handle_preattack()
@@ -490,10 +483,10 @@
var/current_armor = C.armor
if(current_armor.["melee"] < 80)
current_armor.["melee"] = min(current_armor.["melee"] + 10, 80)
- user << "You strengthen [target], improving its resistance against melee attacks."
+ to_chat(user, "You strengthen [target], improving its resistance against melee attacks.")
qdel(src)
else
- user << "You can't improve [C] any further."
+ to_chat(user, "You can't improve [C] any further.")
return
if(istype(target, /obj/mecha/working/ripley))
var/obj/mecha/D = target
@@ -503,19 +496,19 @@
damage_absorption["bullet"] = damage_absorption["bullet"] - 0.05
damage_absorption["fire"] = damage_absorption["fire"] - 0.05
damage_absorption["laser"] = damage_absorption["laser"] - 0.025
- user << "You strengthen [target], improving its resistance against melee attacks."
+ to_chat(user, "You strengthen [target], improving its resistance against melee attacks.")
qdel(src)
if(D.icon_state == "ripley-open")
D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-open")
D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates."
else
- user << "You can't add armour onto the mech while someone is inside!"
+ to_chat(user, "You can't add armour onto the mech while someone is inside!")
if(damage_absorption.["brute"] == 0.3)
if(D.icon_state == "ripley-open")
D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-full-open")
D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - the pilot must be an experienced monster hunter."
else
- user << "You can't add armour onto the mech while someone is inside!"
+ to_chat(user, "You can't add armour onto the mech while someone is inside!")
else
- user << "You can't improve [D] any further!"
+ to_chat(user, "You can't improve [D] any further!")
return
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 8559bd9d3d6..82a7f09af80 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -8,7 +8,7 @@
turns_per_move = 1
maxHealth = 10
health = 10
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "whacks"
@@ -36,9 +36,9 @@
/mob/living/simple_animal/hostile/mushroom/examine(mob/user)
..(user)
if(health >= maxHealth)
- user << "It looks healthy."
+ to_chat(user, "It looks healthy.")
else
- user << "It looks like it's been roughed up."
+ to_chat(user, "It looks like it's been roughed up.")
/mob/living/simple_animal/hostile/mushroom/Life()
..()
@@ -130,7 +130,7 @@
Recover()
qdel(I)
else
- user << "[src] won't eat it!"
+ to_chat(user, "[src] won't eat it!")
return
if(I.force)
Bruise()
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index 4f3cd78c093..fbbc0d0a5e3 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -19,14 +19,7 @@
attacktext = "slashes"
attack_sound = 'sound/weapons/bladeslice.ogg'
- min_oxy = 5
- max_oxy = 0
- min_tox = 0
- max_tox = 1
- min_co2 = 0
- max_co2 = 5
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
speak_emote = list("yarrs")
var/corpse = /obj/effect/landmark/mobcorpse/pirate
diff --git a/code/modules/mob/living/simple_animal/hostile/poison_bees.dm b/code/modules/mob/living/simple_animal/hostile/poison_bees.dm
index dd5a7f35822..c8a6a79fb04 100644
--- a/code/modules/mob/living/simple_animal/hostile/poison_bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/poison_bees.dm
@@ -22,15 +22,9 @@
flying = 1
//Spaceborn beings don't get hurt by space
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(var/check_drift = 0)
return 1
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index f4f0db898bb..cce4b32235c 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -23,15 +23,6 @@
attacktext = "attacks"
attack_sound = 'sound/items/bikehorn.ogg'
environment_smash = 0
-
- min_oxy = 5
- max_oxy = 0
- min_tox = 0
- max_tox = 1
- min_co2 = 0
- max_co2 = 5
- min_n2 = 0
- max_n2 = 0
minbodytemp = 270
maxbodytemp = 370
heat_damage_per_tick = 15 //amount of damage applied if animal's body temperature is higher than maxbodytemp
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
index 6c4986541a6..5ee52bec825 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
@@ -35,14 +35,7 @@
var/exploding = 0
//Drones aren't affected by atmos.
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
var/has_loot = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
index 65964739a32..b8eb3a96459 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
@@ -8,8 +8,7 @@
icon_gib = "carp_gib"
speak_chance = 0
turns_per_move = 5
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
- meat_amount = 1
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1)
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "hits the"
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/pet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/pet.dm
index 17d764b9c1d..5a0798874e4 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/pet.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/pet.dm
@@ -17,7 +17,4 @@
melee_damage_lower = 15
melee_damage_upper = 20
- min_oxy = 5
- max_tox = 2
- max_co2 = 5
-
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 2, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
index abfcad0e403..44de372550f 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
@@ -41,14 +41,7 @@
attacktext = "grips"
attack_sound = 'sound/hallucinations/growl1.ogg'
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("undead") // did I mention ghost
@@ -93,14 +86,7 @@
attacktext = "claws"
attack_sound = 'sound/hallucinations/growl1.ogg'
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("undead")
@@ -131,14 +117,7 @@
attacktext = "claws"
attack_sound = 'sound/hallucinations/growl1.ogg'
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("undead")
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index 1c32975d5e8..35cdbb14dfb 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -21,14 +21,6 @@
a_intent = I_HARM
var/corpse = /obj/effect/landmark/mobcorpse/russian
var/weapon1 = /obj/item/weapon/kitchen/knife
- min_oxy = 5
- max_oxy = 0
- min_tox = 0
- max_tox = 1
- min_co2 = 0
- max_co2 = 5
- min_n2 = 0
- max_n2 = 0
unsuitable_atmos_damage = 15
faction = list("russian")
status_flags = CANPUSH
diff --git a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
index f07b2ed1794..a186bbe3d09 100644
--- a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
+++ b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
@@ -26,9 +26,7 @@
minbodytemp = 0
maxbodytemp = 350
- min_oxy = 0
- max_co2 = 0
- max_tox = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
a_intent = I_HARM //so they don't get pushed around
@@ -165,7 +163,7 @@
src.visible_message("\the [src] starts to eat \the [noms]!","You start to eat \the [noms]. (This will take about [ufnomDelay] seconds.)","You hear gnashing.") //inform everyone what the fucking worm is doing.
- if(do_after(src, nomDelay,5,0, target = noms))
+ if(do_after(src, nomDelay, 0, target = noms))
if(noms && Adjacent(noms) && (currentlyEating == noms))//It exists, were next to it, and it's still the thing were eating
if(W)
W.ChangeTurf(/turf/simulated/floor/plating)
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index a466d62306b..aeda42633a6 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -4,9 +4,9 @@
name = "statue" // matches the name of the statue with the flesh-to-stone spell
desc = "An incredibly lifelike marble carving. Its eyes seems to follow you.." // same as an ordinary statue with the added "eye following you" description
icon = 'icons/obj/statue.dmi'
- icon_state = "angelseen"
- icon_living = "angelseen"
- icon_dead = "angelseen"
+ icon_state = "angel"
+ icon_living = "angel"
+ icon_dead = "angel"
gender = NEUTER
a_intent = I_HARM
@@ -14,8 +14,9 @@
response_disarm = "pushes"
speed = -1
- maxHealth = 1250
- health = 1250
+ maxHealth = 50000
+ health = 50000
+ healable = 0
harm_intent_damage = 35
melee_damage_lower = 34
@@ -23,14 +24,7 @@
attacktext = "claws"
attack_sound = 'sound/hallucinations/growl1.ogg'
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("statue")
@@ -47,7 +41,9 @@
sight = SEE_SELF|SEE_MOBS|SEE_OBJS|SEE_TURFS
anchored = 1
-// status_flags = GODMODE // Cannot push also
+ status_flags = GODMODE // Cannot push also
+
+ var/cannot_be_seen = 1
var/mob/living/creator = null
@@ -67,130 +63,91 @@
if(creator)
src.creator = creator
-/mob/living/simple_animal/hostile/statue/Move(var/turf/NewLoc)
+/mob/living/simple_animal/hostile/statue/Move(turf/NewLoc)
if(can_be_seen(NewLoc))
- icon_state = "angelseen"
if(client)
- src << "You cannot move, there are eyes on you!"
+ to_chat(src, "You cannot move, there are eyes on you!")
return 0
- icon_state = "angel"
return ..()
-/mob/living/simple_animal/hostile/statue/Life()
- if(..())
- if(!ckey)
- spawn() //for saftey
- checkTargets()
- . = 1
-/mob/living/simple_animal/hostile/statue/proc/checkTargets()
- if(target)
+/mob/living/simple_animal/hostile/statue/process_ai()
+ ..()
+ if(target) // If we have a target and we're AI controlled
var/mob/watching = can_be_seen()
+ // If they're not our target
if(watching && watching != target)
+ // This one is closer.
if(get_dist(watching, src) > get_dist(target, src))
LoseTarget()
GiveTarget(watching)
/mob/living/simple_animal/hostile/statue/AttackingTarget()
- if(!can_be_seen())
- icon_state = "angelattack"
+ if(can_be_seen(get_turf(loc)))
+ if(client)
+ to_chat(src, "You cannot attack, there are eyes on you!")
+ return
+ else
..()
/mob/living/simple_animal/hostile/statue/DestroySurroundings()
- if(!can_be_seen())
+ if(!can_be_seen(get_turf(loc)))
..()
/mob/living/simple_animal/hostile/statue/face_atom()
- if(!can_be_seen())
+ if(!can_be_seen(get_turf(loc)))
..()
-/mob/living/simple_animal/hostile/statue/UnarmedAttack()
- if(can_be_seen())
- icon_state = "angelseen"
- if(client)
- src << "You cannot attack, there are eyes on you!"
- return
- icon_state = "angelattack"
- ..()
-
-/mob/living/simple_animal/hostile/statue/proc/can_be_seen(var/turf/destination)
+/mob/living/simple_animal/hostile/statue/proc/can_be_seen(turf/destination)
+ if(!cannot_be_seen)
+ return null
// Check for darkness
var/turf/T = get_turf(loc)
-
- var/light_amount
- var/DLlight_amount
-
- if(T.dynamic_lighting)
- light_amount = T.get_lumcount()
- else
- light_amount = 5
-
- if(destination && destination.dynamic_lighting)
- DLlight_amount = destination.get_lumcount()
- else
- DLlight_amount = 5
-
- if(T && destination)
- //Don't check it twice if our destination is the tile we are on or we can't even get to our destination
+ if(T && destination && T.lighting_overlay)
+ if(T.get_lumcount() * 10 < 1 && destination.get_lumcount() * 10 < 1) // No one can see us in the darkness, right?
+ return null
if(T == destination)
destination = null
- else if(light_amount < 0.1 && DLlight_amount < 0.1) // No one can see us in the darkness, right?
- return null
- //We aren't in darkness, loop for viewers.
+ // We aren't in darkness, loop for viewers.
var/list/check_list = list(src)
if(destination)
check_list += destination
- //This loop will, at most, loop twice.
+ // This loop will, at most, loop twice.
for(var/atom/check in check_list)
for(var/mob/living/M in viewers(world.view + 1, check) - src)
- if(M.client && CanAttack(M))
- if(M.blinded || (M.sdisabilities & BLIND))
- return null
-
- //calculates if any mobs are actually facing the statue
- var/xdif = M.x - src.x
- var/ydif = M.y - src.y
-
- if(abs(xdif) < abs(ydif)) //mob is either above or below src
- if(ydif < 0 && M.dir == NORTH) //mob is below src and looking up
- return M
- if(ydif > 0 && M.dir == SOUTH) //mob is above src and looking down
- return M
-
- else if(abs(xdif) > abs(ydif)) //mob is either left or right of src
- if(xdif < 0 && M.dir == EAST) //mob is to the left of src and looking right
- return M
- if(xdif > 0 && M.dir == WEST) //mob is to the right of src and looking left
- return M
-
- else if(xdif == 0 && ydif == 0) //mob is on the same tile as src
+ if(M.client && CanAttack(M) && !M.has_unlimited_silicon_privilege)
+ if(!M.eye_blind)
return M
+ for(var/obj/mecha/M in view(world.view + 1, check)) //assuming if you can see them they can see you
+ if(M.occupant && M.occupant.client)
+ if(!M.occupant.eye_blind)
+ return M.occupant
+ return null
+// Cannot talk
-
-//Cannot talk
/mob/living/simple_animal/hostile/statue/say()
return 0
-/mob/living/simple_animal/hostile/statue/death(gibbed)
- if(!gibbed) //The looping ends here.
- dust()
- return
- return ..()
+// Turn to dust when gibbed
-//Stop attacking clientless mobs
+/mob/living/simple_animal/hostile/statue/gib()
+ dust()
-/mob/living/simple_animal/hostile/statue/CanAttack(var/atom/the_target)
- if(mind && mind.key && !ckey)
- return 0
+
+// Stop attacking clientless mobs
+
+/mob/living/simple_animal/hostile/statue/CanAttack(atom/the_target)
if(isliving(the_target))
var/mob/living/L = the_target
if(!L.client && !L.ckey)
return 0
return ..()
+// Don't attack your creator if there is one
+
/mob/living/simple_animal/hostile/statue/ListTargets()
. = ..()
return . - creator
@@ -220,15 +177,15 @@
message = "You glare your eyes."
charge_max = 600
clothes_req = 0
- range = 8
+ range = 10
/obj/effect/proc_holder/spell/aoe_turf/blindness/cast(list/targets)
for(var/mob/living/L in living_mob_list)
+ if(L == usr)
+ continue
var/turf/T = get_turf(L.loc)
if(T && T in targets)
L.eye_blind = max(L.eye_blind, 4)
- if(issilicon(L))
- L.Weaken(4)
return
//Toggle Night Vision
@@ -252,4 +209,13 @@
else
target.see_invisible = SEE_INVISIBLE_LIVING
name = "Toggle Nightvision \[OFF\]"
- return
\ No newline at end of file
+ return
+
+
+/mob/living/simple_animal/hostile/statue/sentience_act()
+ faction -= "neutral"
+
+/mob/living/simple_animal/hostile/statue/restrained()
+ . = ..()
+ if(can_be_seen(loc))
+ return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index b81a9161686..64803f06dad 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -22,14 +22,6 @@
var/corpse = /obj/effect/landmark/mobcorpse/syndicatesoldier
var/weapon1
var/weapon2
- min_oxy = 5
- max_oxy = 0
- min_tox = 0
- max_tox = 1
- min_co2 = 0
- max_co2 = 5
- min_n2 = 0
- max_n2 = 0
unsuitable_atmos_damage = 15
faction = list("syndicate")
status_flags = CANPUSH
@@ -70,7 +62,7 @@
visible_message("\red \b [src] blocks the [O] with its shield! ")
playsound(loc, O.hitsound, 25, 1, -1)
else
- usr << "\red This weapon is ineffective, it does no damage."
+ to_chat(usr, "\red This weapon is ineffective, it does no damage.")
visible_message("\red [user] gently taps [src] with the [O]. ")
@@ -85,14 +77,7 @@
/mob/living/simple_animal/hostile/syndicate/melee/space
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
icon_state = "syndicatemeleespace"
icon_living = "syndicatemeleespace"
@@ -120,14 +105,7 @@
icon_state = "syndicaterangedpsace"
icon_living = "syndicaterangedpsace"
name = "Syndicate Commando"
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
corpse = /obj/effect/landmark/mobcorpse/syndicatecommando
speed = 1
@@ -151,16 +129,10 @@
attacktext = "cuts"
attack_sound = 'sound/weapons/bladeslice.ogg'
faction = list("syndicate")
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
flying = 1
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/viscerator/death()
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 181ddaa144e..bd39b681978 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -24,18 +24,11 @@
attack_sound = 'sound/weapons/bite.ogg'
speak_emote = list("pines")
- //Space carp aren't affected by atmos.
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("hostile", "winter")
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/tree/FindTarget()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
index 8ca70430d44..5710005846c 100644
--- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
@@ -14,14 +14,7 @@
icon_living = "placeholder"
icon_dead = "placeholder"
- min_oxy = 0
- max_oxy = 0
- min_tox = 0
- max_tox = 0
- min_co2 = 0
- max_co2 = 0
- min_n2 = 0
- max_n2 = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
melee_damage_lower = 3
@@ -40,6 +33,7 @@
bodytemperature = 73.0 //it's made of snow and hatred, so it's pretty cold.
maxbodytemp = 280.15 //at roughly 7 C, these will start melting (dying) from the warmth. Mind over matter or something.
heat_damage_per_tick = 10 //Now With Rapid Thawing Action!
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/winter/snowman/death()
@@ -66,11 +60,11 @@
icon_state = "reindeer"
icon_living = "reindeer"
icon_dead = "reindeer-dead"
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat = 3)
melee_damage_lower = 5
melee_damage_upper = 10
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/winter/santa
maxHealth = 150 //if this seems low for a "boss", it's because you have to fight him multiple times, with him fully healing between stages
@@ -132,10 +126,10 @@
melee_damage_upper = 25 //that's gonna leave a mark, for sure
/mob/living/simple_animal/hostile/winter/santa/stage_4/death()
- world << "
"
- world << "THE FAT MAN HAS FALLEN!"
- world << "SANTA CLAUS HAS BEEN DEFEATED!"
- world << "
"
+ to_chat(world, "
")
+ to_chat(world, "THE FAT MAN HAS FALLEN!")
+ to_chat(world, "SANTA CLAUS HAS BEEN DEFEATED!")
+ to_chat(world, "
")
..()
var/obj/item/weapon/grenade/clusterbuster/xmas/X = new /obj/item/weapon/grenade/clusterbuster/xmas(get_turf(src))
var/obj/item/weapon/grenade/clusterbuster/xmas/Y = new /obj/item/weapon/grenade/clusterbuster/xmas(get_turf(src))
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 47bc5b31b8f..b4de1c94f40 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -34,6 +34,7 @@
icon_dead = "parrot_dead"
pass_flags = PASSTABLE
small = 1
+ can_collar = 1
speak = list("Hi","Hello!","Cracker?","BAWWWWK george mellons griffing me")
speak_emote = list("squawks","says","yells")
@@ -42,8 +43,7 @@
speak_chance = 1//1% (1 in 100) chance every tick; So about once per 150 seconds, assuming an average tick is 1.5s
turns_per_move = 5
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/cracker/
- meat_amount = 3
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/cracker = 3)
response_help = "pets the"
response_disarm = "gently moves aside the"
@@ -52,12 +52,12 @@
universal_speak = 1
var/parrot_state = PARROT_WANDER //Hunt for a perch when created
- var/parrot_sleep_max = 25 //The time the parrot sits while perched before looking around. Mosly a way to avoid the parrot's AI in life() being run every single tick.
+ var/parrot_sleep_max = 25 //The time the parrot sits while perched before looking around. Mosly a way to avoid the parrot's AI in process_ai() being run every single tick.
var/parrot_sleep_dur = 25 //Same as above, this is the var that physically counts down
var/parrot_dam_zone = list("chest", "head", "l_arm", "l_leg", "r_arm", "r_leg") //For humans, select a bodypart to attack
var/parrot_speed = 5 //"Delay in world ticks between movement." according to byond. Yeah, that's BS but it does directly affect movement. Higher number = slower.
- var/parrot_been_shot = 0 //Parrots get a speed bonus after being shot. This will deincrement every Life() and at 0 the parrot will return to regular speed.
+ var/parrot_been_shot = 0 //Parrots get a speed bonus after being shot. This will deincrement every process_ai() and at 0 the parrot will return to regular speed.
var/list/speech_buffer = list()
var/list/available_channels = list()
@@ -82,6 +82,7 @@
//Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding.
var/obj/item/held_item = null
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/parrot/New()
@@ -118,17 +119,21 @@
*/
/mob/living/simple_animal/parrot/show_inv(mob/user as mob)
user.set_machine(src)
- if(user.stat) return
- var/dat = "Inventory of [name]
"
- if(ears)
- dat += "
Headset: [ears] (Remove)"
- else
- dat += "
Headset: Nothing"
+ var/dat = {"
+ Close
+ "}
+
+ var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 500)
+ popup.set_content(dat)
+ popup.open()
/mob/living/simple_animal/parrot/Topic(href, href_list)
@@ -138,15 +143,13 @@
//Is the usr's mob type able to do this?
if(ishuman(usr) || isrobot(usr))
-
- //Removing from inventory
if(href_list["remove_inv"])
var/remove_from = href_list["remove_inv"]
switch(remove_from)
if("ears")
if(ears)
if(available_channels.len)
- src.say("[pick(available_channels)] BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
+ src.say("[pick(available_channels)]BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
else
src.say("BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
ears.loc = src.loc
@@ -155,19 +158,18 @@
if(copytext(possible_phrase,1,3) in department_radio_keys)
possible_phrase = copytext(possible_phrase,3,length(possible_phrase))
else
- usr << "\red There is nothing to remove from its [remove_from]."
+ to_chat(usr, "\red There is nothing to remove from its [remove_from].")
return
-
- //Adding things to inventory
+ show_inv(usr)
else if(href_list["add_inv"])
var/add_to = href_list["add_inv"]
if(!usr.get_active_hand())
- usr << "\red You have nothing in your hand to put on its [add_to]."
+ to_chat(usr, "\red You have nothing in your hand to put on its [add_to].")
return
switch(add_to)
if("ears")
if(ears)
- usr << "\red It's already wearing something."
+ to_chat(usr, "\red It's already wearing something.")
return
else
var/obj/item/item_to_add = usr.get_active_hand()
@@ -175,7 +177,7 @@
return
if( !istype(item_to_add, /obj/item/device/radio/headset) )
- usr << "\red This object won't fit."
+ to_chat(usr, "\red This object won't fit.")
return
var/obj/item/device/radio/headset/headset_to_add = item_to_add
@@ -183,7 +185,7 @@
usr.drop_item()
headset_to_add.loc = src
src.ears = headset_to_add
- usr << "You fit the headset onto [src]."
+ to_chat(usr, "You fit the headset onto [src].")
clearlist(available_channels)
for(var/ch in headset_to_add.channels)
@@ -205,6 +207,7 @@
if(headset_to_add.translate_binary)
available_channels.Add(":b")
+ show_inv(usr)
else
..()
@@ -271,12 +274,11 @@
//Sprite and AI update for when a parrot gets pulled
if(pulledby && stat == CONSCIOUS)
icon_state = "parrot_fly"
- if(!client)
- parrot_state = PARROT_WANDER
- return
- if(client || stat)
- return //Lets not force players or dead/incap parrots to move
+/mob/living/simple_animal/parrot/process_ai()
+ if(pulledby)
+ parrot_state = PARROT_WANDER
+ return
if(!isturf(src.loc) || !canmove || buckled)
return //If it can't move, dont let it move. (The buckled check probably isn't necessary thanks to canmove)
@@ -327,9 +329,9 @@
useradio = 1
if(copytext(possible_phrase,1,3) in department_radio_keys)
- possible_phrase = "[useradio?pick(available_channels):""] [copytext(possible_phrase,3,length(possible_phrase)+1)]" //crop out the channel prefix
+ possible_phrase = "[useradio?pick(available_channels):""][copytext(possible_phrase,3,length(possible_phrase)+1)]" //crop out the channel prefix
else
- possible_phrase = "[useradio?pick(available_channels):""] [possible_phrase]"
+ possible_phrase = "[useradio?pick(available_channels):""][possible_phrase]"
newspeak.Add(possible_phrase)
@@ -567,7 +569,7 @@
return -1
if(held_item)
- src << "\red You are already holding the [held_item]"
+ to_chat(src, "\red You are already holding the [held_item]")
return 1
for(var/obj/item/I in view(1,src))
@@ -583,7 +585,7 @@
visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
return held_item
- src << "\red There is nothing of interest to take."
+ to_chat(src, "\red There is nothing of interest to take.")
return 0
/mob/living/simple_animal/parrot/proc/steal_from_mob()
@@ -595,7 +597,7 @@
return -1
if(held_item)
- src << "\red You are already holding the [held_item]"
+ to_chat(src, "\red You are already holding the [held_item]")
return 1
var/obj/item/stolen_item = null
@@ -614,7 +616,7 @@
visible_message("[src] grabs the [held_item] out of [C]'s hand!", "\blue You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
return held_item
- src << "\red There is nothing of interest to take."
+ to_chat(src, "\red There is nothing of interest to take.")
return 0
/mob/living/simple_animal/parrot/verb/drop_held_item_player()
@@ -638,7 +640,7 @@
return -1
if(!held_item)
- usr << "\red You have nothing to drop!"
+ to_chat(usr, "\red You have nothing to drop!")
return 0
if(!drop_gently)
@@ -646,11 +648,11 @@
var/obj/item/weapon/grenade/G = held_item
G.loc = src.loc
G.prime()
- src << "You let go of the [held_item]!"
+ to_chat(src, "You let go of the [held_item]!")
held_item = null
return 1
- src << "You drop the [held_item]."
+ to_chat(src, "You drop the [held_item].")
held_item.loc = src.loc
held_item = null
@@ -671,7 +673,7 @@
src.loc = AM.loc
icon_state = "parrot_sit"
return
- src << "\red There is no perch nearby to sit on."
+ to_chat(src, "\red There is no perch nearby to sit on.")
return
/*
@@ -680,40 +682,18 @@
/mob/living/simple_animal/parrot/Poly
name = "Poly"
desc = "Poly the Parrot. An expert on quantum cracker theory."
- speak = list("Poly wanna cracker!", ":e Check the singlo, you chucklefucks!",":e Check the tesla, you shits!",":e STOP HOT-WIRING THE ENGINE, FUCKING CHRIST!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS FREE CALL THE SHUTTLE")
+ speak = list("Poly wanna cracker!", ":eCheck the singlo, you chucklefucks!",":eCheck the tesla, you shits!",":eSTOP HOT-WIRING THE ENGINE, FUCKING CHRIST!",":eWire the solars, you lazy bums!",":eWHO TOOK THE DAMN HARDSUITS?",":eOH GOD ITS FREE CALL THE SHUTTLE")
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
/mob/living/simple_animal/parrot/Poly/New()
ears = new /obj/item/device/radio/headset/headset_eng(src)
available_channels = list(":e")
..()
-/mob/living/simple_animal/parrot/say(var/message)
-
- if(stat)
- return
-
- var/verb = "says"
- if(speak_emote.len)
- verb = pick(speak_emote)
-
- var/message_mode = null
- if(copytext(message,1,2) == ";")
- message_mode = "headset"
- message = copytext(message,2)
-
- if(copytext(message,1,2) == ":")
- var/channel_prefix = copytext(message, 1 ,3)
- message_mode = department_radio_keys[channel_prefix]
- var/positioncut = 3
- message = trim(copytext(message,positioncut))
-
- message = capitalize(trim_left(message))
- if(message_mode)
- if(ears && istype(ears,/obj/item/device/radio))
- ears.talk_into(src, message, message_mode, verb, null)
-
- ..(message)
-
+/mob/living/simple_animal/parrot/handle_message_mode(var/message_mode, var/message, var/verb, var/speaking, var/used_radios, var/alt_name)
+ if(message_mode && istype(ears))
+ ears.talk_into(src, message, message_mode, verb, speaking)
+ used_radios += ears
/mob/living/simple_animal/parrot/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "",var/italics = 0, var/mob/speaker = null)
if(prob(50))
@@ -724,7 +704,7 @@
/mob/living/simple_animal/parrot/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/atom/follow_target)
if(prob(50))
- parrot_hear("[pick(available_channels)] [message]")
+ parrot_hear("[pick(available_channels)][message]")
..()
diff --git a/code/modules/mob/living/simple_animal/pony.dm b/code/modules/mob/living/simple_animal/pony.dm
index 85d8031f8a6..db3d06bc3f3 100644
--- a/code/modules/mob/living/simple_animal/pony.dm
+++ b/code/modules/mob/living/simple_animal/pony.dm
@@ -15,9 +15,7 @@
attacktext = "sends rainbows of power to"
minbodytemp = 0
maxbodytemp = 4000
- min_oxy = 0
- max_co2 = 0
- max_tox = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
speed = 0
stop_automated_movement = 0
status_flags = 0
diff --git a/code/modules/mob/living/simple_animal/powers.dm b/code/modules/mob/living/simple_animal/powers.dm
index 060c85fe4d0..934c93bb3ad 100644
--- a/code/modules/mob/living/simple_animal/powers.dm
+++ b/code/modules/mob/living/simple_animal/powers.dm
@@ -8,13 +8,13 @@
if (layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
- src << text("\green You are now hiding.")
+ to_chat(src, text("\green You are now hiding."))
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
- O << text("[] scurries to the ground!", src)
+ to_chat(O, text("[] scurries to the ground!", src))
else
layer = MOB_LAYER
- src << text("\green You have stopped hiding.")
+ to_chat(src, text("\green You have stopped hiding."))
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
- O << text("[] slowly peaks up from the ground...", src)
\ No newline at end of file
+ to_chat(O, text("[] slowly peaks up from the ground...", src))
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index a006c94b11f..0e01aa51894 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -18,9 +18,7 @@
attacktext = "drains the life from"
minbodytemp = 0
maxbodytemp = 4000
- min_oxy = 0
- max_co2 = 0
- max_tox = 0
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
speed = -1
stop_automated_movement = 1
status_flags = 0
@@ -50,7 +48,7 @@
if ((M.client && !( M.blinded )))
M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
else
- usr << "\red This weapon is ineffective, it does no damage."
+ to_chat(usr, "\red This weapon is ineffective, it does no damage.")
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index e884fe41648..b86a034a69e 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -14,6 +14,7 @@
var/oxygen_alert = 0
var/toxins_alert = 0
var/fire_alert = 0
+ var/healable = 1
var/list/speak = list()
var/speak_chance = 0
@@ -23,8 +24,6 @@
var/turns_per_move = 1
var/turns_since_move = 0
universal_speak = 0
- var/meat_amount = 0
- var/meat_type
var/stop_automated_movement = 0 //Use this to temporarely stop random movement or to if you write special movement code for animals.
var/wander = 1 // Does the mob wander around when idle?
var/stop_automated_movement_when_pulled = 1 //When set to 1 this stops the animal from moving when someone is pulling it.
@@ -43,14 +42,7 @@
var/cold_damage_per_tick = 2 //same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp
//Atmos effect - Yes, you can make creatures that require plasma or co2 to survive. N2O is a trace gas and handled separately, hence why it isn't here. It'd be hard to add it. Hard and me don't mix (Yes, yes make all the dick jokes you want with that.) - Errorage
- var/min_oxy = 5
- var/max_oxy = 0 //Leaving something at 0 means it's off - has no maximum
- var/min_tox = 0
- var/max_tox = 1
- var/min_co2 = 0
- var/max_co2 = 5
- var/min_n2 = 0
- var/max_n2 = 0
+ var/list/atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) //Leaving something at 0 means it's off - has no maximum
var/unsuitable_atmos_damage = 2 //This damage is taken when atmos doesn't fit all the requirements above
@@ -58,7 +50,7 @@
var/melee_damage_lower = 0
var/melee_damage_upper = 0
var/melee_damage_type = BRUTE //Damage type of a simple mob's melee attack, should it do damage.
- var/list/ignored_damage_types = list(BRUTE = 0, BURN = 0, TOX = 0, CLONE = 0, STAMINA = 1, OXY = 0) //Set 0 to receive that damage type, 1 to ignore
+ var/list/damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1) // 1 for full damage , 0 for none , -1 for 1:1 heal from that source
var/attacktext = "attacks"
var/attack_sound = null
var/friendly = "nuzzles" //If the mob does no damage with it's attack
@@ -67,20 +59,37 @@
var/speed = 1 //LETS SEE IF I CAN SET SPEEDS FOR SIMPLE MOBS WITHOUT DESTROYING EVERYTHING. Higher speed is slower, negative speed is faster
var/can_hide = 0
+ var/obj/item/clothing/accessory/petcollar/collar = null
+ var/can_collar = 0 // can add collar to mob or not
+
//Hot simple_animal baby making vars
var/childtype = null
var/scan_ready = 1
var/simplespecies //Sorry, no spider+corgi buttbabies.
+ var/gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //if CHEM_MOB_SPAWN_HOSTILE can be spawned by plasma with gold core, CHEM_MOB_SPAWN_FRIENDLY are 'friendlies' spawned with blood
+
var/master_commander = null //holding var for determining who own/controls a sentient simple animal (for sentience potions).
+ var/sentience_type = SENTIENCE_ORGANIC // Sentience type, for slime potions
/mob/living/simple_animal/New()
..()
+ simple_animal_list += src
verbs -= /mob/verb/observe
if(!can_hide)
verbs -= /mob/living/simple_animal/verb/hide
+ if(collar)
+ if(!istype(collar))
+ collar = new(src)
+ regenerate_icons()
+/mob/living/simple_animal/Destroy()
+ if(collar)
+ collar.forceMove(loc)
+ collar = null
+ simple_animal_list -= src
+ return ..()
/mob/living/simple_animal/Login()
if(src && src.client)
@@ -92,18 +101,40 @@
..()
health = Clamp(health, 0, maxHealth)
+/mob/living/simple_animal/handle_hud_icons()
+ ..()
+ if(fire)
+ if(fire_alert) fire.icon_state = "fire[fire_alert]" //fire_alert is either 0 if no alert, 1 for heat and 2 for cold.
+ else fire.icon_state = "fire0"
+ if(oxygen)
+ if(oxygen_alert) oxygen.icon_state = "oxy1"
+ else oxygen.icon_state = "oxy0"
+ if(toxin)
+ if(toxins_alert) toxin.icon_state = "tox1"
+ else toxin.icon_state = "tox0"
+
+/mob/living/simple_animal/handle_hud_icons_health()
+ ..()
+ if(healths && maxHealth > 0)
+ switch(health / maxHealth * 30)
+ if(30 to INFINITY) healths.icon_state = "health0"
+ if(26 to 29) healths.icon_state = "health1"
+ if(21 to 25) healths.icon_state = "health2"
+ if(16 to 20) healths.icon_state = "health3"
+ if(11 to 15) healths.icon_state = "health4"
+ if(6 to 10) healths.icon_state = "health5"
+ if(1 to 5) healths.icon_state = "health6"
+ if(0) healths.icon_state = "health7"
/mob/living/simple_animal/Life()
-
- if(..())
- if(!ckey)
- handle_automated_movement()
- handle_automated_action()
- handle_automated_speech()
- . = 1
-
+ . = ..()
handle_state_icons()
+/mob/living/simple_animal/proc/process_ai()
+ handle_automated_movement()
+ handle_automated_action()
+ handle_automated_speech()
+
/mob/living/simple_animal/proc/handle_state_icons()
if(resting && icon_resting && stat != DEAD)
icon_state = icon_resting
@@ -176,38 +207,38 @@
var/diff = areatemp - bodytemperature
diff = diff / 5
bodytemperature += diff
-
+
var/tox = environment.toxins
var/oxy = environment.oxygen
var/n2 = environment.nitrogen
var/co2 = environment.carbon_dioxide
- if(min_oxy && oxy < min_oxy)
+ if(atmos_requirements["min_oxy"] && oxy < atmos_requirements["min_oxy"])
atmos_suitable = 0
oxygen_alert = 1
- else if(max_oxy && oxy > max_oxy)
+ else if(atmos_requirements["max_oxy"] && oxy > atmos_requirements["max_oxy"])
atmos_suitable = 0
oxygen_alert = 1
else
oxygen_alert = 0
- if(min_tox && tox < min_tox)
+ if(atmos_requirements["min_tox"] && tox < atmos_requirements["min_tox"])
atmos_suitable = 0
toxins_alert = 1
- else if(max_tox && tox > max_tox)
+ else if(atmos_requirements["max_tox"] && tox > atmos_requirements["max_tox"])
atmos_suitable = 0
toxins_alert = 1
else
toxins_alert = 0
- if(min_n2 && n2 < min_n2)
+ if(atmos_requirements["min_n2"] && n2 < atmos_requirements["min_n2"])
atmos_suitable = 0
- else if(max_n2 && n2 > max_n2)
+ else if(atmos_requirements["max_n2"] && n2 > atmos_requirements["max_n2"])
atmos_suitable = 0
- if(min_co2 && co2 < min_co2)
+ if(atmos_requirements["min_co2"] && co2 < atmos_requirements["min_co2"])
atmos_suitable = 0
- else if(max_co2 && co2 > max_co2)
+ else if(atmos_requirements["max_co2"] && co2 > atmos_requirements["max_co2"])
atmos_suitable = 0
if(!atmos_suitable)
@@ -238,9 +269,10 @@
/mob/living/simple_animal/gib()
if(icon_gib)
flick(icon_gib, src)
- if(meat_amount && meat_type)
- for(var/i = 0; i < meat_amount; i++)
- new meat_type(src.loc)
+ if(butcher_results)
+ for(var/path in butcher_results)
+ for(var/i = 1; i <= butcher_results[path];i++)
+ new path(src.loc)
..()
@@ -355,7 +387,7 @@
/mob/living/simple_animal/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
- M << "You cannot attack people before the game has started."
+ to_chat(M, "You cannot attack people before the game has started.")
return
if(M.Victim) return // can't attack while eating!
@@ -378,7 +410,7 @@
return
/mob/living/simple_animal/attackby(var/obj/item/O as obj, var/mob/living/user as mob) //Marker -Agouri
- if(istype(O, /obj/item/stack/medical))
+ if(istype(O, /obj/item/stack/medical) && healable)
if(stat != DEAD)
var/obj/item/stack/medical/MED = O
if(health < maxHealth)
@@ -393,17 +425,26 @@
M.show_message("\blue [user] applies [MED] on [src]")
return
else
- user << "\blue [MED] won't help at all."
+ to_chat(user, "\blue [MED] won't help at all.")
return
else
- user << "\blue [src] is at full health."
+ to_chat(user, "\blue [src] is at full health.")
return
else
- user << "\blue [src] is dead, medical items won't bring it back to life."
+ to_chat(user, "\blue [src] is dead, medical items won't bring it back to life.")
return
- else if(meat_type && (stat == DEAD)) //if the animal has a meat, and if it is dead.
- if(istype(O, /obj/item/weapon/kitchen/knife))
- harvest()
+ else if(can_collar && !collar && istype(O, /obj/item/clothing/accessory/petcollar))
+ var/obj/item/clothing/accessory/petcollar/C = O
+ user.drop_item()
+ C.forceMove(src)
+ collar = C
+ collar.equipped(src)
+ regenerate_icons()
+ to_chat(usr, "You put \the [C] around \the [src]'s neck.")
+ if(C.tagname)
+ name = C.tagname
+ real_name = C.tagname
+ return
else
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
@@ -424,6 +465,7 @@
user.visible_message("[user] gently taps [src] with [O].",\
"This weapon is ineffective, it does no damage.")
adjustBruteLoss(damage)
+ ..()
/mob/living/simple_animal/movement_delay()
@@ -462,21 +504,29 @@
if(3.0)
adjustBruteLoss(30)
-/mob/living/simple_animal/adjustBruteLoss(damage)
- if(!ignored_damage_types[BRUTE])
- ..()
+/mob/living/simple_animal/adjustBruteLoss(amount)
+ if(damage_coeff[BRUTE])
+ return ..(amount * damage_coeff[BRUTE])
-/mob/living/simple_animal/adjustFireLoss(damage)
- if(!ignored_damage_types[BURN])
- ..(damage)
+/mob/living/simple_animal/adjustFireLoss(amount)
+ if(damage_coeff[BURN])
+ return ..(amount * damage_coeff[BURN])
-/mob/living/simple_animal/adjustToxLoss(damage)
- if(!ignored_damage_types[TOX])
- ..(damage)
+/mob/living/simple_animal/adjustOxyLoss(amount)
+ if(damage_coeff[OXY])
+ return ..(amount * damage_coeff[OXY])
-/mob/living/simple_animal/adjustCloneLoss(damage)
- if(!ignored_damage_types[CLONE])
- ..(damage)
+/mob/living/simple_animal/adjustToxLoss(amount)
+ if(damage_coeff[TOX])
+ return ..(amount * damage_coeff[TOX])
+
+/mob/living/simple_animal/adjustCloneLoss(amount)
+ if(damage_coeff[CLONE])
+ return ..(amount * damage_coeff[CLONE])
+
+/mob/living/simple_animal/adjustStaminaLoss(amount)
+ if(damage_coeff[STAMINA])
+ return ..(amount*damage_coeff[STAMINA])
/mob/living/simple_animal/proc/CanAttack(var/atom/the_target)
if(see_invisible < the_target.invisibility)
@@ -496,11 +546,10 @@
return 1
/mob/living/simple_animal/proc/attack_threshold_check(damage, damagetype = BRUTE)
- if(damage <= force_threshold || ignored_damage_types[damagetype])
+ if(damage <= force_threshold || !damage_coeff[damagetype])
visible_message("[src] looks unharmed from the damage.")
else
- adjustBruteLoss(damage)
- updatehealth()
+ apply_damage(damage, damagetype)
/mob/living/simple_animal/update_fire()
@@ -525,6 +574,21 @@
density = initial(density)
update_canmove()
+/mob/living/simple_animal/show_inv(mob/user as mob)
+ user.set_machine(src)
+ var/dat = {"
+ Close
+ "}
+
+ var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 250)
+ popup.set_content(dat)
+ popup.open()
/mob/living/simple_animal/proc/make_babies() // <3 <3 <3
if(gender != FEMALE || stat || !scan_ready || !childtype || !simplespecies)
@@ -549,12 +613,6 @@
if(alone && partner && children < 3)
new childtype(loc)
-
-// Harvest an animal's delicious byproducts
-/mob/living/simple_animal/proc/harvest()
- gib()
- return
-
/mob/living/simple_animal/say_quote(var/message)
var/verb = "says"
@@ -586,3 +644,57 @@
if(changed)
animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
+
+/mob/living/simple_animal/Topic(href, href_list)
+ if(!usr.stat && usr.canmove && !usr.restrained() && in_range(src, usr))
+ if(href_list["remove_inv"])
+ if(!Adjacent(usr) || !(ishuman(usr) || isrobot(usr) || isalienadult(usr)))
+ return
+ var/remove_from = href_list["remove_inv"]
+ switch(remove_from)
+ if("collar")
+ if(!can_collar)
+ return
+ if(collar)
+ if(collar.flags & NODROP)
+ to_chat(usr, "\The [collar] is stuck too hard to [src] for you to remove!")
+ return
+ collar.dropped(src)
+ collar.forceMove(src.loc)
+ collar = null
+ regenerate_icons()
+ else
+ to_chat(usr, "There is nothing to remove from its [remove_from].")
+ return
+ show_inv(usr)
+ else if(href_list["add_inv"])
+ if(!Adjacent(usr) || !(ishuman(usr) || isrobot(usr) || isalienadult(usr)))
+ return
+
+ var/add_to = href_list["add_inv"]
+ switch(add_to)
+ if("collar")
+ if(!can_collar || collar)
+ return
+ var/obj/item/clothing/accessory/petcollar/C = usr.get_active_hand()
+ if(!C)
+ usr.visible_message("[usr] rubs [src]'s neck.","You rub [src]'s neck for a moment.")
+ return
+ usr.drop_item()
+ C.forceMove(src)
+ collar = C
+ collar.equipped(src)
+ regenerate_icons()
+ to_chat(usr, "You put \the [C] around \the [src]'s neck.")
+ if(C.tagname)
+ name = C.tagname
+ real_name = C.tagname
+ show_inv(usr)
+
+/mob/living/simple_animal/get_access()
+ . = ..()
+ if(collar)
+ . |= collar.GetAccess()
+
+/mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
+ return
diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm
index 3f082c020db..23def05f072 100644
--- a/code/modules/mob/living/simple_animal/tribbles.dm
+++ b/code/modules/mob/living/simple_animal/tribbles.dm
@@ -16,8 +16,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
turns_per_move = 5
maxHealth = 10
health = 10
- meat_type = /obj/item/stack/sheet/fur
- meat_amount = 1
+ butcher_results = list(/obj/item/stack/sheet/fur = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "whacks"
@@ -54,9 +53,9 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
/mob/living/simple_animal/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/weapon/scalpel))
- user << "You try to neuter the tribble, but it's moving too much and you fail!"
+ to_chat(user, "You try to neuter the tribble, but it's moving too much and you fail!")
else if(istype(O, /obj/item/weapon/cautery))
- user << "You try to un-neuter the tribble, but it's moving too much and you fail!"
+ to_chat(user, "You try to un-neuter the tribble, but it's moving too much and you fail!")
..()
@@ -97,7 +96,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
/obj/item/toy/tribble/attack_self(mob/user as mob) //hug that tribble (and play a sound if we add one)
..()
- user << "You nuzzle the tribble and it trills softly."
+ to_chat(user, "You nuzzle the tribble and it trills softly.")
/obj/item/toy/tribble/dropped(mob/user as mob) //now you can't item form them to get rid of them all so easily
..()
@@ -108,17 +107,17 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
T.icon_dead = "[src.icon_state]_dead"
T.gestation = src.gestation
- user << "The tribble gets up and wanders around."
+ to_chat(user, "The tribble gets up and wanders around.")
qdel(src)
/obj/item/toy/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) //neutering and un-neutering
..()
if(istype(O, /obj/item/weapon/scalpel) && src.gestation != null)
gestation = null
- user << "You neuter the tribble so that it can no longer re-produce."
+ to_chat(user, "You neuter the tribble so that it can no longer re-produce.")
else if (istype(O, /obj/item/weapon/cautery) && src.gestation == null)
gestation = 0
- user << "You fuse some recently cut tubes together, it should be able to reproduce again."
+ to_chat(user, "You fuse some recently cut tubes together, it should be able to reproduce again.")
@@ -196,10 +195,10 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
if (src.destroyed)
return
else
- usr << text("\blue You kick the lab cage.")
+ to_chat(usr, text("\blue You kick the lab cage."))
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << text("\red [] kicks the lab cage.", usr)
+ to_chat(O, text("\red [] kicks the lab cage.", usr))
src.health -= 2
healthcheck()
return
diff --git a/code/modules/mob/living/simple_animal/vox.dm b/code/modules/mob/living/simple_animal/vox.dm
index e48c7f81d3d..3b34ddaf143 100644
--- a/code/modules/mob/living/simple_animal/vox.dm
+++ b/code/modules/mob/living/simple_animal/vox.dm
@@ -46,7 +46,7 @@
if ((M.client && !( M.blinded )))
M.show_message("\red \b The [O] bounces harmlessly off of [src]. ")
else
- usr << "\red This weapon is ineffective, it does no damage."
+ to_chat(usr, "\red This weapon is ineffective, it does no damage.")
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [user] gently taps [src] with the [O]. ")
@@ -60,10 +60,10 @@
if(quills<=0)
return
- src << "\red You launch a razor-sharp quill at [target]!"
+ to_chat(src, "\red You launch a razor-sharp quill at [target]!")
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
- O << "\red [src] launches a razor-sharp quill at [target]!"
+ to_chat(O, "\red [src] launches a razor-sharp quill at [target]!")
var/obj/item/weapon/arrow/quill/Q = new(loc)
Q.fingerprintslast = src.ckey
@@ -71,7 +71,7 @@
quills--
spawn(100)
- src << "\red You feel a fresh quill slide into place."
+ to_chat(src, "\red You feel a fresh quill slide into place.")
quills++
/mob/living/simple_animal/vox/armalis/verb/message_mob()
@@ -93,15 +93,15 @@
var/mob/M = targets[target]
if(istype(M, /mob/dead/observer) || M.stat == DEAD)
- src << "Not even the armalis can speak to the dead."
+ to_chat(src, "Not even the armalis can speak to the dead.")
return
- M << "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]"
+ to_chat(M, "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(H.species.name == "Vox")
return
- H << "\red Your nose begins to bleed..."
+ to_chat(H, "\red Your nose begins to bleed...")
H.drip(1)
/mob/living/simple_animal/vox/armalis/verb/shriek()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a9ee30b26bc..97b7f11c32f 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -6,6 +6,8 @@
hud_used = null
if(mind && mind.current == src)
spellremove(src)
+ for(var/infection in viruses)
+ qdel(infection)
ghostize()
for(var/mob/dead/observer/M in following_mobs)
M.following = null
@@ -44,7 +46,7 @@
t+= "\blue Plasma : [environment.toxins] \n"
t+= "\blue Carbon Dioxide: [environment.carbon_dioxide] \n"
for(var/datum/gas/trace_gas in environment.trace_gases)
- usr << "\blue [trace_gas.type]: [trace_gas.moles] \n"
+ to_chat(usr, "\blue [trace_gas.type]: [trace_gas.moles] \n")
usr.show_message(t, 1)
@@ -69,9 +71,9 @@
return
// Added voice muffling for Issue 41.
if(stat == UNCONSCIOUS || (sleeping > 0 && stat != 2))
- src << "... You can almost hear someone talking ..."
+ to_chat(src, "... You can almost hear someone talking ...")
else
- src << msg
+ to_chat(src, msg)
return
// Show a message to all mobs in sight of this one
@@ -169,11 +171,16 @@
if (istype(W, /obj/item/clothing))
var/obj/item/clothing/C = W
if(C.rig_restrict_helmet)
- src << "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)" // Stop eva helms equipping.
+ to_chat(src, "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)")// Stop eva helms equipping.
+
else
equip_to_slot_if_possible(C, slot)
else
equip_to_slot_if_possible(W, slot)
+ else if(!restrained())
+ W = get_item_by_slot(slot)
+ if(W)
+ W.attack_hand(src)
if(ishuman(src) && W == src:head)
src:update_hair()
@@ -200,7 +207,8 @@
qdel(W)
else
if(!disable_warning)
- src << "\red You are unable to equip that." //Only print if del_on_fail is false
+ to_chat(src, "\red You are unable to equip that.")//Only print if del_on_fail is false
+
return 0
equip_to_slot(W, slot, redraw_mob) //This proc should not ever fail.
@@ -342,7 +350,7 @@ var/list/slot_equipment_priority = list( \
if(slot_belt)
if(!H.w_uniform)
if(!disable_warning)
- H << "\red You need a jumpsuit before you can attach this [name]."
+ to_chat(H, "\red You need a jumpsuit before you can attach this [name].")
return 0
if( !(slot_flags & SLOT_BELT) )
return 0
@@ -402,7 +410,7 @@ var/list/slot_equipment_priority = list( \
if(slot_wear_id)
if(!H.w_uniform)
if(!disable_warning)
- H << "\red You need a jumpsuit before you can attach this [name]."
+ to_chat(H, "\red You need a jumpsuit before you can attach this [name].")
return 0
if( !(slot_flags & SLOT_ID) )
return 0
@@ -417,7 +425,7 @@ var/list/slot_equipment_priority = list( \
return 0
if(!H.w_uniform)
if(!disable_warning)
- H << "\red You need a jumpsuit before you can attach this [name]."
+ to_chat(H, "\red You need a jumpsuit before you can attach this [name].")
return 0
if(slot_flags & SLOT_DENYPOCKET)
return
@@ -428,7 +436,7 @@ var/list/slot_equipment_priority = list( \
return 0
if(!H.w_uniform)
if(!disable_warning)
- H << "\red You need a jumpsuit before you can attach this [name]."
+ to_chat(H, "\red You need a jumpsuit before you can attach this [name].")
return 0
if(slot_flags & SLOT_DENYPOCKET)
return 0
@@ -438,15 +446,15 @@ var/list/slot_equipment_priority = list( \
if(slot_s_store)
if(!H.wear_suit)
if(!disable_warning)
- H << "\red You need a suit before you can attach this [name]."
+ to_chat(H, "\red You need a suit before you can attach this [name].")
return 0
if(!H.wear_suit.allowed)
if(!disable_warning)
- usr << "You somehow have a suit with no defined allowed items for suit storage, stop that."
+ to_chat(usr, "You somehow have a suit with no defined allowed items for suit storage, stop that.")
return 0
if(src.w_class > 4)
if(!disable_warning)
- usr << "The [name] is too big to attach."
+ to_chat(usr, "The [name] is too big to attach.")
return 0
if( istype(src, /obj/item/device/pda) || istype(src, /obj/item/weapon/pen) || is_type_in_list(src, H.wear_suit.allowed) )
if(H.s_store)
@@ -495,16 +503,17 @@ var/list/slot_equipment_priority = list( \
/mob/proc/show_inv(mob/user)
user.set_machine(src)
- var/dat = {"
-
- [name]
-
-
Left Hand: [(l_hand&&!(l_hand.flags&ABSTRACT)) ? l_hand : "Nothing"]
-
Right Hand: [(r_hand&&!(r_hand.flags&ABSTRACT)) ? r_hand : "Nothing"]
-
Close
+ var/dat = {"
+ Close
"}
- user << browse(dat, "window=mob\ref[src];size=325x500")
- onclose(user, "mob\ref[src]")
+
+ var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 250)
+ popup.set_content(dat)
+ popup.open()
//mob verbs are faster than object verbs. See http://www.byond.com/forum/?post=1326139&page=2#comment8198716 for why this isn't atom/verb/examine()
/mob/verb/examinate(atom/A as mob|obj|turf in view())
@@ -512,7 +521,7 @@ var/list/slot_equipment_priority = list( \
set category = "IC"
if((is_blind(src) || usr.stat) && !isobserver(src))
- src << "Something is there but you can't see it."
+ to_chat(src, "Something is there but you can't see it.")
return 1
face_atom(A)
@@ -618,7 +627,7 @@ var/list/slot_equipment_priority = list( \
if(mind)
mind.show_memory(src)
else
- src << "The game appears to have misplaced your mind datum, so we can't show you your notes."
+ to_chat(src, "The game appears to have misplaced your mind datum, so we can't show you your notes.")
/mob/verb/add_memory(msg as message)
set name = "Add Note"
@@ -630,7 +639,7 @@ var/list/slot_equipment_priority = list( \
if(mind)
mind.store_memory(msg)
else
- src << "The game appears to have misplaced your mind datum, so we can't show you your notes."
+ to_chat(src, "The game appears to have misplaced your mind datum, so we can't show you your notes.")
/mob/proc/store_memory(msg as message, popup, sane = 1)
msg = copytext(msg, 1, MAX_MESSAGE_LEN)
@@ -649,7 +658,7 @@ var/list/slot_equipment_priority = list( \
/mob/proc/update_flavor_text()
set src in usr
if(usr != src)
- usr << "No."
+ to_chat(usr, "No.")
var/msg = input(usr,"Set the flavor text in your 'examine' verb. Can also be used for OOC notes about your character.","Flavor Text",html_decode(flavor_text)) as message|null
if(msg != null)
@@ -662,7 +671,7 @@ var/list/slot_equipment_priority = list( \
if (flavor_text && flavor_text != "")
var/msg = replacetext(flavor_text, "\n", " ")
if(lentext(msg) <= 40 || !shrink)
- return "[msg]"
+ return "[html_encode(msg)]" //Repeat after me, "I will not give players access to decoded HTML."
else
return "[copytext_preserve_html(msg, 1, 37)]... More..."
@@ -677,16 +686,16 @@ var/list/slot_equipment_priority = list( \
set category = "OOC"
if (!abandon_allowed)
- usr << "Respawning is disabled."
+ to_chat(usr, "Respawning is disabled.")
return
if (stat != DEAD || !ticker)
- usr << "You must be dead to use this!"
+ to_chat(usr, "You must be dead to use this!")
return
log_game("[key_name(usr)] has respawned.")
- usr << "Make sure to play a different character, and please roleplay correctly!"
+ to_chat(usr, "Make sure to play a different character, and please roleplay correctly!")
if(!client)
log_game("[key_name(usr)] respawn failed due to disconnect.")
@@ -715,7 +724,7 @@ var/list/slot_equipment_priority = list( \
if(client.holder && (client.holder.rights & R_ADMIN))
is_admin = 1
else if(stat != DEAD || istype(src, /mob/new_player))
- usr << "\blue You must be observing to use this!"
+ to_chat(usr, "\blue You must be observing to use this!")
return
if(is_admin && stat == DEAD)
@@ -748,16 +757,6 @@ var/list/slot_equipment_priority = list( \
namecounts[name] = 1
creatures[name] = O
- if(istype(O, /obj/machinery/bot))
- var/name = "BOT: [O.name]"
- if (names.Find(name))
- namecounts[name]++
- name = "[name] ([namecounts[name]])"
- else
- names.Add(name)
- namecounts[name] = 1
- creatures[name] = O
-
for(var/mob/M in sortAtom(mob_list))
var/name = M.name
@@ -860,9 +859,9 @@ var/list/slot_equipment_priority = list( \
..()
if(M != usr) return
if(M.small) return // Stops pAI drones and small mobs (borers, parrots, crabs) from stripping people. --DZD
+ if(!M.can_strip) return
if(usr == src) return
if(!Adjacent(usr)) return
- if(istype(M,/mob/living/silicon/ai)) return
show_inv(usr)
//this and stop_pulling really ought to be /mob/living procs
@@ -940,7 +939,7 @@ var/list/slot_equipment_priority = list( \
/mob/proc/see(message)
if(!is_active())
return 0
- src << message
+ to_chat(src, message)
return 1
/mob/proc/is_muzzled()
@@ -996,30 +995,9 @@ var/list/slot_equipment_priority = list( \
// this function displays the shuttles ETA in the status panel if the shuttle has been called
/mob/proc/show_stat_emergency_shuttle_eta()
- var/obj/docking_port/mobile/emergency/E = shuttle_master.emergency
-
- if(E.mode >= SHUTTLE_RECALL)
- var/message = ""
-
- var/timeleft = E.timeLeft()
- message = "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
-
- switch(E.mode)
- if(SHUTTLE_RECALL, SHUTTLE_ESCAPE)
- message = "ETR-[message]"
- if(SHUTTLE_CALL)
- message = "ETA-[message]"
- if(SHUTTLE_DOCKED)
- if(timeleft < 5)
- message = "Departing..."
- else
- message = "ETD-[message]"
- if(SHUTTLE_STRANDED)
- message = "ETA-ERR"
- if(SHUTTLE_ENDGAME)
- return
-
- stat(null, message)
+ var/ETA = shuttle_master.emergency.getModeStr()
+ if(ETA)
+ stat(null, "[ETA] [shuttle_master.emergency.getTimerStr()]")
/mob/proc/add_stings_to_statpanel(var/list/stings)
for(var/obj/effect/proc_holder/changeling/S in stings)
@@ -1191,9 +1169,6 @@ var/list/slot_equipment_priority = list( \
/mob/proc/get_species()
return ""
-/mob/proc/flash_weak_pain()
- flick("weak_pain",pain)
-
/mob/proc/get_visible_implants(var/class = 0)
var/list/visible_implants = list()
for(var/obj/item/O in embedded)
@@ -1212,11 +1187,11 @@ mob/proc/yank_out_object()
usr.changeNext_move(CLICK_CD_RESIST)
if(usr.stat == 1)
- usr << "You are unconcious and cannot do that!"
+ to_chat(usr, "You are unconcious and cannot do that!")
return
if(usr.restrained())
- usr << "You are restrained and cannot do that!"
+ to_chat(usr, "You are restrained and cannot do that!")
return
var/mob/S = src
@@ -1230,17 +1205,17 @@ mob/proc/yank_out_object()
valid_objects = get_visible_implants(0)
if(!valid_objects.len)
if(self)
- src << "You have nothing stuck in your body that is large enough to remove."
+ to_chat(src, "You have nothing stuck in your body that is large enough to remove.")
else
- U << "[src] has nothing stuck in their wounds that is large enough to remove."
+ to_chat(U, "[src] has nothing stuck in their wounds that is large enough to remove.")
return
var/obj/item/weapon/selection = input("What do you want to yank out?", "Embedded objects") in valid_objects
if(self)
- src << "You attempt to get a good grip on [selection] in your body."
+ to_chat(src, "You attempt to get a good grip on [selection] in your body.")
else
- U << "You attempt to get a good grip on [selection] in [S]'s body."
+ to_chat(U, "You attempt to get a good grip on [selection] in [S]'s body.")
if(!do_after(U, 80, target = S))
return
@@ -1295,11 +1270,11 @@ mob/proc/yank_out_object()
set category = "Ghost"
if(jobban_isbanned(usr, "NPC"))
- usr << "You are banned from playing as NPC's."
+ to_chat(usr, "You are banned from playing as NPC's.")
return
if(!ticker || ticker.current_state < 3)
- src << "You can't respawn as an NPC before the game starts!"
+ to_chat(src, "You can't respawn as an NPC before the game starts!")
return
if((usr in respawnable_list) && (stat==2 || istype(usr,/mob/dead/observer)))
@@ -1323,7 +1298,7 @@ mob/proc/yank_out_object()
spawn(5)
respawnable_list += usr
else
- usr << "You are not dead or you have given up your right to be respawned!"
+ to_chat(usr, "You are not dead or you have given up your right to be respawned!")
return
@@ -1332,7 +1307,7 @@ mob/proc/yank_out_object()
if(client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600)
var/timedifference_text
timedifference_text = time2text(mouse_respawn_time * 600 - timedifference,"mm:ss")
- src << "You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left."
+ to_chat(src, "You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.")
return
//find a viable mouse candidate
@@ -1346,11 +1321,11 @@ mob/proc/yank_out_object()
vent_found = pick(found_vents)
host = new /mob/living/simple_animal/mouse(vent_found.loc)
else
- src << "Unable to find any unwelded vents to spawn mice at."
+ to_chat(src, "Unable to find any unwelded vents to spawn mice at.")
if(host)
host.ckey = src.ckey
- host << "You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent."
+ to_chat(host, "You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.")
/mob/proc/assess_threat() //For sec bot threat assessment
return
@@ -1363,6 +1338,11 @@ mob/proc/yank_out_object()
return G
break
+/mob/proc/notify_ghost_cloning(var/message = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!", var/sound = 'sound/effects/genetics.ogg', var/atom/source = null)
+ var/mob/dead/observer/ghost = get_ghost()
+ if(ghost)
+ ghost.notify_cloning(message, sound, source)
+ return ghost
/mob/proc/fakevomit(green=0) //for aesthetic vomits that need to be instant and do not stun. -Fox
if(stat==DEAD)
@@ -1377,16 +1357,6 @@ mob/proc/yank_out_object()
location.add_vomit_floor(src, 1)
playsound(location, 'sound/effects/splat.ogg', 50, 1)
-/mob/proc/fakepoop() //for aesthetic craps. Whyyyyy -Fox
- if(stat==DEAD)
- return
- var/turf/location = loc
- if (istype(location, /turf/simulated))
- src.visible_message("[src] has explosive diarrhea all over the floor!","You have explosive diarrhea all over the floor!")
- location.add_poop_floor()
- playsound(location, 'sound/effects/splat.ogg', 50, 1)
-
-
/mob/proc/adjustEarDamage()
return
@@ -1451,4 +1421,7 @@ mob/proc/yank_out_object()
return 1 // Yes, you can
/mob/proc/IsVocal()
- return 1
\ No newline at end of file
+ return 1
+
+/mob/proc/get_access()
+ return list() //must return list or IGNORE_ACCESS
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 4f7327180c6..0121905380a 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -11,8 +11,6 @@
//Not in use yet
var/obj/effect/organstructure/organStructure = null
- var/obj/screen/flash = null
- var/obj/screen/blind = null
var/obj/screen/hands = null
var/obj/screen/pullin = null
var/obj/screen/internals = null
@@ -26,8 +24,6 @@
var/obj/screen/throw_icon = null
var/obj/screen/nutrition_icon = null
var/obj/screen/pressure = null
- var/obj/screen/damageoverlay = null
- var/obj/screen/pain = null
var/obj/screen/gun/item/item_use_icon = null
var/obj/screen/gun/move/gun_move_icon = null
var/obj/screen/gun/run/gun_run_icon = null
@@ -87,6 +83,7 @@
var/lastpuke = 0
var/unacidable = 0
var/small = 0
+ var/can_strip = 1
var/list/pinned = list() //List of things pinning this creature to walls (see living_defense.dm)
var/list/embedded = list() //Embedded items, since simple mobs don't have organs.
var/list/languages = list() // For speaking/listening.
@@ -194,8 +191,8 @@
//List of active diseases
- var/viruses = list() // replaces var/datum/disease/virus
-
+ var/list/viruses = list() // replaces var/datum/disease/virus
+ var/list/resistances = list()
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
@@ -204,13 +201,17 @@
var/area/lastarea = null
var/digitalcamo = 0 // Can they be tracked by the AI?
- var/weakeyes //Are they vulnerable to flashes?
+ var/weakeyes = 0 //Are they vulnerable to flashes?
+
+ var/has_unlimited_silicon_privilege = 0 // Can they interact with station electronics
var/list/radar_blips = list() // list of screen objects, radar blips
var/radar_open = 0 // nonzero is radar is open
var/atom/movable/remote_control //Calls relaymove() to whatever it is
+ var/remote_view = 0 // Set to 1 to prevent view resets on Life
+
var/obj/control_object //Used by admins to possess objects. All mobs should have this var
var/datum/visibility_interface/visibility_interface = null // used by the visibility system to provide an interface for the visibility networks
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 79fc66d2408..fcbcd410a89 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -6,7 +6,7 @@
#define EAT_TIME_FAT 100
//time it takes for a mob to be eaten (in deciseconds) (overrides mob eat time)
-#define EAT_TIME_MOUSE 30
+#define EAT_TIME_ANIMAL 30
/obj/item/weapon/grab
name = "grab"
@@ -262,7 +262,7 @@
hud.icon_state = "reinforce1"
else if(state < GRAB_NECK)
if(isslime(affecting))
- assailant << "You squeeze [affecting], but nothing interesting happens."
+ to_chat(assailant, "You squeeze [affecting], but nothing interesting happens.")
return
assailant.visible_message("[assailant] has reinforced \his grip on [affecting] (now neck)!")
@@ -318,7 +318,7 @@
switch(assailant.a_intent)
if(I_HELP)
/*if(force_down)
- assailant << "You no longer pin [affecting] to the ground."
+ to_chat(assailant, "You no longer pin [affecting] to the ground.")
force_down = 0
return*///This is a very basic demonstration of a new feature based on attacking someone with the grab, based on intent.
//This specific example would allow you to stop pinning people to the floor without moving away from them.
@@ -345,18 +345,18 @@
/*if(last_hit_zone == "eyes")
if(state < GRAB_NECK)
- assailant << "You require a better grab to do this."
+ to_chat(assailant, "You require a better grab to do this.")
return
if((affected.head && affected.head.flags & HEADCOVERSEYES) || \
(affected.wear_mask && affected.wear_mask.flags & MASKCOVERSEYES) || \
(affected.glasses && affected.glasses.flags & GLASSESCOVERSEYES))
- assailant << "You're going to need to remove the eye covering first."
+ to_chat(assailant, "You're going to need to remove the eye covering first.")
return
if(!affected.internal_organs_by_name["eyes"])
- assailant << "You cannot locate any eyes on [affecting]!"
+ to_chat(assailant, "You cannot locate any eyes on [affecting]!")
return
assailant.visible_message("[assailant] presses \his fingers into [affecting]'s eyes!")
- affecting << "You feel immense pain as digits are being pressed into your eyes!"
+ to_chat(affecting, "You feel immense pain as digits are being pressed into your eyes!")
assailant.attack_log += text("\[[time_stamp()]\] Pressed fingers into the eyes of [affecting.name] ([affecting.ckey])")
affecting.attack_log += text("\[[time_stamp()]\] Had fingers pressed into their eyes by [assailant.name] ([assailant.ckey])")
msg_admin_attack("[key_name(assailant)] has pressed his fingers into [key_name(affecting)]'s eyes.")
@@ -364,12 +364,13 @@
eyes.damage += rand(3,4)
if (eyes.damage >= eyes.min_broken_damage)
if(M.stat != 2)
- M << "\red You go blind!"*///This is a demonstration of adding a new damaging type based on intent as well as hitzone.
+ to_chat(M, "\red You go blind!")*///This is a demonstration of adding a new damaging type based on intent as well as hitzone.
+
//This specific example would allow you to squish people's eyes with a GRAB_NECK.
if(I_DISARM) //This checks that the user is on disarm intent.
/* if(state < GRAB_AGGRESSIVE)
- assailant << "You require a better grab to do this."
+ to_chat(assailant, "You require a better grab to do this.")
return
if(!force_down)
assailant.visible_message("[user] is forcing [affecting] to the ground!")
@@ -381,7 +382,7 @@
affecting.set_dir(SOUTH) //face up
return
else
- assailant << "You are already pinning [affecting] to the ground."
+ to_chat(assailant, "You are already pinning [affecting] to the ground.")
return*///This is an example of something being done with an agressive grab + disarm intent.
return
@@ -413,10 +414,8 @@
if(isalien(attacker) && iscarbon(prey)) //Xenomorphs eating carbon mobs
return 1
- if(ishuman(attacker) && attacker.get_species() == "Kidan" && istype(prey,/mob/living/simple_animal/diona)) //Kidan eating nymphs
- return 1
-
- if(ishuman(attacker) && attacker.get_species() == "Tajaran" && istype(prey,/mob/living/simple_animal/mouse)) //Tajaran eating mice. Meow!
+ var/mob/living/carbon/human/H = attacker
+ if(ishuman(H) && is_type_in_list(prey, H.species.allowed_consumed_mobs)) //species eating of other mobs
return 1
return 0
@@ -425,8 +424,8 @@
if(isalien(attacker))
return EAT_TIME_XENO //xenos get a speed boost
- if(istype(prey,/mob/living/simple_animal/mouse)) //mice get eaten at xeno-eating-speed regardless
- return EAT_TIME_MOUSE
+ if(istype(prey,/mob/living/simple_animal)) //simple animals get eaten at xeno-eating-speed regardless
+ return EAT_TIME_ANIMAL
return EAT_TIME_FAT //if it doesn't fit into the above, it's probably a fat guy, take EAT_TIME_FAT to do it
@@ -447,4 +446,4 @@
#undef EAT_TIME_XENO
#undef EAT_TIME_FAT
-#undef EAT_TIME_MOUSE
+#undef EAT_TIME_ANIMAL
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index ff22f315867..1f2e0e7b456 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -62,6 +62,13 @@ proc/isembryo(A)
return 1
return 0
+/proc/ispet(A)
+ if(istype(A, /mob/living/simple_animal))
+ var/mob/living/simple_animal/SA = A
+ if(SA.can_collar)
+ return 1
+ return 0
+
/proc/iscrab(A)
if(istype(A, /mob/living/simple_animal/crab))
return 1
@@ -87,6 +94,11 @@ proc/isembryo(A)
return 1
return 0
+/proc/isbot(A)
+ if(istype(A, /mob/living/simple_animal/bot))
+ return 1
+ return 0
+
/proc/isclown(A)
if(istype(A, /mob/living/simple_animal/hostile/retaliate/clown))
return 1
@@ -461,7 +473,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
set category = "IC"
if(usr.sleeping)
- usr << "\red You are already sleeping"
+ to_chat(usr, "\red You are already sleeping")
return
else
if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes")
@@ -472,7 +484,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
set category = "IC"
resting = !resting
- src << "\blue You are now [resting ? "resting" : "getting up"]"
+ to_chat(src, "\blue You are now [resting ? "resting" : "getting up"]")
/proc/is_blind(A)
if(iscarbon(A))
@@ -542,14 +554,14 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
else // Everyone else (dead people who didn't ghost yet, etc.)
lname = name
lname = "[lname] "
- M << "[lname][follow][message]"
+ to_chat(M, "[lname][follow][message]")
/proc/notify_ghosts(var/message, var/ghost_sound = null) //Easy notification of ghosts.
for(var/mob/dead/observer/O in player_list)
if(O.client)
- O << "[message]"
+ to_chat(O, "[message]")
if(ghost_sound)
- O << sound(ghost_sound)
+ to_chat(O, sound(ghost_sound))
/mob/proc/switch_to_camera(var/obj/machinery/camera/C)
if (!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove))
@@ -616,8 +628,9 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
var/newname
for(var/i=1,i<=3,i++) //we get 3 attempts to pick a suitable name.
- newname = input(src,"You are a [role]. Would you like to change your name to something else?", "Name change",oldname) as text
- if((world.time-time_passed)>300)
+ newname = input(src, "You are a [role]. Would you like to change your name to something else? (You have 3 minutes to select a new name.)", "Name Change", oldname) as text
+ if((world.time - time_passed) > 1800)
+ alert(src, "Unfortunately, more than 3 minutes have passed for selecting your name. If you are a robot, use the Namepick verb; otherwise, adminhelp.", "Name Change")
return //took too long
newname = reject_bad_name(newname,allow_numbers) //returns null if the name doesn't meet some basic requirements. Tidies up a few other things like bad-characters.
@@ -629,7 +642,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
break
if(newname)
break //That's a suitable name!
- src << "Sorry, that [role]-name wasn't appropriate, please try another. It's possibly too long/short, has bad characters or is already taken."
+ to_chat(src, "Sorry, that [role]-name wasn't appropriate, please try another. It's possibly too long/short, has bad characters or is already taken.")
if(!newname) //we'll stick with the oldname then
return
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 22a41279401..68913c6ad25 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -50,12 +50,12 @@
var/mob/living/silicon/robot/R = usr
var/module = R.get_selected_module()
if(!module)
- usr << "\red You have no module selected."
+ to_chat(usr, "\red You have no module selected.")
return
R.cycle_modules()
R.uneq_numbered(module)
else
- usr << "\red This mob type cannot throw items."
+ to_chat(usr, "\red This mob type cannot throw items.")
return
@@ -63,17 +63,17 @@
if(iscarbon(usr))
var/mob/living/carbon/C = usr
if(!C.get_active_hand())
- usr << "\red You have nothing to drop in your hand."
+ to_chat(usr, "\red You have nothing to drop in your hand.")
return
drop_item()
else if(isrobot(usr))
var/mob/living/silicon/robot/R = usr
if(!R.get_selected_module())
- usr << "\red You have no module selected."
+ to_chat(usr, "\red You have no module selected.")
return
R.deselect_module(R.get_selected_module())
else
- usr << "\red This mob type cannot drop items."
+ to_chat(usr, "\red This mob type cannot drop items.")
return
//This gets called when you press the delete button.
@@ -81,7 +81,7 @@
set hidden = 1
if(!usr.pulling)
- usr << "\blue You are not pulling anything."
+ to_chat(usr, "\blue You are not pulling anything.")
return
usr.stop_pulling()
@@ -227,13 +227,13 @@
for(var/mob/M in range(mob, 1))
if(M.pulling == mob)
if(!M.restrained() && M.stat == 0 && M.canmove && mob.Adjacent(M))
- src << "\blue You're restrained! You can't move!"
+ to_chat(src, "\blue You're restrained! You can't move!")
return 0
else
M.stop_pulling()
if(mob.pinned.len)
- src << "\blue You're pinned to a wall by [mob.pinned[1]]!"
+ to_chat(src, "\blue You're pinned to a wall by [mob.pinned[1]]!")
return 0
var/turf/T = mob.loc
@@ -392,7 +392,7 @@
if(3) //Incorporeal move, but blocked by holy-watered tiles
var/turf/simulated/floor/stepTurf = get_step(L, direct)
if(stepTurf.flags & NOJAUNT)
- L << "Holy energies block your path."
+ to_chat(L, "Holy energies block your path.")
L.notransform = 1
spawn(2)
L.notransform = 0
@@ -439,7 +439,7 @@
if(movement_dir && dense_object_backup)
if(dense_object_backup.newtonian_move(turn(movement_dir, 180))) //You're pushing off something movable, so it moves
- src << "You push off of [dense_object_backup] to propel yourself."
+ to_chat(src, "You push off of [dense_object_backup] to propel yourself.")
return 1
diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm
index 33428a9c096..856879acf38 100644
--- a/code/modules/mob/mob_transformation_simple.dm
+++ b/code/modules/mob/mob_transformation_simple.dm
@@ -5,7 +5,7 @@
/mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/forcekey = 0)
if(istype(src,/mob/new_player))
- usr << "\red cannot convert players who have not entered yet."
+ to_chat(usr, "\red cannot convert players who have not entered yet.")
return
if(!new_type)
@@ -15,11 +15,11 @@
new_type = text2path(new_type)
if( !ispath(new_type) )
- usr << "Invalid type path (new_type = [new_type]) in change_mob_type(). Contact a coder."
+ to_chat(usr, "Invalid type path (new_type = [new_type]) in change_mob_type(). Contact a coder.")
return
if( new_type == /mob/new_player )
- usr << "\red cannot convert into a new_player mob type."
+ to_chat(usr, "\red cannot convert into a new_player mob type.")
return
var/mob/M
@@ -29,7 +29,7 @@
M = new new_type( src.loc )
if(!M || !ismob(M))
- usr << "Type path is not a mob (new_type = [new_type]) in change_mob_type(). Contact a coder."
+ to_chat(usr, "Type path is not a mob (new_type = [new_type]) in change_mob_type(). Contact a coder.")
qdel(M)
return
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index b29267f9c3b..f6e2441e876 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -1,7 +1,7 @@
/mob/new_player/Login()
update_Login_details() //handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying
if(join_motd)
- src << "[join_motd]
"
+ to_chat(src, "[join_motd]
")
if(!mind)
mind = new /datum/mind(key)
@@ -43,4 +43,5 @@
for(var/client/C in clients)
tally++
if(tally > config.player_overflow_cap)
- src << link(config.overflow_server_url)
\ No newline at end of file
+ src << link(config.overflow_server_url)
+
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index f77e2ff7ed5..ffb6f6c13b8 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -15,505 +15,468 @@
anchored = 1 // don't get pushed around
- New()
- mob_list += src
+/mob/new_player/New()
+ mob_list += src
- verb/new_player_panel()
- set src = usr
- new_player_panel_proc()
+/mob/new_player/verb/new_player_panel()
+ set src = usr
+ new_player_panel_proc()
- proc/new_player_panel_proc()
- var/output = "Setup Character
"
+/mob/new_player/proc/new_player_panel_proc()
+ var/output = "Setup Character
"
- if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
- if(!ready) output += "Declare Ready
"
- else output += "You are ready (Cancel)
"
+ if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
+ if(!ready) output += "Declare Ready
"
+ else output += "You are ready (Cancel)
"
- else
- output += "View the Crew Manifest
"
- output += "Join Game!
"
+ else
+ output += "View the Crew Manifest
"
+ output += "Join Game!
"
- output += "Observe
"
+ output += "Observe
"
- if(!IsGuestKey(src.key))
- establish_db_connection()
+ if(!IsGuestKey(src.key))
+ establish_db_connection()
- if(dbcon.IsConnected())
- var/isadmin = 0
- if(src.client && src.client.holder)
- isadmin = 1
- var/DBQuery/query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_question")] WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime AND id NOT IN (SELECT pollid FROM [format_table_name("poll_vote")] WHERE ckey = \"[ckey]\") AND id NOT IN (SELECT pollid FROM [format_table_name("poll_textreply")] WHERE ckey = \"[ckey]\")")
- query.Execute()
- var/newpoll = 0
- while(query.NextRow())
- newpoll = 1
- break
+ if(dbcon.IsConnected())
+ var/isadmin = 0
+ if(src.client && src.client.holder)
+ isadmin = 1
+ var/DBQuery/query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_question")] WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime AND id NOT IN (SELECT pollid FROM [format_table_name("poll_vote")] WHERE ckey = \"[ckey]\") AND id NOT IN (SELECT pollid FROM [format_table_name("poll_textreply")] WHERE ckey = \"[ckey]\")")
+ query.Execute()
+ var/newpoll = 0
+ while(query.NextRow())
+ newpoll = 1
+ break
- if(newpoll)
- output += "Show Player Polls (NEW!)
"
- else
- output += "Show Player Polls
"
-
- output += ""
-
- var/datum/browser/popup = new(src, "playersetup", "New Player Options
", 220, 290)
- popup.set_window_options("can_close=0")
- popup.set_content(output)
- popup.open(0)
- return
-
- Stat()
- if((!ticker) || ticker.current_state == GAME_STATE_PREGAME)
- statpanel("Lobby") // First tab during pre-game.
- ..()
-
- statpanel("Status")
- if (client.statpanel == "Status" && ticker)
- if (ticker.current_state != GAME_STATE_PREGAME)
- stat(null, "Station Time: [worldtime2text()]")
- statpanel("Lobby")
- if(client.statpanel=="Lobby" && ticker)
- if(ticker.hide_mode)
- stat("Game Mode:", "Secret")
+ if(newpoll)
+ output += "Show Player Polls (NEW!)
"
else
- if(ticker.hide_mode == 0)
- stat("Game Mode:", "[master_mode]") // Old setting for showing the game mode
- else
- stat("Game Mode: ", "Secret")
+ output += "Show Player Polls
"
- if((ticker.current_state == GAME_STATE_PREGAME) && going)
- stat("Time To Start:", ticker.pregame_timeleft)
- if((ticker.current_state == GAME_STATE_PREGAME) && !going)
- stat("Time To Start:", "DELAYED")
+ output += ""
- if(ticker.current_state == GAME_STATE_PREGAME)
- stat("Players: [totalPlayers]", "Players Ready: [totalPlayersReady]")
- totalPlayers = 0
- totalPlayersReady = 0
- for(var/mob/new_player/player in player_list)
- stat("[player.key]", (player.ready)?("(Playing)"):(null))
- totalPlayers++
- if(player.ready)totalPlayersReady++
+ var/datum/browser/popup = new(src, "playersetup", "New Player Options
", 220, 290)
+ popup.set_window_options("can_close=0")
+ popup.set_content(output)
+ popup.open(0)
+ return
- Topic(href, href_list[])
- if(!client) return 0
+/mob/new_player/Stat()
+ if((!ticker) || ticker.current_state == GAME_STATE_PREGAME)
+ statpanel("Lobby") // First tab during pre-game.
+ ..()
- if(href_list["show_preferences"])
- client.prefs.ShowChoices(src)
- return 1
+ statpanel("Status")
+ if (client.statpanel == "Status" && ticker)
+ if (ticker.current_state != GAME_STATE_PREGAME)
+ stat(null, "Station Time: [worldtime2text()]")
+ statpanel("Lobby")
+ if(client.statpanel=="Lobby" && ticker)
+ if(ticker.hide_mode)
+ stat("Game Mode:", "Secret")
+ else
+ if(ticker.hide_mode == 0)
+ stat("Game Mode:", "[master_mode]") // Old setting for showing the game mode
+ else
+ stat("Game Mode: ", "Secret")
- if(href_list["ready"])
- ready = !ready
- new_player_panel_proc()
+ if((ticker.current_state == GAME_STATE_PREGAME) && going)
+ stat("Time To Start:", ticker.pregame_timeleft)
+ if((ticker.current_state == GAME_STATE_PREGAME) && !going)
+ stat("Time To Start:", "DELAYED")
- if(href_list["refresh"])
- src << browse(null, "window=playersetup") //closes the player setup window
- new_player_panel_proc()
+ if(ticker.current_state == GAME_STATE_PREGAME)
+ stat("Players: [totalPlayers]", "Players Ready: [totalPlayersReady]")
+ totalPlayers = 0
+ totalPlayersReady = 0
+ for(var/mob/new_player/player in player_list)
+ stat("[player.key]", (player.ready)?("(Playing)"):(null))
+ totalPlayers++
+ if(player.ready)totalPlayersReady++
- if(href_list["observe"])
+/mob/new_player/Topic(href, href_list[])
+ if(!client) return 0
- if(alert(src,"Are you sure you wish to observe? You cannot normally join the round after doing this!","Player Setup","Yes","No") == "Yes")
- if(!client) return 1
- var/mob/dead/observer/observer = new()
- src << browse(null, "window=playersetup")
- spawning = 1
- src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
-
- observer.started_as_observer = 1
- close_spawn_windows()
- var/obj/O = locate("landmark*Observer-Start")
- src << "\blue Now teleporting."
- observer.loc = O.loc
- observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly.
- client.prefs.update_preview_icon(1)
- observer.icon = client.prefs.preview_icon
- observer.alpha = 127
-
- if(client.prefs.be_random_name)
- client.prefs.real_name = random_name(client.prefs.gender,client.prefs.species)
- observer.real_name = client.prefs.real_name
- observer.name = observer.real_name
- if(!client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
- observer.verbs -= /mob/dead/observer/verb/toggle_antagHUD // Poor guys, don't know what they are missing!
- observer.key = key
- respawnable_list += observer
- qdel(src)
- return 1
-
- if(href_list["late_join"])
- if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
- usr << "\red The round is either not ready, or has already finished..."
- return
-
- if(client.prefs.species in whitelisted_species)
-
- if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
- src << alert("You are currently not whitelisted to play [client.prefs.species].")
- return 0
-
- LateChoices()
-
- if(href_list["manifest"])
- ViewManifest()
-
- if(href_list["SelectedJob"])
-
- if(!enter_allowed)
- usr << "\blue There is an administrative lock on entering the game!"
- return
-
- if(client.prefs.species in whitelisted_species)
- if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
- src << alert("You are currently not whitelisted to play [client.prefs.species].")
- return 0
-
- AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint)
- return
-
- if(!ready && href_list["preference"])
- if(client)
- client.prefs.process_link(src, href_list)
- else if(!href_list["late_join"])
- new_player_panel()
-
- if(href_list["showpoll"])
-
- handle_player_polling()
- return
-
- if(href_list["pollid"])
-
- var/pollid = href_list["pollid"]
- if(istext(pollid))
- pollid = text2num(pollid)
- if(isnum(pollid))
- src.poll_player(pollid)
- return
-
- if(href_list["votepollid"] && href_list["votetype"])
- var/pollid = text2num(href_list["votepollid"])
- var/votetype = href_list["votetype"]
- switch(votetype)
- if("OPTION")
- var/optionid = text2num(href_list["voteoptionid"])
- vote_on_poll(pollid, optionid)
- if("TEXT")
- var/replytext = href_list["replytext"]
- log_text_poll_reply(pollid, replytext)
- if("NUMVAL")
- var/id_min = text2num(href_list["minid"])
- var/id_max = text2num(href_list["maxid"])
-
- if( (id_max - id_min) > 100 ) //Basic exploit prevention
- usr << "The option ID difference is too big. Please contact administration or the database admin."
- return
-
- for(var/optionid = id_min; optionid <= id_max; optionid++)
- if(!isnull(href_list["o[optionid]"])) //Test if this optionid was replied to
- var/rating
- if(href_list["o[optionid]"] == "abstain")
- rating = null
- else
- rating = text2num(href_list["o[optionid]"])
- if(!isnum(rating))
- return
-
- vote_on_numval_poll(pollid, optionid, rating)
- if("MULTICHOICE")
- var/id_min = text2num(href_list["minoptionid"])
- var/id_max = text2num(href_list["maxoptionid"])
-
- if( (id_max - id_min) > 100 ) //Basic exploit prevention
- usr << "The option ID difference is too big. Please contact administration or the database admin."
- return
-
- for(var/optionid = id_min; optionid <= id_max; optionid++)
- if(!isnull(href_list["option_[optionid]"])) //Test if this optionid was selected
- vote_on_poll(pollid, optionid, 1)
-
- proc/IsJobAvailable(rank)
- var/datum/job/job = job_master.GetJob(rank)
- if(!job) return 0
- if(!job.is_position_available()) return 0
- if(jobban_isbanned(src,rank)) return 0
- if(!is_job_whitelisted(src, rank)) return 0
- if(!job.player_old_enough(src.client)) return 0
- if(config.assistantlimit)
- if(job.title == "Civilian")
- var/count = 0
- var/datum/job/officer = job_master.GetJob("Security Officer")
- var/datum/job/warden = job_master.GetJob("Warden")
- var/datum/job/hos = job_master.GetJob("Head of Security")
- count += (officer.current_positions + warden.current_positions + hos.current_positions)
- if(job.current_positions > (config.assistantratio * count))
- if(count >= 5) // if theres more than 5 security on the station just let assistants join regardless, they should be able to handle the tide
- return 1
- return 0
+ if(href_list["show_preferences"])
+ client.prefs.ShowChoices(src)
return 1
+ if(href_list["ready"])
+ ready = !ready
+ new_player_panel_proc()
- proc/AttemptLateSpawn(rank,var/spawning_at)
- if (src != usr)
- return 0
- if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
- usr << "\red The round is either not ready, or has already finished..."
- return 0
- if(!enter_allowed)
- usr << "\blue There is an administrative lock on entering the game!"
- return 0
- if(!IsJobAvailable(rank))
- src << alert("[rank] is not available. Please try another.")
- return 0
+ if(href_list["refresh"])
+ src << browse(null, "window=playersetup") //closes the player setup window
+ new_player_panel_proc()
- job_master.AssignRole(src, rank, 1)
+ if(href_list["observe"])
- var/mob/living/character = create_character() //creates the human and transfers vars and mind
- character = job_master.EquipRank(character, rank, 1) //equips the human
- EquipCustomItems(character)
+ if(alert(src,"Are you sure you wish to observe? You cannot normally join the round after doing this!","Player Setup","Yes","No") == "Yes")
+ if(!client) return 1
+ var/mob/dead/observer/observer = new()
+ src << browse(null, "window=playersetup")
+ spawning = 1
+ to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS cant last forever yo
- // AIs don't need a spawnpoint, they must spawn at an empty core
- if(character.mind.assigned_role == "AI")
- character = character.AIize(move=0) // AIize the character, but don't move them yet
+ observer.started_as_observer = 1
+ close_spawn_windows()
+ var/obj/O = locate("landmark*Observer-Start")
+ to_chat(src, "\blue Now teleporting.")
+ observer.loc = O.loc
+ observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly.
+ client.prefs.update_preview_icon(1)
+ observer.icon = client.prefs.preview_icon
+ observer.alpha = 127
- // IsJobAvailable for AI checks that there is an empty core available in this list
- var/obj/structure/AIcore/deactivated/C = empty_playable_ai_cores[1]
- empty_playable_ai_cores -= C
-
- character.loc = C.loc
-
- AnnounceCyborg(character, rank, "has been downloaded to the empty core in \the [character.loc.loc]")
- ticker.mode.latespawn(character)
-
- qdel(C)
+ if(client.prefs.be_random_name)
+ client.prefs.real_name = random_name(client.prefs.gender,client.prefs.species)
+ observer.real_name = client.prefs.real_name
+ observer.name = observer.real_name
+ if(!client.holder && !config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
+ observer.verbs -= /mob/dead/observer/verb/toggle_antagHUD // Poor guys, don't know what they are missing!
+ observer.key = key
+ respawnable_list += observer
qdel(src)
+ return 1
+
+ if(href_list["late_join"])
+ if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
+ to_chat(usr, "\red The round is either not ready, or has already finished...")
return
- //Find our spawning point.
- var/join_message
- var/datum/spawnpoint/S
+ if(client.prefs.species in whitelisted_species)
- if(spawning_at)
- S = spawntypes[spawning_at]
+ if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
+ to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species]."))
+ return 0
- if(S && istype(S))
- if(S.check_job_spawning(rank))
- character.loc = pick(S.turfs)
- join_message = S.msg
- else
- character << "Your chosen spawnpoint ([S.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead."
- character.loc = pick(latejoin)
- join_message = "has arrived on the station"
- else
- character.loc = pick(latejoin)
- join_message = "has arrived on the station"
+ LateChoices()
- character.lastarea = get_area(loc)
- // Moving wheelchair if they have one
- if(character.buckled && istype(character.buckled, /obj/structure/stool/bed/chair/wheelchair))
- character.buckled.loc = character.loc
- character.buckled.dir = character.dir
+ if(href_list["manifest"])
+ ViewManifest()
- ticker.mode.latespawn(character)
+ if(href_list["SelectedJob"])
- if(character.mind.assigned_role != "Cyborg")
- data_core.manifest_inject(character)
- ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc. //TODO!!!!! ~Carn
- AnnounceArrival(character, rank, join_message)
- callHook("latespawn", list(character))
- else
- AnnounceCyborg(character, rank, join_message)
- callHook("latespawn", list(character))
- qdel(src)
+ if(!enter_allowed)
+ to_chat(usr, "\blue There is an administrative lock on entering the game!")
+ return
+
+ if(client.prefs.species in whitelisted_species)
+ if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
+ to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species]."))
+ return 0
+
+ AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint)
+ return
+
+ if(!ready && href_list["preference"])
+ if(client)
+ client.prefs.process_link(src, href_list)
+ else if(!href_list["late_join"])
+ new_player_panel()
+
+ if(href_list["showpoll"])
+
+ handle_player_polling()
+ return
+
+ if(href_list["pollid"])
+
+ var/pollid = href_list["pollid"]
+ if(istext(pollid))
+ pollid = text2num(pollid)
+ if(isnum(pollid))
+ src.poll_player(pollid)
+ return
+
+ if(href_list["votepollid"] && href_list["votetype"])
+ var/pollid = text2num(href_list["votepollid"])
+ var/votetype = href_list["votetype"]
+ switch(votetype)
+ if("OPTION")
+ var/optionid = text2num(href_list["voteoptionid"])
+ vote_on_poll(pollid, optionid)
+ if("TEXT")
+ var/replytext = href_list["replytext"]
+ log_text_poll_reply(pollid, replytext)
+ if("NUMVAL")
+ var/id_min = text2num(href_list["minid"])
+ var/id_max = text2num(href_list["maxid"])
+
+ if( (id_max - id_min) > 100 ) //Basic exploit prevention
+ to_chat(usr, "The option ID difference is too big. Please contact administration or the database admin.")
+ return
+
+ for(var/optionid = id_min; optionid <= id_max; optionid++)
+ if(!isnull(href_list["o[optionid]"])) //Test if this optionid was replied to
+ var/rating
+ if(href_list["o[optionid]"] == "abstain")
+ rating = null
+ else
+ rating = text2num(href_list["o[optionid]"])
+ if(!isnum(rating))
+ return
+
+ vote_on_numval_poll(pollid, optionid, rating)
+ if("MULTICHOICE")
+ var/id_min = text2num(href_list["minoptionid"])
+ var/id_max = text2num(href_list["maxoptionid"])
+
+ if( (id_max - id_min) > 100 ) //Basic exploit prevention
+ to_chat(usr, "The option ID difference is too big. Please contact administration or the database admin.")
+ return
+
+ for(var/optionid = id_min; optionid <= id_max; optionid++)
+ if(!isnull(href_list["option_[optionid]"])) //Test if this optionid was selected
+ vote_on_poll(pollid, optionid, 1)
+
+/mob/new_player/proc/IsJobAvailable(rank)
+ var/datum/job/job = job_master.GetJob(rank)
+ if(!job) return 0
+ if(!job.is_position_available()) return 0
+ if(jobban_isbanned(src,rank)) return 0
+ if(!is_job_whitelisted(src, rank)) return 0
+ if(!job.player_old_enough(src.client)) return 0
+ if(config.assistantlimit)
+ if(job.title == "Civilian")
+ var/count = 0
+ var/datum/job/officer = job_master.GetJob("Security Officer")
+ var/datum/job/warden = job_master.GetJob("Warden")
+ var/datum/job/hos = job_master.GetJob("Head of Security")
+ count += (officer.current_positions + warden.current_positions + hos.current_positions)
+ if(job.current_positions > (config.assistantratio * count))
+ if(count >= 5) // if theres more than 5 security on the station just let assistants join regardless, they should be able to handle the tide
+ return 1
+ return 0
+ return 1
- proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message)
- if (ticker.current_state == GAME_STATE_PLAYING)
- var/ailist[] = list()
- for (var/mob/living/silicon/ai/A in living_mob_list)
- ailist += A
- if (ailist.len)
- var/mob/living/silicon/ai/announcer = pick(ailist)
- if(character.mind)
- if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
- if(character.mind.role_alt_title)
- rank = character.mind.role_alt_title
- var/arrivalmessage = announcer.arrivalmsg
- arrivalmessage = replacetext(arrivalmessage,"$name",character.real_name)
- arrivalmessage = replacetext(arrivalmessage,"$rank",rank ? "[rank]" : "visitor")
- arrivalmessage = replacetext(arrivalmessage,"$species",character.species.name)
- arrivalmessage = replacetext(arrivalmessage,"$age",num2text(character.age))
- arrivalmessage = replacetext(arrivalmessage,"$gender",character.gender == FEMALE ? "Female" : "Male")
- announcer.say(";[arrivalmessage]")
- else
- if(character.mind)
- if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
- if(character.mind.role_alt_title)
- rank = character.mind.role_alt_title
- global_announcer.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
-
- proc/AnnounceCyborg(var/mob/living/character, var/rank, var/join_message)
- if (ticker.current_state == GAME_STATE_PLAYING)
- var/ailist[] = list()
- for (var/mob/living/silicon/ai/A in living_mob_list)
- ailist += A
- if (ailist.len)
- var/mob/living/silicon/ai/announcer = pick(ailist)
- if(character.mind)
- if((character.mind.special_role != "MODE"))
- var/arrivalmessage = "A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"]."
- announcer.say(";[arrivalmessage]")
- else
- if(character.mind)
- if((character.mind.special_role != "MODE"))
- // can't use their name here, since cyborg namepicking is done post-spawn, so we'll just say "A new Cyborg has arrived"/"A new Android has arrived"/etc.
- global_announcer.autosay("A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
-
- proc/LateChoices()
- var/mills = world.time // 1/10 of a second, not real milliseconds but whatever
- //var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
- var/mins = (mills % 36000) / 600
- var/hours = mills / 36000
-
- var/dat = ""
- dat += "Round Duration: [round(hours)]h [round(mins)]m
"
-
- if(shuttle_master.emergency.mode >= SHUTTLE_ESCAPE)
- dat += "The station has been evacuated.
"
- else if(shuttle_master.emergency.mode >= SHUTTLE_CALL)
- dat += "The station is currently undergoing evacuation procedures.
"
-
- dat += "Choose from the following open positions:
"
- for(var/datum/job/job in job_master.occupations)
- if(job && IsJobAvailable(job.title))
- var/active = 0
- // Only players with the job assigned and AFK for less than 10 minutes count as active
- for(var/mob/M in player_list) if(M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
- active++
- dat += "[job.title] ([job.current_positions]) (Active: [active])
"
-
- dat += ""
- // Removing the old window method but leaving it here for reference
-// src << browse(dat, "window=latechoices;size=300x640;can_close=1")
- // Added the new browser window method
- var/datum/browser/popup = new(src, "latechoices", "Choose Profession", 440, 500)
- popup.add_stylesheet("playeroptions", 'html/browser/playeroptions.css')
- popup.set_content(dat)
- popup.open(0) // 0 is passed to open so that it doesn't use the onclose() proc
-
- proc/create_character()
- spawning = 1
- close_spawn_windows()
-
- var/mob/living/carbon/human/new_character
-
- var/datum/species/chosen_species
- if(client.prefs.species)
- chosen_species = all_species[client.prefs.species]
- if(chosen_species)
- // Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
- if(is_species_whitelisted(chosen_species) || has_admin_rights())
- new_character = new(loc, client.prefs.species)
-
- if(!new_character)
- new_character = new(loc)
-
- new_character.lastarea = get_area(loc)
-
- var/datum/language/chosen_language
- if(client.prefs.language)
- chosen_language = all_languages[client.prefs.language]
- if(chosen_language)
- if(is_alien_whitelisted(src, client.prefs.language) || !config.usealienwhitelist || !(chosen_language.flags & WHITELISTED))
- new_character.add_language(client.prefs.language)
- if(ticker.random_players || appearance_isbanned(new_character))
- client.prefs.random_character()
- client.prefs.real_name = random_name(new_character.gender)
- client.prefs.copy_to(new_character)
-
- src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
-
- if(mind)
- mind.active = 0 //we wish to transfer the key manually
- if(mind.assigned_role == "Clown") //give them a clownname if they are a clown
- new_character.real_name = pick(clown_names) //I hate this being here of all places but unfortunately dna is based on real_name!
- new_character.rename_self("clown")
- else if(new_character.species == "Diona")
- new_character.real_name = pick(diona_names) //I hate this being here of all places but unfortunately dna is based on real_name!
- new_character.rename_self("diona")
- mind.original = new_character
- mind.transfer_to(new_character) //won't transfer key since the mind is not active
-
- new_character.name = real_name
- new_character.dna.ready_dna(new_character)
- new_character.dna.b_type = client.prefs.b_type
-
- if(client.prefs.disabilities & DISABILITY_FLAG_NEARSIGHTED)
- new_character.dna.SetSEState(GLASSESBLOCK,1,1)
- new_character.disabilities |= NEARSIGHTED
-
- if(client.prefs.disabilities & DISABILITY_FLAG_FAT)
- new_character.mutations += FAT
- new_character.overeatduration = 600 // Max overeat
-
- if(client.prefs.disabilities & DISABILITY_FLAG_EPILEPTIC)
- new_character.dna.SetSEState(EPILEPSYBLOCK,1,1)
- new_character.disabilities |= EPILEPSY
-
- if(client.prefs.disabilities & DISABILITY_FLAG_DEAF)
- new_character.dna.SetSEState(DEAFBLOCK,1,1)
- new_character.sdisabilities |= DEAF
-
- if(client.prefs.disabilities & DISABILITY_FLAG_BLIND)
- new_character.dna.SetSEState(BLINDBLOCK,1,1)
- new_character.sdisabilities |= BLIND
-
- if(client.prefs.disabilities & DISABILITY_FLAG_MUTE)
- new_character.dna.SetSEState(MUTEBLOCK,1,1)
- new_character.sdisabilities |= MUTE
-
- chosen_species.handle_dna(new_character)
-
- domutcheck(new_character)
- new_character.dna.UpdateSE()
- new_character.sync_organ_dna(1) //just fucking incase I guess
-
- // Do the initial caching of the player's body icons.
- new_character.force_update_limbs()
- new_character.update_eyes()
- new_character.regenerate_icons()
-
- new_character.key = key //Manually transfer the key to log them in
-
- return new_character
-
- proc/ViewManifest()
- var/dat = ""
- dat += "Crew Manifest
"
- dat += data_core.get_manifest(OOC = 1)
-
- src << browse(dat, "window=manifest;size=370x420;can_close=1")
-
- Move()
+/mob/new_player/proc/AttemptLateSpawn(rank,var/spawning_at)
+ if (src != usr)
+ return 0
+ if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
+ to_chat(usr, "\red The round is either not ready, or has already finished...")
+ return 0
+ if(!enter_allowed)
+ to_chat(usr, "\blue There is an administrative lock on entering the game!")
+ return 0
+ if(!IsJobAvailable(rank))
+ to_chat(src, alert("[rank] is not available. Please try another."))
return 0
+ job_master.AssignRole(src, rank, 1)
- proc/close_spawn_windows()
+ var/mob/living/character = create_character() //creates the human and transfers vars and mind
+ character = job_master.EquipRank(character, rank, 1) //equips the human
+ EquipCustomItems(character)
- src << browse(null, "window=latechoices") //closes late choices window
- src << browse(null, "window=playersetup") //closes the player setup window
- src << browse(null, "window=preferences") //closes job selection
- src << browse(null, "window=mob_occupation")
- src << browse(null, "window=latechoices") //closes late job selection
+ // AIs don't need a spawnpoint, they must spawn at an empty core
+ if(character.mind.assigned_role == "AI")
+
+ character = character.AIize(move=0) // AIize the character, but don't move them yet
+
+ // IsJobAvailable for AI checks that there is an empty core available in this list
+ var/obj/structure/AIcore/deactivated/C = empty_playable_ai_cores[1]
+ empty_playable_ai_cores -= C
+
+ character.loc = C.loc
+
+ AnnounceCyborg(character, rank, "has been downloaded to the empty core in \the [get_area(character)]")
+ ticker.mode.latespawn(character)
+
+ qdel(C)
+ qdel(src)
+ return
+
+ //Find our spawning point.
+ var/join_message
+ var/datum/spawnpoint/S
+
+ if(spawning_at)
+ S = spawntypes[spawning_at]
+
+ if(S && istype(S))
+ if(S.check_job_spawning(rank))
+ character.loc = pick(S.turfs)
+ join_message = S.msg
+ else
+ to_chat(character, "Your chosen spawnpoint ([S.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")
+ character.loc = pick(latejoin)
+ join_message = "has arrived on the station"
+ else
+ character.loc = pick(latejoin)
+ join_message = "has arrived on the station"
+
+ character.lastarea = get_area(loc)
+ // Moving wheelchair if they have one
+ if(character.buckled && istype(character.buckled, /obj/structure/stool/bed/chair/wheelchair))
+ character.buckled.loc = character.loc
+ character.buckled.dir = character.dir
+
+ ticker.mode.latespawn(character)
+
+ if(character.mind.assigned_role != "Cyborg")
+ data_core.manifest_inject(character)
+ ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc. //TODO!!!!! ~Carn
+ AnnounceArrival(character, rank, join_message)
+ callHook("latespawn", list(character))
+ else
+ AnnounceCyborg(character, rank, join_message)
+ callHook("latespawn", list(character))
+ qdel(src)
- proc/has_admin_rights()
- return check_rights(R_ADMIN, 0, src)
+/mob/new_player/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank, var/join_message)
+ if (ticker.current_state == GAME_STATE_PLAYING)
+ var/ailist[] = list()
+ for (var/mob/living/silicon/ai/A in living_mob_list)
+ ailist += A
+ if (ailist.len)
+ var/mob/living/silicon/ai/announcer = pick(ailist)
+ if(character.mind)
+ if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
+ if(character.mind.role_alt_title)
+ rank = character.mind.role_alt_title
+ var/arrivalmessage = announcer.arrivalmsg
+ arrivalmessage = replacetext(arrivalmessage,"$name",character.real_name)
+ arrivalmessage = replacetext(arrivalmessage,"$rank",rank ? "[rank]" : "visitor")
+ arrivalmessage = replacetext(arrivalmessage,"$species",character.species.name)
+ arrivalmessage = replacetext(arrivalmessage,"$age",num2text(character.age))
+ arrivalmessage = replacetext(arrivalmessage,"$gender",character.gender == FEMALE ? "Female" : "Male")
+ announcer.say(";[arrivalmessage]")
+ else
+ if(character.mind)
+ if((character.mind.assigned_role != "Cyborg") && (character.mind.special_role != "MODE"))
+ if(character.mind.role_alt_title)
+ rank = character.mind.role_alt_title
+ global_announcer.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
- proc/is_species_whitelisted(datum/species/S)
- if(!S) return 1
- return is_alien_whitelisted(src, S.name) || !config.usealienwhitelist || !(S.flags & IS_WHITELISTED)
+/mob/new_player/proc/AnnounceCyborg(var/mob/living/character, var/rank, var/join_message)
+ if (ticker.current_state == GAME_STATE_PLAYING)
+ var/ailist[] = list()
+ for (var/mob/living/silicon/ai/A in living_mob_list)
+ ailist += A
+ if (ailist.len)
+ var/mob/living/silicon/ai/announcer = pick(ailist)
+ if(character.mind)
+ if((character.mind.special_role != "MODE"))
+ var/arrivalmessage = "A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"]."
+ announcer.say(";[arrivalmessage]")
+ else
+ if(character.mind)
+ if((character.mind.special_role != "MODE"))
+ // can't use their name here, since cyborg namepicking is done post-spawn, so we'll just say "A new Cyborg has arrived"/"A new Android has arrived"/etc.
+ global_announcer.autosay("A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
+
+/mob/new_player/proc/LateChoices()
+ var/mills = world.time // 1/10 of a second, not real milliseconds but whatever
+ //var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
+ var/mins = (mills % 36000) / 600
+ var/hours = mills / 36000
+
+ var/dat = ""
+ dat += "Round Duration: [round(hours)]h [round(mins)]m
"
+
+ if(shuttle_master.emergency.mode >= SHUTTLE_ESCAPE)
+ dat += "The station has been evacuated.
"
+ else if(shuttle_master.emergency.mode >= SHUTTLE_CALL)
+ dat += "The station is currently undergoing evacuation procedures.
"
+
+ dat += "Choose from the following open positions:
"
+ for(var/datum/job/job in job_master.occupations)
+ if(job && IsJobAvailable(job.title))
+ var/active = 0
+ // Only players with the job assigned and AFK for less than 10 minutes count as active
+ for(var/mob/M in player_list) if(M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
+ active++
+ dat += "[job.title] ([job.current_positions]) (Active: [active])
"
+
+ dat += ""
+ // Removing the old window method but leaving it here for reference
+// src << browse(dat, "window=latechoices;size=300x640;can_close=1")
+ // Added the new browser window method
+ var/datum/browser/popup = new(src, "latechoices", "Choose Profession", 440, 500)
+ popup.add_stylesheet("playeroptions", 'html/browser/playeroptions.css')
+ popup.set_content(dat)
+ popup.open(0) // 0 is passed to open so that it doesn't use the onclose() proc
+
+/mob/new_player/proc/create_character()
+ spawning = 1
+ close_spawn_windows()
+
+ check_prefs_are_sane()
+ var/mob/living/carbon/human/new_character = new(loc)
+ new_character.lastarea = get_area(loc)
+
+ if(ticker.random_players || appearance_isbanned(new_character))
+ client.prefs.random_character()
+ client.prefs.real_name = random_name(client.prefs.gender)
+ client.prefs.copy_to(new_character)
+
+ to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS cant last forever yo
+
+
+ if(mind)
+ mind.active = 0 //we wish to transfer the key manually
+ if(mind.assigned_role == "Clown") //give them a clownname if they are a clown
+ new_character.real_name = pick(clown_names) //I hate this being here of all places but unfortunately dna is based on real_name!
+ new_character.rename_self("clown")
+ else if(new_character.species == "Diona")
+ new_character.real_name = pick(diona_names) //I hate this being here of all places but unfortunately dna is based on real_name!
+ new_character.rename_self("diona")
+ mind.original = new_character
+ mind.transfer_to(new_character) //won't transfer key since the mind is not active
+
+
+ new_character.key = key //Manually transfer the key to log them in
+
+ return new_character
+
+// This is to check that the player only has preferences set that they're supposed to
+/mob/new_player/proc/check_prefs_are_sane()
+ var/datum/species/chosen_species
+ if(client.prefs.species)
+ chosen_species = all_species[client.prefs.species]
+ if(!(chosen_species && (is_species_whitelisted(chosen_species) || has_admin_rights())))
+ // Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
+ log_to_dd("[src] had species [client.prefs.species], though they weren't supposed to. Setting to Human.")
+ client.prefs.species = "Human"
+
+ var/datum/language/chosen_language
+ if(client.prefs.language)
+ chosen_language = all_languages[client.prefs.language]
+ if(!((chosen_language || client.prefs.language == "None") && (is_alien_whitelisted(src, client.prefs.language) || !config.usealienwhitelist || !(chosen_language.flags & WHITELISTED))))
+ log_to_dd("[src] had language [client.prefs.language], though they weren't supposed to. Setting to None.")
+ client.prefs.language = "None"
+
+/mob/new_player/proc/ViewManifest()
+ var/dat = ""
+ dat += "Crew Manifest
"
+ dat += data_core.get_manifest(OOC = 1)
+
+ src << browse(dat, "window=manifest;size=370x420;can_close=1")
+
+/mob/new_player/Move()
+ return 0
+
+
+/mob/new_player/proc/close_spawn_windows()
+ src << browse(null, "window=latechoices") //closes late choices window
+ src << browse(null, "window=playersetup") //closes the player setup window
+ src << browse(null, "window=preferences") //closes job selection
+ src << browse(null, "window=mob_occupation")
+ src << browse(null, "window=latechoices") //closes late job selection
+
+
+/mob/new_player/proc/has_admin_rights()
+ return check_rights(R_ADMIN, 0, src)
+
+/mob/new_player/proc/is_species_whitelisted(datum/species/S)
+ if(!S) return 1
+ return is_alien_whitelisted(src, S.name) || !config.usealienwhitelist || !(S.flags & IS_WHITELISTED)
/mob/new_player/get_species()
var/datum/species/chosen_species
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index d9e240936d7..4ce44be1fd8 100644
--- a/code/modules/mob/new_player/poll.dm
+++ b/code/modules/mob/new_player/poll.dm
@@ -59,7 +59,7 @@
break
if(!found)
- usr << "\red Poll question details not found."
+ to_chat(usr, "\red Poll question details not found.")
return
switch(polltype)
@@ -316,7 +316,7 @@
break
if(!validpoll)
- usr << "\red Poll is not valid."
+ to_chat(usr, "\red Poll is not valid.")
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
@@ -329,7 +329,7 @@
break
if(!validoption)
- usr << "\red Poll option is not valid."
+ to_chat(usr, "\red Poll option is not valid.")
return
var/alreadyvoted = 0
@@ -343,11 +343,11 @@
break
if(!multichoice && alreadyvoted)
- usr << "\red You already voted in this poll."
+ to_chat(usr, "\red You already voted in this poll.")
return
if(multichoice && (alreadyvoted >= multiplechoiceoptions))
- usr << "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error."
+ to_chat(usr, "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.")
return
var/adminrank = "Player"
@@ -358,7 +358,7 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
insert_query.Execute()
- usr << "\blue Vote successful."
+ to_chat(usr, "\blue Vote successful.")
usr << browse(null,"window=playerpoll")
@@ -383,7 +383,7 @@
break
if(!validpoll)
- usr << "\red Poll is not valid."
+ to_chat(usr, "\red Poll is not valid.")
return
var/alreadyvoted = 0
@@ -396,7 +396,7 @@
break
if(alreadyvoted)
- usr << "\red You already sent your feedback for this poll."
+ to_chat(usr, "\red You already sent your feedback for this poll.")
return
var/adminrank = "Player"
@@ -410,13 +410,13 @@
replytext = replacetext(replytext, "%BR%", "
")
if(!text_pass)
- usr << "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again."
+ to_chat(usr, "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again.")
return
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_textreply")] (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
insert_query.Execute()
- usr << "\blue Feedback logging successful."
+ to_chat(usr, "\blue Feedback logging successful.")
usr << browse(null,"window=playerpoll")
@@ -441,7 +441,7 @@
break
if(!validpoll)
- usr << "\red Poll is not valid."
+ to_chat(usr, "\red Poll is not valid.")
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
@@ -454,7 +454,7 @@
break
if(!validoption)
- usr << "\red Poll option is not valid."
+ to_chat(usr, "\red Poll option is not valid.")
return
var/alreadyvoted = 0
@@ -467,7 +467,7 @@
break
if(alreadyvoted)
- usr << "\red You already voted in this poll."
+ to_chat(usr, "\red You already voted in this poll.")
return
var/adminrank = "Player"
@@ -478,5 +478,5 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])")
insert_query.Execute()
- usr << "\blue Vote successful."
+ to_chat(usr, "\blue Vote successful.")
usr << browse(null,"window=playerpoll")
\ No newline at end of file
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index e8b9f948ee7..3bd2672d612 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -1,849 +1,851 @@
-datum/preferences
+/datum/preferences
//The mob should have a gender you want before running this proc. Will run fine without H
- proc/random_character(gender_override)
- if(gender_override)
- gender = gender_override
+/datum/preferences/proc/random_character(gender_override)
+ if(gender_override)
+ gender = gender_override
+ else
+ gender = pick(MALE, FEMALE)
+ underwear = random_underwear(gender, species)
+ undershirt = random_undershirt(gender, species)
+ socks = random_socks(gender, species)
+ if(species == "Human")
+ s_tone = random_skin_tone()
+ h_style = random_hair_style(gender, species)
+ f_style = random_facial_hair_style(gender, species)
+ if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine" || species == "Vulpkanin")
+ randomize_hair_color("hair")
+ randomize_hair_color("facial")
+ randomize_eyes_color()
+ if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Vulpkanin")
+ randomize_skin_color()
+ backbag = 2
+ age = rand(AGE_MIN,AGE_MAX)
+
+
+/datum/preferences/proc/randomize_hair_color(var/target = "hair")
+ if(prob (75) && target == "facial") // Chance to inherit hair color
+ r_facial = r_hair
+ g_facial = g_hair
+ b_facial = b_hair
+ return
+
+ var/red
+ var/green
+ var/blue
+
+ var/col = pick ("blonde", "black", "chestnut", "copper", "brown", "wheat", "old", "punk")
+ switch(col)
+ if("blonde")
+ red = 255
+ green = 255
+ blue = 0
+ if("black")
+ red = 0
+ green = 0
+ blue = 0
+ if("chestnut")
+ red = 153
+ green = 102
+ blue = 51
+ if("copper")
+ red = 255
+ green = 153
+ blue = 0
+ if("brown")
+ red = 102
+ green = 51
+ blue = 0
+ if("wheat")
+ red = 255
+ green = 255
+ blue = 153
+ if("old")
+ red = rand (100, 255)
+ green = red
+ blue = red
+ if("punk")
+ red = rand (0, 255)
+ green = rand (0, 255)
+ blue = rand (0, 255)
+
+ red = max(min(red + rand (-25, 25), 255), 0)
+ green = max(min(green + rand (-25, 25), 255), 0)
+ blue = max(min(blue + rand (-25, 25), 255), 0)
+
+ switch(target)
+ if("hair")
+ r_hair = red
+ g_hair = green
+ b_hair = blue
+ if("facial")
+ r_facial = red
+ g_facial = green
+ b_facial = blue
+
+/datum/preferences/proc/randomize_eyes_color()
+ var/red
+ var/green
+ var/blue
+
+ var/col = pick ("black", "grey", "brown", "chestnut", "blue", "lightblue", "green", "albino")
+ switch(col)
+ if("black")
+ red = 0
+ green = 0
+ blue = 0
+ if("grey")
+ red = rand (100, 200)
+ green = red
+ blue = red
+ if("brown")
+ red = 102
+ green = 51
+ blue = 0
+ if("chestnut")
+ red = 153
+ green = 102
+ blue = 0
+ if("blue")
+ red = 51
+ green = 102
+ blue = 204
+ if("lightblue")
+ red = 102
+ green = 204
+ blue = 255
+ if("green")
+ red = 0
+ green = 102
+ blue = 0
+ if("albino")
+ red = rand (200, 255)
+ green = rand (0, 150)
+ blue = rand (0, 150)
+
+ red = max(min(red + rand (-25, 25), 255), 0)
+ green = max(min(green + rand (-25, 25), 255), 0)
+ blue = max(min(blue + rand (-25, 25), 255), 0)
+
+ r_eyes = red
+ g_eyes = green
+ b_eyes = blue
+
+/datum/preferences/proc/randomize_skin_color()
+ var/red
+ var/green
+ var/blue
+
+ var/col = pick ("black", "grey", "brown", "chestnut", "blue", "lightblue", "green", "albino")
+ switch(col)
+ if("black")
+ red = 0
+ green = 0
+ blue = 0
+ if("grey")
+ red = rand (100, 200)
+ green = red
+ blue = red
+ if("brown")
+ red = 102
+ green = 51
+ blue = 0
+ if("chestnut")
+ red = 153
+ green = 102
+ blue = 0
+ if("blue")
+ red = 51
+ green = 102
+ blue = 204
+ if("lightblue")
+ red = 102
+ green = 204
+ blue = 255
+ if("green")
+ red = 0
+ green = 102
+ blue = 0
+ if("albino")
+ red = rand (200, 255)
+ green = rand (0, 150)
+ blue = rand (0, 150)
+
+ red = max(min(red + rand (-25, 25), 255), 0)
+ green = max(min(green + rand (-25, 25), 255), 0)
+ blue = max(min(blue + rand (-25, 25), 255), 0)
+
+ r_skin = red
+ g_skin = green
+ b_skin = blue
+
+/datum/preferences/proc/blend_backpack(var/icon/clothes_s,var/backbag,var/satchel,var/backpack="backpack")
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', backpack), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', satchel), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ return clothes_s
+
+/datum/preferences/proc/update_preview_icon(var/for_observer=0) //seriously. This is horrendous.
+ qdel(preview_icon_front)
+ qdel(preview_icon_side)
+ qdel(preview_icon)
+
+ var/g = "m"
+ if(gender == FEMALE) g = "f"
+
+ var/icon/icobase
+ var/datum/species/current_species = all_species[species]
+
+ if(current_species)
+ icobase = current_species.icobase
+ else
+ icobase = 'icons/mob/human_races/r_human.dmi'
+
+ var/fat=""
+ if(disabilities&DISABILITY_FLAG_FAT && current_species.flags & CAN_BE_FAT)
+ fat="_fat"
+ preview_icon = new /icon(icobase, "torso_[g][fat]")
+ preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
+ preview_icon.Blend(new /icon(icobase, "head_[g]"), ICON_OVERLAY)
+
+ //Tail
+ if(current_species && (current_species.bodyflags & HAS_TAIL))
+ var/tail_icon
+ var/tail_icon_state
+
+ if(body_accessory)
+ var/datum/body_accessory/accessory = body_accessory_by_name[body_accessory]
+ tail_icon = accessory.icon
+ tail_icon_state = accessory.icon_state
else
- gender = pick(MALE, FEMALE)
- underwear = random_underwear(gender, species)
- undershirt = random_undershirt(gender, species)
- socks = random_socks(gender, species)
- if(species == "Human")
- s_tone = random_skin_tone()
- h_style = random_hair_style(gender, species)
- f_style = random_facial_hair_style(gender, species)
- if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine" || species == "Vulpkanin")
- randomize_hair_color("hair")
- randomize_hair_color("facial")
- randomize_eyes_color()
- if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Vulpkanin")
- randomize_skin_color()
- backbag = 2
- age = rand(AGE_MIN,AGE_MAX)
+ tail_icon = "icons/effects/species.dmi"
+ tail_icon_state = "[current_species.tail]_s"
+ var/icon/temp = new /icon("icon" = tail_icon, "icon_state" = tail_icon_state)
+ preview_icon.Blend(temp, ICON_OVERLAY)
- proc/randomize_hair_color(var/target = "hair")
- if(prob (75) && target == "facial") // Chance to inherit hair color
- r_facial = r_hair
- g_facial = g_hair
- b_facial = b_hair
- return
+ for(var/name in list("chest", "groin", "head", "r_arm", "r_hand", "r_leg", "r_foot", "l_leg", "l_foot", "l_arm", "l_hand"))
+ if(organ_data[name] == "amputated") continue
+ if(organ_data[name] == "cyborg")
+ var/datum/robolimb/R
+ if(rlimb_data[name]) R = all_robolimbs[rlimb_data[name]]
+ if(!R) R = basic_robolimb
+ if(name == "chest")
+ name = "torso"
+ preview_icon.Blend(icon(R.icon, "[name]"), ICON_OVERLAY) // This doesn't check gendered_icon. Not an issue while only limbs can be robotic.
+ continue
+ preview_icon.Blend(new /icon(icobase, "[name]"), ICON_OVERLAY)
- var/red
- var/green
- var/blue
+ // Skin color
+ if(current_species && (current_species.bodyflags & HAS_SKIN_COLOR))
+ preview_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
- var/col = pick ("blonde", "black", "chestnut", "copper", "brown", "wheat", "old", "punk")
- switch(col)
- if("blonde")
- red = 255
- green = 255
- blue = 0
- if("black")
- red = 0
- green = 0
- blue = 0
- if("chestnut")
- red = 153
- green = 102
- blue = 51
- if("copper")
- red = 255
- green = 153
- blue = 0
- if("brown")
- red = 102
- green = 51
- blue = 0
- if("wheat")
- red = 255
- green = 255
- blue = 153
- if("old")
- red = rand (100, 255)
- green = red
- blue = red
- if("punk")
- red = rand (0, 255)
- green = rand (0, 255)
- blue = rand (0, 255)
-
- red = max(min(red + rand (-25, 25), 255), 0)
- green = max(min(green + rand (-25, 25), 255), 0)
- blue = max(min(blue + rand (-25, 25), 255), 0)
-
- switch(target)
- if("hair")
- r_hair = red
- g_hair = green
- b_hair = blue
- if("facial")
- r_facial = red
- g_facial = green
- b_facial = blue
-
- proc/randomize_eyes_color()
- var/red
- var/green
- var/blue
-
- var/col = pick ("black", "grey", "brown", "chestnut", "blue", "lightblue", "green", "albino")
- switch(col)
- if("black")
- red = 0
- green = 0
- blue = 0
- if("grey")
- red = rand (100, 200)
- green = red
- blue = red
- if("brown")
- red = 102
- green = 51
- blue = 0
- if("chestnut")
- red = 153
- green = 102
- blue = 0
- if("blue")
- red = 51
- green = 102
- blue = 204
- if("lightblue")
- red = 102
- green = 204
- blue = 255
- if("green")
- red = 0
- green = 102
- blue = 0
- if("albino")
- red = rand (200, 255)
- green = rand (0, 150)
- blue = rand (0, 150)
-
- red = max(min(red + rand (-25, 25), 255), 0)
- green = max(min(green + rand (-25, 25), 255), 0)
- blue = max(min(blue + rand (-25, 25), 255), 0)
-
- r_eyes = red
- g_eyes = green
- b_eyes = blue
-
- proc/randomize_skin_color()
- var/red
- var/green
- var/blue
-
- var/col = pick ("black", "grey", "brown", "chestnut", "blue", "lightblue", "green", "albino")
- switch(col)
- if("black")
- red = 0
- green = 0
- blue = 0
- if("grey")
- red = rand (100, 200)
- green = red
- blue = red
- if("brown")
- red = 102
- green = 51
- blue = 0
- if("chestnut")
- red = 153
- green = 102
- blue = 0
- if("blue")
- red = 51
- green = 102
- blue = 204
- if("lightblue")
- red = 102
- green = 204
- blue = 255
- if("green")
- red = 0
- green = 102
- blue = 0
- if("albino")
- red = rand (200, 255)
- green = rand (0, 150)
- blue = rand (0, 150)
-
- red = max(min(red + rand (-25, 25), 255), 0)
- green = max(min(green + rand (-25, 25), 255), 0)
- blue = max(min(blue + rand (-25, 25), 255), 0)
-
- r_skin = red
- g_skin = green
- b_skin = blue
-
- proc/blend_backpack(var/icon/clothes_s,var/backbag,var/satchel,var/backpack="backpack")
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', backpack), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', satchel), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- return clothes_s
-
- proc/update_preview_icon(var/for_observer=0) //seriously. This is horrendous.
- qdel(preview_icon_front)
- qdel(preview_icon_side)
- qdel(preview_icon)
-
- var/g = "m"
- if(gender == FEMALE) g = "f"
-
- var/icon/icobase
- var/datum/species/current_species = all_species[species]
-
- if(current_species)
- icobase = current_species.icobase
+ // Skin tone
+ if(current_species && (current_species.bodyflags & HAS_SKIN_TONE))
+ if (s_tone >= 0)
+ preview_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
else
- icobase = 'icons/mob/human_races/r_human.dmi'
+ preview_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
- var/fat=""
- if(disabilities&DISABILITY_FLAG_FAT && current_species.flags & CAN_BE_FAT)
- fat="_fat"
- preview_icon = new /icon(icobase, "torso_[g][fat]")
- preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
- preview_icon.Blend(new /icon(icobase, "head_[g]"), ICON_OVERLAY)
-
- //Tail
- if(current_species && (current_species.bodyflags & HAS_TAIL))
- var/tail_icon
- var/tail_icon_state
-
- if(body_accessory)
- var/datum/body_accessory/accessory = body_accessory_by_name[body_accessory]
- tail_icon = accessory.icon
- tail_icon_state = accessory.icon_state
- else
- tail_icon = "icons/effects/species.dmi"
- tail_icon_state = "[current_species.tail]_s"
-
- var/icon/temp = new /icon("icon" = tail_icon, "icon_state" = tail_icon_state)
- preview_icon.Blend(temp, ICON_OVERLAY)
-
- for(var/name in list("r_arm","r_hand","r_leg","r_foot","l_leg","l_foot","l_arm","l_hand"))
- if(organ_data[name] == "amputated") continue
- if(organ_data[name] == "cyborg")
- var/datum/robolimb/R
- if(rlimb_data[name]) R = all_robolimbs[rlimb_data[name]]
- if(!R) R = basic_robolimb
- preview_icon.Blend(icon(R.icon, "[name]"), ICON_OVERLAY) // This doesn't check gendered_icon. Not an issue while only limbs can be robotic.
- continue
- preview_icon.Blend(new /icon(icobase, "[name]"), ICON_OVERLAY)
-
- // Skin color
- if(current_species && (current_species.bodyflags & HAS_SKIN_COLOR))
- preview_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
-
- // Skin tone
- if(current_species && (current_species.bodyflags & HAS_SKIN_TONE))
- if (s_tone >= 0)
- preview_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
- else
- preview_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
-
- //Body Markings
- if(current_species && (current_species.bodyflags & HAS_MARKINGS))
- var/datum/sprite_accessory/marking_style = marking_styles_list[m_style]
- if(marking_style && marking_style.species_allowed)
- var/icon/markings_s = new/icon("icon" = marking_style.icon, "icon_state" = "[marking_style.icon_state]_s")
- markings_s.Blend(rgb(r_markings, g_markings, b_markings), ICON_ADD)
- preview_icon.Blend(markings_s, ICON_OVERLAY)
+ //Body Markings
+ if(current_species && (current_species.bodyflags & HAS_MARKINGS))
+ var/datum/sprite_accessory/marking_style = marking_styles_list[m_style]
+ if(marking_style && marking_style.species_allowed)
+ var/icon/markings_s = new/icon("icon" = marking_style.icon, "icon_state" = "[marking_style.icon_state]_s")
+ markings_s.Blend(rgb(r_markings, g_markings, b_markings), ICON_ADD)
+ preview_icon.Blend(markings_s, ICON_OVERLAY)
- var/icon/face_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "bald_s")
- if(!(current_species.bodyflags & NO_EYES))
- var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = current_species ? current_species.eyes : "eyes_s")
- eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
- face_s.Blend(eyes_s, ICON_OVERLAY)
+ var/icon/face_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "bald_s")
+ if(!(current_species.bodyflags & NO_EYES))
+ var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = current_species ? current_species.eyes : "eyes_s")
+ eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+ face_s.Blend(eyes_s, ICON_OVERLAY)
- var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
- if(hair_style)
- var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
- if(current_species.name == "Slime People") // whee I am part of the problem
- hair_s.Blend(rgb(r_skin, g_skin, b_skin, 160), ICON_ADD)
- else
- hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
- face_s.Blend(hair_s, ICON_OVERLAY)
+ var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
+ if(hair_style)
+ var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+ if(current_species.name == "Slime People") // whee I am part of the problem
+ hair_s.Blend(rgb(r_skin, g_skin, b_skin, 160), ICON_ADD)
+ else
+ hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+ face_s.Blend(hair_s, ICON_OVERLAY)
- //Head Accessory
- if(current_species && (current_species.bodyflags & HAS_HEAD_ACCESSORY))
- var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[ha_style]
- if(head_accessory_style && head_accessory_style.species_allowed)
- var/icon/head_accessory_s = new/icon("icon" = head_accessory_style.icon, "icon_state" = "[head_accessory_style.icon_state]_s")
- head_accessory_s.Blend(rgb(r_headacc, g_headacc, b_headacc), ICON_ADD)
- face_s.Blend(head_accessory_s, ICON_OVERLAY)
+ //Head Accessory
+ if(current_species && (current_species.bodyflags & HAS_HEAD_ACCESSORY))
+ var/datum/sprite_accessory/head_accessory_style = head_accessory_styles_list[ha_style]
+ if(head_accessory_style && head_accessory_style.species_allowed)
+ var/icon/head_accessory_s = new/icon("icon" = head_accessory_style.icon, "icon_state" = "[head_accessory_style.icon_state]_s")
+ head_accessory_s.Blend(rgb(r_headacc, g_headacc, b_headacc), ICON_ADD)
+ face_s.Blend(head_accessory_s, ICON_OVERLAY)
- var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
- if(facial_hair_style && facial_hair_style.species_allowed)
- var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
- if(current_species.name == "Slime People") // whee I am part of the problem
- facial_s.Blend(rgb(r_skin, g_skin, b_skin, 160), ICON_ADD)
- else
- facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
- face_s.Blend(facial_s, ICON_OVERLAY)
+ var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
+ if(facial_hair_style && facial_hair_style.species_allowed)
+ var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
+ if(current_species.name == "Slime People") // whee I am part of the problem
+ facial_s.Blend(rgb(r_skin, g_skin, b_skin, 160), ICON_ADD)
+ else
+ facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+ face_s.Blend(facial_s, ICON_OVERLAY)
- var/icon/underwear_s = null
- if(underwear && (current_species.clothing_flags & HAS_UNDERWEAR))
- var/datum/sprite_accessory/underwear/U = underwear_list[underwear]
- if(U)
- underwear_s = new/icon(U.icon, "uw_[U.icon_state]_s", ICON_OVERLAY)
+ var/icon/underwear_s = null
+ if(underwear && (current_species.clothing_flags & HAS_UNDERWEAR))
+ var/datum/sprite_accessory/underwear/U = underwear_list[underwear]
+ if(U)
+ underwear_s = new/icon(U.icon, "uw_[U.icon_state]_s", ICON_OVERLAY)
- var/icon/undershirt_s = null
- if(undershirt && (current_species.clothing_flags & HAS_UNDERSHIRT))
- var/datum/sprite_accessory/undershirt/U2 = undershirt_list[undershirt]
- if(U2)
- undershirt_s = new/icon(U2.icon, "us_[U2.icon_state]_s", ICON_OVERLAY)
+ var/icon/undershirt_s = null
+ if(undershirt && (current_species.clothing_flags & HAS_UNDERSHIRT))
+ var/datum/sprite_accessory/undershirt/U2 = undershirt_list[undershirt]
+ if(U2)
+ undershirt_s = new/icon(U2.icon, "us_[U2.icon_state]_s", ICON_OVERLAY)
- var/icon/socks_s = null
- if(socks && (current_species.clothing_flags & HAS_SOCKS))
- var/datum/sprite_accessory/socks/U3 = socks_list[socks]
- if(U3)
- socks_s = new/icon(U3.icon, "sk_[U3.icon_state]_s", ICON_OVERLAY)
+ var/icon/socks_s = null
+ if(socks && (current_species.clothing_flags & HAS_SOCKS))
+ var/datum/sprite_accessory/socks/U3 = socks_list[socks]
+ if(U3)
+ socks_s = new/icon(U3.icon, "sk_[U3.icon_state]_s", ICON_OVERLAY)
- var/icon/clothes_s = null
- var/uniform_dmi='icons/mob/uniform.dmi'
- if(disabilities&DISABILITY_FLAG_FAT)
- uniform_dmi='icons/mob/uniform_fat.dmi'
- if(job_support_low & CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
- clothes_s = new /icon(uniform_dmi, "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(backbag == 2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- else if(backbag == 3 || backbag == 4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ var/icon/clothes_s = null
+ var/uniform_dmi='icons/mob/uniform.dmi'
+ if(disabilities&DISABILITY_FLAG_FAT)
+ uniform_dmi='icons/mob/uniform_fat.dmi'
+ if(job_support_low & CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
+ clothes_s = new /icon(uniform_dmi, "grey_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if(backbag == 2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ else if(backbag == 3 || backbag == 4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- else if(job_support_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
- switch(job_support_high)
- if(HOP)
- clothes_s = new /icon(uniform_dmi, "hop_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "ianshirt"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(BARTENDER)
- clothes_s = new /icon(uniform_dmi, "ba_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "tophat"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(BOTANIST)
- clothes_s = new /icon(uniform_dmi, "hydroponics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "nymph"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CHEF)
- clothes_s = new /icon(uniform_dmi, "chef_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "chefhat"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apronchef"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(JANITOR)
- clothes_s = new /icon(uniform_dmi, "janitor_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_janitor"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(LIBRARIAN)
- clothes_s = new /icon(uniform_dmi, "red_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hairflower"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(QUARTERMASTER)
- clothes_s = new /icon(uniform_dmi, "qm_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "poncho"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CARGOTECH)
- clothes_s = new /icon(uniform_dmi, "cargotech_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "flat_cap"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(MINER)
- clothes_s = new /icon(uniform_dmi, "miner_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "bearpelt"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(LAWYER)
- clothes_s = new /icon(uniform_dmi, "internalaffairs_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CHAPLAIN)
- clothes_s = new /icon(uniform_dmi, "chapblack_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "imperium_monk"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CLOWN)
- clothes_s = new /icon(uniform_dmi, "clown_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
- if(MIME)
- clothes_s = new /icon(uniform_dmi, "mime_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
- else if(job_medsci_high)
- switch(job_medsci_high)
- if(RD)
- clothes_s = new /icon(uniform_dmi, "director_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(SCIENTIST)
- clothes_s = new /icon(uniform_dmi, "toxinswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CHEMIST)
- clothes_s = new /icon(uniform_dmi, "chemistrywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labgreen"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CMO)
- clothes_s = new /icon(uniform_dmi, "cmo_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_cmo"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(DOCTOR)
- clothes_s = new /icon(uniform_dmi, "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(GENETICIST)
- clothes_s = new /icon(uniform_dmi, "geneticswhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "monkeysuit"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(VIROLOGIST)
- clothes_s = new /icon(uniform_dmi, "virologywhite_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(PSYCHIATRIST)
- clothes_s = new /icon(uniform_dmi, "psych_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(PARAMEDIC)
- clothes_s = new /icon(uniform_dmi, "paramedic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigoff"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "bluesoft"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
- if(ROBOTICIST)
- clothes_s = new /icon(uniform_dmi, "robotics_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
- else if(job_engsec_high)
- switch(job_engsec_high)
- if(CAPTAIN)
- clothes_s = new /icon(uniform_dmi, "captain_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "centcomcaptain"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(HOS)
- clothes_s = new /icon(uniform_dmi, "hosred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_hos"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(WARDEN)
- clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY)
- else
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(DETECTIVE)
- clothes_s = new /icon(uniform_dmi, "detective_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(OFFICER)
- clothes_s = new /icon(uniform_dmi, "secred_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_officer"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CHIEF)
- clothes_s = new /icon(uniform_dmi, "chief_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "blueprints"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(ENGINEER)
- clothes_s = new /icon(uniform_dmi, "engine_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hazard"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(ATMOSTECH)
- clothes_s = new /icon(uniform_dmi, "atmos_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- if(prob(1))
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "firesuit"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-
- if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
- clothes_s = new /icon(uniform_dmi, "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
- if(backbag == 2)
+ else if(job_support_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
+ switch(job_support_high)
+ if(HOP)
+ clothes_s = new /icon(uniform_dmi, "hop_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "ianshirt"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- else if(backbag == 3 || backbag == 4)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(CYBORG)
- clothes_s = new /icon(uniform_dmi, "grey_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
- if(backbag == 2)
+ if(BARTENDER)
+ clothes_s = new /icon(uniform_dmi, "ba_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "tophat"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- else if(backbag == 3 || backbag == 4)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- else if(job_karma_high)
- switch(job_karma_high)
- if(MECHANIC)
- clothes_s = new /icon(uniform_dmi, "mechanic_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(PILOT)
- clothes_s = new /icon(uniform_dmi, "secred_s")
+ if(BOTANIST)
+ clothes_s = new /icon(uniform_dmi, "hydroponics_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "nymph"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(CHEF)
+ clothes_s = new /icon(uniform_dmi, "chef_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "chefhat"), ICON_OVERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apronchef"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(JANITOR)
+ clothes_s = new /icon(uniform_dmi, "janitor_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_janitor"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(LIBRARIAN)
+ clothes_s = new /icon(uniform_dmi, "red_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "hairflower"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(QUARTERMASTER)
+ clothes_s = new /icon(uniform_dmi, "qm_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "poncho"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(CARGOTECH)
+ clothes_s = new /icon(uniform_dmi, "cargotech_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "flat_cap"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(MINER)
+ clothes_s = new /icon(uniform_dmi, "miner_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "bearpelt"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(LAWYER)
+ clothes_s = new /icon(uniform_dmi, "internalaffairs_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "briefcase"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(CHAPLAIN)
+ clothes_s = new /icon(uniform_dmi, "chapblack_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "imperium_monk"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(CLOWN)
+ clothes_s = new /icon(uniform_dmi, "clown_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
+ if(MIME)
+ clothes_s = new /icon(uniform_dmi, "mime_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+ else if(job_medsci_high)
+ switch(job_medsci_high)
+ if(RD)
+ clothes_s = new /icon(uniform_dmi, "director_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(SCIENTIST)
+ clothes_s = new /icon(uniform_dmi, "toxinswhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(CHEMIST)
+ clothes_s = new /icon(uniform_dmi, "chemistrywhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labgreen"), ICON_OVERLAY)
+ else
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(CMO)
+ clothes_s = new /icon(uniform_dmi, "cmo_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_cmo"), ICON_OVERLAY)
+ else
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(DOCTOR)
+ clothes_s = new /icon(uniform_dmi, "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY)
+ else
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(GENETICIST)
+ clothes_s = new /icon(uniform_dmi, "geneticswhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "monkeysuit"), ICON_OVERLAY)
+ else
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(VIROLOGIST)
+ clothes_s = new /icon(uniform_dmi, "virologywhite_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(PSYCHIATRIST)
+ clothes_s = new /icon(uniform_dmi, "psych_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(PARAMEDIC)
+ clothes_s = new /icon(uniform_dmi, "paramedic_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigoff"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "bluesoft"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ if(ROBOTICIST)
+ clothes_s = new /icon(uniform_dmi, "robotics_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+ else if(job_engsec_high)
+ switch(job_engsec_high)
+ if(CAPTAIN)
+ clothes_s = new /icon(uniform_dmi, "captain_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "centcomcaptain"), ICON_OVERLAY)
+ else
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(HOS)
+ clothes_s = new /icon(uniform_dmi, "hosred_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_hos"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(WARDEN)
+ clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY)
+ else
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(BRIGDOC)
- clothes_s = new /icon(uniform_dmi, "medical_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(NANO)
- clothes_s = new /icon(uniform_dmi, "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(BLUESHIELD)
- clothes_s = new /icon(uniform_dmi, "officer_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(JUDGE)
- clothes_s = new /icon(uniform_dmi, "really_black_suit_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/head.dmi', "mercy_hood"), ICON_UNDERLAY)
- clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_UNDERLAY)
- switch(backbag)
- if(2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- if(3)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
- if(4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(DETECTIVE)
+ clothes_s = new /icon(uniform_dmi, "detective_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(OFFICER)
+ clothes_s = new /icon(uniform_dmi, "secred_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_officer"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(CHIEF)
+ clothes_s = new /icon(uniform_dmi, "chief_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/inhands/items_righthand.dmi', "blueprints"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(ENGINEER)
+ clothes_s = new /icon(uniform_dmi, "engine_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hazard"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(ATMOSTECH)
+ clothes_s = new /icon(uniform_dmi, "atmos_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ if(prob(1))
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "firesuit"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- if(disabilities & NEARSIGHTED)
- preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
+ if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
+ clothes_s = new /icon(uniform_dmi, "grey_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
+ if(backbag == 2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ else if(backbag == 3 || backbag == 4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(CYBORG)
+ clothes_s = new /icon(uniform_dmi, "grey_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
+ if(backbag == 2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ else if(backbag == 3 || backbag == 4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ else if(job_karma_high)
+ switch(job_karma_high)
+ if(MECHANIC)
+ clothes_s = new /icon(uniform_dmi, "mechanic_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(PILOT)
+ clothes_s = new /icon(uniform_dmi, "secred_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bomber"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(BRIGDOC)
+ clothes_s = new /icon(uniform_dmi, "medical_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(NANO)
+ clothes_s = new /icon(uniform_dmi, "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(BLUESHIELD)
+ clothes_s = new /icon(uniform_dmi, "officer_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(JUDGE)
+ clothes_s = new /icon(uniform_dmi, "really_black_suit_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/head.dmi', "mercy_hood"), ICON_UNDERLAY)
+ clothes_s.Blend(new /icon('icons/mob/suit.dmi', "judge"), ICON_UNDERLAY)
+ switch(backbag)
+ if(2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ if(3)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+ if(4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- // Observers get tourist outfit.
- if(for_observer)
- clothes_s = new /icon(uniform_dmi, "tourist_s")
- clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
- if(backbag == 2)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
- else if(backbag == 3 || backbag == 4)
- clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+ if(disabilities & NEARSIGHTED)
+ preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
- if(underwear_s)
- preview_icon.Blend(underwear_s, ICON_OVERLAY)
- if(undershirt_s)
- preview_icon.Blend(undershirt_s, ICON_OVERLAY)
- if(socks_s)
- preview_icon.Blend(socks_s, ICON_OVERLAY)
- if(clothes_s)
- preview_icon.Blend(clothes_s, ICON_OVERLAY)
- preview_icon.Blend(face_s, ICON_OVERLAY)
- preview_icon_front = new(preview_icon, dir = SOUTH)
- preview_icon_side = new(preview_icon, dir = WEST)
+ // Observers get tourist outfit.
+ if(for_observer)
+ clothes_s = new /icon(uniform_dmi, "tourist_s")
+ clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+ if(backbag == 2)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+ else if(backbag == 3 || backbag == 4)
+ clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
- qdel(face_s)
- qdel(underwear_s)
- qdel(undershirt_s)
- qdel(socks_s)
- qdel(clothes_s)
+ if(underwear_s)
+ preview_icon.Blend(underwear_s, ICON_OVERLAY)
+ if(undershirt_s)
+ preview_icon.Blend(undershirt_s, ICON_OVERLAY)
+ if(socks_s)
+ preview_icon.Blend(socks_s, ICON_OVERLAY)
+ if(clothes_s)
+ preview_icon.Blend(clothes_s, ICON_OVERLAY)
+ preview_icon.Blend(face_s, ICON_OVERLAY)
+ preview_icon_front = new(preview_icon, dir = SOUTH)
+ preview_icon_side = new(preview_icon, dir = WEST)
+
+ qdel(face_s)
+ qdel(underwear_s)
+ qdel(undershirt_s)
+ qdel(socks_s)
+ qdel(clothes_s)
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 60b28f69213..23e3fb1d906 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -64,7 +64,7 @@
name = "Bald"
icon_state = "bald"
gender = MALE
- species_allowed = list("Human","Unathi","Vox","Diona","Kidan","Grey","Plasmaman","Skeleton")
+ species_allowed = list("Human", "Unathi", "Vox", "Diona", "Kidan", "Grey", "Plasmaman", "Skeleton")
short
name = "Short Hair" // try to capatilize the names please~
@@ -152,7 +152,7 @@
name = "Pompadour"
icon_state = "hair_pompadour"
gender = MALE
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human", "Unathi")
quiff
name = "Quiff"
@@ -175,19 +175,19 @@
name = "Beehive"
icon_state = "hair_beehive"
gender = FEMALE
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human", "Unathi")
bobcurl
name = "Bobcurl"
icon_state = "hair_bobcurl"
gender = FEMALE
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human", "Unathi")
bob
name = "Bob"
icon_state = "hair_bobcut"
gender = FEMALE
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human", "Unathi")
bowl
name = "Bowl"
@@ -203,7 +203,7 @@
name = "Buzzcut"
icon_state = "hair_buzzcut"
gender = MALE
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human", "Unathi")
crew
name = "Crewcut"
@@ -265,12 +265,23 @@
mohawk
name = "Mohawk"
icon_state = "hair_d"
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human", "Unathi")
+
jensen
name = "Adam Jensen Hair"
icon_state = "hair_jensen"
gender = MALE
+ cia
+ name = "CIA"
+ icon_state = "hair_cia"
+ gender = MALE
+
+ mulder
+ name = "Mulder"
+ icon_state = "hair_mulder"
+ gender = MALE
+
gelled
name = "Gelled Back"
icon_state = "hair_gelled"
@@ -284,7 +295,7 @@
spiky
name = "Spiky"
icon_state = "hair_spikey"
- species_allowed = list("Human","Unathi")
+ species_allowed = list("Human", "Unathi")
kusangi
name = "Kusanagi Hair"
@@ -485,7 +496,7 @@
name = "Shaved"
icon_state = "bald"
gender = NEUTER
- species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Diona","Kidan","Greys","Machine", "Vulpkanin", "Slime People")
+ species_allowed = list("Human", "Unathi", "Tajaran", "Skrell", "Vox", "Diona", "Kidan", "Greys", "Machine", "Vulpkanin", "Slime People")
watson
@@ -1074,7 +1085,7 @@
/datum/sprite_accessory/underwear
icon = 'icons/mob/underwear.dmi'
- species_allowed = list("Human","Unathi","Vox","Diona","Vulpkanin","Kidan","Grey","Plasmaman","Skeleton")
+ species_allowed = list("Human", "Unathi", "Vox", "Diona", "Vulpkanin", "Kidan", "Grey", "Plasmaman", "Skeleton", "Machine")
nude
name = "Nude"
@@ -1222,7 +1233,7 @@
/datum/sprite_accessory/undershirt
icon = 'icons/mob/underwear.dmi'
- species_allowed = list("Human","Unathi","Vox","Diona","Vulpkanin","Kidan","Grey","Plasmaman","Skeleton")
+ species_allowed = list("Human", "Unathi", "Vox", "Diona", "Vulpkanin", "Kidan", "Grey", "Plasmaman", "Skeleton", "Machine")
/datum/sprite_accessory/undershirt/nude
name = "Nude"
@@ -1508,13 +1519,13 @@
///////////////////////
/datum/sprite_accessory/socks
icon = 'icons/mob/underwear.dmi'
- species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skeleton")
+ species_allowed = list("Human", "Unathi", "Diona", "Grey", "Machine", "Tajaran", "Vulpkanin", "Slime People", "Skeleton")
/datum/sprite_accessory/socks/nude
name = "Nude"
icon_state = null
gender = NEUTER
- species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skeleton","Vox")
+ species_allowed = list("Human", "Unathi", "Diona", "Grey", "Machine", "Tajaran", "Vulpkanin", "Slime People", "Skeleton", "Vox")
/datum/sprite_accessory/socks/white_norm
@@ -1681,12 +1692,12 @@
/datum/sprite_accessory/head_accessory
icon = 'icons/mob/body_accessory.dmi'
- species_allowed = list("Unathi", "Vulpkanin", "Tajaran")
+ species_allowed = list("Unathi", "Vulpkanin", "Tajaran", "Machine")
icon_state = "accessory_none"
/datum/sprite_accessory/head_accessory/none
name = "None"
- species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skeleton","Vox")
+ species_allowed = list("Human", "Unathi", "Diona", "Grey", "Machine", "Tajaran", "Vulpkanin", "Slime People", "Skeleton", "Vox")
icon_state = "accessory_none"
/datum/sprite_accessory/head_accessory/simple
@@ -1769,16 +1780,22 @@
icon_state = "ears_plain"
species_allowed = list("Tajaran")
+/datum/sprite_accessory/head_accessory/ipc_antennae
+ name = "Antennae"
+ icon_state = "antennae"
+ species_allowed = list("Machine")
+
+
/* BODY MARKINGS */
/datum/sprite_accessory/body_markings
icon = 'icons/mob/body_accessory.dmi'
- species_allowed = list("Unathi", "Tajaran", "Vulpkanin")
+ species_allowed = list("Unathi", "Tajaran", "Vulpkanin", "Machine")
icon_state = "accessory_none"
/datum/sprite_accessory/body_markings/none
name = "None"
- species_allowed = list("Human","Unathi","Diona","Grey","Machine","Tajaran","Vulpkanin","Slime People","Skeleton","Vox")
+ species_allowed = list("Human", "Unathi", "Diona", "Grey", "Machine", "Tajaran", "Vulpkanin", "Slime People", "Skeleton", "Vox")
icon_state = "accessory_none"
/datum/sprite_accessory/body_markings/stripe
@@ -1811,6 +1828,11 @@
species_allowed = list("Unathi")
icon_state = "markings_tigerheadface_una"
+/datum/sprite_accessory/body_markings/optics
+ name = "Humanoid Optics"
+ species_allowed = list("Machine")
+ icon_state = "optics"
+
/datum/sprite_accessory/body_markings/tattoo // Tattoos applied post-round startup with tattoo guns in item_defines.dm
name = "base tattoo"
species_allowed = list()
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index cc4aafb64e8..e5b12ed022b 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -42,11 +42,11 @@
/mob/proc/say_dead(var/message)
if(!src.client.holder)
if(!config.dsay_allowed)
- src << "Deadchat is globally muted."
+ to_chat(src, "Deadchat is globally muted.")
return
if(client && !(client.prefs.toggles & CHAT_DEAD))
- usr << "You have deadchat muted."
+ to_chat(usr, "You have deadchat muted.")
return
say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], \"[message]\"", src)
diff --git a/code/modules/mob/spirit/mask/mask.dm b/code/modules/mob/spirit/mask/mask.dm
index c121d5684d0..8ae366ef16a 100644
--- a/code/modules/mob/spirit/mask/mask.dm
+++ b/code/modules/mob/spirit/mask/mask.dm
@@ -18,7 +18,7 @@
if (cultist)
follow_cultist(cultist.owner)
cult_log("[key_name_admin(src)] started following [key_name_admin(cultist)].")
- src << "You start following [cultist.get_display_name()]."
+ to_chat(src, "You start following [cultist.get_display_name()].")
/mob/spirit/mask/verb/urge_cultist()
@@ -31,7 +31,7 @@
if (cultist.owner)
var/newUrge = stripped_input(usr, "", "Set Urge", "")
cultist.set_urge(newUrge)
- src << "You urge [cultist.owner.name] to [newUrge]."
+ to_chat(src, "You urge [cultist.owner.name] to [newUrge].")
cult_log("controlled by [key_name_admin(src)] has urged [key_name_admin(cultist.owner)] to [newUrge].")
/mob/spirit/mask/verb/set_cult_name()
@@ -45,7 +45,7 @@
if (!newName)
return
cultist.set_cult_name(newName)
- src << "You grant [cultist.owner.name] the secret name of [newName]."
+ to_chat(src, "You grant [cultist.owner.name] the secret name of [newName].")
if (cultist.owner)
cult_log("[key_name_admin(src)] has set [key_name_admin(cultist.owner)] to \'[newName]\'")
@@ -58,7 +58,7 @@
var/newUrge = stripped_input(usr, "Please choose an urge.", "Set Urge", "")
for(var/obj/cult_viewpoint/viewpoint in cult_viewpoints)
viewpoint.set_urge(newUrge)
- src << "You urge the entire cult to [newUrge]."
+ to_chat(src, "You urge the entire cult to [newUrge].")
cult_log("[key_name_admin(src)] has urged the entire cult to [newUrge]")
@@ -88,7 +88,7 @@
spawn(0)
var/newName = stripped_input(src, "Please pick a name.", "Pick Name for Mask", "")
name = newName ? newName : "Mask of Nar'sie"
- src << "You have set your name to [name]."
+ to_chat(src, "You have set your name to [name].")
/mob/spirit/mask/proc/pick_cultist()
@@ -133,9 +133,9 @@
flicker_mask(usr)
for(var/datum/mind/H in ticker.mode.cult)
if (H.current)
- H.current << "[usr.name]: [input]"
+ to_chat(H.current, "[usr.name]: [input]")
for(var/mob/spirit/spirit in spirits)
- spirit << "[usr.name]: [input]"
+ to_chat(spirit, "[usr.name]: [input]")
/obj/effect/proc_holder/spell/aoe_turf/shatter_lights
@@ -194,7 +194,7 @@
var/talisman = input("Pick a talisman type", "Talisman", null, null) as null|anything in talismans
var/imbue_value = talismans[talisman]
if (!talisman)
- usr << "You choose not to create a talisman."
+ to_chat(usr, "You choose not to create a talisman.")
revert_cast(usr)
return
@@ -206,7 +206,7 @@
if ("Teleport")
var/target_rune = input("Pick a teleport target", "Teleport Rune", null, null) as null|anything in engwords
if (!target_rune)
- usr << "You choose not to create a talisman."
+ to_chat(usr, "You choose not to create a talisman.")
revert_cast(usr)
return
summon_type = list(/obj/item/weapon/paper/talisman)
diff --git a/code/modules/mob/spirit/movement.dm b/code/modules/mob/spirit/movement.dm
index b5ac53fbeae..65a992c1932 100644
--- a/code/modules/mob/spirit/movement.dm
+++ b/code/modules/mob/spirit/movement.dm
@@ -36,10 +36,10 @@ mob/spirit/proc/Spirit_Move(direct)
var/mob/spirit/U = usr
if (!currentView)
- U << "As a spirit, you may only track cultists."
+ to_chat(U, "As a spirit, you may only track cultists.")
U.follow_target = target
- U << "Now following [currentView.get_cult_name()]."
+ to_chat(U, "Now following [currentView.get_cult_name()].")
spawn (0)
while (U.follow_target == target)
@@ -58,4 +58,4 @@ mob/spirit/verb/toggle_acceleration()
set name = "Toggle Acceleration"
acceleration = !acceleration
- usr << "Acceleration has been toggled [acceleration ? "on" : "off"]."
\ No newline at end of file
+ to_chat(usr, "Acceleration has been toggled [acceleration ? "on" : "off"].")
diff --git a/code/modules/mob/spirit/spirit.dm b/code/modules/mob/spirit/spirit.dm
index b5295a0d85f..a9b10f8224f 100644
--- a/code/modules/mob/spirit/spirit.dm
+++ b/code/modules/mob/spirit/spirit.dm
@@ -57,12 +57,12 @@ mob/spirit/Topic(href, href_list)
return
..()
- usr << "Spirit Href = [href]"
+ to_chat(usr, "Spirit Href = [href]")
for (var/tempref in href_list)
- usr << "Spirit href list [tempref] = [href_list[tempref]]"
+ to_chat(usr, "Spirit href list [tempref] = [href_list[tempref]]")
if (href_list["track"])
- usr << "Got to tracking."
+ to_chat(usr, "Got to tracking.")
var/mob/target = locate(href_list["track"]) in mob_list
var/mob/spirit/A = locate(href_list["track2"]) in spirits
if(A && target)
diff --git a/code/modules/mob/spirit/viewpoint.dm b/code/modules/mob/spirit/viewpoint.dm
index 85599a52b62..90814317124 100644
--- a/code/modules/mob/spirit/viewpoint.dm
+++ b/code/modules/mob/spirit/viewpoint.dm
@@ -36,9 +36,9 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
set name = "Check Urge"
set src in usr
if (src.urge)
- owner << "\red \b You feel the urge to [src.urge]"
+ to_chat(owner, "\red \b You feel the urge to [src.urge]")
else
- owner << "\b You feel no supernatural compulsions."
+ to_chat(owner, "\b You feel no supernatural compulsions.")
/obj/cult_viewpoint/verb/reach_out()
@@ -49,10 +49,11 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
for(var/mob/spirit/mask/currentMask in spirits)
if (currentMask.is_active())
- owner << "\red \b You feel the reassuring presence of your god."
- currentMask << "[get_display_name()] has reached out to you."
+ to_chat(owner, "\red \b You feel the reassuring presence of your god.")
+ to_chat(currentMask, "[get_display_name()] has reached out to you.")
+
return
- owner << "\b You feel a chilling absence."
+ to_chat(owner, "\b You feel a chilling absence.")
handle_missing_mask()
@@ -63,11 +64,11 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
set src in usr
switch(favor)
if(FAVOR_PLEASED)
- owner << "\red \b You bask in your gods favor."
+ to_chat(owner, "\red \b You bask in your gods favor.")
if(FAVOR_INDIFFERENT)
- owner << "\red \b You feel nothing."
+ to_chat(owner, "\red \b You feel nothing.")
if(FAVOR_DISPLEASED)
- owner << "\red \b You cringe at your gods displeasure."
+ to_chat(owner, "\red \b You cringe at your gods displeasure.")
/obj/cult_viewpoint/verb/pray_to_mask()
@@ -81,10 +82,11 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
return
cult_log("[key_name(usr,0)](Pray):[input]")
- owner << "You pray to Nar'Sie: [input]"
+ to_chat(owner, "You pray to Nar'Sie: [input]")
for(var/mob/spirit/spirit in spirits)
- spirit << "[get_display_name()] prays : [input]"
+ to_chat(spirit, "[get_display_name()] prays : [input]")
+
// PROCS
/obj/cult_viewpoint/proc/set_favor(var/newFavor)
@@ -120,10 +122,10 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
return FALSE
if (newName)
cult_name = newName
- owner << "\red \b You have been blessed with the secret name of '[newName]'."
+ to_chat(owner, "\red \b You have been blessed with the secret name of '[newName]'.")
else
cult_name = null
- owner << "\red \b Your god has taken your secret name."
+ to_chat(owner, "\red \b Your god has taken your secret name.")
/obj/cult_viewpoint/proc/get_display_name()
@@ -159,7 +161,7 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list()
else
return
else
- owner << "\b You cannot become a mask of Nar'Sie because a Mask already exists."
+ to_chat(owner, "\b You cannot become a mask of Nar'Sie because a Mask already exists.")
mask_has_been_found()
return
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 26e2497ac0c..5e3641803ff 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -28,7 +28,8 @@
/mob/proc/AIize()
if(client)
- src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs
+ to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// stop the jams for AIs
+
var/mob/living/silicon/ai/O = new (loc,,,1)//No MMI but safety is in effect.
O.invisibility = 0
O.aiRestorePowerRoutine = 0
@@ -53,7 +54,7 @@
continue
loc_landmark = tripai
if (!loc_landmark)
- O << "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone."
+ to_chat(O, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.")
for(var/obj/effect/landmark/start/sloc in landmarks_list)
if (sloc.name == "AI")
loc_landmark = sloc
@@ -106,8 +107,8 @@
"You hear strange noise, you can't quite place it.")
qdel(src)
- new_spirit << "You are a Mask of Nar'sie now. You are a tiny fragment of the unknowable entity that is the god."
- new_spirit << "Your job is to help your acolytes complete their goals. Be spooky. Do evil."
+ to_chat(new_spirit, "You are a Mask of Nar'sie now. You are a tiny fragment of the unknowable entity that is the god.")
+ to_chat(new_spirit, "Your job is to help your acolytes complete their goals. Be spooky. Do evil.")
new_spirit.set_name()
@@ -208,7 +209,7 @@
new_xeno.a_intent = I_HARM
new_xeno.key = key
- new_xeno << "You are now an alien."
+ to_chat(new_xeno, "You are now an alien.")
new_xeno.update_pipe_vision()
spawn(0)//To prevent the proc from returning null.
qdel(src)
@@ -244,7 +245,7 @@
else
new_slime.key = key
- new_slime << "You are now a slime. Skreee!"
+ to_chat(new_slime, "You are now a slime. Skreee!")
new_slime.update_pipe_vision()
spawn(0)//To prevent the proc from returning null.
qdel(src)
@@ -267,7 +268,7 @@
new_corgi.a_intent = I_HARM
new_corgi.key = key
- new_corgi << "You are now a Corgi. Yap Yap!"
+ to_chat(new_corgi, "You are now a Corgi. Yap Yap!")
new_corgi.update_pipe_vision()
spawn(0)//To prevent the proc from returning null.
qdel(src)
@@ -298,7 +299,7 @@
new_mob.a_intent = I_HARM
- new_mob << "You suddenly feel more... animalistic."
+ to_chat(new_mob, "You suddenly feel more... animalistic.")
new_mob.update_pipe_vision()
spawn()
qdel(src)
@@ -313,7 +314,7 @@
new_mob.key = key
new_mob.a_intent = I_HARM
- new_mob << "You feel more... animalistic"
+ to_chat(new_mob, "You feel more... animalistic")
new_mob.update_pipe_vision()
qdel(src)
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 138fd093eaf..49d9a7aad48 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -10,7 +10,8 @@ var/global/image/typing_indicator
/mob/proc/set_typing_indicator(var/state)
if(!typing_indicator)
- typing_indicator = image('icons/mob/talk.dmi',null,"typing")
+ typing_indicator = image('icons/mob/talk.dmi', null, "typing", MOB_LAYER + 1)
+ typing_indicator.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
if(ishuman(src))
var/mob/living/carbon/human/H = src
@@ -82,7 +83,7 @@ var/global/image/typing_indicator
set desc = "Toggles showing an indicator when you are typing emote or say message."
prefs.toggles ^= SHOW_TYPING
prefs.save_preferences(src)
- src << "You will [(prefs.toggles & SHOW_TYPING) ? "no longer" : "now"] display a typing indicator."
+ to_chat(src, "You will [(prefs.toggles & SHOW_TYPING) ? "no longer" : "now"] display a typing indicator.")
// Clear out any existing typing indicator.
if(prefs.toggles & SHOW_TYPING)
diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm
index e0e7c3a98f6..ad70ec7f484 100644
--- a/code/modules/nano/interaction/default.dm
+++ b/code/modules/nano/interaction/default.dm
@@ -96,4 +96,10 @@
if(. != STATUS_CLOSE)
. = min(., shared_living_nano_distance(src_object))
if(!IsAdvancedToolUser())
+ . = STATUS_CLOSE
+
+/mob/living/simple_animal/bot/default_can_use_topic(var/src_object)
+ . = shared_nano_interaction(src_object)
+ if(. != STATUS_CLOSE)
+ if(!(src_object in contents))
. = STATUS_CLOSE
\ No newline at end of file
diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm
index 6888702ea83..848530c3c1d 100644
--- a/code/modules/nano/modules/crew_monitor.dm
+++ b/code/modules/nano/modules/crew_monitor.dm
@@ -6,7 +6,7 @@
return 1
var/turf/T = get_turf(nano_host())
if (!T || !(T.z in config.player_levels))
- usr << "Unable to establish a connection: You're too far away from the station!"
+ to_chat(usr, "Unable to establish a connection: You're too far away from the station!")
return 0
if(href_list["track"])
if(isAI(usr))
diff --git a/code/modules/nano/modules/law_manager.dm b/code/modules/nano/modules/law_manager.dm
index 93d68c2bf12..df00504cf1f 100644
--- a/code/modules/nano/modules/law_manager.dm
+++ b/code/modules/nano/modules/law_manager.dm
@@ -134,15 +134,15 @@
return 1
if(href_list["notify_laws"])
- owner << "Law Notice"
+ to_chat(owner, "Law Notice")
owner.laws.show_laws(owner)
if(isAI(owner))
var/mob/living/silicon/ai/AI = owner
for(var/mob/living/silicon/robot/R in AI.connected_robots)
- R << "Law Notice"
+ to_chat(R, "Law Notice")
R.laws.show_laws(R)
if(usr != owner)
- usr << "Laws displayed."
+ to_chat(usr, "Laws displayed.")
return 1
return 0
diff --git a/code/modules/nano/modules/virus2_creator.dm b/code/modules/nano/modules/virus2_creator.dm
deleted file mode 100644
index 40bf1480914..00000000000
--- a/code/modules/nano/modules/virus2_creator.dm
+++ /dev/null
@@ -1,142 +0,0 @@
-/datum/nano_module/virus2
- name = "Virus Creator"
-
- var/mob/virus_target = null
- var/datum/disease2/disease/curr_virus = null
-
-/datum/nano_module/virus2/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = admin_state)
- var/data[0]
-
- data["virus_target"] = virus_target
- data["curr_virus"] = curr_virus ? curr_virus.uniqueID : null
- if(curr_virus)
- var/effects[0]
- for(var/datum/disease2/effectholder/E in curr_virus.effects)
- var/subeffect[0]
- subeffect["name"] = E.effect.name
- subeffect["stage"] = E.stage
- subeffect["chance"] = E.chance
- subeffect["multiplier"] = E.multiplier
- subeffect["badness"] = E.effect.badness
-
- effects.Add(list(subeffect))
- data["virus_effects"] = effects
-
- var/virusstats[0]
- virusstats["antigen"] = antigens2string(curr_virus.antigen)
- virusstats["spreadType"] = curr_virus.spreadtype
- virusstats["affectedSpecies"] = list2text(curr_virus.affected_species, ", ")
- virusstats["speed"] = curr_virus.speed
- data["virusStats"] = virusstats
-
-
-
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "virus2_creator.tmpl", "[src]", 800, 450, state = state)
- ui.set_initial_data(data)
- ui.open()
- ui.set_auto_update(1)
-
-/datum/nano_module/virus2/Topic(href, href_list)
- if(..())
- return 1
-
- if(href_list["setTarget"])
- var/list/mob_list_l = list()
- for(var/mob/living/carbon/human/H in mob_list)
- mob_list_l += H
- mob_list_l = sortList(mob_list_l)
- mob_list_l += "Random"
-
- var/newTarget = input(usr, "Who do you want to infect?", "Infection", "Random") as null|anything in mob_list_l
- if(newTarget)
- if(newTarget == "Random")
- virus_target = null
- else
- if(ismob(newTarget))
- virus_target = newTarget
- return 1
-
- if(href_list["createVirus"])
- if(curr_virus)
- if(alert(usr, "Would you like to delete the current virus and generate a new one?", "Regenerate Virus", "Yes", "No") == "Yes")
- qdel(curr_virus)
- curr_virus = null
- else
- return 0
-
- var/datum/disease2/disease/new_virus = new()
- new_virus.makerandom()
- curr_virus = new_virus
- new_virus.affected_species = list("Human","Unathi","Skrell","Tajaran","Vox","Kidan","Slime People","Grey","Diona", "Vulpkanin") //restore to default
- usr << "New virus generated: [new_virus.uniqueID]."
- return 1
-
- if(href_list["deleteCurrVirus"])
- if(curr_virus)
- qdel(curr_virus)
- curr_virus = null
- return 1
-
- if(href_list["changeEffect"])
- if(curr_virus)
- var/stage = text2num(href_list["changeEffect"])
- if(stage)
- var/list/L = list()
-
- for(var/effect in (subtypesof(/datum/disease2/effect)))
- var/datum/disease2/effect/E = new effect
- if(initial(E.stage) == stage)
- L[initial(E.name)] = E
-
- var/datum/disease2/effectholder/holder = curr_virus.effects[stage]
- if(holder)
- var/datum/disease2/effect/current_effect = holder.effect
-
- var/C = input("Select effect for stage [stage]:", "Stage [stage]", current_effect.name) as null|anything in L
- if(!C)
- return 0
-
- var/datum/disease2/effect/applied_effect = L[C]
- if(istype(applied_effect))
- holder.effect = applied_effect
- qdel(current_effect)
- else
-
- return 1
-
- if(href_list["changeStat"])
- if(curr_virus)
- var/stat = href_list["changeStat"]
- var/stage = text2num(href_list["cSEffect"])
- if(stat && stage)
- switch(stat)
- if("C")
- var/C = input(usr, "What would you like to change the chance to? ", "Edit Chance", null) as null|num
- if(C)
- var/datum/disease2/effectholder/holder = curr_virus.effects[stage]
- if(holder)
- holder.chance = Clamp(C, 0, holder.effect.chance_maxm)
-
- if("M")
- var/C = input(usr, "What would you like to change the multiplier to?", "Edit Multiplier", null) as null|num
- if(C)
- var/datum/disease2/effectholder/holder = curr_virus.effects[stage]
- if(holder)
- holder.multiplier = Clamp(C, 1, holder.effect.maxm)
- return 1
-
- if(href_list["spreadToTarget"])
- if(curr_virus)
- if(virus_target)
- infect_virus2(virus_target, curr_virus, 1) //no protection from gods
- else //random
- var/list/mob_list_l = list()
- for(var/mob/living/carbon/human/H in mob_list)
- if(H.client)
- mob_list_l += H
-
- var/mob/living/carbon/human/H = pick(mob_list_l)
- if(H && H.client)
- infect_virus2(H, curr_virus, 1) //no protection from gods
\ No newline at end of file
diff --git a/code/modules/nano/nanomapgen.dm b/code/modules/nano/nanomapgen.dm
index 44154cdb675..62ad6649e20 100644
--- a/code/modules/nano/nanomapgen.dm
+++ b/code/modules/nano/nanomapgen.dm
@@ -32,19 +32,19 @@
endY = world.maxy
if (currentZ < 0 || currentZ > world.maxz)
- usr << "NanoMapGen: ERROR: currentZ ([currentZ]) must be between 1 and [world.maxz]"
+ to_chat(usr, "NanoMapGen: ERROR: currentZ ([currentZ]) must be between 1 and [world.maxz]")
sleep(3)
return NANOMAP_TERMINALERR
if (startX > endX)
- usr << "NanoMapGen: ERROR: startX ([startX]) cannot be greater than endX ([endX])"
+ to_chat(usr, "NanoMapGen: ERROR: startX ([startX]) cannot be greater than endX ([endX])")
sleep(3)
return NANOMAP_TERMINALERR
if (startY > endX)
- usr << "NanoMapGen: ERROR: startY ([startY]) cannot be greater than endY ([endY])"
+ to_chat(usr, "NanoMapGen: ERROR: startY ([startY]) cannot be greater than endY ([endY])")
sleep(3)
return NANOMAP_TERMINALERR
@@ -55,7 +55,7 @@
return NANOMAP_TERMINALERR
log_to_dd("NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])")
- usr << "NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])"
+ to_chat(usr, "NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])")
var/count = 0;
for(var/WorldX = startX, WorldX <= endX, WorldX++)
@@ -82,7 +82,7 @@
log_to_dd("NanoMapGen: Done.")
- usr << "NanoMapGen: Done. File [mapFilename] uploaded to your cache."
+ to_chat(usr, "NanoMapGen: Done. File [mapFilename] uploaded to your cache.")
if (Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION)
return NANOMAP_BADOUTPUT
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index cddb25bd118..7675d3b2c81 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -187,7 +187,7 @@ nanoui is used to open and update nano browser uis
"showMap" = show_map,
"mapZLevel" = map_z_level,
"user" = list(
- "name" = user.name,
+ "name" = sanitize(user.name),
"fancy" = user.client.prefs.nanoui_fancy
),
"window" = list(
@@ -456,7 +456,8 @@ nanoui is used to open and update nano browser uis
var/list/send_data = get_send_data(data)
- //user << list2json_usecache(send_data) // used for debugging //NANO DEBUG HOOK
+// to_chat(user, list2json_usecache(send_data))// used for debugging //NANO DEBUG HOOK
+
user << output(list2params(list(list2json_usecache(send_data))),"[window_id].browser:receiveUpdateData")
/**
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 58c2036848a..5e6a1cbcb32 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -65,7 +65,7 @@
msg = "Your Energy Katana lands at your feet!"
if(msg)
- user << "[msg]"
+ to_chat(user, "[msg]")
/obj/item/weapon/katana/energy/New()
..()
diff --git a/code/modules/ninja/martial_art.dm b/code/modules/ninja/martial_art.dm
index 7b230c1e011..0903425f89d 100644
--- a/code/modules/ninja/martial_art.dm
+++ b/code/modules/ninja/martial_art.dm
@@ -21,7 +21,7 @@
if(!used)
user.visible_message("You stick the [src]'s needle into your arm and press the button.", \
"[user] sticks the [src]'s needle \his arm and presses the button.")
- user << "The nanomachines in the [src] flow through your bloodstream."
+ to_chat(user, "The nanomachines in the [src] flow through your bloodstream.")
var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null)
N.teach(user)
@@ -31,7 +31,7 @@
desc = "A strange autoinjector made of a black metal.
It appears to be used up and empty."
return 0
else
- user << "The [src] has been used already!"
+ to_chat(user, "The [src] has been used already!")
return 1
// Ninja martial art datum
@@ -45,7 +45,7 @@
/datum/martial_art/ninja_martial_art/teach(var/mob/living/carbon/human/H,var/make_temporary=0)
..()
H.middleClickOverride = new /datum/middleClickOverride/ninja_martial_art()
- H << "You have been taugh the ways of the Creeping Widow.
\
+ to_chat(H, "You have been taugh the ways of the Creeping Widow.
\)
Your stikes on harm intent will deal more damage.
Using middle mouse button on a nearby person while on harm intent will send them flying backwards.
\
Your grabs will instantly be aggressive while you are using this style.
Using middle mouse button while on harm intent and behind a person will put them in a silencing choke hold.
\
Using middle mouse button on a nearby person while on disarm intent will wrench their wrist, causing them to drop what they are holding."
@@ -64,7 +64,7 @@
D.Stun(1)
spawn(50) has_focus = 1
return 1
- A << "You are not focused enough to use that move yet!"
+ to_chat(A, "You are not focused enough to use that move yet!")
return 0
return A.pointed(D)
@@ -72,11 +72,11 @@
if(!D.stat && !D.weakened)
A.face_atom(D)
if(A.dir != D.dir) // If the user's direction is not the same as the target's after A.face_atom(D) you are not behind them, and cannot use this ability.
- A << "You cannot grab [D] from that angle!"
+ to_chat(A, "You cannot grab [D] from that angle!")
return 0
if(has_choke_hold) // Are we already choking someone?
- A<< "You are have a target in your grip!"
+ to_chat(A, "You are have a target in your grip!")
return 0
has_choke_hold = 1
@@ -105,8 +105,8 @@
I++
sleep(5)
- A << "You feel [D] go limp in your grip."
- D << "You feel your consciousness slip away as [A] strangles you!"
+ to_chat(A, "You feel [D] go limp in your grip.")
+ to_chat(D, "You feel your consciousness slip away as [A] strangles you!")
D.AdjustParalysis(20)
has_choke_hold = 0
@@ -131,7 +131,7 @@
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
spawn(50) has_focus = 1
return 1
- A << "You are not focused enough to use that move yet!"
+ to_chat(A, "You are not focused enough to use that move yet!")
return 0
return A.pointed(D)
diff --git a/code/modules/ninja/suit/SpiderOS.dm b/code/modules/ninja/suit/SpiderOS.dm
index 11a595e6645..871e8215bbd 100644
--- a/code/modules/ninja/suit/SpiderOS.dm
+++ b/code/modules/ninja/suit/SpiderOS.dm
@@ -9,7 +9,7 @@
if(!s_busy)
display_spideros()
else
- affecting << "The interface is locked!"
+ to_chat(affecting, "The interface is locked!")
/obj/item/clothing/suit/space/space_ninja/proc/display_spideros()
@@ -194,7 +194,7 @@
if(!affecting||U.stat||!s_initialized)//Check to make sure the guy is wearing the suit after clicking and it's on.
- U << "Your suit must be worn and active to use this function."
+ to_chat(U, "Your suit must be worn and active to use this function.")
U << browse(null, "window=spideros")//Closes the window.
return
@@ -217,31 +217,21 @@
display_to << browse(null, "window=spideros")
return
if(isnull(P)||P.toff)//So it doesn't freak out if the object no-longer exists.
- display_to << "Error: unable to deliver message."
+ to_chat(display_to, "Error: unable to deliver message.")
display_spideros()
return
- //Search for holder of the PDA.
- var/mob/living/L = null
- if(P.loc && isliving(P.loc))
- L = P.loc
- //Maybe they are a pAI!
- else
- L = get(P, /mob/living/silicon)
-
- if(L)
- L << "\icon[P] Message from unknown source: \"[t]\" (Unable to Reply)"
- P.play_ringtone()
+
var/datum/data/pda/app/messenger/M = P.find_program(/datum/data/pda/app/messenger)
- M.set_new(1)
+ M.notify("Message from unknown source: \"[t]\" (Unable to Reply)", 0)
if("Inject")
if( (href_list["tag"]=="radium"? (reagents.get_reagent_amount("radium"))<=(a_boost*a_transfer) : !reagents.get_reagent_amount(href_list["tag"])) )//Special case for radium. If there are only a_boost*a_transfer radium units left.
- display_to << "Error: the suit cannot perform this function. Out of [href_list["name"]]."
+ to_chat(display_to, "Error: the suit cannot perform this function. Out of [href_list["name"]].")
else
reagents.reaction(U, 2)
reagents.trans_id_to(U, href_list["tag"], href_list["tag"]=="nutriment"?5:a_transfer)//Nutriment is a special case since it's very potent. Shouldn't influence actual refill amounts or anything.
- display_to << "Injecting..."
- U << "You feel a tiny prick and a sudden rush of substance in to your veins."
+ to_chat(display_to, "Injecting...")
+ to_chat(U, "You feel a tiny prick and a sudden rush of substance in to your veins.")
if("Trigger Ability")
var/ability_name = href_list["name"]+href_list["cost"]//Adds the name and cost to create the full proc name.
@@ -261,7 +251,7 @@
proc_arguments = pick(targets)
safety = 0
if(!safety)
- U << "[href_list["name"]] suddenly triggered!"
+ to_chat(U, "[href_list["name"]] suddenly triggered!")
call(src,ability_name)(proc_arguments)
if("Eject Disk")
@@ -275,11 +265,11 @@
t_disk.loc = T
t_disk = null
else
- U << "ERROR: Could not eject disk."
+ to_chat(U, "ERROR: Could not eject disk.")
if("Copy to Disk")
var/datum/tech/current_data = locate(href_list["target"])
- U << "[current_data.name] successfully [(!t_disk.stored) ? "copied" : "overwritten"] to disk."
+ to_chat(U, "[current_data.name] successfully [(!t_disk.stored) ? "copied" : "overwritten"] to disk.")
t_disk.stored = current_data
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index bfcc4330dc2..936f947758d 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -30,19 +30,19 @@ Contents:
/obj/item/clothing/suit/space/space_ninja/proc/toggle_suit_lock(mob/living/carbon/human/user)
if(!suitActive)
if(!istype(user.wear_suit, /obj/item/clothing/suit/space/space_ninja))
- user<< "ERROR: Unable to locate user.\nABORTING..."
+ to_chat(user, "ERROR: Unable to locate user.\nABORTING...")
return 0
if(!istype(user.head, /obj/item/clothing/head/helmet/space/space_ninja))
- user<< "ERROR: Unable to locate hood.\nABORTING..."
+ to_chat(user, "ERROR: Unable to locate hood.\nABORTING...")
return 0
if(!istype(user.gloves, /obj/item/clothing/gloves/space_ninja))
- user<< "ERROR: Unable to locate gloves.\nABORTING..."
+ to_chat(user, "ERROR: Unable to locate gloves.\nABORTING...")
return 0
if(!istype(user.shoes, /obj/item/clothing/shoes/space_ninja))
- user<< "ERROR: Unable to locate foot gear.\nABORTING..."
+ to_chat(user, "ERROR: Unable to locate foot gear.\nABORTING...")
return 0
if(!istype(user.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja))
- user<< "ERROR: Unable to locate mask.\nABORTING..."
+ to_chat(user, "ERROR: Unable to locate mask.\nABORTING...")
return 0
suitHood = user.head
diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm
index 760f6648452..620c2261782 100644
--- a/code/modules/ninja/suit/suit_attackby.dm
+++ b/code/modules/ninja/suit/suit_attackby.dm
@@ -5,7 +5,7 @@
if(istype(I, /obj/item/weapon/stock_parts/cell))
var/obj/item/weapon/stock_parts/cell/CELL
if(CELL.maxcharge > cell.maxcharge && suitGloves)
- U << "Higher maximum capacity detected.\nUpgrading..."
+ to_chat(U, "Higher maximum capacity detected.\nUpgrading...")
if (n_gloves && n_gloves.candrain && do_after(U,s_delay, target = U))
U.drop_item()
CELL.loc = src
@@ -17,8 +17,8 @@
old_cell.corrupt()
old_cell.updateicon()
cell = CELL
- U << "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%"
+ to_chat(U, "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%")
else
- U << "Procedure interrupted. Protocol terminated."
+ to_chat(U, "Procedure interrupted. Protocol terminated.")
return
..()
\ No newline at end of file
diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm
index 7c84bef5aa3..f1abfbe725a 100644
--- a/code/modules/ninja/suit/suit_initialisation.dm
+++ b/code/modules/ninja/suit/suit_initialisation.dm
@@ -8,34 +8,34 @@
if(usr.mind.special_role == "Ninja")
if(suitBusy)
- usr << "ERROR: Suit systems busy, cannot initiate [suitActive ? "de-activation" : "activation"] protocals at this time."
+ to_chat(usr, "ERROR: Suit systems busy, cannot initiate [suitActive ? "de-activation" : "activation"] protocals at this time.")
return
suitBusy = 1
if(suitActive && (alert("Confirm suit systems shutdown? This cannot be halted once it has started.", "Confirm Shutdown", "Yes", "No") == "Yes"))
- usr << "Now de-initializing..."
+ to_chat(usr, "Now de-initializing...")
sleep(15)
- usr << "Logging off, [usr.real_name]. Shutting down SpiderOS."
+ to_chat(usr, "Logging off, [usr.real_name]. Shutting down SpiderOS.")
sleep(10)
- usr<< "Primary system status: OFFLINE.\nBackup system status: OFFLINE."
+ to_chat(usr, "Primary system status: OFFLINE.\nBackup system status: OFFLINE.")
sleep(5)
- usr<< "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE."
+ to_chat(usr, "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE.")
//TODO: Shut down any active abilities
sleep(10)
- usr<< "Disconnecting neural-net interface... Success."
+ to_chat(usr, "Disconnecting neural-net interface... Success.")
usr.hud_used.instantiate()
usr.regenerate_icons()
sleep(5)
- usr<< "Disengaging neural-net interface... Success."
+ to_chat(usr, "Disengaging neural-net interface... Success.")
sleep(10)
- usr<< "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED."
+ to_chat(usr, "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED.")
//TODO: Grant verbs
toggle_suit_lock(usr)
usr.regenerate_icons()
@@ -43,44 +43,44 @@
suitActive = 0
else if(!suitActive) // Activate the suit.
- usr << "Now initializing..."
+ to_chat(usr, "Now initializing...")
sleep(15)
- usr<< "Now establishing neural-net interface..."
+ to_chat(usr, "Now establishing neural-net interface...")
if(usr.mind.special_role != "Ninja")
- usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked."
+ to_chat(usr, "FĆAL �Rr�R: ŧer nt recgnized, c-cntr-r䣧-ç äcked.")
return
sleep(10)
- usr<< "Neural-net established. Now monitoring brainwave pattern. \nBrainwave pattern GREEN, proceeding."
+ to_chat(usr, "Neural-net established. Now monitoring brainwave pattern. \nBrainwave pattern GREEN, proceeding.")
sleep(10)
- usr<< "Securing external locking mechanism..."
+ to_chat(usr, "Securing external locking mechanism...")
if(!toggle_suit_lock(usr))
return
sleep(5)
- usr<< "Suit secured, extending neural-net interface..."
+ to_chat(usr, "Suit secured, extending neural-net interface...")
usr.hud_used.human_hud('icons/mob/screen1_NinjaHUD.dmi',"#ffffff",255)
usr.regenerate_icons()
sleep(10)
- usr<< "VOID-shift device status: ONLINE.\nCLOAK-tech device status:ONLINE"
+ to_chat(usr, "VOID-shift device status: ONLINE.\nCLOAK-tech device status:ONLINE")
sleep(5)
- usr<< "Primary system status: ONLINE.\nBackup system status: ONLINE."
+ to_chat(usr, "Primary system status: ONLINE.\nBackup system status: ONLINE.")
if(suitCell)
- usr<< "Current energy capacity: [suitCell.charge]/[suitCell.maxcharge]."
+ to_chat(usr, "Current energy capacity: [suitCell.charge]/[suitCell.maxcharge].")
sleep(10)
- usr<< "All systems operational. Welcome to SpiderOS, [usr.real_name]."
+ to_chat(usr, "All systems operational. Welcome to SpiderOS, [usr.real_name].")
//TODO: Grant ninja verbs here.
suitBusy = 0
suitActive = 1
else
suitBusy = 0
- usr << "NOTICE: Suit de-activation protocals aborted."
+ to_chat(usr, "NOTICE: Suit de-activation protocals aborted.")
else
- usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked."
+ to_chat(usr, "FĆAL �Rr�R: ŧer nt recgnized, c-cntr-r䣧-ç äcked.")
return
\ No newline at end of file
diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm
index ae8357a5582..643c5b1fbb7 100644
--- a/code/modules/paperwork/carbonpaper.dm
+++ b/code/modules/paperwork/carbonpaper.dm
@@ -41,10 +41,10 @@
copy.name = "Copy - " + c.name
copy.fields = c.fields
copy.updateinfolinks()
- usr << "You tear off the carbon-copy!"
+ to_chat(usr, "You tear off the carbon-copy!")
c.copied = 1
copy.iscopy = 1
copy.update_icon()
c.update_icon()
else
- usr << "There are no more carbon copies attached to this paper!"
\ No newline at end of file
+ to_chat(usr, "There are no more carbon copies attached to this paper!")
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index fe9a5bb62f2..fbb26b650a8 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -49,7 +49,7 @@
W.loc = src
if(istype(W, /obj/item/weapon/paper))
toppaper = W
- user << "You clip the [W] onto \the [src]."
+ to_chat(user, "You clip the [W] onto \the [src].")
update_icon()
else if(istype(toppaper) && istype(W, /obj/item/weapon/pen))
@@ -102,7 +102,7 @@
usr.drop_item()
W.loc = src
haspen = W
- usr << "You slot the pen into \the [src]."
+ to_chat(usr, "You slot the pen into \the [src].")
else if(href_list["write"])
var/obj/item/weapon/P = locate(href_list["write"])
@@ -145,7 +145,7 @@
var/obj/item/P = locate(href_list["top"])
if(P && (P.loc == src) && istype(P, /obj/item/weapon/paper) )
toppaper = P
- usr << "You move [P.name] to the top."
+ to_chat(usr, "You move [P.name] to the top.")
//Update everything
attack_self(usr)
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 14e3f0d1343..23a0f3eec7e 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -44,9 +44,9 @@ var/list/alldepartments = list()
/obj/machinery/photocopier/faxmachine/emag_act(user as mob)
if(!emagged)
emagged = 1
- user << "The transmitters realign to an unknown source!"
+ to_chat(user, "The transmitters realign to an unknown source!")
else
- user << "You swipe the card through [src], but nothing happens."
+ to_chat(user, "You swipe the card through [src], but nothing happens.")
/obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
var/data[0]
@@ -100,7 +100,7 @@ var/list/alldepartments = list()
if(copyitem)
copyitem.loc = usr.loc
usr.put_in_hands(copyitem)
- usr << "You take \the [copyitem] out of \the [src]."
+ to_chat(usr, "You take \the [copyitem] out of \the [src].")
copyitem = null
else
var/obj/item/I = usr.get_active_hand()
@@ -108,7 +108,7 @@ var/list/alldepartments = list()
usr.drop_item()
copyitem = I
I.loc = src
- usr << "You insert \the [I] into \the [src]."
+ to_chat(usr, "You insert \the [I] into \the [src].")
flick(insert_anim, src)
if(href_list["scan"])
@@ -265,4 +265,4 @@ var/list/alldepartments = list()
for(var/client/C in admins)
if(R_EVENT & C.holder.rights)
- C << msg
+ to_chat(C, msg)
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index e520aa1976e..cd52d4424e3 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -35,7 +35,7 @@
/obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob, params)
if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/weapon/paper_bundle) || istype(P, /obj/item/documents))
- user << "You put [P] in [src]."
+ to_chat(user, "You put [P] in [src].")
user.drop_item()
P.loc = src
icon_state = "[initial(icon_state)]-open"
@@ -45,14 +45,14 @@
else if(istype(P, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
anchored = !anchored
- user << "You [anchored ? "wrench" : "unwrench"] \the [src]."
+ to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].")
else
- user << "You can't put [P] in [src]!"
+ to_chat(user, "You can't put [P] in [src]!")
/obj/structure/filingcabinet/attack_hand(mob/user as mob)
if(contents.len <= 0)
- user << "\The [src] is empty."
+ to_chat(user, "\The [src] is empty.")
return
user.set_machine(src)
@@ -77,9 +77,9 @@
I.loc = loc
if(prob(25))
step_rand(I)
- user << "You pull \a [I] out of [src] at random."
+ to_chat(user, "You pull \a [I] out of [src] at random.")
return
- user << "You find nothing in [src]."
+ to_chat(user, "You find nothing in [src].")
/obj/structure/filingcabinet/Topic(href, href_list)
if(href_list["retrieve"])
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 173723bf4cb..12f9e13a4e9 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -32,7 +32,7 @@
if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/weapon/paper_bundle) || istype(W, /obj/item/documents))
user.drop_item()
W.loc = src
- user << "You put the [W] into \the [src]."
+ to_chat(user, "You put the [W] into \the [src].")
update_icon()
else if(istype(W, /obj/item/weapon/pen))
var/n_name = input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text|null
diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm
index ec014d6a845..f988cf117cc 100644
--- a/code/modules/paperwork/frames.dm
+++ b/code/modules/paperwork/frames.dm
@@ -70,7 +70,7 @@
name = initial(name)
update_icon()
else
- user << "There is nothing to remove from \the [src]."
+ to_chat(user, "There is nothing to remove from \the [src].")
else if(istype(I, /obj/item/weapon/crowbar))
playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
user.visible_message("[user] breaks down \the [src].", "You break down \the [src].")
@@ -89,7 +89,7 @@
insert(I)
update_icon()
else
- user << "\The [src] already contains \a [displayed]."
+ to_chat(user, "\The [src] already contains \a [displayed].")
else
return ..()
@@ -103,14 +103,14 @@
var/stuff_on_wall = 0
for(var/obj/O in user.loc.contents) //Let's see if it already has a poster on it or too much stuff
if(istype(O, /obj/structure/sign))
- user << "\The [T] is far too cluttered to place \a [src]!"
+ to_chat(user, "\The [T] is far too cluttered to place \a [src]!")
return
stuff_on_wall++
if(stuff_on_wall >= 4)
- user << "\The [T] is far too cluttered to place \a [src]!"
+ to_chat(user, "\The [T] is far too cluttered to place \a [src]!")
return
- user << "You start place \the [src] on \the [T]."
+ to_chat(user, "You start place \the [src] on \the [T].")
var/px = 0
var/py = 0
@@ -126,7 +126,7 @@
if(WEST)
px = -32
else
- user << "You cannot reach \the [T] from here!"
+ to_chat(user, "You cannot reach \the [T] from here!")
return
user.unEquip(src)
@@ -226,10 +226,10 @@
qdel(src)
if(istype(I, /obj/item/weapon/grenade) || istype(I, /obj/item/weapon/c4))
if(explosive)
- user << "There is already a device attached behind \the [src], remove it first."
+ to_chat(user, "There is already a device attached behind \the [src], remove it first.")
return 1
if(!tilted)
- user << "\The [src] needs to be already tilted before being rigged with \the [I]."
+ to_chat(user, "\The [src] needs to be already tilted before being rigged with \the [I].")
return 1
user.visible_message("[user] is fiddling around behind \the [src].", "You begin to secure \the [I] behind \the [src].")
if(do_after(user, 150, target = src))
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index 940a797addc..8dbfbd9c1b4 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -15,22 +15,22 @@
return // don't set a label
if(!labels_left)
- user << "No labels left."
+ to_chat(user, "No labels left.")
return
if(!label || !length(label))
- user << "No text set."
+ to_chat(user, "No text set.")
return
if(length(A.name) + length(label) > 64)
- user << "Label too big."
+ to_chat(user, "Label too big.")
return
if(ishuman(A))
- user << "You can't label humans."
+ to_chat(user, "You can't label humans.")
return
if(issilicon(A))
- user << "You can't label cyborgs."
+ to_chat(user, "You can't label cyborgs.")
return
if(istype(A, /obj/item/weapon/reagent_containers/glass))
- user << "The label can't stick to the [A.name]. (Try using a pen)"
+ to_chat(user, "The label can't stick to the [A.name]. (Try using a pen)")
return
user.visible_message("[user] labels [A] as [label].", \
@@ -41,13 +41,13 @@
mode = !mode
icon_state = "labeler[mode]"
if(mode)
- user << "You turn on \the [src]."
+ to_chat(user, "You turn on \the [src].")
//Now let them chose the text.
var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
- user << "Invalid text."
+ to_chat(user, "Invalid text.")
return
label = str
- user << "You set the text to '[str]'."
+ to_chat(user, "You set the text to '[str]'.")
else
- user << "You turn off \the [src]."
\ No newline at end of file
+ to_chat(user, "You turn off \the [src].")
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 98c50af7dad..bf847a06c0a 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -56,7 +56,7 @@
if(in_range(user, src) || istype(user, /mob/dead/observer))
show_content(user)
else
- user << "You have to go closer if you want to read it."
+ to_chat(user, "You have to go closer if you want to read it.")
/obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1)
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper)
@@ -81,7 +81,7 @@
set src in usr
if((CLUMSY in usr.mutations) && prob(50))
- usr << "You cut yourself on the paper."
+ to_chat(usr, "You cut yourself on the paper.")
return
var/n_name = sanitize(copytext(input(usr, "What would you like to label the paper?", "Paper Labelling", name) as text, 1, MAX_MESSAGE_LEN))
if((loc == usr && usr.stat == 0))
@@ -125,13 +125,13 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H == user)
- user << "You wipe off your face with [src]."
+ to_chat(user, "You wipe off your face with [src].")
H.lip_style = null
H.update_body()
else
user.visible_message("[user] begins to wipe [H]'s face clean with \the [src].", \
"You begin to wipe off [H]'s face.")
- if(do_after(user, 10, target = H) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not.
+ if(do_after(user, 10, target = H) && do_after(H, 10, 0)) //user needs to keep their active hand, H does not.
user.visible_message("[user] wipes [H]'s face clean with \the [src].", \
"You wipe off [H]'s face.")
H.lip_style = null
@@ -140,10 +140,13 @@
..()
/obj/item/weapon/paper/proc/addtofield(var/id, var/text, var/links = 0)
+ if(id > MAX_PAPER_FIELDS)
+ return
+
var/locid = 0
var/laststart = 1
var/textindex = 1
- while(1) // I know this can cause infinite loops and fuck up the whole server, but the if(istart==0) should be safe as fuck
+ while(locid <= MAX_PAPER_FIELDS)
var/istart = 0
if(links)
istart = findtext(info_links, "", laststart)
@@ -248,11 +251,11 @@
t = "[t]"
-// t = replacetext(t, "#", "") // Junk converted to nothing!
+ t = copytext(t, 1, MAX_PAPER_MESSAGE_LEN)
//Count the fields
var/laststart = 1
- while(1)
+ while(fields < MAX_PAPER_FIELDS)
var/i = findtext(t, "", laststart)
if(i==0)
break
@@ -308,7 +311,7 @@
qdel(src)
else
- user << "\red You must hold \the [P] steady to burn \the [src]."
+ to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
/obj/item/weapon/paper/Topic(href, href_list)
..()
@@ -338,7 +341,7 @@
// check for exploits
for(var/bad in paper_blacklist)
if(findtext(t,bad))
- usr << "\blue You think to yourself, \"Hm.. this is only paper...\""
+ to_chat(usr, "\blue You think to yourself, \"Hm.. this is only paper...\"")
log_admin("PAPER: [key_name(usr)] tried to use forbidden word in [src]: [bad].")
message_admins("PAPER: [key_name_admin(usr)] tried to use forbidden word in [src]: [bad].")
return
@@ -374,7 +377,7 @@
if (istype(P, /obj/item/weapon/paper/carbon))
var/obj/item/weapon/paper/carbon/C = P
if (!C.iscopy && !C.copied)
- user << "Take off the carbon copy first."
+ to_chat(user, "Take off the carbon copy first.")
add_fingerprint(user)
return
var/obj/item/weapon/paper_bundle/B = new(src.loc)
@@ -410,7 +413,7 @@
src.loc = get_turf(h_user)
if(h_user.client) h_user.client.screen -= src
h_user.put_in_hands(B)
- user << "You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name]."
+ to_chat(user, "You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].")
src.loc = B
P.loc = B
B.amount++
@@ -431,12 +434,12 @@
if(istype(P, /obj/item/weapon/stamp/clown))
if(!clown)
- user << "You are totally unable to use the stamp. HONK!"
+ to_chat(user, "You are totally unable to use the stamp. HONK!")
return
stamp(P)
- user << "You stamp the paper with your rubber stamp."
+ to_chat(user, "You stamp the paper with your rubber stamp.")
else if(istype(P, /obj/item/weapon/lighter))
burnpaper(P, user)
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 311971f326c..a99efb09294 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -24,14 +24,14 @@
if (istype(P, /obj/item/weapon/paper/carbon))
var/obj/item/weapon/paper/carbon/C = P
if (!C.iscopy && !C.copied)
- user << "Take off the carbon copy first."
+ to_chat(user, "Take off the carbon copy first.")
add_fingerprint(user)
return
amount++
if(screen == 2)
screen = 1
- user << "You add [(P.name == "paper") ? "the paper" : P.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."
+ to_chat(user, "You add [(P.name == "paper") ? "the paper" : P.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")
user.unEquip(P)
P.loc = src
if(istype(user,/mob/living/carbon/human))
@@ -42,7 +42,7 @@
amount++
if(screen == 2)
screen = 1
- user << "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."
+ to_chat(user, "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")
user.unEquip(W)
W.loc = src
else if(istype(W, /obj/item/weapon/lighter))
@@ -55,7 +55,7 @@
src.amount++
if(screen == 2)
screen = 1
- user << "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."
+ to_chat(user, "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")
qdel(W)
else
if(istype(W, /obj/item/stack/tape_roll))
@@ -94,13 +94,13 @@
qdel(src)
else
- user << "\red You must hold \the [P] steady to burn \the [src]."
+ to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
/obj/item/weapon/paper_bundle/examine(mob/user)
if(..(user, 1))
src.show_content(user)
else
- user << "It is too far away."
+ to_chat(user, "It is too far away.")
/obj/item/weapon/paper_bundle/proc/show_content(mob/user as mob)
var/dat
@@ -162,7 +162,7 @@
if(href_list["remove"])
var/obj/item/weapon/W = src[page]
usr.put_in_hands(W)
- usr << "You remove the [W.name] from the bundle."
+ to_chat(usr, "You remove the [W.name] from the bundle.")
if(amount == 1)
var/obj/item/weapon/paper/P = src[1]
usr.unEquip(src)
@@ -176,7 +176,7 @@
amount--
update_icon()
else
- usr << "You need to hold it in your hands to change pages."
+ to_chat(usr, "You need to hold it in your hands to change pages.")
if (istype(src.loc, /mob))
src.attack_self(src.loc)
updateUsrDialog()
@@ -200,7 +200,7 @@
set category = "Object"
set src in usr
- usr << "You loosen the bundle."
+ to_chat(usr, "You loosen the bundle.")
for(var/obj/O in src)
O.loc = usr.loc
O.layer = initial(O.layer)
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 552f55051d1..cd3afbd400d 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -54,7 +54,7 @@
if (H.hand)
temp = H.organs_by_name["l_hand"]
if(temp && !temp.is_usable())
- H << "You try to move your [temp.name], but cannot!"
+ to_chat(H, "You try to move your [temp.name], but cannot!")
return
if(amount >= 1)
amount--
@@ -75,9 +75,9 @@
P.loc = user.loc
user.put_in_hands(P)
- user << "You take [P] out of the [src]."
+ to_chat(user, "You take [P] out of the [src].")
else
- user << "[src] is empty!"
+ to_chat(user, "[src] is empty!")
add_fingerprint(user)
return
@@ -89,7 +89,7 @@
user.drop_item()
i.loc = src
- user << "You put [i] in [src]."
+ to_chat(user, "You put [i] in [src].")
papers.Add(i)
amount++
@@ -97,9 +97,9 @@
/obj/item/weapon/paper_bin/examine(mob/user)
if(..(user, 1))
if(amount)
- usr << "There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin."
+ to_chat(usr, "There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.")
else
- usr << "There are no papers in the bin."
+ to_chat(usr, "There are no papers in the bin.")
/obj/item/weapon/paper_bin/update_icon()
@@ -127,9 +127,9 @@
P = new /obj/item/weapon/paper/carbon
P.loc = user.loc
user.put_in_hands(P)
- user << "You take [P] out of the [src]."
+ to_chat(user, "You take [P] out of the [src].")
else
- user << "[src] is empty!"
+ to_chat(user, "[src] is empty!")
add_fingerprint(user)
return
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 6bba24d2805..46d080adb6f 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -25,7 +25,7 @@
pressure_resistance = 2
/obj/item/weapon/pen/suicide_act(mob/user)
- viewers(user) << "[user] starts scribbling numbers over \himself with the [src.name]! It looks like \he's trying to commit sudoku."
+ to_chat(viewers(user), "[user] starts scribbling numbers over \himself with the [src.name]! It looks like \he's trying to commit sudoku.")
return (BRUTELOSS)
/obj/item/weapon/pen/blue
@@ -110,8 +110,8 @@
if(!force)
if(M.can_inject(user, 1))
- user << "You stab [M] with the pen."
-// M << "You feel a tiny prick!"
+ to_chat(user, "You stab [M] with the pen.")
+// to_chat(M, "You feel a tiny prick!")
. = 1
add_logs(M, user, "stabbed", object="[name]")
@@ -161,7 +161,7 @@
hitsound = initial(hitsound)
throwforce = initial(throwforce)
playsound(user, 'sound/weapons/saberoff.ogg', 5, 1)
- user << "[src] can now be concealed."
+ to_chat(user, "[src] can now be concealed.")
else
on = 1
force = 18
@@ -172,7 +172,7 @@
hitsound = 'sound/weapons/blade1.ogg'
throwforce = 35
playsound(user, 'sound/weapons/saberon.ogg', 5, 1)
- user << "[src] is now active."
+ to_chat(user, "[src] is now active.")
update_icon()
/obj/item/weapon/pen/edagger/update_icon()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 6630c24d46c..d6b4b6ad213 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -63,7 +63,7 @@
copyass()
sleep(15)
else
- usr << "\The [copyitem] can't be copied by \the [src]."
+ to_chat(usr, "\The [copyitem] can't be copied by \the [src].")
break
use_power(active_power_usage)
@@ -72,11 +72,11 @@
if(copyitem)
copyitem.loc = usr.loc
usr.put_in_hands(copyitem)
- usr << "You take \the [copyitem] out of \the [src]."
+ to_chat(usr, "You take \the [copyitem] out of \the [src].")
copyitem = null
updateUsrDialog()
else if(check_ass())
- ass << "You feel a slight pressure on your ass."
+ to_chat(ass, "You feel a slight pressure on your ass.")
updateUsrDialog()
else if(href_list["min"])
if(copies > 1)
@@ -117,25 +117,25 @@
user.drop_item()
copyitem = O
O.loc = src
- user << "You insert \the [O] into \the [src]."
+ to_chat(user, "You insert \the [O] into \the [src].")
flick(insert_anim, src)
updateUsrDialog()
else
- user << "There is already something in \the [src]."
+ to_chat(user, "There is already something in \the [src].")
else if(istype(O, /obj/item/device/toner))
if(toner <= 10) //allow replacing when low toner is affecting the print darkness
user.drop_item()
- user << "You insert the toner cartridge into \the [src]."
+ to_chat(user, "You insert the toner cartridge into \the [src].")
var/obj/item/device/toner/T = O
toner += T.toner_amount
qdel(O)
updateUsrDialog()
else
- user << "This cartridge is not yet ready for replacement! Use up the rest of the toner."
+ to_chat(user, "This cartridge is not yet ready for replacement! Use up the rest of the toner.")
else if(istype(O, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
anchored = !anchored
- user << "You [anchored ? "wrench" : "unwrench"] \the [src]."
+ to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].")
else if(istype(O, /obj/item/weapon/grab)) //For ass-copying.
var/obj/item/weapon/grab/G = O
if(ismob(G.affecting) && G.affecting != ass)
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 133018743cc..b63dcc2750c 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -67,13 +67,13 @@
qdel(src)
else
- user << "\red You must hold \the [P] steady to burn \the [src]."
+ to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
/obj/item/weapon/photo/examine(mob/user)
if(..(user, 1) || isobserver(user))
show(user)
else
- user << "It is too far away."
+ to_chat(user, "It is too far away.")
/obj/item/weapon/photo/proc/show(mob/user as mob)
usr << browse_rsc(img, "tmp_photo.png")
@@ -175,7 +175,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
var/nsize = input("Photo Size","Pick a size of resulting photo.") as null|anything in list(1,3,5,7)
if(nsize)
size = nsize
- usr << "Camera will now take [size]x[size] photos."
+ to_chat(usr, "Camera will now take [size]x[size] photos.")
/obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return
@@ -186,15 +186,15 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
src.icon_state = icon_on
else
src.icon_state = icon_off
- user << "You switch the camera [on ? "on" : "off"]."
+ to_chat(user, "You switch the camera [on ? "on" : "off"].")
return
/obj/item/device/camera/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/device/camera_film))
if(pictures_left)
- user << "[src] still has some film in it!"
+ to_chat(user, "[src] still has some film in it!")
return
- user << "You insert [I] into [src]."
+ to_chat(user, "You insert [I] into [src].")
user.drop_item()
qdel(I)
pictures_left = pictures_max
@@ -304,7 +304,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
pictures_left--
desc = "A polaroid camera. It has [pictures_left] photos left."
- user << "[pictures_left] photos left."
+ to_chat(user, "[pictures_left] photos left.")
icon_state = icon_off
on = 0
if(user.mind && !(user.mind.assigned_role == "Chaplain"))
@@ -427,9 +427,9 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
/obj/item/device/camera/digital/captureimage(atom/target, mob/user, flag)
if(saved_pictures.len >= max_storage)
- user << "Maximum photo storage capacity reached."
+ to_chat(user, "Maximum photo storage capacity reached.")
return
- user << "Picture saved."
+ to_chat(user, "Picture saved.")
var/x_c = target.x - (size-1)/2
var/y_c = target.y + (size-1)/2
var/z_c = target.z
@@ -454,10 +454,10 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
set src in usr
if(saved_pictures.len == 0)
- usr << "No images saved."
+ to_chat(usr, "No images saved.")
return
if(pictures_left == 0)
- usr << "There is no film left to print."
+ to_chat(usr, "There is no film left to print.")
return
var/datum/picture/P = null
@@ -472,7 +472,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
set src in usr
if(saved_pictures.len == 0)
- usr << "No images saved"
+ to_chat(usr, "No images saved")
return
var/datum/picture/P = null
P = input("Select image to delete:",P) as null|anything in saved_pictures
@@ -516,11 +516,11 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
camera.network = list("news")
cameranet.removeCamera(camera)
camera.c_tag = user.name
- user << "You switch the camera [on ? "on" : "off"]."
+ to_chat(user, "You switch the camera [on ? "on" : "off"].")
/obj/item/device/videocam/examine(mob/user)
if(..(user, 1))
- user << "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active."
+ to_chat(user, "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active.")
/obj/item/device/videocam/hear_talk(mob/M as mob, msg)
if (camera && on)
@@ -545,4 +545,4 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\
'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\
'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg')
- user << pick(creepyasssounds)
+ to_chat(user, pick(creepyasssounds))
diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm
index ec4d920eaaa..83740eac7ee 100644
--- a/code/modules/paperwork/silicon_photography.dm
+++ b/code/modules/paperwork/silicon_photography.dm
@@ -29,11 +29,12 @@
if(C.connected_ai)
var/mob/A = P.fields["author"]
C.connected_ai.aiCamera.injectaialbum(P, " (taken by [A.name])")
- C.connected_ai << "Image recorded and saved by [name]"
- usr << "Image recorded and saved to remote database" //feedback to the Cyborg player that the picture was taken
+ to_chat(C.connected_ai, "Image recorded and saved by [name]")
+ to_chat(usr, "Image recorded and saved to remote database")//feedback to the Cyborg player that the picture was taken
+
else
injectaialbum(P)
- usr << "Image recorded"
+ to_chat(usr, "Image recorded")
/obj/item/device/camera/siliconcam/proc/selectpicture(obj/item/device/camera/siliconcam/cam)
if(!cam)
@@ -42,7 +43,7 @@
var/list/nametemp = list()
var/find
if(cam.aipictures.len == 0)
- usr << "No images saved"
+ to_chat(usr, "No images saved")
return
for(var/datum/picture/t in cam.aipictures)
nametemp += t.fields["name"]
@@ -61,7 +62,7 @@
var/obj/item/weapon/photo/P = new/obj/item/weapon/photo()
P.construct(selection)
P.show(usr)
- usr << P.desc
+ to_chat(usr, P.desc)
// TG uses a special garbage collector.. qdel(P)
qdel(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all.
@@ -73,7 +74,7 @@
return
cam.aipictures -= selection
- usr << "Image deleted"
+ to_chat(usr, "Image deleted")
/obj/item/device/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user)
var/mob/living/silicon/ai = user
@@ -87,15 +88,15 @@
/obj/item/device/camera/siliconcam/proc/camera_mode_off()
src.in_camera_mode = 0
- usr << "Camera Mode deactivated"
+ to_chat(usr, "Camera Mode deactivated")
/obj/item/device/camera/siliconcam/proc/camera_mode_on()
src.in_camera_mode = 1
- usr << "Camera Mode activated"
+ to_chat(usr, "Camera Mode activated")
/obj/item/device/camera/siliconcam/ai_camera/printpicture(mob/user, datum/picture/P)
injectaialbum(P)
- usr << "Image recorded"
+ to_chat(usr, "Image recorded")
/obj/item/device/camera/siliconcam/robot_camera/printpicture(mob/user, datum/picture/P)
injectmasteralbum(P)
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index c88dce0e20f..96c5eedff2d 100755
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -29,19 +29,27 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/honkamt = 0 //How many honks left when infected with honk.exe
var/mimeamt = 0 //How many silence left when infected with mime.exe
var/detonate = 1 // Can the PDA be blown up?
- var/newmessage = 0 //To remove hackish overlay check
var/ttone = "beep" //The ringtone!
+ var/list/ttone_sound = list("beep" = 'sound/machines/twobeep.ogg',
+ "boom" = 'sound/effects/explosionfar.ogg',
+ "slip" = 'sound/misc/slip.ogg',
+ "honk" = 'sound/items/bikehorn.ogg',
+ "SKREE" = 'sound/voice/shriek1.ogg',
+ "holy" = 'sound/items/PDA/ambicha4-short.ogg',
+ "xeno" = 'sound/voice/hiss1.ogg')
var/list/programs = list(
new/datum/data/pda/app/main_menu,
new/datum/data/pda/app/notekeeper,
new/datum/data/pda/app/messenger,
new/datum/data/pda/app/manifest,
+ new/datum/data/pda/app/chatroom,
new/datum/data/pda/app/atmos_scanner,
new/datum/data/pda/utility/scanmode/notes,
new/datum/data/pda/utility/flashlight)
var/list/shortcut_cache = list()
var/list/shortcut_cat_order = list()
+ var/list/notifying_programs = list()
var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both.
var/ownjob = null //related to above
@@ -70,7 +78,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
return 0
var/mob/M = loc
- if(M.stat || M.restrained() || M.paralysis || M.stunned || M.weakened)
+ if(M.incapacitated())
return 0
if((src in M.contents) || ( istype(loc, /turf) && in_range(src, M) ))
return 1
@@ -133,7 +141,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
cat = list()
shortcut_cache[P.category] = cat
shortcut_cat_order += P.category
- cat |= list(list(name = P.name, icon = P.icon, ref = "\ref[P]"))
+ cat |= list(list(name = P.name, icon = P.icon, notify_icon = P.notify_icon, ref = "\ref[P]"))
// force the order of a few core categories
shortcut_cat_order = list("General") \
@@ -250,12 +258,17 @@ var/global/list/obj/item/device/pda/PDAs = list()
start_program(find_program(/datum/data/pda/app/main_menu))
if(C.radio)
C.radio.hostpda = null
+ for(var/datum/data/pda/P in notifying_programs)
+ if(P in C.programs)
+ P.unnotify()
cartridge = null
update_shortcuts()
if ("Authenticate")//Checks for ID
id_check(usr, 1)
if("Retro")
retro_mode = !retro_mode
+ if("Ringtone")
+ return set_ringtone()
else
if(current_app)
. = current_app.Topic(href, href_list)
@@ -281,16 +294,18 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(can_use(usr))
start_program(find_program(/datum/data/pda/app/main_menu))
- usr << "You press the reset button on \the [src]."
+ notifying_programs.Cut()
+ overlays.Cut()
+ to_chat(usr, "You press the reset button on \the [src].")
else
- usr << "You cannot do this while restrained."
+ to_chat(usr, "You cannot do this while restrained.")
/obj/item/device/pda/proc/remove_id()
if (id)
if (ismob(loc))
var/mob/M = loc
M.put_in_hands(id)
- usr << "You remove the ID from the [name]."
+ to_chat(usr, "You remove the ID from the [name].")
else
id.forceMove(get_turf(src))
id = null
@@ -307,9 +322,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(id)
remove_id()
else
- usr << "This PDA does not have an ID in it."
+ to_chat(usr, "This PDA does not have an ID in it.")
else
- usr << "You cannot do this while restrained."
+ to_chat(usr, "You cannot do this while restrained.")
/obj/item/device/pda/verb/verb_remove_pen()
@@ -327,13 +342,13 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/mob/M = loc
if(M.get_active_hand() == null)
M.put_in_hands(O)
- usr << "You remove \the [O] from \the [src]."
+ to_chat(usr, "You remove \the [O] from \the [src].")
return
O.forceMove(get_turf(src))
else
- usr << "This PDA does not have a pen in it."
+ to_chat(usr, "This PDA does not have a pen in it.")
else
- usr << "You cannot do this while restrained."
+ to_chat(usr, "You cannot do this while restrained.")
/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.
@@ -364,40 +379,40 @@ var/global/list/obj/item/device/pda/PDAs = list()
cartridge.forceMove(src)
cartridge.update_programs(src)
update_shortcuts()
- user << "You insert [cartridge] into [src]."
+ to_chat(user, "You insert [cartridge] into [src].")
if(cartridge.radio)
cartridge.radio.hostpda = src
else if(istype(C, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/idcard = C
if(!idcard.registered_name)
- user << "\The [src] rejects the ID."
+ to_chat(user, "\The [src] rejects the ID.")
return
if(!owner)
owner = idcard.registered_name
ownjob = idcard.assignment
ownrank = idcard.rank
name = "PDA-[owner] ([ownjob])"
- user << "Card scanned."
+ to_chat(user, "Card scanned.")
else
//Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand.
if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) )
if( can_use(user) )//If they can still act.
id_check(user, 2)
- user << "You put the ID into \the [src]'s slot."
+ to_chat(user, "You put the ID into \the [src]'s slot.")
else if(istype(C, /obj/item/device/paicard) && !src.pai)
user.drop_item()
C.forceMove(src)
pai = C
- user << "You slot \the [C] into [src]."
+ to_chat(user, "You slot \the [C] into [src].")
else if(istype(C, /obj/item/weapon/pen))
var/obj/item/weapon/pen/O = locate() in src
if(O)
- user << "There is already a pen in \the [src]."
+ to_chat(user, "There is already a pen in \the [src].")
else
user.drop_item()
C.forceMove(src)
- user << "You slide \the [C] into \the [src]."
+ to_chat(user, "You slide \the [C] into \the [src].")
/obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob)
if (istype(C, /mob/living/carbon) && scanmode)
@@ -442,4 +457,30 @@ var/global/list/obj/item/device/pda/PDAs = list()
// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP
/obj/item/device/pda/emp_act(severity)
for(var/atom/A in src)
- A.emp_act(severity)
\ No newline at end of file
+ A.emp_act(severity)
+
+/obj/item/device/pda/proc/play_ringtone()
+ var/S
+
+ if(ttone in ttone_sound)
+ S = ttone_sound[ttone]
+ else
+ S = 'sound/machines/twobeep.ogg'
+ playsound(loc, S, 50, 1)
+ for(var/mob/O in hearers(3, loc))
+ O.show_message(text("\icon[src] *[ttone]*"))
+
+/obj/item/device/pda/proc/set_ringtone()
+ var/t = input("Please enter new ringtone", name, ttone) as text
+ if (in_range(src, usr) && loc == usr)
+ if (t)
+ if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code)))
+ to_chat(usr, "The PDA softly beeps.")
+ close(usr)
+ else
+ t = sanitize(copytext(t, 1, 20))
+ ttone = t
+ return 1
+ else
+ close(usr)
+ return 0
\ No newline at end of file
diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm
index a6c7769ab52..b8b95276c06 100644
--- a/code/modules/pda/ai.dm
+++ b/code/modules/pda/ai.dm
@@ -17,13 +17,12 @@
set category = "AI IM"
set name = "Send PDA Message"
set src in usr
-
- if(usr.stat == DEAD)
- usr << "You can't send PDA messages because you are dead!"
+
+ if(!can_use())
return
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
if(!M)
- usr << "Cannot use messenger!"
+ to_chat(usr, "Cannot use messenger!")
var/list/plist = M.available_pdas()
if (plist)
var/c = input(usr, "Please select a PDA") as null|anything in sortList(plist)
@@ -36,13 +35,12 @@
set category = "AI IM"
set name = "Show Message Log"
set src in usr
-
- if(usr.stat == DEAD)
- usr << "You can't do that because you are dead!"
+
+ if(!can_use())
return
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
if(!M)
- usr << "Cannot use messenger!"
+ to_chat(usr, "Cannot use messenger!")
var/HTML = "AI PDA Message Log"
for(var/index in M.tnote)
if(index["sent"])
@@ -56,30 +54,30 @@
set category = "AI IM"
set name = "Toggle Sender/Receiver"
set src in usr
-
- if(usr.stat == DEAD)
- usr << "You can't do that because you are dead!"
+
+ if(!can_use())
return
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
M.toff = !M.toff
- usr << "PDA sender/receiver toggled [(M.toff ? "Off" : "On")]!"
+ to_chat(usr, "PDA sender/receiver toggled [(M.toff ? "Off" : "On")]!")
/obj/item/device/pda/ai/verb/cmd_toggle_pda_silent()
set category = "AI IM"
set name = "Toggle Ringer"
set src in usr
-
- if(usr.stat == DEAD)
- usr << "You can't do that because you are dead!"
+
+ if(!can_use())
return
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
- M.silent = !M.silent
- usr << "PDA ringer toggled [(M.silent ? "Off" : "On")]!"
+ M.notify_silent = !M.notify_silent
+ to_chat(usr, "PDA ringer toggled [(M.notify_silent ? "Off" : "On")]!")
/obj/item/device/pda/ai/can_use()
- return 1
-
+ var/mob/living/silicon/ai/AI = usr
+ if(!istype(AI))
+ return 0
+ return ..() && !AI.check_unable(AI_CHECK_WIRELESS)
/obj/item/device/pda/ai/attack_self(mob/user as mob)
if ((honkamt > 0) && (prob(60)))//For clown virus.
@@ -87,5 +85,13 @@
playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
return
-/obj/item/device/pda/ai/pai
- ttone = "assist"
\ No newline at end of file
+/obj/item/device/pda/pai
+ icon_state = "NONE"
+ detonate = 0
+ ttone = "assist"
+
+/obj/item/device/pda/pai/can_use()
+ var/mob/living/silicon/pai/pAI = usr
+ if(!istype(pAI))
+ return 0
+ return ..() && !pAI.silence_time
\ No newline at end of file
diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm
index 1f8b37d97fa..45b2e79aec3 100644
--- a/code/modules/pda/app.dm
+++ b/code/modules/pda/app.dm
@@ -1,6 +1,8 @@
// Base class for anything that can show up on home screen
/datum/data/pda
var/icon = "tasks"
+ var/notify_icon = "exclamation-circle"
+ var/notify_silent = 0
var/hidden = 0 // program not displayed in main menu
var/category = "General" // the category to list it in on the main menu
var/obj/item/device/pda/pda // if this is null, and the app is running code, something's gone wrong
@@ -11,6 +13,35 @@
/datum/data/pda/proc/start()
+/datum/data/pda/proc/notify(message, blink = 1)
+ if(message)
+ //Search for holder of the PDA.
+ var/mob/living/L = null
+ if(pda.loc && isliving(pda.loc))
+ L = pda.loc
+ //Maybe they are a pAI!
+ else
+ L = get(pda, /mob/living/silicon)
+
+ if(L)
+ to_chat(L, "\icon[pda] [message]")
+ nanomanager.update_user_uis(L, pda) // Update the receiving user's PDA UI so that they can see the new message
+
+ if(!notify_silent)
+ pda.play_ringtone()
+
+ if(blink && !(src in pda.notifying_programs))
+ pda.overlays.Cut()
+ pda.overlays += image('icons/obj/pda.dmi', "pda-r")
+ pda.notifying_programs |= src
+
+/datum/data/pda/proc/unnotify()
+ if(src in pda.notifying_programs)
+ pda.notifying_programs -= src
+ if(!pda.notifying_programs.len)
+ pda.overlays.Cut()
+
+/datum/data/pda/proc/
// An app has a button on the home screen and its own UI
/datum/data/pda/app
diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm
index 58db368a489..9afb3e52764 100644
--- a/code/modules/pda/cart_apps.dm
+++ b/code/modules/pda/cart_apps.dm
@@ -96,7 +96,7 @@
/datum/data/pda/app/power/update_ui(mob/user as mob, list/data)
update = PDA_APP_UPDATE_SLOW
-
+
if (powmonitor && !isnull(powmonitor.powernet))
data["records"] = list(
"powerconnected" = 1,
@@ -226,7 +226,7 @@
beepskyData["botstatus"] = list("loca" = null, "mode" = -1)
var/botsCount=0
if(SC.botlist && SC.botlist.len)
- for(var/obj/machinery/bot/B in SC.botlist)
+ for(var/mob/living/simple_animal/bot/B in SC.botlist)
botsCount++
if(B.loc)
botsData[++botsData.len] = list("Name" = sanitize(B.name), "Location" = sanitize(B.loc.loc.name), "ref" = "\ref[B]")
@@ -276,7 +276,7 @@
var/mulebotsCount=0
- for(var/obj/machinery/bot/B in QC.botlist)
+ for(var/mob/living/simple_animal/bot/B in QC.botlist)
mulebotsCount++
if(B.loc)
mulebotsData[++mulebotsData.len] = list("Name" = sanitize(B.name), "Location" = sanitize(B.loc.loc.name), "ref" = "\ref[B]")
@@ -392,7 +392,7 @@
BucketData[++BucketData.len] = list("x" = 0, "y" = 0, dir=null, status = null)
var/CbotData[0]
- for(var/obj/machinery/bot/cleanbot/B in aibots)
+ for(var/mob/living/simple_animal/bot/cleanbot/B in simple_animal_list)
var/turf/bl = get_turf(B)
if(bl)
if(bl.z != cl.z)
diff --git a/code/modules/pda/chatroom.dm b/code/modules/pda/chatroom.dm
index 008dab64149..d5758b161f4 100644
--- a/code/modules/pda/chatroom.dm
+++ b/code/modules/pda/chatroom.dm
@@ -1,16 +1,264 @@
-var/list/chatrooms = list()
+var/list/chatrooms = list(new /datum/chatroom("General Discussion"))
/datum/chatroom
var/name = "Generic Chatroom"
- var/list/logged_in = list()
+ var/list/users = list()
+ var/list/invites = list()
var/list/logs = list() // chat logs
- var/list/banned = list() // banned users
- var/list/whitelist = list() // whitelisted users
- var/list/muted = list()
- var/topic = "" // topic message for the chatroom
- var/password = "" // blank for no password.
- var/operator = "" // name of the operator
+ var/topic = "Discussion" // topic message for the chatroom
+ var/is_public = 1
+ var/announcer = "CyberiadAI"
-/datum/chatroom/proc/attempt_connect(var/obj/item/device/pda/device, var/obj/password)
- if(!device)
+/datum/chatroom/New(n)
+ name = n
+
+/datum/chatroom/proc/post(user, message, username)
+ if(!user || !message)
return
+
+ if(!username)
+ if(istype(user, /datum/data/pda/app/chatroom))
+ var/datum/data/pda/app/chatroom/c = user
+ if(!c.pda.owner)
+ return
+ username = c.pda.owner
+ else
+ return
+
+ logs += list(list(username = username, message = message))
+
+ for(var/datum/data/pda/app/chatroom/u in users)
+ spawn()
+ if(u.messaging_available() && !u.toff && user != u)
+ u.notify("Post from [username] in #[name], \"[message]\" (Post)")
+
+/datum/chatroom/proc/announce(user, message)
+ post(user, "[message]", announcer)
+
+/datum/chatroom/proc/login(datum/data/pda/app/chatroom/user)
+ if(!user || !user.pda.owner)
+ return 0
+
+ if(user in users)
+ return 1
+
+ if(!is_public && !(user in invites))
+ return 0
+
+ users |= user
+ announce(user, "[user.pda.owner] has entered #[name].")
+ return 1
+
+/datum/chatroom/proc/logout(datum/data/pda/app/chatroom/user)
+ if(!user || !user.pda.owner || !(user in users))
+ return
+
+ users -= user
+ invites -= user
+ announce(user, "[user.pda.owner] has left #[name].")
+
+/datum/data/pda/app/chatroom
+ name = "Chatbuddy"
+ icon = "hashtag"
+ notify_icon = "comments"
+ template = "pda_chatroom"
+ var/toff = 0
+ var/datum/chatroom/current_room = null
+ var/inviting = 0
+ var/channels_created = 0
+ var/max_channels_created = 3
+ var/latest_post = 0
+ var/auto_scroll = 1
+ var/disconnected = 0
+
+/datum/data/pda/app/chatroom/Destroy()
+ for(var/C in chatrooms)
+ var/datum/chatroom/ch = C
+ if(src in ch.users)
+ ch.users -= src
+ if(src in ch.invites)
+ ch.invites -= src
+
+/datum/data/pda/app/chatroom/start()
+ . = ..()
+ unnotify()
+ latest_post = 0
+
+/datum/data/pda/app/chatroom/update_ui(mob/user as mob, list/data)
+ data["silent"] = notify_silent
+ data["toff"] = toff
+ if(disconnected || !messaging_available(1))
+ data["no_server"] = 1
+ has_back = 0
+ else if(current_room)
+ data["room"] = current_room.name
+ data["topic"] = current_room.topic
+ if(inviting)
+ data["inviting"] = 1
+ var/list/pdas = list()
+ for(var/A in PDAs)
+ var/obj/item/device/pda/P = A
+ var/datum/data/pda/app/chatroom/C = P.find_program(/datum/data/pda/app/chatroom)
+ var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
+
+ if (!P.owner || P == pda || PM.m_hidden || (C in current_room.invites) || (C in current_room.users))
+ continue
+ pdas += list(list(name = "[P.owner] ([P.ownjob])", ref = "\ref[C]"))
+ data["people"] = pdas
+ else
+ data["history"] = current_room.logs
+ var/list/users[0]
+ for(var/U in current_room.users)
+ var/datum/data/pda/app/chatroom/ch = U
+ users += "[ch.pda.owner]"
+ for(var/U in (current_room.invites - current_room.users))
+ var/datum/data/pda/app/chatroom/ch = U
+ users += "[ch.pda.owner]"
+ data["users"] = users
+ data["auto_scroll"] = auto_scroll
+ data["latest_post"] = latest_post
+ latest_post = current_room.logs.len
+ has_back = 1
+ else
+ var/list/rooms[0]
+ for(var/datum/chatroom/c in chatrooms)
+ if((src in c.users) || (src in c.invites) || c.is_public)
+ rooms += list(list(name = "[c]", ref = "\ref[c]"))
+ data["rooms"] = rooms
+ has_back = 0
+
+/datum/data/pda/app/chatroom/proc/messaging_available(cheap = 0)
+ . = 0
+ if(message_servers)
+ for(var/A in message_servers)
+ var/obj/machinery/message_server/MS = A
+ if(MS.active)
+ . = cheap || pda.test_telecomms()
+ disconnected = !.
+
+/datum/data/pda/app/chatroom/proc/check_messaging_available()
+ . = messaging_available()
+ if(!.)
+ to_chat(usr, "ERROR: Messaging server is not responding.")
+
+/datum/data/pda/app/chatroom/Topic(href, list/href_list)
+ if(!pda.can_use())
+ return
+ unnotify()
+
+ switch(href_list["choice"])
+ if("Toggle Chatroom")
+ toff = !toff
+ if("Toggle Ringer")
+ notify_silent = !notify_silent
+ if("Back")
+ if(inviting)
+ inviting = 0
+ else
+ current_room = null
+ latest_post = 0
+ if("Join")
+ if(href_list["room"])
+ current_room = locate(href_list["room"])
+ if(!(src in current_room.users))
+ if(!current_room.login(src))
+ current_room = null
+ latest_post = 0
+ if("Post")
+ var/datum/chatroom/target
+ if(href_list["target"])
+ target = locate(href_list["target"])
+ else
+ target = current_room
+
+ if(!target)
+ return
+
+ var/t = input("Please enter message", target) as text|null
+ spawn()
+ if(!t || !check_messaging_available())
+ return
+ t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
+ t = readd_quotes(t)
+ if (!t || !pda.can_use())
+ return
+
+ target.post(src, t)
+ if("Topic")
+ if(!current_room)
+ return
+
+ var/t = input("Enter new topic:", current_room, current_room.topic) as text|null
+ spawn()
+ if(!t || !check_messaging_available() || !pda.can_use())
+ return
+ t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
+ t = readd_quotes(t)
+ if (!t)
+ return
+
+ current_room.topic = t
+ current_room.announce(src, "Topic has been changed to '[t]' by [pda.owner].")
+ if("Leave")
+ if(!current_room)
+ return
+
+ current_room.logout(src)
+ current_room = null
+ latest_post = 0
+ if("Invite")
+ if(!current_room)
+ return
+
+ inviting = 1
+ if("Invite PDA")
+ spawn()
+ if(!check_messaging_available() || !current_room || !href_list["user"])
+ return
+
+ var/datum/data/pda/app/chatroom/C = locate(href_list["user"])
+ if(C)
+ current_room.invites |= C
+ spawn()
+ if(C.messaging_available() && !C.toff)
+ C.notify("Invite to #[current_room] (Join)")
+ if("New Room")
+ if(channels_created >= max_channels_created)
+ alert("This PDA has already reached its maximum channels created.", name)
+ return
+
+ var/t = input("Enter room name:", name) as text|null
+ if(!t)
+ return
+ t = sanitize(copytext(t, 1, MAX_NAME_LEN))
+ t = readd_quotes(t)
+
+ var/access = input("Room access?", current_room) as null|anything in list("Public", "Private")
+ if(!access)
+ return
+
+ spawn()
+ if (!t || !check_messaging_available() || !pda.can_use())
+ return
+
+ // check if already taken
+ for(var/datum/chatroom/C in chatrooms)
+ if(C.name == t)
+ alert("Channel with that name already exists.", name)
+ return
+
+ channels_created++
+ current_room = new /datum/chatroom(t)
+ chatrooms += current_room
+ latest_post = 0
+
+ current_room.invites |= src
+ current_room.is_public = access == "Public"
+ current_room.login(src)
+ if(!current_room.is_public)
+ current_room.announce(src, "Users must be invited to join this room.")
+ if("Autoscroll")
+ auto_scroll = !auto_scroll
+ if("Reconnect")
+ spawn()
+ messaging_available()
\ No newline at end of file
diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm
index 55a6dbd6f45..0117a6b9140 100644
--- a/code/modules/pda/core_apps.dm
+++ b/code/modules/pda/core_apps.dm
@@ -11,6 +11,11 @@
data["apps"] = pda.shortcut_cache
data["categories"] = pda.shortcut_cat_order
data["pai"] = !isnull(pda.pai) // pAI inserted?
+
+ var/list/notifying[0]
+ for(var/P in pda.notifying_programs)
+ notifying["\ref[P]"] = 1
+ data["notifying"] = notifying
/datum/data/pda/app/main_menu/Topic(href, list/href_list)
switch(href_list["choice"])
diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm
index 0cd76bb7796..c5f6375f82f 100644
--- a/code/modules/pda/messenger.dm
+++ b/code/modules/pda/messenger.dm
@@ -1,82 +1,78 @@
/datum/data/pda/app/messenger
name = "Messenger"
icon = "comments-o"
- title = "SpaceMessenger V4.0.1"
+ notify_icon = "comments"
+ title = "SpaceMessenger V4.1.0"
template = "pda_messenger"
- var/silent = 0 //To beep or not to beep, that is the question
var/toff = 0 //If 1, messenger disabled
var/list/tnote[0] //Current Texts
var/last_text //No text spamming
- var/list/ttone_sound = list("beep" = 'sound/machines/twobeep.ogg',
- "boom" = 'sound/effects/explosionfar.ogg',
- "slip" = 'sound/misc/slip.ogg',
- "honk" = 'sound/items/bikehorn.ogg',
- "SKREE" = 'sound/voice/shriek1.ogg',
- "holy" = 'sound/items/PDA/ambicha4-short.ogg',
- "xeno" = 'sound/voice/hiss1.ogg')
var/m_hidden = 0 // Is the PDA hidden from the PDA list?
var/active_conversation = null // New variable that allows us to only view a single conversation.
var/list/conversations = list() // For keeping up with who we have PDA messsages from.
+ var/latest_post = 0
+ var/auto_scroll = 1
/datum/data/pda/app/messenger/start()
. = ..()
- set_new(0)
+ unnotify()
+ latest_post = 0
/datum/data/pda/app/messenger/update_ui(mob/user as mob, list/data)
- data["silent"] = silent // does the pda make noise when it receives a message?
+ data["silent"] = notify_silent // does the pda make noise when it receives a message?
data["toff"] = toff // is the messenger function turned off?
data["active_conversation"] = active_conversation // Which conversation are we following right now?
- var/convopdas[0]
- var/pdas[0]
- var/count = 0
- for(var/A in PDAs)
- var/obj/item/device/pda/P = A
- var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
-
- if (!P.owner || PM.toff || P == pda || PM.m_hidden)
- continue
- if(conversations.Find("\ref[P]"))
- convopdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "1")))
- else
- pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0")))
- count++
-
- data["convopdas"] = convopdas
- data["pdas"] = pdas
- data["pda_count"] = count
-
- data["messagescount"] = tnote.len
- data["messages"] = tnote
-
has_back = active_conversation
if(active_conversation)
+ data["messages"] = tnote
for(var/c in tnote)
if(c["target"] == active_conversation)
data["convo_name"] = sanitize(c["owner"])
data["convo_job"] = sanitize(c["job"])
break
+ data["auto_scroll"] = auto_scroll
+ data["latest_post"] = latest_post
+ latest_post = tnote.len
+ else
+ var/convopdas[0]
+ var/pdas[0]
+ for(var/A in PDAs)
+ var/obj/item/device/pda/P = A
+ var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger)
- var/list/plugins = list()
- if(pda.cartridge)
- for(var/A in pda.cartridge.messenger_plugins)
- var/datum/data/pda/messenger_plugin/P = A
- plugins += list(list(name = P.name, icon = P.icon, ref = "\ref[P]"))
- data["plugins"] = plugins
+ if (!P.owner || PM.toff || P == pda || PM.m_hidden)
+ continue
+ if(conversations.Find("\ref[P]"))
+ convopdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "1")))
+ else
+ pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0")))
- if(pda.cartridge)
- data["charges"] = pda.cartridge.charges ? pda.cartridge.charges : 0
+ data["convopdas"] = convopdas
+ data["pdas"] = pdas
+
+ var/list/plugins = list()
+ if(pda.cartridge)
+ for(var/A in pda.cartridge.messenger_plugins)
+ var/datum/data/pda/messenger_plugin/P = A
+ plugins += list(list(name = P.name, icon = P.icon, ref = "\ref[P]"))
+ data["plugins"] = plugins
+
+ if(pda.cartridge)
+ data["charges"] = pda.cartridge.charges ? pda.cartridge.charges : 0
/datum/data/pda/app/messenger/Topic(href, list/href_list)
- set_new(0)
+ if(!pda.can_use())
+ return
+ unnotify()
switch(href_list["choice"])
if("Toggle Messenger")
toff = !toff
if("Toggle Ringer")//If viewing texts then erase them, if not then toggle silent status
- silent = !silent
+ notify_silent = !notify_silent
if("Clear")//Clears messages
if(href_list["option"] == "All")
tnote.Cut()
@@ -90,62 +86,36 @@
conversations.Remove(active_conversation)
active_conversation = null
- if("Ringtone")
- var/t = input("Please enter new ringtone", name, pda.ttone) as text
- if (in_range(pda, usr) && pda.loc == usr)
- if (t)
- if(pda.hidden_uplink && pda.hidden_uplink.check_trigger(usr, lowertext(t), lowertext(pda.lock_code)))
- usr << "The PDA softly beeps."
- pda.close(usr)
- else
- t = sanitize(copytext(t, 1, 20))
- pda.ttone = t
- else
- pda.close(usr)
- return 0
+ latest_post = 0
if("Message")
var/obj/item/device/pda/P = locate(href_list["target"])
create_message(usr, P)
if(href_list["target"] in conversations) // Need to make sure the message went through, if not welp.
active_conversation = href_list["target"]
+ latest_post = 0
if("Select Conversation")
var/P = href_list["convo"]
for(var/n in conversations)
if(P == n)
active_conversation = P
+ latest_post = 0
if("Messenger Plugin")
if(!href_list["target"] || !href_list["plugin"])
return
var/obj/item/device/pda/P = locate(href_list["target"])
if(!P)
- usr << "PDA not found."
+ to_chat(usr, "PDA not found.")
var/datum/data/pda/messenger_plugin/plugin = locate(href_list["plugin"])
- if(plugin && plugin in pda.cartridge.messenger_plugins)
+ if(plugin && (plugin in pda.cartridge.messenger_plugins))
plugin.messenger = src
plugin.user_act(usr, P)
if("Back")
active_conversation = null
-
-/datum/data/pda/app/messenger/proc/set_new(isnew)
- if(pda.newmessage == isnew)
- return
-
- if(pda.newmessage)
- //To clear message overlays.
- pda.overlays.Cut()
- pda.newmessage = 0
-
- icon = "comments"
- pda.update_shortcuts()
- else
- pda.overlays.Cut()
- pda.overlays += image('icons/obj/pda.dmi', "pda-r")
- pda.newmessage = 1
-
- icon = "comments-o"
- pda.update_shortcuts()
+ latest_post = 0
+ if("Autoscroll")
+ auto_scroll = !auto_scroll
/datum/data/pda/app/messenger/proc/create_message(var/mob/living/U, var/obj/item/device/pda/P)
var/t = input(U, "Please enter message", name, null) as text|null
@@ -196,7 +166,7 @@
if(useMS && useTC) // only send the message if it's stable
if(useTC != 2) // Does our recipient have a broadcaster on their level?
- U << "ERROR: Cannot reach recipient."
+ to_chat(U, "ERROR: Cannot reach recipient.")
return
useMS.send_pda_message("[P.owner]","[pda.owner]","[t]")
tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]")))
@@ -207,38 +177,11 @@
if(!PM.conversations.Find("\ref[pda]"))
PM.conversations.Add("\ref[pda]")
- PM.play_ringtone()
- //Search for holder of the PDA.
- var/mob/living/L = null
- if(P.loc && isliving(P.loc))
- L = P.loc
- //Maybe they are a pAI!
- else
- L = get(P, /mob/living/silicon)
-
-
- if(L)
- L << "\icon[P] Message from [pda.owner] ([pda.ownjob]), \"[t]\" (Reply)"
- nanomanager.update_user_uis(L, P) // Update the receiving user's PDA UI so that they can see the new message
-
nanomanager.update_user_uis(U, P) // Update the sending user's PDA UI so that they can see the new message
- set_new(1)
+ PM.notify("Message from [pda.owner] ([pda.ownjob]), \"[t]\" (Reply)")
log_pda("[usr] (PDA: [src.name]) sent \"[t]\" to [P.name]")
else
- U << "ERROR: Messaging server is not responding."
-
-/datum/data/pda/app/messenger/proc/play_ringtone()
- if (!silent)
- var/S
-
- if(pda.ttone in ttone_sound)
- S = ttone_sound[pda.ttone]
- else
- S = 'sound/machines/twobeep.ogg'
- playsound(pda.loc, S, 50, 1)
- for(var/mob/O in hearers(3, pda.loc))
- if(!silent)
- O.show_message(text("\icon[pda] *[pda.ttone]*"))
+ to_chat(U, "ERROR: Messaging server is not responding.")
/datum/data/pda/app/messenger/proc/available_pdas()
var/list/names = list()
@@ -246,7 +189,7 @@
var/list/namecounts = list()
if (toff)
- usr << "Turn on your receiver in order to send messages."
+ to_chat(usr, "Turn on your receiver in order to send messages.")
return
for(var/A in PDAs)
diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm
index ed4d330fdba..98cab31aaf7 100644
--- a/code/modules/pda/messenger_plugins.dm
+++ b/code/modules/pda/messenger_plugins.dm
@@ -34,10 +34,13 @@
. = ..(user, P)
if(.)
user.show_message("Virus sent!", 1)
- var/datum/data/pda/app/messenger/M = P.find_program(/datum/data/pda/app/messenger)
+ var/datum/data/pda/app/M = P.find_program(/datum/data/pda/app/messenger)
if(M)
- M.silent = 1
- P.ttone = "silence"
+ M.notify_silent = 1
+ M = P.find_program(/datum/data/pda/app/chatroom)
+ if(M)
+ M.notify_silent = 1
+ P.ttone = "silence"
/datum/data/pda/messenger_plugin/virus/detonate
diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm
index 1e15144c5fd..6ad7f2b378c 100644
--- a/code/modules/pda/pdas.dm
+++ b/code/modules/pda/pdas.dm
@@ -50,9 +50,12 @@
/obj/item/device/pda/mime/New()
..()
- var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
+ var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger)
if(M)
- M.silent = 1
+ M.notify_silent = 1
+ M = find_program(/datum/data/pda/app/chatroom)
+ if(M)
+ M.notify_silent = 1
/obj/item/device/pda/heads
default_cartridge = /obj/item/weapon/cartridge/head
@@ -142,9 +145,12 @@
/obj/item/device/pda/librarian/New()
..()
- var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
+ var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger)
if(M)
- M.silent = 1 //Quiet in the library!
+ M.notify_silent = 1 //Quiet in the library!
+ M = find_program(/datum/data/pda/app/chatroom)
+ if(M)
+ M.notify_silent = 1 //Quiet in the library!
/obj/item/device/pda/clear
icon_state = "pda-transp"
diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm
index 02a5dc996e2..c64ea02ce7c 100644
--- a/code/modules/pda/radio.dm
+++ b/code/modules/pda/radio.dm
@@ -5,7 +5,7 @@
icon_state = "power_mod"
var/obj/item/device/pda/hostpda = null
var/list/botlist = null // list of bots
- var/obj/machinery/bot/active // the active bot; if null, show bot list
+ var/mob/living/simple_animal/bot/active // the active bot; if null, show bot list
var/list/botstatus // the status signal sent by the bot
var/bot_type //The type of bot it is.
var/bot_filter //Determines which radio filter to use.
@@ -17,9 +17,9 @@
/obj/item/radio/integrated/New()
..()
- if (istype(loc.loc, /obj/item/device/pda))
+ if(istype(loc.loc, /obj/item/device/pda))
hostpda = loc.loc
- if (bot_filter)
+ if(bot_filter)
spawn(5)
add_to_radio(bot_filter)
@@ -31,7 +31,7 @@
/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3,var/key4, var/value4, s_filter)
- //world << "Post: [freq]: [key]=[value], [key2]=[value2]"
+// to_chat(world, "Post: [freq]: [key]=[value], [key2]=[value2]")
var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
if(!frequency)
@@ -51,31 +51,22 @@
frequency.post_signal(src, signal, filter = s_filter)
/obj/item/radio/integrated/receive_signal(datum/signal/signal)
- /*var/obj/item/device/pda/P = src.loc
-
-
- world << "recvd:[P] : [signal.source]"
- for(var/d in signal.data)
- world << "- [d] = [signal.data[d]]"
- */
-
if (signal.data["type"] == bot_type)
if(!botlist)
botlist = new()
- if(!(signal.source in botlist))
- botlist += signal.source
+ var/obj/machinery/bot_core/core = signal.source
- if(active == signal.source)
+ if(istype(core) && !(core.owner in botlist))
+ botlist += core.owner
+
+ if(active == core.owner)
var/list/b = signal.data
botstatus = b.Copy()
/obj/item/radio/integrated/Topic(href, href_list)
..()
- var/obj/item/device/pda/PDA = src.hostpda
-
switch(href_list["op"])
-
if("control")
active = locate(href_list["bot"])
spawn(0)
@@ -89,14 +80,14 @@
if("botlist")
active = null
- if("stop", "go")
+ if("stop", "go", "home")
spawn(0)
post_signal(control_freq, "command", href_list["op"], "active", active, s_filter = bot_filter)
post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter)
if("summon")
spawn(0)
- post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(PDA) , "useraccess", PDA.GetAccess(), s_filter = bot_filter)
+ post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(hostpda), "useraccess", hostpda.GetAccess(), "user", usr, s_filter = bot_filter)
post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter)
/obj/item/radio/integrated/proc/add_to_radio(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots.
@@ -121,101 +112,45 @@
bot_type = CLEAN_BOT
/obj/item/radio/integrated/mule
- //var/list/botlist = null // list of bots
- //var/obj/machinery/bot/mulebot/active // the active bot; if null, show bot list
- //var/list/botstatus // the status signal sent by the bot
- var/list/beacons
-
- var/beacon_freq = 1400
- control_freq = 1447
-
-// create a new QM cartridge, and register to receive bot control & beacon message
-/obj/item/radio/integrated/mule/New()
- ..()
- spawn(5)
- if(radio_controller)
- radio_controller.add_object(src, control_freq, filter = RADIO_MULEBOT)
- radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
- spawn(10)
- post_signal(beacon_freq, "findbeacon", "delivery", s_filter = RADIO_NAVBEACONS)
-
-/obj/item/radio/integrated/mule/Destroy()
- if(radio_controller)
- radio_controller.remove_object(src,beacon_freq)
- return ..()
-
-// receive radio signals
-// can detect bot status signals
-// and beacon locations
-// create/populate lists as they are recvd
-
-/obj/item/radio/integrated/mule/receive_signal(datum/signal/signal)
- if(signal.data["type"] == MULE_BOT)
- if(!botlist)
- botlist = new()
-
- if(!(signal.source in botlist))
- botlist += signal.source
-
- if(active == signal.source)
- var/list/b = signal.data
- botstatus = b.Copy()
-
- else if(signal.data["beacon"])
- if(!beacons)
- beacons = new()
-
- beacons[signal.data["beacon"] ] = signal.source
+ bot_filter = RADIO_MULEBOT
+ bot_type = MULE_BOT
/obj/item/radio/integrated/mule/Topic(href, href_list)
- //..()
- //var/obj/item/device/pda/PDA = src.hostpda
- var/cmd = "command"
- if(active)
- cmd = "command [active.suffix]"
-
+ ..()
switch(href_list["op"])
- if("control")
- active = locate(href_list["bot"])
-
- if("scanbots") // find all bots
- botlist = null
-
- if("botlist")
- active = null
+ if("start")
+ spawn(0)
+ post_signal(control_freq, "command", "start", "active", active, s_filter = RADIO_MULEBOT)
if("unload")
spawn(0)
- post_signal(control_freq, cmd, "unload", s_filter = RADIO_MULEBOT)
+ post_signal(control_freq, "command", "unload", "active", active, s_filter = RADIO_MULEBOT)
+
if("setdest")
- if(beacons)
- var/dest = input("Select Bot Destination", "Mulebot [active.suffix] Interlink", active.destination) as null|anything in beacons
+ if(deliverybeacons)
+ var/dest = input("Select Bot Destination", "Mulebot [active.suffix] Interlink", active.destination) as null|anything in deliverybeacontags
if(dest)
spawn(0)
- post_signal(control_freq, cmd, "target", "destination", dest, s_filter = RADIO_MULEBOT)
+ post_signal(control_freq, "command", "target", "active", active, "destination", dest, s_filter = RADIO_MULEBOT)
if("retoff")
spawn(0)
- post_signal(control_freq, cmd, "autoret", "value", 0, s_filter = RADIO_MULEBOT)
-
+ post_signal(control_freq, "command", "autoret", "active", active, "value", 0, s_filter = RADIO_MULEBOT)
+
if("reton")
spawn(0)
- post_signal(control_freq, cmd, "autoret", "value", 1, s_filter = RADIO_MULEBOT)
+ post_signal(control_freq, "command", "autoret", "active", active, "value", 1, s_filter = RADIO_MULEBOT)
if("pickoff")
spawn(0)
- post_signal(control_freq, cmd, "autopick", "value", 0, s_filter = RADIO_MULEBOT)
+ post_signal(control_freq, "command", "autopick", "active", active, "value", 0, s_filter = RADIO_MULEBOT)
if("pickon")
spawn(0)
- post_signal(control_freq, cmd, "autopick", "value", 1, s_filter = RADIO_MULEBOT)
-
- if("stop", "go", "home")
- spawn(0)
- post_signal(control_freq, cmd, href_list["op"], s_filter = RADIO_MULEBOT)
+ post_signal(control_freq, "command", "autopick", "active", active, "value", 1, s_filter = RADIO_MULEBOT)
spawn(10)
- post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
+ post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_MULEBOT)
diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm
index 6d4feacb457..0f4fcd79741 100644
--- a/code/modules/pda/utilities.dm
+++ b/code/modules/pda/utilities.dm
@@ -68,9 +68,9 @@
if(istype(C, /mob/living/carbon/human))
var/mob/living/carbon/human/H = C
if (!istype(H.dna, /datum/dna))
- user << "No fingerprints found on [H]"
+ to_chat(user, "No fingerprints found on [H]")
else
- user << "[H]'s Fingerprints: [md5(H.dna.uni_identity)]"
+ to_chat(user, "[H]'s Fingerprints: [md5(H.dna.uni_identity)]")
scan_blood(C, user)
/datum/data/pda/utility/scanmode/dna/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob)
@@ -78,14 +78,14 @@
/datum/data/pda/utility/scanmode/dna/proc/scan_blood(atom/A, mob/user)
if (!A.blood_DNA)
- user << "No blood found on [A]"
+ to_chat(user, "No blood found on [A]")
if(A.blood_DNA)
qdel(A.blood_DNA)
else
- user << "Blood found on [A]. Analysing..."
+ to_chat(user, "Blood found on [A]. Analysing...")
spawn(15)
for(var/blood in A.blood_DNA)
- user << "Blood type: [A.blood_DNA[blood]]\nDNA: [blood]"
+ to_chat(user, "Blood type: [A.blood_DNA[blood]]\nDNA: [blood]")
/datum/data/pda/utility/scanmode/halogen
base_name = "Halogen Counter"
@@ -108,13 +108,13 @@
if(!isnull(A.reagents))
if(A.reagents.reagent_list.len > 0)
var/reagents_length = A.reagents.reagent_list.len
- user << "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found."
+ to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.")
for(var/re in A.reagents.reagent_list)
- user << "\t [re]"
+ to_chat(user, "\t [re]")
else
- user << "No active chemical agents found in [A]."
+ to_chat(user, "No active chemical agents found in [A].")
else
- user << "No significant chemical agents found in [A]."
+ to_chat(user, "No significant chemical agents found in [A].")
/datum/data/pda/utility/scanmode/gas
base_name = "Gas Scanner"
@@ -194,6 +194,7 @@
// notehtml ISN'T set to allow user to get their old notes back. A better implementation would add a "scanned documents"
// feature to the PDA, which would better convey the availability of the feature, but this will work for now.
// Inform the user
- user << "Paper scanned and OCRed to notekeeper." //concept of scanning paper copyright brainoblivion 2009
+ to_chat(user, "Paper scanned and OCRed to notekeeper.")//concept of scanning paper copyright brainoblivion 2009
+
else
- user << "Error scanning [A]."
\ No newline at end of file
+ to_chat(user, "Error scanning [A].")
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 22eaa83cf75..edefabf2aff 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -213,25 +213,25 @@
/obj/machinery/power/apc/examine(mob/user)
if(..(user, 1))
if(stat & BROKEN)
- user << "Looks broken."
+ to_chat(user, "Looks broken.")
return
if(opened)
if(has_electronics && terminal)
- user << "The cover is [opened==2?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"]."
+ to_chat(user, "The cover is [opened==2?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"].")
else if (!has_electronics && terminal)
- user << "There are some wires but no any electronics."
+ to_chat(user, "There are some wires but no any electronics.")
else if (has_electronics && !terminal)
- user << "Electronics installed but not wired."
+ to_chat(user, "Electronics installed but not wired.")
else /* if (!has_electronics && !terminal) */
- user << "There is no electronics nor connected wires."
+ to_chat(user, "There is no electronics nor connected wires.")
else
if (stat & MAINT)
- user << "The cover is closed. Something wrong with it: it doesn't work."
+ to_chat(user, "The cover is closed. Something wrong with it: it doesn't work.")
else if (malfhack)
- user << "The cover is broken. It may be hard to force it open."
+ to_chat(user, "The cover is broken. It may be hard to force it open.")
else
- user << "The cover is closed."
+ to_chat(user, "The cover is closed.")
// update the APC icon to show the three base states
// also add overlays for indicator lights
@@ -416,10 +416,11 @@
if (istype(W, /obj/item/weapon/crowbar) && opened)
if (has_electronics==1)
if (terminal)
- user << "Disconnect wires first."
+ to_chat(user, "Disconnect wires first.")
return
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
- user << "You are trying to remove the power control board..." //lpeters - fixed grammar issues
+ to_chat(user, "You are trying to remove the power control board...")//lpeters - fixed grammar issues
+
if(do_after(user, 50, target = src))
if (has_electronics==1)
has_electronics = 0
@@ -439,18 +440,18 @@
update_icon()
else if (istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || malfhack) )
if(coverlocked && !(stat & MAINT))
- user << "The cover is locked and cannot be opened."
+ to_chat(user, "The cover is locked and cannot be opened.")
return
else
opened = 1
update_icon()
else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened) // trying to put a cell inside
if(cell)
- user << "There is a power cell already installed."
+ to_chat(user, "There is a power cell already installed.")
return
else
if (stat & MAINT)
- user << "There is no connector for your power cell."
+ to_chat(user, "There is no connector for your power cell.")
return
user.drop_item()
W.loc = src
@@ -463,55 +464,56 @@
else if (istype(W, /obj/item/weapon/screwdriver)) // haxing
if(opened)
if (cell)
- user << "Close the APC first." //Less hints more mystery!
+ to_chat(user, "Close the APC first.")//Less hints more mystery!
+
return
else
if (has_electronics==1 && terminal)
has_electronics = 2
stat &= ~MAINT
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You screw the circuit electronics into place."
+ to_chat(user, "You screw the circuit electronics into place.")
else if (has_electronics==2)
has_electronics = 1
stat |= MAINT
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You unfasten the electronics."
+ to_chat(user, "You unfasten the electronics.")
else /* has_electronics==0 */
- user << "There is nothing to secure."
+ to_chat(user, "There is nothing to secure.")
return
update_icon()
else if(emagged)
- user << "The interface is broken."
+ to_chat(user, "The interface is broken.")
else
wiresexposed = !wiresexposed
- user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
+ to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]")
update_icon()
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card
if(emagged)
- user << "The interface is broken."
+ to_chat(user, "The interface is broken.")
else if(opened)
- user << "You must close the cover to swipe an ID card."
+ to_chat(user, "You must close the cover to swipe an ID card.")
else if(wiresexposed)
- user << "You must close the panel"
+ to_chat(user, "You must close the panel")
else if(stat & (BROKEN|MAINT))
- user << "Nothing happens."
+ to_chat(user, "Nothing happens.")
else
if(src.allowed(usr) && !isWireCut(APC_WIRE_IDSCAN))
locked = !locked
- user << "You [ locked ? "lock" : "unlock"] the APC interface."
+ to_chat(user, "You [ locked ? "lock" : "unlock"] the APC interface.")
update_icon()
else
- user << "Access denied."
+ to_chat(user, "Access denied.")
else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2)
if (src.loc:intact)
- user << "You must remove the floor plating in front of the APC first."
+ to_chat(user, "You must remove the floor plating in front of the APC first.")
return
var/obj/item/stack/cable_coil/C = W
if(C.amount < 10)
- user << "You need more wires."
+ to_chat(user, "You need more wires.")
return
- user << "You start adding cables to the APC frame..."
+ to_chat(user, "You start adding cables to the APC frame...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20, target = src))
if (C.amount >= 10 && !terminal && opened && has_electronics != 2)
@@ -530,9 +532,9 @@
terminal.connect_to_network()
else if (istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2)
if (src.loc:intact)
- user << "You must remove the floor plating in front of the APC first."
+ to_chat(user, "You must remove the floor plating in front of the APC first.")
return
- user << "You begin to cut the cables..."
+ to_chat(user, "You begin to cut the cables...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 50, target = src))
if(terminal && opened && has_electronics!=2)
@@ -542,23 +544,23 @@
s.start()
return
new /obj/item/stack/cable_coil(loc,10)
- user << "You cut the cables and dismantle the power terminal."
+ to_chat(user, "You cut the cables and dismantle the power terminal.")
qdel(terminal) // qdel
else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
- user << "You trying to insert the power control board into the frame..."
+ to_chat(user, "You trying to insert the power control board into the frame...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 10, target = src))
if(has_electronics==0)
has_electronics = 1
- user << "You place the power control board inside the frame."
+ to_chat(user, "You place the power control board inside the frame.")
qdel(W) // qdel
else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
- user << "You cannot put the board inside, the frame is damaged."
+ to_chat(user, "You cannot put the board inside, the frame is damaged.")
return
else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal)
var/obj/item/weapon/weldingtool/WT = W
if (WT.get_fuel() < 3)
- user << "You need more welding fuel to complete this task."
+ to_chat(user, "You need more welding fuel to complete this task.")
return
user.visible_message("[user.name] welds [src].", \
"You start welding the APC frame...", \
@@ -591,9 +593,9 @@
update_icon()
else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && ((stat & BROKEN) || malfhack))
if (has_electronics)
- user << "You cannot repair this APC until you remove the electronics still inside."
+ to_chat(user, "You cannot repair this APC until you remove the electronics still inside.")
return
- user << "You begin to replace the damaged APC frame..."
+ to_chat(user, "You begin to replace the damaged APC frame...")
if(do_after(user, 50, target = src))
user.visible_message(\
"[user.name] has replaced the damaged APC frame with new one.",\
@@ -633,16 +635,16 @@
/obj/machinery/power/apc/emag_act(user as mob)
if (!(emagged || malfhack)) // trying to unlock with an emag card
if(opened)
- user << "You must close the cover to swipe an ID card."
+ to_chat(user, "You must close the cover to swipe an ID card.")
else if(wiresexposed)
- user << "You must close the panel first"
+ to_chat(user, "You must close the panel first")
else if(stat & (BROKEN|MAINT))
- user << "Nothing happens."
+ to_chat(user, "Nothing happens.")
else
flick("apc-spark", src)
emagged = 1
locked = 0
- user << "You emag the APC interface."
+ to_chat(user, "You emag the APC interface.")
update_icon()
// attack with hand - remove cell (if cover open) or interact with the APC
@@ -660,7 +662,7 @@
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
- H << "The APC power currents surge erratically, damaging your chassis!"
+ to_chat(H, "The APC power currents surge erratically, damaging your chassis!")
H.adjustFireLoss(10,0)
else if(src.cell && src.cell.charge > 0)
if(H.nutrition < 450)
@@ -671,16 +673,16 @@
H.nutrition += src.cell.charge/10
src.cell.charge = 0
- user << "You slot your fingers into the APC interface and siphon off some of the stored charge for your own use."
+ to_chat(user, "You slot your fingers into the APC interface and siphon off some of the stored charge for your own use.")
if(src.cell.charge < 0)
src.cell.charge = 0
if(H.nutrition > 500)
H.nutrition = 500
src.charging = 1
else
- user << "You are already fully charged."
+ to_chat(user, "You are already fully charged.")
else
- user << "There is no charge to draw from that APC."
+ to_chat(user, "There is no charge to draw from that APC.")
return
if(usr == user && opened && (!issilicon(user)))
@@ -694,7 +696,7 @@
src.cell = null
user.visible_message("[user.name] removes the power cell from [src.name]!", "You remove the power cell.")
- //user << "You remove the power cell."
+// to_chat(user, "You remove the power cell.")
charging = 0
src.update_icon()
return
@@ -834,13 +836,13 @@
area.power_environ = (environ > 1)
// if (area.name == "AI Chamber")
// spawn(10)
-// world << " [area.name] [area.power_equip]"
+// to_chat(world, " [area.name] [area.power_equip]")
else
area.power_light = 0
area.power_equip = 0
area.power_environ = 0
// if (area.name == "AI Chamber")
-// world << "[area.power_equip]"
+// to_chat(world, "[area.power_equip]")
area.power_change()
/obj/machinery/power/apc/proc/isWireCut(var/wireIndex)
@@ -864,7 +866,7 @@
) \
)
if(!loud)
- user << "\The [src] has AI control disabled!"
+ to_chat(user, "\The [src] has AI control disabled!")
user << browse(null, "window=apc")
user.unset_machine()
return 0
@@ -876,10 +878,10 @@
if (istype(H))
if(H.getBrainLoss() >= 60)
for(var/mob/M in viewers(src, null))
- M << "[H] stares cluelessly at [src] and drools."
+ to_chat(M, "[H] stares cluelessly at [src] and drools.")
return 0
else if(prob(H.getBrainLoss()))
- user << "You momentarily forget how to use [src]."
+ to_chat(user, "You momentarily forget how to use [src].")
return 0
return 1
@@ -970,9 +972,9 @@
var/mob/living/silicon/ai/malfai = usr
if(get_malf_status(malfai)==1)
if (malfai.malfhacking)
- malfai << "You are already hacking an APC."
+ to_chat(malfai, "You are already hacking an APC.")
return 0
- malfai << "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process."
+ to_chat(malfai, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")
malfai.malfhack = src
malfai.malfhacking = 1
sleep(600)
@@ -988,7 +990,7 @@
src.malfai = usr:parent
else
src.malfai = usr
- malfai << "Hack complete. The APC is now under your exclusive control."
+ to_chat(malfai, "Hack complete. The APC is now under your exclusive control.")
update_icon()
else if (href_list["occupyapc"])
@@ -1002,7 +1004,7 @@
else if (href_list["toggleaccess"])
if(istype(usr, /mob/living/silicon))
if(emagged || aidisabled || (stat & (BROKEN|MAINT)))
- usr << "The APC does not respond to the command."
+ to_chat(usr, "The APC does not respond to the command.")
else
locked = !locked
update_icon()
@@ -1024,10 +1026,10 @@
if(!istype(malf))
return
if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC
- malf << "You must evacuate your current apc first."
+ to_chat(malf, "You must evacuate your current apc first.")
return
if(!malf.can_shunt)
- malf << "You cannot shunt."
+ to_chat(malf, "You cannot shunt.")
return
if(!(src.z in config.station_levels))
return
@@ -1067,7 +1069,7 @@
point.the_disk = A //The pinpointer tracks the AI back into its core.
else
- src.occupier << "Primary core damaged, unable to return core processes."
+ to_chat(src.occupier, "Primary core damaged, unable to return core processes.")
if(forced)
src.occupier.loc = src.loc
src.occupier.death()
@@ -1082,7 +1084,7 @@
if(prob(3))
src.locked = 1
if (src.cell.charge > 0)
-// world << "blew APC in [src.loc.loc]"
+// to_chat(world, "blew APC in [src.loc.loc]")
src.cell.charge = 0
cell.corrupt()
src.malfhack = 1
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index da2e75bd488..9253c19a5aa 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -120,11 +120,11 @@ By design, d1 is the smallest direction and d2 is the highest
if(istype(W, /obj/item/weapon/wirecutters))
///// Z-Level Stuff
/* if(src.d1 == 12 || src.d2 == 12)
- user << "You must cut this cable from above."
+ to_chat(user, "You must cut this cable from above.")
return */
///// Z-Level Stuff
/* if(breaker_box)
- user << "\red This cable is connected to nearby breaker box. Use breaker box to interact with it."
+ to_chat(user, "\red This cable is connected to nearby breaker box. Use breaker box to interact with it.")
return */
if (shock(user, 50))
@@ -157,17 +157,17 @@ By design, d1 is the smallest direction and d2 is the highest
else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = W
if (coil.get_amount() < 1)
- user << "Not enough cable"
+ to_chat(user, "Not enough cable")
return
coil.cable_join(src, user)
else if(istype(W, /obj/item/device/multitool))
if(powernet && (powernet.avail > 0)) // is it powered?
- user << "[powernet.avail]W in power network."
+ to_chat(user, "[powernet.avail]W in power network.")
else
- user << "The cable is not powered."
+ to_chat(user, "The cable is not powered.")
shock(user, 5, 0.2)
@@ -514,10 +514,10 @@ obj/structure/cable/proc/cableColor(var/colorC)
S.heal_damage(0,15,0,1)
user.visible_message("\The [user] repairs some burn damage on \the [M]'s [S.name] with \the [src].")
else if(S.open != 2)
- user << "The damage is far too severe to patch over externally."
+ to_chat(user, "The damage is far too severe to patch over externally.")
return 1
else if(S.open != 2)
- user << "Nothing to fix!"
+ to_chat(user, "Nothing to fix!")
else
return ..()
@@ -546,11 +546,11 @@ obj/structure/cable/proc/cableColor(var/colorC)
return
if(get_amount() == 1)
- user << "A short piece of power cable."
+ to_chat(user, "A short piece of power cable.")
else if(get_amount() == 2)
- user << "A piece of power cable."
+ to_chat(user, "A piece of power cable.")
else
- user << "A coil of power cable. There are [get_amount()] lengths of cable in the coil."
+ to_chat(user, "A coil of power cable. There are [get_amount()] lengths of cable in the coil.")
/obj/item/stack/cable_coil/verb/make_restraint()
@@ -561,14 +561,14 @@ obj/structure/cable/proc/cableColor(var/colorC)
if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned)
if(!istype(usr.loc,/turf)) return
if(src.amount <= 14)
- usr << "You need at least 15 lengths to make restraints!"
+ to_chat(usr, "You need at least 15 lengths to make restraints!")
return
var/obj/item/weapon/restraints/handcuffs/cable/B = new /obj/item/weapon/restraints/handcuffs/cable(usr.loc)
B.color = color
- usr << "You wind some cable together to make some restraints."
+ to_chat(usr, "You wind some cable together to make some restraints.")
src.use(15)
else
- usr << "You cannot do that."
+ to_chat(usr, "You cannot do that.")
..()
// Items usable on a cable coil :
@@ -579,24 +579,24 @@ obj/structure/cable/proc/cableColor(var/colorC)
if( istype(W, /obj/item/weapon/wirecutters) && src.amount > 1)
src.amount--
new/obj/item/stack/cable_coil(user.loc, 1,color)
- user << "You cut a piece off the cable coil."
+ to_chat(user, "You cut a piece off the cable coil.")
src.update_icon()
return
else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if(C.amount >= MAXCOIL)
- user << "The coil is too long, you cannot add any more cable to it."
+ to_chat(user, "The coil is too long, you cannot add any more cable to it.")
return
if( (C.amount + src.amount <= MAXCOIL) )
- user << "You join the cable coils together."
+ to_chat(user, "You join the cable coils together.")
C.give(src.amount) // give it cable
src.use(src.amount) // make sure this one cleans up right
return
else
var/amt = MAXCOIL - C.amount
- user << "You transfer [amt] length\s of cable from one coil to the other."
+ to_chat(user, "You transfer [amt] length\s of cable from one coil to the other.")
C.give(amt)
src.use(amt)
return
@@ -646,15 +646,15 @@ obj/structure/cable/proc/cableColor(var/colorC)
return
if(!T.can_have_cabling())
- user << "You can only lay cables on catwalks and plating!"
+ to_chat(user, "You can only lay cables on catwalks and plating!")
return
if(get_amount() < 1) // Out of cable
- user << "There is no cable left!"
+ to_chat(user, "There is no cable left!")
return
if(get_dist(T,user) > 1) // Too far
- user << "You can't lay cable at a place that far away!"
+ to_chat(user, "You can't lay cable at a place that far away!")
return
else
@@ -667,7 +667,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
for(var/obj/structure/cable/LC in T)
if(LC.d2 == dirn && LC.d1 == 0)
- user << "There's already a cable at that position!"
+ to_chat(user, "There's already a cable at that position!")
return
var/obj/structure/cable/C = get_new_cable(T)
@@ -709,7 +709,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
return
if(get_dist(C, user) > 1) // make sure it's close enough
- user << "You can't lay cable at a place that far away."
+ to_chat(user, "You can't lay cable at a place that far away.")
return
@@ -722,7 +722,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
// one end of the clicked cable is pointing towards us
if(C.d1 == dirn || C.d2 == dirn)
if(U.intact) // can't place a cable if the floor is complete
- user << "You can't lay cable there unless the floor tiles are removed."
+ to_chat(user, "You can't lay cable there unless the floor tiles are removed.")
return
else
// cable is pointing at us, we're standing on an open tile
@@ -732,7 +732,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
for(var/obj/structure/cable/LC in U) // check to make sure there's not a cable there already
if(LC.d1 == fdirn || LC.d2 == fdirn)
- user << "There's already a cable at that position."
+ to_chat(user, "There's already a cable at that position.")
return
var/obj/structure/cable/NC = new(U)
@@ -778,7 +778,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
if(LC == C) // skip the cable we're interacting with
continue
if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction
- user << "There's already a cable at that position."
+ to_chat(user, "There's already a cable at that position.")
return
diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm
index 5d21df1cc02..87a25032eb7 100644
--- a/code/modules/power/cable_heavyduty.dm
+++ b/code/modules/power/cable_heavyduty.dm
@@ -16,10 +16,10 @@
return
if(istype(W, /obj/item/weapon/wirecutters))
- usr << "\blue These cables are too tough to be cut with those [W.name]."
+ to_chat(usr, "\blue These cables are too tough to be cut with those [W.name].")
return
else if(istype(W, /obj/item/stack/cable_coil))
- usr << "\blue You will need heavier cables to connect to these."
+ to_chat(usr, "\blue You will need heavier cables to connect to these.")
return
else
..()
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 1fd649ba19d..7dda66629d7 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -58,11 +58,11 @@
/obj/item/weapon/stock_parts/cell/examine(mob/user)
if(..(user, 1))
if(maxcharge <= 2500)
- user << "[desc]\nThe manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%."
+ to_chat(user, "[desc]\nThe manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%.")
else
- user << "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%."
+ to_chat(user, "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%.")
if(crit_fail)
- user << "\red This power cell seems to be faulty."
+ to_chat(user, "\red This power cell seems to be faulty.")
/obj/item/weapon/stock_parts/cell/attack_self(mob/user as mob)
src.add_fingerprint(user)
@@ -73,7 +73,7 @@
if(istype(W, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = W
- user << "You inject the solution into the power cell."
+ to_chat(user, "You inject the solution into the power cell.")
if(S.reagents.has_reagent("plasma", 5))
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index c11292d4fd7..81af0089e6f 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -121,7 +121,7 @@
/obj/machinery/power/generator/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/wrench))
anchored = !anchored
- user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor."
+ to_chat(user, "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.")
use_power = anchored
reconnect()
else
diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm
index 00ab21b64df..46a6fe20320 100644
--- a/code/modules/power/generator_type2.dm
+++ b/code/modules/power/generator_type2.dm
@@ -72,7 +72,7 @@
hot_air.temperature = hot_air.temperature - energy_transfer/hot_air_heat_capacity
cold_air.temperature = cold_air.temperature + heat/cold_air_heat_capacity
- //world << "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]"
+// to_chat(world, "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]")
input1.parent.update = 1
input2.parent.update = 1
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 863bdc19b32..04ffbc5c0a4 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -182,14 +182,14 @@ var/const/GRAV_NEEDS_WRENCH = 3
switch(broken_state)
if(GRAV_NEEDS_SCREWDRIVER)
if(istype(I, /obj/item/weapon/screwdriver))
- user << "You secure the screws of the framework."
+ to_chat(user, "You secure the screws of the framework.")
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
broken_state++
if(GRAV_NEEDS_WELDING)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = I
if(WT.remove_fuel(1, user))
- user << "You mend the damaged framework."
+ to_chat(user, "You mend the damaged framework.")
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
broken_state++
if(GRAV_NEEDS_PLASTEEL)
@@ -197,14 +197,14 @@ var/const/GRAV_NEEDS_WRENCH = 3
var/obj/item/stack/sheet/plasteel/PS = I
if(PS.amount >= 10)
PS.use(10)
- user << "You add the plating to the framework."
+ to_chat(user, "You add the plating to the framework.")
playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
broken_state++
else
- user << "You need 10 sheets of plasteel."
+ to_chat(user, "You need 10 sheets of plasteel.")
if(GRAV_NEEDS_WRENCH)
if(istype(I, /obj/item/weapon/wrench))
- user << "You secure the plating to the framework."
+ to_chat(user, "You secure the plating to the framework.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
set_fix()
else
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index f7ca916dfff..3890b433eaf 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -30,18 +30,18 @@
if(..(user, 2))
switch(src.stage)
if(1)
- usr << "It's an empty frame."
+ to_chat(usr, "It's an empty frame.")
if(2)
- usr << "It's wired."
+ to_chat(usr, "It's wired.")
if(3)
- usr << "The casing is closed."
+ to_chat(usr, "The casing is closed.")
/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
src.add_fingerprint(user)
if (istype(W, /obj/item/weapon/wrench))
if (src.stage == 1)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
- usr << "You begin deconstructing [src]."
+ to_chat(usr, "You begin deconstructing [src].")
if (!do_after(usr, 30, target = src))
return
new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
@@ -50,11 +50,11 @@
playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1)
qdel(src)
if (src.stage == 2)
- usr << "You have to remove the wires first."
+ to_chat(usr, "You have to remove the wires first.")
return
if (src.stage == 3)
- usr << "You have to unscrew the case first."
+ to_chat(usr, "You have to unscrew the case first.")
return
if(istype(W, /obj/item/weapon/wirecutters))
@@ -269,13 +269,13 @@
if(..(user, 1))
switch(status)
if(LIGHT_OK)
- user << "[desc] It is turned [on? "on" : "off"]."
+ to_chat(user, "[desc] It is turned [on? "on" : "off"].")
if(LIGHT_EMPTY)
- user << "[desc] The [fitting] has been removed."
+ to_chat(user, "[desc] The [fitting] has been removed.")
if(LIGHT_BURNED)
- user << "[desc] The [fitting] is burnt out."
+ to_chat(user, "[desc] The [fitting] is burnt out.")
if(LIGHT_BROKEN)
- user << "[desc] The [fitting] has been smashed."
+ to_chat(user, "[desc] The [fitting] has been smashed.")
@@ -294,14 +294,14 @@
// attempt to insert light
if(istype(W, /obj/item/weapon/light))
if(status != LIGHT_EMPTY)
- user << "There is a [fitting] already inserted."
+ to_chat(user, "There is a [fitting] already inserted.")
return
else
src.add_fingerprint(user)
var/obj/item/weapon/light/L = W
if(istype(L, light_type))
status = L.status
- user << "You insert the [L.name]."
+ to_chat(user, "You insert the [L.name].")
switchcount = L.switchcount
rigged = L.rigged
brightness_range = L.brightness_range
@@ -320,7 +320,7 @@
explode()
else
- user << "This type of light requires a [fitting]."
+ to_chat(user, "This type of light requires a [fitting].")
return
// attempt to break the light
@@ -331,7 +331,7 @@
user.do_attack_animation(src)
if(prob(1+W.force * 5))
- user << "You hit the light, and it smashes!"
+ to_chat(user, "You hit the light, and it smashes!")
for(var/mob/M in viewers(src))
if(M == user)
continue
@@ -369,7 +369,7 @@
qdel(src)
return
- user << "You stick \the [W] into the light socket!"
+ to_chat(user, "You stick \the [W] into the light socket!")
if(has_power() && (W.flags & CONDUCT))
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, src)
@@ -407,7 +407,7 @@
// Aliens smash the bulb but do not get electrocuted./N
/obj/machinery/light/attack_alien(mob/living/carbon/alien/humanoid/user)//So larva don't go breaking light bulbs.
if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
- user << "\green That object is useless to you."
+ to_chat(user, "\green That object is useless to you.")
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
user.do_attack_animation(src)
@@ -418,7 +418,7 @@
/obj/machinery/light/attack_animal(mob/living/simple_animal/M)
if(M.melee_damage_upper == 0) return
if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
- M << "\red That object is useless to you."
+ to_chat(M, "\red That object is useless to you.")
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
M.do_attack_animation(src)
@@ -433,7 +433,7 @@
add_fingerprint(user)
if(status == LIGHT_EMPTY)
- user << "There is no [fitting] in this light."
+ to_chat(user, "There is no [fitting] in this light.")
return
// make it burn hands if not wearing fire-insulated gloves
@@ -451,11 +451,11 @@
prot = 1
if(prot > 0 || (RESIST_HEAT in user.mutations))
- user << "You remove the light [fitting]"
+ to_chat(user, "You remove the light [fitting]")
else if(TK in user.mutations)
- user << "You telekinetically remove the light [fitting]."
+ to_chat(user, "You telekinetically remove the light [fitting].")
else
- user << "You try to remove the light [fitting], but you burn your hand on it!"
+ to_chat(user, "You try to remove the light [fitting], but you burn your hand on it!")
var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
if(affecting.take_damage( 0, 5 )) // 5 burn damage
@@ -463,7 +463,7 @@
H.updatehealth()
return // if burned, don't remove the light
else
- user << "You remove the light [fitting]."
+ to_chat(user, "You remove the light [fitting].")
// create a light tube/bulb item and put it in the user's hand
@@ -490,10 +490,10 @@
/obj/machinery/light/attack_tk(mob/user)
if(status == LIGHT_EMPTY)
- user << "There is no [fitting] in this light."
+ to_chat(user, "There is no [fitting] in this light.")
return
- user << "You telekinetically remove the light [fitting]."
+ to_chat(user, "You telekinetically remove the light [fitting].")
// create a light tube/bulb item and put it in the user's hand
var/obj/item/weapon/light/L = new light_type()
L.status = status
@@ -671,7 +671,7 @@
if(istype(I, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = I
- user << "You inject the solution into the [src]."
+ to_chat(user, "You inject the solution into the [src].")
if(S.reagents.has_reagent("plasma", 5))
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 7feba62c14b..bc1599674a2 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -51,9 +51,9 @@
if(!..(user,1 ))
return
if(active)
- usr << "The generator is on."
+ to_chat(usr, "The generator is on.")
else
- usr << "The generator is off."
+ to_chat(usr, "The generator is off.")
/obj/machinery/power/port_gen/emp_act(severity)
var/duration = 6000 //ten minutes
@@ -151,10 +151,12 @@
/obj/machinery/power/port_gen/pacman/examine(mob/user)
..(user)
- user << "\The [src] appears to be producing [power_gen*power_output] W."
- user << "There [sheets == 1 ? "is" : "are"] [sheets] sheet\s left in the hopper."
- if(IsBroken()) user << "\The [src] seems to have broken down."
- if(overheating) user << "\The [src] is overheating!"
+ to_chat(user, "\The [src] appears to be producing [power_gen*power_output] W.")
+ to_chat(user, "There [sheets == 1 ? "is" : "are"] [sheets] sheet\s left in the hopper.")
+ if(IsBroken())
+ to_chat(user, "\The [src] seems to have broken down.")
+ if(overheating)
+ to_chat(user, "\The [src] is overheating!")
/obj/machinery/power/port_gen/pacman/HasFuel()
var/needed_sheets = power_output / time_per_sheet
@@ -269,9 +271,9 @@
var/obj/item/stack/addstack = O
var/amount = min((max_sheets - sheets), addstack.amount)
if(amount < 1)
- user << "The [src.name] is full!"
+ to_chat(user, "The [src.name] is full!")
return
- user << "You add [amount] sheet\s to the [src.name]."
+ to_chat(user, "You add [amount] sheet\s to the [src.name].")
sheets += amount
addstack.use(amount)
nanomanager.update_uis(src)
@@ -281,10 +283,10 @@
if(!anchored)
connect_to_network()
- user << "You secure the generator to the floor."
+ to_chat(user, "You secure the generator to the floor.")
else
disconnect_from_network()
- user << "You unsecure the generator from the floor."
+ to_chat(user, "You unsecure the generator from the floor.")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
anchored = !anchored
@@ -293,9 +295,9 @@
panel_open = !panel_open
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(panel_open)
- user << "You open the access panel."
+ to_chat(user, "You open the access panel.")
else
- user << "You close the access panel."
+ to_chat(user, "You close the access panel.")
else if(istype(O, /obj/item/weapon/storage/part_replacer) && panel_open)
exchange_parts(user, O)
return
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 3e94274cf2f..5dd8f2e36ea 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -44,23 +44,23 @@ var/global/list/rad_collectors = list()
investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.toxins/0.29)]%":"It is empty"].","singulo")
return
else
- user << "\red The controls are locked!"
+ to_chat(user, "\red The controls are locked!")
return
..()
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/multitool))
- user << "The [W.name] detects that [last_power]W were recently produced."
+ to_chat(user, "The [W.name] detects that [last_power]W were recently produced.")
return 1
else if(istype(W, /obj/item/device/analyzer) && P)
atmosanalyzer_scan(P.air_contents, user)
else if(istype(W, /obj/item/weapon/tank/plasma))
if(!src.anchored)
- user << "\red The [src] needs to be secured to the floor first."
+ to_chat(user, "\red The [src] needs to be secured to the floor first.")
return 1
if(src.P)
- user << "\red There's already a plasma tank loaded."
+ to_chat(user, "\red There's already a plasma tank loaded.")
return 1
user.drop_item()
src.P = W
@@ -72,7 +72,7 @@ var/global/list/rad_collectors = list()
return 1
else if(istype(W, /obj/item/weapon/wrench))
if(P)
- user << "\blue Remove the plasma tank first."
+ to_chat(user, "\blue Remove the plasma tank first.")
return 1
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
src.anchored = !src.anchored
@@ -87,12 +87,12 @@ var/global/list/rad_collectors = list()
if (src.allowed(user))
if(active)
src.locked = !src.locked
- user << "The controls are now [src.locked ? "locked." : "unlocked."]"
+ to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
else
src.locked = 0 //just in case it somehow gets locked
- user << "\red The controls can only be locked when the [src] is active"
+ to_chat(user, "\red The controls can only be locked when the [src] is active")
else
- user << "\red Access denied!"
+ to_chat(user, "\red Access denied!")
return 1
else
..()
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index e78ed83fa1f..4f0d72e1511 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -65,7 +65,7 @@
set src in oview(1)
if (src.anchored || usr:stat)
- usr << "It is fastened to the floor!"
+ to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1
@@ -106,8 +106,8 @@
active=on
var/statestr=on?"on":"off"
// Spammy message_admins("Emitter turned [statestr] by radio signal ([signal.data["command"]] @ [frequency]) in [formatJumpTo(src)]",0,1)
- log_game("Emitter turned [statestr] by radio signal ([signal.data["command"]] @ [frequency]) in ([x], [y], [z]) AAC prints: [list2text(signal.data["hiddenprints"])]")
- investigate_log("turned [statestr] by radio signal ([signal.data["command"]] @ [frequency]) AAC prints: [list2text(signal.data["hiddenprints"])]","singulo")
+ log_game("Emitter turned [statestr] by radio signal ([signal.data["command"]] @ [frequency]) in ([x], [y], [z]) AAC prints: [jointext(signal.data["hiddenprints"], "")]")
+ investigate_log("turned [statestr] by radio signal ([signal.data["command"]] @ [frequency]) AAC prints: [jointext(signal.data["hiddenprints"], "")]","singulo")
update_icon()
/obj/machinery/power/emitter/Destroy()
@@ -127,18 +127,18 @@
src.add_fingerprint(user)
if(state == 2)
if(!powernet)
- user << "The emitter isn't connected to a wire."
+ to_chat(user, "The emitter isn't connected to a wire.")
return 1
if(!src.locked)
if(src.active==1)
src.active = 0
- user << "You turn off the [src]."
+ to_chat(user, "You turn off the [src].")
message_admins("Emitter turned off by [key_name_admin(user)] in ([x], [y], [z] - JMP)",0,1)
log_game("Emitter turned off by [key_name(user)] in [x], [y], [z]")
investigate_log("turned off by [key_name(usr)]","singulo")
else
src.active = 1
- user << "You turn on the [src]."
+ to_chat(user, "You turn on the [src].")
src.shot_number = 0
src.fire_delay = maximum_fire_delay
message_admins("Emitter turned on by [key_name_admin(user)] in ([x], [y], [z] - JMP)",0,1)
@@ -146,9 +146,9 @@
investigate_log("turned on by [key_name(usr)]","singulo")
update_icon()
else
- user << "\red The controls are locked!"
+ to_chat(user, "\red The controls are locked!")
else
- user << "\red The [src] needs to be firmly secured to the floor first."
+ to_chat(user, "\red The [src] needs to be firmly secured to the floor first.")
return 1
@@ -223,7 +223,7 @@
if(istype(W, /obj/item/weapon/wrench))
if(active)
- user << "Turn off the [src] first."
+ to_chat(user, "Turn off the [src] first.")
return
switch(state)
if(0)
@@ -241,17 +241,17 @@
"You hear a ratchet")
src.anchored = 0
if(2)
- user << "\red The [src.name] needs to be unwelded from the floor."
+ to_chat(user, "\red The [src.name] needs to be unwelded from the floor.")
return
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(active)
- user << "Turn off the [src] first."
+ to_chat(user, "Turn off the [src] first.")
return
switch(state)
if(0)
- user << "\red The [src.name] needs to be wrenched to the floor."
+ to_chat(user, "\red The [src.name] needs to be wrenched to the floor.")
if(1)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -261,10 +261,10 @@
if (do_after(user,20, target = src))
if(!src || !WT.isOn()) return
state = 2
- user << "You weld the [src] to the floor."
+ to_chat(user, "You weld the [src] to the floor.")
connect_to_network()
else
- user << "\red You need more welding fuel to complete this task."
+ to_chat(user, "\red You need more welding fuel to complete this task.")
if(2)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -274,25 +274,25 @@
if (do_after(user,20, target = src))
if(!src || !WT.isOn()) return
state = 1
- user << "You cut the [src] free from the floor."
+ to_chat(user, "You cut the [src] free from the floor.")
disconnect_from_network()
else
- user << "\red You need more welding fuel to complete this task."
+ to_chat(user, "\red You need more welding fuel to complete this task.")
return
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(emagged)
- user << "\red The lock seems to be broken"
+ to_chat(user, "\red The lock seems to be broken")
return
if(src.allowed(user))
if(active)
src.locked = !src.locked
- user << "The controls are now [src.locked ? "locked." : "unlocked."]"
+ to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
else
src.locked = 0 //just in case it somehow gets locked
- user << "\red The controls can only be locked when the [src] is online"
+ to_chat(user, "\red The controls can only be locked when the [src] is online")
else
- user << "\red Access denied."
+ to_chat(user, "\red Access denied.")
return
if(default_deconstruction_screwdriver(user, "emitter_open", "emitter", W))
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index cabe2b7a9b6..5bf41aac044 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -79,7 +79,7 @@ field_generator power level display
if(state == 2)
if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on
if(src.active >= 1)
- user << "You are unable to turn off the [src.name] once it is online!"
+ to_chat(user, "You are unable to turn off the [src.name] once it is online!")
return 1
else
user.visible_message("[user.name] turns on the [src.name].", \
@@ -90,13 +90,13 @@ field_generator power level display
src.add_fingerprint(user)
else
- user << "The [src] needs to be firmly secured to the floor first!"
+ to_chat(user, "The [src] needs to be firmly secured to the floor first!")
return
/obj/machinery/field/generator/attackby(obj/item/W, mob/user, params)
if(active)
- user << "The [src] needs to be off!"
+ to_chat(user, "The [src] needs to be off!")
return
else if(istype(W, /obj/item/weapon/wrench))
switch(state)
@@ -116,13 +116,13 @@ field_generator power level display
"You hear ratchet.")
src.anchored = 0
if(2)
- user << "The [src.name] needs to be unwelded from the floor!"
+ to_chat(user, "The [src.name] needs to be unwelded from the floor!")
return
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
switch(state)
if(0)
- user << "The [src.name] needs to be wrenched to the floor!"
+ to_chat(user, "The [src.name] needs to be wrenched to the floor!")
return
if(1)
if (WT.remove_fuel(0,user))
@@ -133,7 +133,7 @@ field_generator power level display
if (do_after(user,20, target = src))
if(!src || !WT.isOn()) return
state = 2
- user << "You weld the field generator to the floor."
+ to_chat(user, "You weld the field generator to the floor.")
else
return
if(2)
@@ -145,7 +145,7 @@ field_generator power level display
if (do_after(user,20, target = src))
if(!src || !WT.isOn()) return
state = 1
- user << "You cut \the [src] free from the floor."
+ to_chat(user, "You cut \the [src] free from the floor.")
else
return
else
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 355b8ec6e74..1c43e1a829d 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -24,8 +24,8 @@
/obj/singularity/narsie/large/New()
..()
- world << "NAR-SIE HAS RISEN"
- world << pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg'))
+ to_chat(world, "NAR-SIE HAS RISEN")
+ to_chat(world, pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg')))
var/area/A = get_area(src)
if(A)
@@ -38,7 +38,7 @@
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
if(!(src in view()))
- user << "Your soul is too far away."
+ to_chat(user, "Your soul is too far away.")
return
makeNewConstruct(/mob/living/simple_animal/construct/harvester, user, null, 1)
new /obj/effect/effect/sleep_smoke(user.loc)
@@ -76,7 +76,7 @@
for(var/mob/living/carbon/M in oviewers(8, src))
if(M.stat == CONSCIOUS)
if(!iscultist(M))
- M << "You feel your sanity crumble away in an instant as you gaze upon [src.name]..."
+ to_chat(M, "You feel your sanity crumble away in an instant as you gaze upon [src.name]...")
M.apply_effect(3, STUN)
@@ -123,12 +123,12 @@
/obj/singularity/narsie/proc/acquire(var/mob/food)
- target << "NAR-SIE HAS LOST INTEREST IN YOU"
+ to_chat(target, "NAR-SIE HAS LOST INTEREST IN YOU")
target = food
if(ishuman(target))
- target << "NAR-SIE HUNGERS FOR YOUR SOUL"
+ to_chat(target, "NAR-SIE HUNGERS FOR YOUR SOUL")
else
- target << "NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL"
+ to_chat(target, "NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL")
//Wizard narsie
/obj/singularity/narsie/wizard
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index eb5fe86b5ed..cff8c2ee9fa 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -96,7 +96,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
- usr << "It is fastened to the floor!"
+ to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 270)
return 1
@@ -109,7 +109,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
- usr << "It is fastened to the floor!"
+ to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1
@@ -235,7 +235,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
"You add some wires.")
temp_state++
else
- user << "You need one length of cable to wire the [src.name]!"
+ to_chat(user, "You need one length of cable to wire the [src.name]!")
return
if(2)
if(iswirecutter(O))//TODO:Shock user if its on?
@@ -289,7 +289,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
- usr << "It is fastened to the floor!"
+ to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 270)
return 1
@@ -302,7 +302,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
- usr << "It is fastened to the floor!"
+ to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 6723bc156c0..8101269762e 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -86,7 +86,7 @@
return 1
if(!interface_control)
- usr << "ERROR: Request timed out. Check wire contacts."
+ to_chat(usr, "ERROR: Request timed out. Check wire contacts.")
return
if( href_list["close"] )
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index ba8e5d34dea..ba516cd2181 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -390,7 +390,7 @@
if(istype(H.glasses, /obj/item/clothing/glasses/meson))
var/obj/item/clothing/glasses/meson/MS = H.glasses
if(MS.vision_flags == SEE_TURFS)
- H << "You look directly into the [src.name], good thing you had your protective eyewear on!"
+ to_chat(H, "You look directly into the [src.name], good thing you had your protective eyewear on!")
return
M.apply_effect(3, STUN)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 33a5c69fdc8..d55394f83bd 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -130,10 +130,10 @@
if(term && term.dir == turn(dir, 180))
terminal = term
terminal.master = src
- user << "Terminal found."
+ to_chat(user, "Terminal found.")
break
if(!terminal)
- user << "No power source found."
+ to_chat(user, "No power source found.")
return
stat &= ~BROKEN
update_icon()
@@ -150,21 +150,21 @@
return
if(terminal) //is there already a terminal ?
- user << "This SMES already has a power terminal!"
+ to_chat(user, "This SMES already has a power terminal!")
return
if(!panel_open) //is the panel open ?
- user << "You must open the maintenance panel first!"
+ to_chat(user, "You must open the maintenance panel first!")
return
var/turf/T = get_turf(user)
if (T.intact) //is the floor plating removed ?
- user << "You must first remove the floor plating!"
+ to_chat(user, "You must first remove the floor plating!")
return
var/obj/item/stack/cable_coil/C = I
if(C.amount < 10)
- user << "You need more wires."
+ to_chat(user, "You need more wires.")
return
//build the terminal and link it to the network
@@ -176,10 +176,10 @@
if(istype(I, /obj/item/weapon/wirecutters) && terminal && panel_open)
var/turf/T = get_turf(terminal)
if (T.intact) //is the floor plating removed ?
- user << "You must first expose the power terminal!"
+ to_chat(user, "You must first expose the power terminal!")
return
- user << "You begin to dismantle the power terminal..."
+ to_chat(user, "You begin to dismantle the power terminal...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 50, target = src))
@@ -302,7 +302,7 @@
//Will return 1 on failure
/obj/machinery/power/smes/proc/make_terminal(const/mob/user)
if (user.loc == loc)
- user << "You must not be on the same tile as the [src]."
+ to_chat(user, "You must not be on the same tile as the [src].")
return 1
//Direction the terminal will face to
@@ -314,13 +314,13 @@
tempDir = WEST
var/turf/tempLoc = get_step(src, reverse_direction(tempDir))
if (istype(tempLoc, /turf/space))
- user << "You can't build a terminal on space."
+ to_chat(user, "You can't build a terminal on space.")
return 1
else if (istype(tempLoc))
if(tempLoc.intact)
- user << "You must remove the floor plating first."
+ to_chat(user, "You must remove the floor plating first.")
return 1
- user << "You start adding cable to the [src]."
+ to_chat(user, "You start adding cable to the [src].")
if(do_after(user, 50, target = src))
var/turf/T = get_turf(user)
var/obj/structure/cable/N = T.get_cable_node() //get the connecting node cable, if there's one
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 3f714c911c2..44f78fa4e38 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -247,7 +247,7 @@
else
new /obj/machinery/power/solar(get_turf(src), src)
else
- user << "You need two sheets of glass to put them into a solar panel."
+ to_chat(user, "You need two sheets of glass to put them into a solar panel.")
return
return 1
@@ -418,7 +418,7 @@
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20, target = src))
if (src.stat & BROKEN)
- user << "The broken glass falls out."
+ to_chat(user, "The broken glass falls out.")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/shard( src.loc )
var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A )
@@ -430,7 +430,7 @@
A.anchored = 1
qdel(src)
else
- user << "You disconnect the monitor."
+ to_chat(user, "You disconnect the monitor.")
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A )
for (var/obj/C in src)
diff --git a/code/modules/power/supermatter/sm_shard.dm b/code/modules/power/supermatter/sm_shard.dm
index e55a065c462..e95b51cf828 100644
--- a/code/modules/power/supermatter/sm_shard.dm
+++ b/code/modules/power/supermatter/sm_shard.dm
@@ -44,7 +44,7 @@
/obj/item/weapon/shard/supermatter/Crossed(AM as mob|obj)
if(ismob(AM))
var/mob/M = AM
- M << "\red You step on \the [src]!"
+ to_chat(M, "\red You step on \the [src]!")
playsound(src.loc, 'sound/effects/glass_step_sm.ogg', 70, 1) // not sure how to handle metal shards with sounds
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -66,7 +66,7 @@
/obj/item/weapon/shard/supermatter/attack_hand(var/mob/user)
if(!istype(user,/mob/living/carbon/human/nucleation))
- user << pick( "\red You think twice before touching that without protection.",
+ to_chat(user, pick( "\red You think twice before touching that without protection.",)
"\red You don't want to touch that without some protection.",
"\red You probably should get something else to pick that up.",
"\red You aren't sure that's a good idea.",
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 6f04bf82a1a..5bb36c06187 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -224,8 +224,8 @@
message_admins("Singularity has consumed a supermatter shard and can now become stage six.")
visible_message("[src] is consumed by the singularity!")
for(var/mob/M in mob_list)
- M << 'sound/effects/supermatter.ogg' //everyone goan know bout this
- M << "A horrible screeching fills your ears, and a wave of dread washes over you..."
+ M << 'sound/effects/supermatter.ogg' //everyone gunna know bout this
+ to_chat(M, "A horrible screeching fills your ears, and a wave of dread washes over you...")
qdel(src)
return(gain)
diff --git a/code/modules/power/switch.dm b/code/modules/power/switch.dm
index 0f36d7274bf..cba253be5f0 100644
--- a/code/modules/power/switch.dm
+++ b/code/modules/power/switch.dm
@@ -24,18 +24,18 @@
/obj/structure/powerswitch/examine(mob/user)
..(user)
if(on)
- user << "The switch is in the on position"
+ to_chat(user, "The switch is in the on position")
else
- user << "The switch is in the off position"
+ to_chat(user, "The switch is in the off position")
/obj/structure/powerswitch/attack_ai(mob/user)
- user << "\red You're an AI. This is a manual switch. It's not going to work."
+ to_chat(user, "\red You're an AI. This is a manual switch. It's not going to work.")
return
/obj/structure/powerswitch/attack_hand(mob/user)
if(busy)
- user << "\red This switch is already being toggled."
+ to_chat(user, "\red This switch is already being toggled.")
return
..()
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 0776918c5b4..dd20b4fde12 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -56,7 +56,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
/obj/singularity/energy_ball/examine(mob/user)
..()
if(orbiting_balls.len)
- user << "The amount of orbiting mini-balls is [orbiting_balls.len]."
+ to_chat(user, "The amount of orbiting mini-balls is [orbiting_balls.len].")
/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm
new file mode 100644
index 00000000000..8ae75a982a4
--- /dev/null
+++ b/code/modules/power/treadmill.dm
@@ -0,0 +1,225 @@
+#define BASE_MOVE_DELAY 8
+#define MAX_SPEED 2
+
+/obj/machinery/power/treadmill
+ icon = 'icons/obj/recycling.dmi'
+ icon_state = "conveyor0"
+ name = "treadmill"
+ desc = "A power-generating treadmill."
+ layer = 2.2
+ anchored = 1
+ use_power = 0
+
+ var/speed = 0
+ var/friction = 0.15 // lose this much speed every ptick
+ var/inertia = 0.25 // multiplier to mob speed, when increasing treadmill speed
+ var/throw_dist = 2 // distance to throw the person, worst case
+ var/power_gen = 4000 // amount of power output at max speed
+ var/list/mobs_running[0]
+ var/id = null // for linking to monitor
+
+/obj/machinery/power/treadmill/initialize()
+ ..()
+ if(anchored)
+ connect_to_network()
+
+/obj/machinery/power/treadmill/update_icon()
+ icon_state = speed ? "conveyor-1" : "conveyor0"
+
+/obj/machinery/power/treadmill/Crossed(mob/living/M)
+ if(anchored && !M.anchored)
+ if(!istype(M) || M.dir != dir)
+ throw_off(M)
+ else
+ mobs_running[M] = M.last_movement
+ . = ..()
+
+/obj/machinery/power/treadmill/Uncrossed(mob/living/M)
+ if(anchored && istype(M))
+ mobs_running -= M
+ . = ..()
+
+/obj/machinery/power/treadmill/proc/throw_off(atom/movable/A)
+ // if 2fast, throw the person, otherwise they just slide off, if there's reasonable speed at all
+ if(speed)
+ var/dist = max(throw_dist * speed / MAX_SPEED, 1)
+ A.throw_at(get_distant_turf(get_turf(src), reverse_direction(dir), dist), A.throw_range, A.throw_speed, src, 1)
+
+/obj/machinery/power/treadmill/process()
+ if(!anchored)
+ speed = 0
+ update_icon()
+ return
+
+ speed = Clamp(speed - friction, 0, MAX_SPEED)
+ for(var/A in (loc.contents - src))
+ var/atom/movable/AM = A
+ if(AM.anchored)
+ continue
+ if(istype(A, /mob/living))
+ var/mob/living/M = A
+ var/last_move
+ // get/update old step count
+ if(mobs_running[M])
+ last_move = mobs_running[M]
+ else
+ last_move = M.last_movement
+ mobs_running[M] = M.last_movement
+ // if we "stepped" in right direction, add to speed, else throw the person off like a common obj
+ if(last_move != M.last_movement && dir == M.dir)
+ // a reasonable approximation of movement speed
+ var/mob_speed = M.movement_delay()
+ switch(M.m_intent)
+ if("run")
+ if(M.drowsyness > 0)
+ mob_speed += 6
+ mob_speed += config.run_speed - 1
+ if("walk")
+ mob_speed += config.walk_speed - 1
+ mob_speed = BASE_MOVE_DELAY / max(1, BASE_MOVE_DELAY + mob_speed)
+ speed = min(speed + inertia * mob_speed, mob_speed)
+ continue
+ throw_off(A)
+
+ var/output = get_power_output()
+ if(output)
+ add_avail(output)
+ update_icon()
+
+/obj/machinery/power/treadmill/proc/get_power_output()
+ if(speed && !stat && anchored && powernet)
+ return power_gen * speed / MAX_SPEED
+ return 0
+
+/obj/machinery/power/treadmill/emp_act(severity)
+ ..()
+ if(!(stat & BROKEN))
+ stat |= BROKEN
+ spawn(100)
+ stat &= ~BROKEN
+
+/obj/machinery/power/treadmill/attackby(obj/item/W, mob/user)
+ if(default_unfasten_wrench(user, W, time = 60))
+ if(anchored)
+ connect_to_network()
+ else
+ disconnect_from_network()
+ speed = 0
+ update_icon()
+ return
+ ..()
+
+#undef BASE_MOVE_DELAY
+#undef MAX_SPEED
+
+#define CHARS_PER_LINE 5
+#define FONT_SIZE "5pt"
+#define FONT_COLOR "#09f"
+#define FONT_STYLE "Arial Black"
+
+/obj/machinery/treadmill_monitor
+ name = "Treadmill Monitor"
+ icon = 'icons/obj/status_display.dmi'
+ icon_state = "frame"
+ desc = "Monitors treadmill use."
+ anchored = 1
+ density = 0
+ maptext_height = 26
+ maptext_width = 32
+
+ var/on = 0 // if we should be metering or not
+ var/id = null // id of treadmill
+ var/obj/machinery/power/treadmill/treadmill = null
+ var/total_joules = 0 // total power from prisoner
+ var/J_per_ticket = 45000 // amt of power charged for a ticket
+ var/line1 = ""
+ var/line2 = ""
+ var/frame = 0 // on 0, show labels, on 1 show numbers
+ var/redeem_immediately = 0 // redeem immediately for holding cell
+
+/obj/machinery/treadmill_monitor/initialize()
+ if(id)
+ for(var/obj/machinery/power/treadmill/T in machines)
+ if(T.id == id)
+ treadmill = T
+ break
+ if(!treadmill)
+ // also simply check if treadmill at loc
+ for(var/obj/machinery/power/treadmill/T in loc)
+ treadmill = T
+ break
+
+/obj/machinery/treadmill_monitor/process()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ if(treadmill && on)
+ var/output = treadmill.get_power_output()
+ if(output)
+ total_joules += output
+ if(redeem_immediately && total_joules > J_per_ticket)
+ redeem()
+ total_joules = 1
+ update_icon()
+ frame = !frame
+
+/obj/machinery/treadmill_monitor/power_change()
+ ..()
+ update_icon()
+
+/obj/machinery/treadmill_monitor/examine(mob/user)
+ ..()
+ to_chat(user, "The display reads:[line1]
[line2]
")
+
+/obj/machinery/treadmill_monitor/update_icon()
+ overlays.Cut()
+ if(stat & NOPOWER || !total_joules || !on)
+ line1 = ""
+ line2 = ""
+ else if(stat & BROKEN)
+ overlays += image('icons/obj/status_display.dmi', icon_state = "ai_bsod")
+ line1 = "A@#$A"
+ line2 = "729%!"
+ else
+ if(!frame)
+ line1 = "-W/S-"
+ line2 = "-TIX-"
+ else
+ if(!treadmill || treadmill.stat)
+ line1 = "???"
+ else
+ line1 = "[add_zero(num2text(round(treadmill.get_power_output())), 4)]"
+ if(length(line1) > CHARS_PER_LINE)
+ line1 = "Error"
+ if(J_per_ticket)
+ line2 = "[round(total_joules / J_per_ticket)]"
+ if(length(line2) > CHARS_PER_LINE)
+ line2 = "Error"
+ update_display(line1, line2)
+
+//Checks to see if there's 1 line or 2, adds text-icons-numbers/letters over display
+// Stolen from status_display
+/obj/machinery/treadmill_monitor/proc/update_display(var/line1, var/line2)
+ var/new_text = {"[line1]
[line2]
"}
+ if(maptext != new_text)
+ maptext = new_text
+
+// called by brig timer when prisoner released
+/obj/machinery/treadmill_monitor/proc/redeem()
+ if(total_joules >= J_per_ticket && J_per_ticket)
+ playsound(loc, 'sound/machines/chime.ogg', 50, 1)
+ new /obj/item/stack/tickets(get_turf(src), round(total_joules / J_per_ticket))
+ total_joules = 0
+
+/obj/machinery/treadmill_monitor/emp_act(severity)
+ ..()
+ if(!(stat & BROKEN))
+ stat |= BROKEN
+ update_icon()
+ spawn(100)
+ stat &= ~BROKEN
+ update_icon()
+
+#undef FONT_SIZE
+#undef FONT_COLOR
+#undef FONT_STYLE
+#undef CHARS_PER_LINE
\ No newline at end of file
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 4c7b51e5ac0..7df58795f43 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -120,10 +120,10 @@
inturf = get_step(src, dir)
locate_machinery()
if(turbine)
- user << "Turbine connected."
+ to_chat(user, "Turbine connected.")
stat &= ~BROKEN
else
- user << "Turbine not connected."
+ to_chat(user, "Turbine not connected.")
stat |= BROKEN
return
@@ -279,10 +279,10 @@
outturf = get_step(src, dir)
locate_machinery()
if(compressor)
- user << "Compressor connected."
+ to_chat(user, "Compressor connected.")
stat &= ~BROKEN
else
- user << "Compressor not connected."
+ to_chat(user, "Compressor not connected.")
stat |= BROKEN
return
diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm
index c0b89549f3e..645c6e786de 100644
--- a/code/modules/procedural_mapping/mapGenerator.dm
+++ b/code/modules/procedural_mapping/mapGenerator.dm
@@ -153,23 +153,23 @@
var/endInput = input(usr,"End turf of Map (X;Y;Z)", "Map Gen Settings", "[world.maxx];[world.maxy];[mob ? mob.z : 1]") as text
//maxx maxy and current z so that if you fuck up, you only fuck up one entire z level instead of the entire universe
if(!startInput || !endInput)
- src << "Missing Input"
+ to_chat(src, "Missing Input")
return
- var/list/startCoords = text2list(startInput, ";")
- var/list/endCoords = text2list(endInput, ";")
+ var/list/startCoords = splittext(startInput, ";")
+ var/list/endCoords = splittext(endInput, ";")
if(!startCoords || !endCoords)
- src << "Invalid Coords"
- src << "Start Input: [startInput]"
- src << "End Input: [endInput]"
+ to_chat(src, "Invalid Coords")
+ to_chat(src, "Start Input: [startInput]")
+ to_chat(src, "End Input: [endInput]")
return
var/turf/Start = locate(text2num(startCoords[1]),text2num(startCoords[2]),text2num(startCoords[3]))
var/turf/End = locate(text2num(endCoords[1]),text2num(endCoords[2]),text2num(endCoords[3]))
if(!Start || !End)
- src << "Invalid Turfs"
- src << "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]"
- src << "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]"
+ to_chat(src, "Invalid Turfs")
+ to_chat(src, "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]")
+ to_chat(src, "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]")
return
var/list/clusters = list("None"=CLUSTER_CHECK_NONE,"All"=CLUSTER_CHECK_ALL,"Sames"=CLUSTER_CHECK_SAMES,"Differents"=CLUSTER_CHECK_DIFFERENTS, \
@@ -178,24 +178,24 @@
var/moduleClusters = input("Cluster Flags (Cancel to leave unchanged from defaults)","Map Gen Settings") as null|anything in clusters
//null for default
-
+
var/theCluster = 0
if(moduleClusters != "None")
if(!clusters[moduleClusters])
- src << "Invalid Cluster Flags"
+ to_chat(src, "Invalid Cluster Flags")
return
theCluster = clusters[moduleClusters]
else
theCluster = CLUSTER_CHECK_NONE
-
+
if(theCluster)
for(var/datum/mapGeneratorModule/M in N.modules)
M.clusterCheckFlags = theCluster
- src << "Defining Region"
+ to_chat(src, "Defining Region")
N.defineRegion(Start, End)
- src << "Region Defined"
- src << "Generating Region"
+ to_chat(src, "Region Defined")
+ to_chat(src, "Generating Region")
N.generate()
- src << "Generated Region"
+ to_chat(src, "Generated Region")
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 57ed66625ec..0022a4e1f80 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -38,18 +38,19 @@
var/tmp_label = ""
var/label_text = sanitize(input(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label))
if(length(label_text) > 20)
- user << "\red The inscription can be at most 20 characters long."
+ to_chat(user, "\red The inscription can be at most 20 characters long.")
else
if(label_text == "")
- user << "\blue You scratch the inscription off of [initial(BB)]."
+ to_chat(user, "\blue You scratch the inscription off of [initial(BB)].")
BB.name = initial(BB.name)
else
- user << "\blue You inscribe \"[label_text]\" into \the [initial(BB.name)]."
+ to_chat(user, "\blue You inscribe \"[label_text]\" into \the [initial(BB.name)].")
BB.name = "[initial(BB.name)] \"[label_text]\""
else
- user << "\blue You can only inscribe a metal bullet." //because inscribing beanbags is silly
+ to_chat(user, "\blue You can only inscribe a metal bullet.")//because inscribing beanbags is silly
+
else
- user << "\blue There is no bullet in the casing to inscribe anything into."
+ to_chat(user, "\blue There is no bullet in the casing to inscribe anything into.")
/obj/item/ammo_casing/proc/newshot() //For energy weapons, shotgun shells and wands (!).
if (!BB)
@@ -121,7 +122,7 @@
num_loaded++
if(num_loaded)
if(!silent)
- user << "You load [num_loaded] shell\s into \the [src]!"
+ to_chat(user, "You load [num_loaded] shell\s into \the [src]!")
A.update_icon()
update_icon()
@@ -129,7 +130,7 @@
var/obj/item/ammo_casing/A = get_round()
if(A)
user.put_in_hands(A)
- user << "You remove a round from \the [src]!"
+ to_chat(user, "You remove a round from \the [src]!")
update_icon()
/obj/item/ammo_box/update_icon()
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index dcafea10a35..7a3718d1642 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -68,7 +68,7 @@
proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
- user << "*click*"
+ to_chat(user, "*click*")
playsound(user, 'sound/weapons/emptyclick.ogg', 40, 1)
return
@@ -98,30 +98,30 @@
if(istype(user, /mob/living))
var/mob/living/M = user
if ((CLUMSY in M.mutations) && prob(50))
- M << "[src] blows up in your face."
+ to_chat(M, "[src] blows up in your face.")
M.take_organ_damage(0,20)
M.drop_item()
qdel(src)
return
if (!user.IsAdvancedToolUser() || istype(user, /mob/living/simple_animal/diona))
- user << "You don't have the dexterity to do this!"
+ to_chat(user, "You don't have the dexterity to do this!")
return
if(istype(user, /mob/living))
var/mob/living/M = user
if (HULK in M.mutations)
- M << "Your meaty finger is much too large for the trigger guard!"
+ to_chat(M, "Your meaty finger is much too large for the trigger guard!")
return
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.get_species() == "Golem")
- user << "Your metal fingers don't fit in the trigger guard!"
+ to_chat(user, "Your metal fingers don't fit in the trigger guard!")
return
if(H.get_species() == "Shadowling")
- user << "The muzzle flash would cause damage to your form!"
+ to_chat(user, "The muzzle flash would cause damage to your form!")
return
if(H.martial_art && H.martial_art.name == "The Sleeping Carp") //great dishonor to famiry
- user << "Use of ranged weaponry would bring dishonor to the clan."
+ to_chat(user, "Use of ranged weaponry would bring dishonor to the clan.")
return
add_fingerprint(user)
@@ -131,7 +131,7 @@
if (!ready_to_fire())
if (world.time % 3) //to prevent spam
- user << "[src] is not ready to fire again!"
+ to_chat(user, "[src] is not ready to fire again!")
return
if(heavy_weapon)
@@ -230,13 +230,13 @@
in_chamber.p_y = text2num(mouse_control["icon-y"])
if(mouse_control["screen-loc"])
//Split screen-loc up into X+Pixel_X and Y+Pixel_Y
- var/list/screen_loc_params = text2list(mouse_control["screen-loc"], ",")
+ var/list/screen_loc_params = splittext(mouse_control["screen-loc"], ",")
//Split X+Pixel_X up into list(X, Pixel_X)
- var/list/screen_loc_X = text2list(screen_loc_params[1],":")
+ var/list/screen_loc_X = splittext(screen_loc_params[1],":")
//Split Y+Pixel_Y up into list(Y, Pixel_Y)
- var/list/screen_loc_Y = text2list(screen_loc_params[2],":")
+ var/list/screen_loc_Y = splittext(screen_loc_params[2],":")
var/x = text2num(screen_loc_X[1]) * 32 + text2num(screen_loc_X[2]) - 32
var/y = text2num(screen_loc_Y[1]) * 32 + text2num(screen_loc_Y[2]) - 32
@@ -299,7 +299,7 @@
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1)
user.death()
else
- user << "Ow..."
+ to_chat(user, "Ow...")
user.apply_effect(110,STAMINA,0)
del(in_chamber)
mouthshoot = 0
@@ -329,10 +329,10 @@
if(can_flashlight)
if(!F)
if(user.l_hand != src && user.r_hand != src)
- user << "You'll need [src] in your hands to do that."
+ to_chat(user, "You'll need [src] in your hands to do that.")
return
user.drop_item()
- user << "You click [S] into place on [src]."
+ to_chat(user, "You click [S] into place on [src].")
if(S.on)
set_light(0)
F = S
@@ -343,10 +343,10 @@
if(istype(A, /obj/item/weapon/screwdriver))
if(F)
if(user.l_hand != src && user.r_hand != src)
- user << "You'll need [src] in your hands to do that."
+ to_chat(user, "You'll need [src] in your hands to do that.")
return
for(var/obj/item/device/flashlight/seclite/S in src)
- user << "You unscrew the seclite from [src]."
+ to_chat(user, "You unscrew the seclite from [src].")
F = null
S.loc = get_turf(user)
update_gunlight(user)
@@ -366,9 +366,9 @@
var/mob/living/carbon/human/user = usr
if(!isturf(user.loc))
- user << "You cannot turn the light on while in this [user.loc]."
+ to_chat(user, "You cannot turn the light on while in this [user.loc].")
F.on = !F.on
- user << "You toggle the gunlight [F.on ? "on":"off"]."
+ to_chat(user, "You toggle the gunlight [F.on ? "on":"off"].")
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
update_gunlight(user)
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index ea4c15a0596..eeb775be84a 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/code/modules/projectiles/guns/alien.dm
@@ -33,7 +33,7 @@
/obj/item/weapon/gun/launcher/spikethrower/examine(mob/user)
..(user)
- user << "It has [spikes] [spikes == 1 ? "spike" : "spikes"] remaining."
+ to_chat(user, "It has [spikes] [spikes == 1 ? "spike" : "spikes"] remaining.")
/obj/item/weapon/gun/launcher/spikethrower/update_icon()
icon_state = "spikethrower[spikes]"
@@ -45,7 +45,7 @@
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(H.species && H.species.name != "Vox" && H.species.name != "Vox Armalis")
- user << "\red \The [src] does not respond to you!"
+ to_chat(user, "\red \The [src] does not respond to you!")
return 0
return 1
@@ -89,7 +89,7 @@
if(H.species.name == "Vox Armalis")
..()
return
- user << "\red \The [src] is far too large for you to pick up."
+ to_chat(user, "\red \The [src] is far too large for you to pick up.")
return
/obj/item/weapon/gun/energy/noisecannon/process_chambered() //Does not have ammo.
diff --git a/code/modules/projectiles/guns/energy/advtaser.dm b/code/modules/projectiles/guns/energy/advtaser.dm
index f617db1122b..8601a388f15 100644
--- a/code/modules/projectiles/guns/energy/advtaser.dm
+++ b/code/modules/projectiles/guns/energy/advtaser.dm
@@ -21,7 +21,7 @@
mode = 1
charge_cost = 500
fire_sound = 'sound/weapons/taser2.ogg'
- user << "\red [src.name] is now set to Disable."
+ to_chat(user, "\red [src.name] is now set to Disable.")
projectile_type = "/obj/item/projectile/beam/disabler"
modifystate = "advtaserdisable"
fire_delay = 0
@@ -29,7 +29,7 @@
mode = 0
charge_cost = 2000
fire_sound = 'sound/weapons/Taser.ogg'
- user << "\red [src.name] is now set to stun."
+ to_chat(user, "\red [src.name] is now set to stun.")
projectile_type = "/obj/item/projectile/energy/electrode"
modifystate = "advtaserstun"
fire_delay = 15
diff --git a/code/modules/projectiles/guns/energy/blueshield.dm b/code/modules/projectiles/guns/energy/blueshield.dm
index 1ba9e26eba1..914b92e19a6 100644
--- a/code/modules/projectiles/guns/energy/blueshield.dm
+++ b/code/modules/projectiles/guns/energy/blueshield.dm
@@ -21,7 +21,7 @@
projectile_type = "/obj/item/projectile/beam"
modifystate = "bsgun_kill"
- user << "You adjust [src.name] to the kill setting."
+ to_chat(user, "You adjust [src.name] to the kill setting.")
else
fire_mode = 0
@@ -32,6 +32,6 @@
fire_sound = 'sound/weapons/gunshot.ogg'
modifystate = "bsgun_stun"
- user << "You adjust [src.name] to the stun setting."
+ to_chat(user, "You adjust [src.name] to the stun setting.")
update_icon()
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/energy/hos.dm b/code/modules/projectiles/guns/energy/hos.dm
index c48a7ee3398..6bcb9992c4d 100644
--- a/code/modules/projectiles/guns/energy/hos.dm
+++ b/code/modules/projectiles/guns/energy/hos.dm
@@ -18,7 +18,7 @@
mode = 0
charge_cost = 1000
fire_sound = 'sound/weapons/Laser.ogg'
- user << "\red [src.name] is now set to kill."
+ to_chat(user, "\red [src.name] is now set to kill.")
projectile_type = "/obj/item/projectile/beam"
modifystate = "hoslaserkill"
fire_delay = 0
@@ -26,7 +26,7 @@
mode = 1
charge_cost = 500
fire_sound = 'sound/weapons/taser2.ogg'
- user << "\red [src.name] is now set to disable."
+ to_chat(user, "\red [src.name] is now set to disable.")
projectile_type = "/obj/item/projectile/beam/disabler"
modifystate = "hoslaserdisable"
fire_delay = 0
@@ -34,7 +34,7 @@
mode = 2
charge_cost = 2000
fire_sound = 'sound/weapons/taser.ogg'
- user << "\red [src.name] is now set to stun."
+ to_chat(user, "\red [src.name] is now set to stun.")
projectile_type = "/obj/item/projectile/energy/electrode"
modifystate = "hoslaserstun"
fire_delay = 15
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 2c0eb581bde..096cd26da3a 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -125,7 +125,7 @@ obj/item/weapon/gun/energy/laser/retro
if(ishuman(M))
if(istype(M.wear_suit, /obj/item/clothing/suit/bluetag))
return 1
- M << "\red You need to be wearing your laser tag vest!"
+ to_chat(M, "\red You need to be wearing your laser tag vest!")
return 0
/obj/item/weapon/gun/energy/laser/redtag
@@ -143,5 +143,5 @@ obj/item/weapon/gun/energy/laser/retro
if(ishuman(M))
if(istype(M.wear_suit, /obj/item/clothing/suit/redtag))
return 1
- M << "\red You need to be wearing your laser tag vest!"
+ to_chat(M, "\red You need to be wearing your laser tag vest!")
return 0
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index edfcd01d211..5bc164c5d76 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -19,14 +19,14 @@
mode = 1
charge_cost = 1000
fire_sound = 'sound/weapons/Laser.ogg'
- user << "\red [src.name] is now set to kill."
+ to_chat(user, "\red [src.name] is now set to kill.")
projectile_type = "/obj/item/projectile/beam"
modifystate = "energykill"
if(1)
mode = 0
charge_cost = 500
fire_sound = 'sound/weapons/Taser2.ogg'
- user << "\red [src.name] is now set to disable."
+ to_chat(user, "\red [src.name] is now set to disable.")
projectile_type = "/obj/item/projectile/beam/disabler"
modifystate = "energystun"
update_icon()
@@ -96,16 +96,16 @@
if (prob(src.reliability))
for (var/mob/living/M in range(0,src)) //Only a minor failure, enjoy your radiation if you're in the same tile or carrying it
if (src in M.contents)
- M << "\red Your gun feels pleasantly warm for a moment."
+ to_chat(M, "\red Your gun feels pleasantly warm for a moment.")
else
- M << "\red You feel a warm sensation."
+ to_chat(M, "\red You feel a warm sensation.")
M.apply_effect(rand(3,120), IRRADIATE)
lightfail = 1
else
for (var/mob/living/M in range(rand(1,4),src)) //Big failure, TIME FOR RADIATION BITCHES
if (src in M.contents)
- M << "\red Your gun's reactor overloads!"
- M << "\red You feel a wave of heat wash over you."
+ to_chat(M, "\red Your gun's reactor overloads!")
+ to_chat(M, "\red You feel a wave of heat wash over you.")
M.apply_effect(300, IRRADIATE)
crit_fail = 1 //break the gun so it stops recharging
processing_objects.Remove(src)
@@ -173,7 +173,7 @@
mode = 1
charge_cost = 500
fire_sound = 'sound/weapons/Laser.ogg'
- user << "\red [src.name] is now set to kill."
+ to_chat(user, "\red [src.name] is now set to kill.")
projectile_type = /obj/item/projectile/beam
modifystate = "energykill"
fire_delay = 0
@@ -181,7 +181,7 @@
mode = 0
charge_cost = 1000
fire_sound = 'sound/weapons/Taser.ogg'
- user << "\red [src.name] is now set to stun."
+ to_chat(user, "\red [src.name] is now set to stun.")
projectile_type = /obj/item/projectile/energy/electrode
modifystate = "energystun"
fire_delay = 15
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index ffb075c8c34..bc7704d709a 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -21,19 +21,19 @@
mode = 0
charge_cost = 50
fire_sound = 'sound/weapons/Taser.ogg'
- user << "\red [src.name] is now set to stun."
+ to_chat(user, "\red [src.name] is now set to stun.")
projectile_type = "/obj/item/projectile/energy/electrode"
if(0)
mode = 1
charge_cost = 100
fire_sound = 'sound/weapons/Laser.ogg'
- user << "\red [src.name] is now set to kill."
+ to_chat(user, "\red [src.name] is now set to kill.")
projectile_type = "/obj/item/projectile/beam"
if(1)
mode = 2
charge_cost = 200
fire_sound = 'sound/weapons/pulse.ogg'
- user << "\red [src.name] is now set to DESTROY."
+ to_chat(user, "\red [src.name] is now set to DESTROY.")
projectile_type = "/obj/item/projectile/beam/pulse"
return
@@ -58,7 +58,7 @@
cell_type = "/obj/item/weapon/stock_parts/cell/infinite"
attack_self(mob/living/user as mob)
- user << "\red [src.name] has three settings, and they are all DESTROY."
+ to_chat(user, "\red [src.name] has three settings, and they are all DESTROY.")
/obj/item/weapon/gun/energy/pulse_rifle/carbine
name = "pulse carbine"
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index c5002a03acf..bb556a4f178 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -50,13 +50,13 @@
if(0)
mode = 1
charge_cost = 1000
- user << "\red The [src.name] is now set to increase yield."
+ to_chat(user, "\red The [src.name] is now set to increase yield.")
projectile_type = "/obj/item/projectile/energy/florayield"
modifystate = "florayield"
if(1)
mode = 0
charge_cost = 1000
- user << "\red The [src.name] is now set to induce mutations."
+ to_chat(user, "\red The [src.name] is now set to induce mutations.")
projectile_type = "/obj/item/projectile/energy/floramut"
modifystate = "floramut"
update_icon()
@@ -117,11 +117,11 @@ obj/item/weapon/gun/energy/staff/focus
attack_self(mob/living/user as mob)
if(projectile_type == "/obj/item/projectile/forcebolt")
charge_cost = 200
- user << "\red The [src.name] will now strike a small area."
+ to_chat(user, "\red The [src.name] will now strike a small area.")
projectile_type = "/obj/item/projectile/forcebolt/strong"
else
charge_cost = 100
- user << "\red The [src.name] will now strike only a single person."
+ to_chat(user, "\red The [src.name] will now strike only a single person.")
projectile_type = "/obj/item/projectile/forcebolt"
*/
@@ -174,10 +174,10 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
set name = "Use Sniper Scope"
set popup_menu = 0
if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
- usr << "You are unable to focus down the scope of the rifle."
+ to_chat(usr, "You are unable to focus down the scope of the rifle.")
return
if(!zoom && usr.get_active_hand() != src)
- usr << "You are too distracted to look down the scope, perhaps if it was in your active hand this might work better"
+ to_chat(usr, "You are too distracted to look down the scope, perhaps if it was in your active hand this might work better")
return
if(usr.client.view == world.view)
@@ -191,7 +191,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
if(!usr.hud_used.hud_shown)
usr.button_pressed_F12(1)
zoom = 0
- usr << "Zoom mode [zoom?"en":"dis"]abled."
+ to_chat(usr, "Zoom mode [zoom?"en":"dis"]abled.")
/obj/item/weapon/gun/energy/kinetic_accelerator
@@ -241,7 +241,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
if(!silenced)
playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
else if(user)
- usr << "You silently charge [src]."
+ to_chat(usr, "You silently charge [src].")
recently_fired = 0
update_icon()
@@ -292,18 +292,18 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
/obj/item/weapon/gun/energy/plasmacutter/examine(mob/user)
..(user)
if(power_supply)
- user <<"[src] is [round(power_supply.percent())]% charged."
+ to_chat(user, "[src] is [round(power_supply.percent())]% charged.")
/obj/item/weapon/gun/energy/plasmacutter/attackby(var/obj/item/A, var/mob/user)
if(istype(A, /obj/item/stack/sheet/mineral/plasma))
var/obj/item/stack/sheet/S = A
S.use(1)
power_supply.give(10000)
- user << "You insert [A] in [src], recharging it."
+ to_chat(user, "You insert [A] in [src], recharging it.")
else if(istype(A, /obj/item/weapon/ore/plasma))
qdel(A)
power_supply.give(5000)
- user << "You insert [A] in [src], recharging it."
+ to_chat(user, "You insert [A] in [src], recharging it.")
else
..()
@@ -376,12 +376,12 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
switch(mode)
if(0)
mode = 1
- user << "[name] is now set to orange."
+ to_chat(user, "[name] is now set to orange.")
projectile_type = "/obj/item/projectile/beam/wormhole/orange"
modifystate = "wormhole_projector_orange"
if(1)
mode = 0
- user << "[name] is now set to blue."
+ to_chat(user, "[name] is now set to blue.")
projectile_type = "/obj/item/projectile/beam/wormhole"
modifystate = "wormhole_projector"
update_icon()
diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm
index 8d33a9e2508..1e0eb5d08c2 100644
--- a/code/modules/projectiles/guns/energy/temperature.dm
+++ b/code/modules/projectiles/guns/energy/temperature.dm
@@ -42,7 +42,7 @@
/obj/item/weapon/gun/energy/temperature/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/card/emag) && !emagged)
emagged = 1
- user << "You double the gun's temperature cap! Targets hit by searing beams will burst into flames!"
+ to_chat(user, "You double the gun's temperature cap! Targets hit by searing beams will burst into flames!")
desc = "A gun that changes the body temperature of its targets. Its temperature cap has been hacked."
/obj/item/weapon/gun/energy/temperature/Topic(href, href_list)
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 57c3ca2628c..13f92bcef86 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -33,7 +33,7 @@
if(no_den_usage)
var/area/A = get_area(user)
if(istype(A, /area/wizard_station))
- user << "You know better than to violate the security of The Den, best wait until you leave to use [src]."
+ to_chat(user, "You know better than to violate the security of The Den, best wait until you leave to use [src].")
return
else
no_den_usage = 0
@@ -62,5 +62,5 @@
return
/obj/item/weapon/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj)
- user << "The [name] whizzles quietly."
+ to_chat(user, "The [name] whizzles quietly.")
return
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index eb4bf5c37d1..6be4e0936bf 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -27,13 +27,13 @@
/obj/item/weapon/gun/magic/wand/examine(mob/user)
..(user)
- user << "Has [charges] charge\s remaining."
+ to_chat(user, "Has [charges] charge\s remaining.")
/obj/item/weapon/gun/magic/wand/attack_self(mob/living/user as mob)
if(charges)
zap_self(user)
else
- user << "The [name] whizzles quietly."
+ to_chat(user, "The [name] whizzles quietly.")
..()
/obj/item/weapon/gun/magic/wand/attack(atom/target as mob, mob/living/user as mob)
@@ -43,7 +43,7 @@
/obj/item/weapon/gun/magic/wand/afterattack(atom/target as mob, mob/living/user as mob)
if(!charges && !drained)
- user << "The [name] whizzles quietly."
+ to_chat(user, "The [name] whizzles quietly.")
icon_state = "[icon_state]-drained"
drained = 1
return
@@ -51,7 +51,7 @@
if(no_den_usage)
var/area/A = get_area(user)
if(istype(A, /area/wizard_station))
- user << "You know better than to violate the security of The Den, best wait until you leave to use [src]."
+ to_chat(user, "You know better than to violate the security of The Den, best wait until you leave to use [src].")
return
else
no_den_usage = 0
@@ -73,7 +73,7 @@
if(alert(user, "You really want to zap yourself with the wand of death?",, "Yes", "No") == "Yes" && charges && user.get_active_hand() == src && isliving(user))
var/message ="You irradiate yourself with pure energy! "
message += pick("Do not pass go. Do not collect 200 zorkmids.","You feel more confident in your spell casting skills.","You Die...","Do you want your possessions identified?")
- user << message
+ to_chat(user, message)
user.adjustOxyLoss(500)
charges--
..()
@@ -95,7 +95,7 @@
user.radiation = 0
user.heal_overall_damage(user.getBruteLoss(), user.getFireLoss())
user.reagents.clear_reagents()
- user << "You feel great!"
+ to_chat(user, "You feel great!")
charges--
..()
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index f7b61436dfe..d6fb9d9aff0 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -66,22 +66,22 @@
user.remove_from_mob(AM)
magazine = AM
magazine.loc = src
- user << "You load a new magazine into \the [src]."
+ to_chat(user, "You load a new magazine into \the [src].")
chamber_round()
A.update_icon()
update_icon()
return 1
else if (magazine)
- user << "There's already a magazine in \the [src]."
+ to_chat(user, "There's already a magazine in \the [src].")
if(istype(A, /obj/item/weapon/suppressor))
var/obj/item/weapon/suppressor/S = A
if(can_suppress)
if(!silenced)
if(user.l_hand != src && user.r_hand != src)
- user << "You'll need [src] in your hands to do that."
+ to_chat(user, "You'll need [src] in your hands to do that.")
return
user.drop_item()
- user << "You screw [S] onto [src]."
+ to_chat(user, "You screw [S] onto [src].")
silenced = A
S.oldsound = fire_sound
S.initial_w_class = w_class
@@ -91,10 +91,10 @@
update_icon()
return
else
- user << "[src] already has a suppressor."
+ to_chat(user, "[src] already has a suppressor.")
return
else
- user << "You can't seem to figure out how to fit [S] on [src]."
+ to_chat(user, "You can't seem to figure out how to fit [S] on [src].")
return
return 0
@@ -105,7 +105,7 @@
if(user.l_hand != src && user.r_hand != src)
..()
return
- user << "You unscrew [silenced] from [src]."
+ to_chat(user, "You unscrew [silenced] from [src].")
user.put_in_hands(silenced)
fire_sound = S.oldsound
w_class = S.initial_w_class
@@ -120,15 +120,15 @@
user.put_in_hands(magazine)
magazine.update_icon()
magazine = null
- user << "You pull the magazine out of \the [src]!"
+ to_chat(user, "You pull the magazine out of \the [src]!")
else
- user << "There's no magazine in \the [src]."
+ to_chat(user, "There's no magazine in \the [src].")
update_icon()
return
/obj/item/weapon/gun/projectile/examine(mob/user)
..(user)
- user << "Has [get_ammo()] round\s remaining."
+ to_chat(user, "Has [get_ammo()] round\s remaining.")
/obj/item/weapon/gun/projectile/proc/get_ammo(var/countchambered = 1)
var/boolets = 0 //mature var names for mature people
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index ee8d7be812f..b56344ce039 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -36,12 +36,12 @@
var/obj/item/ammo_box/magazine/AM = A
if(istype(AM, text2path(mag_type)))
if(magazine)
- user << "You perform a tactical reload on \the [src], replacing the magazine."
+ to_chat(user, "You perform a tactical reload on \the [src], replacing the magazine.")
magazine.forceMove(get_turf(src.loc))
magazine.update_icon()
magazine = null
else
- user << "You insert the magazine into \the [src]."
+ to_chat(user, "You insert the magazine into \the [src].")
user.remove_from_mob(AM)
magazine = AM
magazine.forceMove(src)
@@ -59,11 +59,11 @@
if(!select)
burst_size = 1
fire_delay = 0
- user << "You switch to semi-automatic."
+ to_chat(user, "You switch to semi-automatic.")
else
burst_size = initial(burst_size)
fire_delay = initial(fire_delay)
- user << "You switch to [burst_size] round burst."
+ to_chat(user, "You switch to [burst_size] round burst.")
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
update_icon()
@@ -144,7 +144,7 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob)
cover_open = !cover_open
- user << "You [cover_open ? "open" : "close"] [src]'s cover."
+ to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.")
update_icon()
/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
@@ -154,7 +154,7 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
if(cover_open)
- user << "[src]'s cover is open! Close it before firing!"
+ to_chat(user, "[src]'s cover is open! Close it before firing!")
else
..()
update_icon()
@@ -172,12 +172,12 @@
user.put_in_hands(magazine)
magazine = null
update_icon()
- user << "You remove the magazine from [src]."
+ to_chat(user, "You remove the magazine from [src].")
/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob, params)
if(!cover_open && istype(A, mag_type))
- user << "[src]'s cover is closed! You can't insert a new mag!"
+ to_chat(user, "[src]'s cover is closed! You can't insert a new mag!")
return
..()
@@ -246,15 +246,15 @@
select = 1
burst_size = initial(burst_size)
fire_delay = initial(fire_delay)
- user << "You switch to [burst_size] round burst."
+ to_chat(user, "You switch to [burst_size] round burst.")
if(1)
select = 2
- user << "You switch to grenades."
+ to_chat(user, "You switch to grenades.")
if(2)
select = 0
burst_size = 1
fire_delay = 0
- user << "You switch to semi-auto."
+ to_chat(user, "You switch to semi-auto.")
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
update_icon()
return
diff --git a/code/modules/projectiles/guns/projectile/crossbow.dm b/code/modules/projectiles/guns/projectile/crossbow.dm
index bc87fcb999a..3645899ab21 100644
--- a/code/modules/projectiles/guns/projectile/crossbow.dm
+++ b/code/modules/projectiles/guns/projectile/crossbow.dm
@@ -42,7 +42,7 @@
/obj/item/weapon/arrow/rod/removed(mob/user)
if(throwforce == 15) // The rod has been superheated - we don't want it to be useable when removed from the bow.
- user << "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow."
+ to_chat(user, "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow.")
var/obj/item/weapon/shard/shrapnel/S = new()
S.loc = get_turf(src)
qdel(src)
@@ -80,7 +80,7 @@
/obj/item/weapon/gun/launcher/crossbow/special_check(user)
if(tension <= 0)
- user << "\red \The [src] is not drawn back!"
+ to_chat(user, "\red \The [src] is not drawn back!")
return 0
return 1
@@ -111,7 +111,7 @@
/obj/item/weapon/gun/launcher/crossbow/proc/draw(var/mob/user as mob)
if(!in_chamber)
- user << "You don't have anything nocked to [src]."
+ to_chat(user, "You don't have anything nocked to [src].")
return
if(user.restrained())
@@ -132,7 +132,7 @@
if(tension>=max_tension)
tension = max_tension
- usr << "[src] clunks as you draw the string to its maximum tension!"
+ to_chat(usr, "[src] clunks as you draw the string to its maximum tension!")
else
user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!")
spawn(25) increase_tension(user)
@@ -162,19 +162,19 @@
user.drop_item()
W.loc = src
cell = W
- user << "You jam [cell] into [src] and wire it to the firing coil."
+ to_chat(user, "You jam [cell] into [src] and wire it to the firing coil.")
superheat_rod(user)
else
- user << "[src] already has a cell installed."
+ to_chat(user, "[src] already has a cell installed.")
else if(istype(W, /obj/item/weapon/screwdriver))
if(cell)
var/obj/item/C = cell
C.loc = get_turf(user)
- user << "You jimmy [cell] out of [src] with [W]."
+ to_chat(user, "You jimmy [cell] out of [src] with [W].")
cell = null
else
- user << "[src] doesn't have a cell installed."
+ to_chat(user, "[src] doesn't have a cell installed.")
else
..()
@@ -186,7 +186,7 @@
if(in_chamber.throwforce >= 15) return
if(!istype(in_chamber,/obj/item/weapon/arrow/rod)) return
- user << "[in_chamber] plinks and crackles as it begins to glow red-hot."
+ to_chat(user, "[in_chamber] plinks and crackles as it begins to glow red-hot.")
in_chamber.throwforce = 15
in_chamber.icon_state = "metal-rod-superheated"
cell.use(500)
@@ -229,7 +229,7 @@
if(tension>=max_tension)
tension = max_tension
- usr << "[src] clunks as you draw the string to its maximum tension!"
+ to_chat(usr, "[src] clunks as you draw the string to its maximum tension!")
else
user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!")
spawn(25) increase_tension(user)
@@ -249,11 +249,16 @@
/obj/item/weapon/crossbowframe/examine(mob/user)
..(user)
switch(buildstate)
- if(1) user << "It has a loose rod frame in place."
- if(2) user << "It has a steel backbone welded in place."
- if(3) user << "It has a steel backbone and a cell mount installed."
- if(4) user << "It has a steel backbone, plastic lath and a cell mount installed."
- if(5) user << "It has a steel cable loosely strung across the lath."
+ if(1)
+ to_chat(user, "It has a loose rod frame in place.")
+ if(2)
+ to_chat(user, "It has a steel backbone welded in place.")
+ if(3)
+ to_chat(user, "It has a steel backbone and a cell mount installed.")
+ if(4)
+ to_chat(user, "It has a steel backbone, plastic lath and a cell mount installed.")
+ if(5)
+ to_chat(user, "It has a steel cable loosely strung across the lath.")
/obj/item/weapon/crossbowframe/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/stack/rods))
@@ -261,11 +266,11 @@
var/obj/item/stack/rods/R = W
if(R.amount >= 3)
R.use(3)
- user << "\blue You assemble a backbone of rods around the wooden stock."
+ to_chat(user, "\blue You assemble a backbone of rods around the wooden stock.")
buildstate++
update_icon()
else
- user << "\blue You need at least three rods to complete this task."
+ to_chat(user, "\blue You need at least three rods to complete this task.")
return
else if(istype(W,/obj/item/weapon/weldingtool))
if(buildstate == 1)
@@ -273,7 +278,7 @@
if(T.remove_fuel(0,user))
if(!src || !T.isOn()) return
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "\blue You weld the rods into place."
+ to_chat(user, "\blue You weld the rods into place.")
buildstate++
update_icon()
return
@@ -282,35 +287,35 @@
if(buildstate == 2)
if(C.amount >= 5)
C.use(5)
- user << "\blue You wire a crude cell mount into the top of the crossbow."
+ to_chat(user, "\blue You wire a crude cell mount into the top of the crossbow.")
buildstate++
update_icon()
else
- user << "\blue You need at least five segments of cable coil to complete this task."
+ to_chat(user, "\blue You need at least five segments of cable coil to complete this task.")
return
else if(buildstate == 4)
if(C.amount >= 5)
C.use(5)
- user << "\blue You string a steel cable across the crossbow's lath."
+ to_chat(user, "\blue You string a steel cable across the crossbow's lath.")
buildstate++
update_icon()
else
- user << "\blue You need at least five segments of cable coil to complete this task."
+ to_chat(user, "\blue You need at least five segments of cable coil to complete this task.")
return
else if(istype(W,/obj/item/stack/sheet/mineral/plastic))
if(buildstate == 3)
var/obj/item/stack/sheet/mineral/plastic/P = W
if(P.amount >= 3)
P.use(3)
- user << "\blue You assemble and install a heavy plastic lath onto the crossbow."
+ to_chat(user, "\blue You assemble and install a heavy plastic lath onto the crossbow.")
buildstate++
update_icon()
else
- user << "\blue You need at least three plastic sheets to complete this task."
+ to_chat(user, "\blue You need at least three plastic sheets to complete this task.")
return
else if(istype(W,/obj/item/weapon/screwdriver))
if(buildstate == 5)
- user << "\blue You secure the crossbow's various parts."
+ to_chat(user, "\blue You secure the crossbow's various parts.")
new /obj/item/weapon/gun/launcher/crossbow(get_turf(src))
qdel(src)
return
diff --git a/code/modules/projectiles/guns/projectile/grenade launcher.dm b/code/modules/projectiles/guns/projectile/grenade launcher.dm
index d4b2c6fc167..28dc0c3a4b9 100644
--- a/code/modules/projectiles/guns/projectile/grenade launcher.dm
+++ b/code/modules/projectiles/guns/projectile/grenade launcher.dm
@@ -29,7 +29,7 @@
//Override this to avoid a runtime with suicide handling.
/obj/item/weapon/gun/launcher/attack(mob/living/M as mob, mob/living/user as mob, def_zone)
if (M == user && user.zone_sel.selecting == "mouth")
- user << "\red Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it."
+ to_chat(user, "\red Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it.")
return
..()
@@ -39,7 +39,7 @@
/obj/item/weapon/gun/launcher/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
if (!user.IsAdvancedToolUser())
- user << "\red You don't have the dexterity to do this!"
+ to_chat(user, "\red You don't have the dexterity to do this!")
return 0
add_fingerprint(user)
@@ -55,7 +55,7 @@
if (!ready_to_fire())
if (world.time % 3) //to prevent spam
- user << "[src] is not ready to fire again!"
+ to_chat(user, "[src] is not ready to fire again!")
return 0
if(!chamber_round()) //CHECK
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 5803a4fa2be..2cb3c849e4b 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -32,7 +32,7 @@
AC.loc = src
num_loaded++
if(num_loaded)
- user << "You load [num_loaded] shell\s into \the [src]!"
+ to_chat(user, "You load [num_loaded] shell\s into \the [src]!")
A.update_icon()
update_icon()
chamber_round()
@@ -48,9 +48,9 @@
CB.update_icon()
num_unloaded++
if (num_unloaded)
- user << "You unload [num_unloaded] shell\s from [src]!"
+ to_chat(user, "You unload [num_unloaded] shell\s from [src]!")
else
- user << "[src] is empty."
+ to_chat(user, "[src] is empty.")
/obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1)
var/boolets = 0 //mature var names for mature people
@@ -62,7 +62,7 @@
/obj/item/weapon/gun/projectile/revolver/examine(mob/user)
..(user)
- user << "[get_ammo(0,0)] of those are live rounds."
+ to_chat(user, "[get_ammo(0,0)] of those are live rounds.")
/obj/item/weapon/gun/projectile/revolver/verb/spin_revolver()
set name = "Spin cylinder"
@@ -98,7 +98,7 @@
if(!ghettomodded)
return 1
if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60
- M << "[src] blows up in your face!"
+ to_chat(M, "[src] blows up in your face!")
M.take_organ_damage(0,20)
M.drop_item()
qdel(src)
@@ -115,7 +115,7 @@
if(src && input && !M.stat && in_range(M,src))
name = input
- M << "You name the gun [input]. Say hello to your new friend."
+ to_chat(M, "You name the gun [input]. Say hello to your new friend.")
return 1
/obj/item/weapon/gun/projectile/revolver/detective/verb/reskin_gun()
@@ -134,21 +134,21 @@
if(src && choice && !M.stat && in_range(M,src))
icon_state = options[choice]
- M << "Your gun is now skinned as [choice]. Say hello to your new friend."
+ to_chat(M, "Your gun is now skinned as [choice]. Say hello to your new friend.")
return 1
/obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob, params)
..()
if(istype(A, /obj/item/weapon/screwdriver) || istype(A, /obj/item/weapon/conversion_kit))
if(magazine.caliber == "38")
- user << "You begin to reinforce the barrel of [src]."
+ to_chat(user, "You begin to reinforce the barrel of [src].")
if(magazine.ammo_count())
afterattack(user, user) //you know the drill
user.visible_message("[src] goes off!", "[src] goes off in your face!")
return
if(do_after(user, 30, target = src))
if(magazine.ammo_count())
- user << "You can't modify it!"
+ to_chat(user, "You can't modify it!")
return
if (istype(A, /obj/item/weapon/conversion_kit))
ghettomodded = 0
@@ -156,21 +156,21 @@
ghettomodded = 1
magazine.caliber = "357"
desc = "[initial(desc)] The barrel and chamber assembly seems to have been modified."
- user << "You reinforce the barrel of [src]! Now it will fire .357 rounds."
+ to_chat(user, "You reinforce the barrel of [src]! Now it will fire .357 rounds.")
else
- user << "You begin to revert the modifications to [src]."
+ to_chat(user, "You begin to revert the modifications to [src].")
if(magazine.ammo_count())
afterattack(user, user) //and again
user.visible_message("[src] goes off!", "[src] goes off in your face!")
return
if(do_after(user, 30, target = src))
if(magazine.ammo_count())
- user << "You can't modify it!"
+ to_chat(user, "You can't modify it!")
return
ghettomodded = 0
magazine.caliber = "38"
desc = initial(desc)
- user << "You remove the modifications on [src]! Now it will fire .38 rounds."
+ to_chat(user, "You remove the modifications on [src]! Now it will fire .38 rounds.")
diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm
index ecb1c5a03cd..e667d9323ce 100644
--- a/code/modules/projectiles/guns/projectile/rocket.dm
+++ b/code/modules/projectiles/guns/projectile/rocket.dm
@@ -18,7 +18,7 @@
/obj/item/weapon/gun/rocketlauncher/examine(mob/user)
if(..(user, 2))
- user << "\blue [rockets.len] / [max_rockets] rockets."
+ to_chat(user, "\blue [rockets.len] / [max_rockets] rockets.")
/obj/item/weapon/gun/rocketlauncher/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/ammo_casing/rocket))
@@ -26,10 +26,10 @@
user.drop_item()
I.loc = src
rockets += I
- user << "\blue You put the rocket in [src]."
- user << "\blue [rockets.len] / [max_rockets] rockets."
+ to_chat(user, "\blue You put the rocket in [src].")
+ to_chat(user, "\blue [rockets.len] / [max_rockets] rockets.")
else
- usr << "\red [src] cannot hold more rockets."
+ to_chat(usr, "\red [src] cannot hold more rockets.")
/obj/item/weapon/gun/rocketlauncher/can_fire()
return rockets.len
@@ -47,4 +47,4 @@
qdel(I)
return
else
- usr << "\red [src] is empty."
\ No newline at end of file
+ to_chat(usr, "\red [src] is empty.")
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 8e057695b3a..90402f0e57c 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -29,7 +29,7 @@
AC.loc = src
num_loaded++
if(num_loaded)
- user << "You load [num_loaded] shell\s into \the [src]!"
+ to_chat(user, "You load [num_loaded] shell\s into \the [src]!")
A.update_icon()
update_icon()
@@ -72,7 +72,7 @@
/obj/item/weapon/gun/projectile/shotgun/examine(mob/user)
..(user)
if (chambered)
- user << "A [chambered.BB ? "live" : "spent"] one is in the chamber."
+ to_chat(user, "A [chambered.BB ? "live" : "spent"] one is in the chamber.")
/obj/item/weapon/gun/projectile/shotgun/isHandgun() //You cannot, in fact, holster a shotgun.
return 0
@@ -117,13 +117,13 @@
/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(var/obj/item/A as obj, mob/user as mob)
if(!bolt_open)
- user << "The bolt is closed!"
+ to_chat(user, "The bolt is closed!")
return
. = ..()
/obj/item/weapon/gun/projectile/shotgun/boltaction/examine(mob/user)
..(user)
- user << "The bolt is [bolt_open ? "open" : "closed"]."
+ to_chat(user, "The bolt is [bolt_open ? "open" : "closed"].")
/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted
name = "enchanted bolt action rifle"
@@ -191,9 +191,9 @@
CB.update_icon()
num_unloaded++
if (num_unloaded)
- user << "You break open \the [src] and unload [num_unloaded] shell\s."
+ to_chat(user, "You break open \the [src] and unload [num_unloaded] shell\s.")
else
- user << "[src] is empty."
+ to_chat(user, "[src] is empty.")
/obj/item/weapon/gun/projectile/revolver/doublebarrel/isHandgun() //contrary to popular opinion, double barrels are not, shockingly, handguns
return 0
@@ -219,10 +219,10 @@
if(C.use(10))
slot_flags = SLOT_BACK
icon_state = "ishotgunsling"
- user << "You tie the lengths of cable to the shotgun, making a sling."
+ to_chat(user, "You tie the lengths of cable to the shotgun, making a sling.")
update_icon()
else
- user << "You need at least ten lengths of cable if you want to make a sling."
+ to_chat(user, "You need at least ten lengths of cable if you want to make a sling.")
return
// Sawing guns related procs //
@@ -236,7 +236,7 @@
/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob)
if(sawn_state == SAWN_OFF)
- user << "\The [src] is already shortened."
+ to_chat(user, "\The [src] is already shortened.")
return
if(sawn_state == SAWN_SAWING)
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 672f683e3b2..0e43d550c85 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -30,11 +30,11 @@
/obj/item/weapon/gun/syringe/examine(mob/user)
..(user)
- user << "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining."
+ to_chat(user, "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining.")
/obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob)
if(!syringes.len)
- user << "[src] is empty."
+ to_chat(user, "[src] is empty.")
return 0
var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len]
@@ -43,7 +43,7 @@
S.forceMove(user.loc)
syringes.Remove(S)
- user << "You unload [S] from \the [src]!"
+ to_chat(user, "You unload [S] from \the [src]!")
return 1
@@ -51,12 +51,12 @@
if(istype(A, /obj/item/weapon/reagent_containers/syringe))
if(syringes.len < max_syringes)
user.drop_item()
- user << "You load [A] into \the [src]!"
+ to_chat(user, "You load [A] into \the [src]!")
syringes.Add(A)
A.forceMove(src)
return 1
else
- usr << "[src] cannot hold more syringes."
+ to_chat(usr, "[src] cannot hold more syringes.")
return 0
/obj/item/weapon/gun/syringe/rapidsyringe
diff --git a/code/modules/projectiles/medbeam.dm b/code/modules/projectiles/medbeam.dm
index ba93e9703ba..04f8f4b6862 100644
--- a/code/modules/projectiles/medbeam.dm
+++ b/code/modules/projectiles/medbeam.dm
@@ -67,7 +67,7 @@
if(get_dist(H,current_target)>max_range || !los_check(H,current_target))
LoseTarget()
- H << "You lose control of the beam!"
+ to_chat(H, "You lose control of the beam!")
return
if(current_target)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 0ce3b3c63ba..5a028a1084a 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -140,7 +140,7 @@
return
if(silenced)
playsound(loc, hitsound, 5, 1, -1)
- M << "\red You've been shot in the [parse_zone(def_zone)] by the [src.name]!"
+ to_chat(M, "\red You've been shot in the [parse_zone(def_zone)] by the [src.name]!")
else
playsound(loc, hitsound, 20, 1, -1)
visible_message("\red [A.name] is hit by the [src.name] 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
@@ -209,7 +209,7 @@
if(!Angle)
Angle=round(Get_Angle(src,current))
- //world << "[Angle] angle"
+// to_chat(world, "[Angle] angle")
//overlays.Cut()
//var/icon/I=new(initial(icon),icon_state) //using initial(icon) makes sure that the angle for that is reset as well
//I.Turn(Angle)
@@ -229,23 +229,23 @@
var/new_y = y
//Not sure if using whiles for this is good
while(pixel_x_offset > 16)
- //world << "Pre-adjust coords (x++): xy [pixel_x] xy offset [pixel_x_offset]"
+// to_chat(world, "Pre-adjust coords (x++): xy [pixel_x] xy offset [pixel_x_offset]")
pixel_x_offset -= 32
pixel_x -= 32
new_x++// x++
while(pixel_x_offset < -16)
- //world << "Pre-adjust coords (x--): xy [pixel_x] xy offset [pixel_x_offset]"
+// to_chat(world, "Pre-adjust coords (x--): xy [pixel_x] xy offset [pixel_x_offset]")
pixel_x_offset += 32
pixel_x += 32
new_x--
while(pixel_y_offset > 16)
- //world << "Pre-adjust coords (y++): py [pixel_y] py offset [pixel_y_offset]"
+// to_chat(world, "Pre-adjust coords (y++): py [pixel_y] py offset [pixel_y_offset]")
pixel_y_offset -= 32
pixel_y -= 32
new_y++
while(pixel_y_offset < -16)
- //world << "Pre-adjust coords (y--): py [pixel_y] py offset [pixel_y_offset]"
+// to_chat(world, "Pre-adjust coords (y--): py [pixel_y] py offset [pixel_y_offset]")
pixel_y_offset += 32
pixel_y += 32
new_y--
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 319633e6277..e86d8e7a739 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -239,16 +239,16 @@
f.break_tile()
f.hotspot_expose(1000,CELL_VOLUME)
if((x == 1 || x == world.maxx || y == 1 || y == world.maxy))
- //world << "deleting"
+// to_chat(world, "deleting")
//qdel(src) //Delete if it passes the world edge
broken = 1
return
if(kill_count < 1)
- //world << "deleting"
+// to_chat(world, "deleting")
//qdel(src)
broken = 1
kill_count--
- //world << "[x] [y]"
+// to_chat(world, "[x] [y]")
if(!bumped && !isturf(original))
if(loc == get_turf(original))
if(!(original in permutated))
@@ -263,7 +263,7 @@
Bump(original)
first = 0
if(broken)
- //world << "breaking"
+// to_chat(world, "breaking")
break
else
last = get_turf(src.loc)
@@ -274,7 +274,7 @@
qdel(src)
return
/*cleanup(reference) //Waits .3 seconds then removes the overlay.
- //world << "setting invisibility"
+// to_chat(world, "setting invisibility")
sleep(50)
src.invisibility = 101
return*/
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 5b740a0699b..7d8c9abbe8f 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -67,9 +67,9 @@
ghost.reenter_corpse()
break
if(old_stat != DEAD)
- target << "You feel great!"
+ to_chat(target, "You feel great!")
else
- target << "You rise with a start, you're alive!!!"
+ to_chat(target, "You rise with a start, you're alive!!!")
/obj/item/projectile/magic/teleport
name = "bolt of teleportation"
@@ -238,7 +238,7 @@ proc/wabbajack(mob/living/M)
else
new_mob.key = M.key
- new_mob << "Your form morphs into that of a [randomize]."
+ to_chat(new_mob, "Your form morphs into that of a [randomize].")
qdel(M)
return new_mob
@@ -262,8 +262,8 @@ proc/wabbajack(mob/living/M)
S.icon = change.icon
if(H.mind)
H.mind.transfer_to(S)
- S << "You are an animated statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved!"
- S << "Do not harm [firer.name], your creator."
+ to_chat(S, "You are an animated statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved!")
+ to_chat(S, "Do not harm [firer.name], your creator.")
H = change
H.loc = S
qdel(src)
diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm
index 3ef440f6f2e..8eb0d7b6b45 100644
--- a/code/modules/projectiles/targeting.dm
+++ b/code/modules/projectiles/targeting.dm
@@ -3,9 +3,9 @@
set category = "Object"
firerate = !firerate
if (firerate == 0)
- loc << "You will now continue firing when your target moves."
+ to_chat(loc, "You will now continue firing when your target moves.")
else
- loc << "You will now only fire once, then lower your aim, when your target moves."
+ to_chat(loc, "You will now only fire once, then lower your aim, when your target moves.")
/obj/item/weapon/gun/verb/lower_aim()
set name = "Lower Aim"
@@ -84,7 +84,7 @@
if(firing_check == 1)
Fire(T,usr, reflex = 1)
else if(!told_cant_shoot)
- M << "\red They can't be hit from here!"
+ to_chat(M, "\red They can't be hit from here!")
told_cant_shoot = 1
spawn(30)
told_cant_shoot = 0
@@ -101,7 +101,7 @@
#define SIGN(X) ((X<0)?-1:1)
proc/GunTrace(X1,Y1,X2,Y2,Z=1,exc_obj,PX1=16,PY1=16,PX2=16,PY2=16)
- //bluh << "Tracin' [X1],[Y1] to [X2],[Y2] on floor [Z]."
+// to_chat(bluh, "Tracin' [X1],[Y1] to [X2],[Y2] on floor [Z].")
var/turf/T
var/mob/living/M
if(X1==X2)
@@ -152,7 +152,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory.
I.target += src
else if(I.target.len >= 5)
if(ismob(I.loc))
- I.loc << "You can only target 5 people at once!"
+ to_chat(I.loc, "You can only target 5 people at once!")
return
else
return
@@ -162,10 +162,10 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory.
if(!targeted_by) targeted_by = list()
targeted_by += I
I.lock_time = world.time + 20 //Target has 2 second to realize they're targeted and stop (or target the opponent).
- src << "((\red Your character is being targeted. They have 2 seconds to stop any click or move actions. \black While targeted, they may \
- drag and drop items in or into the map, speak, and click on interface buttons. Clicking on the map objects (floors and walls are fine), their items \
- (other than a weapon to de-target), or moving will result in being fired upon. \red The aggressor may also fire manually, \
- so try not to get on their bad side.\black ))"
+ to_chat(src, "((Your character is being targeted. They have 2 seconds to stop any click or move actions. \
+ While targeted, they may drag and drop items in or into the map, speak, and click on interface buttons. \
+ Clicking on the map objects (floors and walls are fine), their items (other than a weapon to de-target), or moving will result in being fired upon. \
+ The aggressor may also fire manually, so try not to get on their bad side.))")
if(targeted_by.len == 1)
spawn(0)
@@ -186,7 +186,8 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory.
I.lower_aim()
return
/*if(m_intent == "run" && T.client.target_can_move == 1 && T.client.target_can_run == 0 && (ishuman(T)))
- src << "\red Your move intent is now set to walk, as your targeter permits it." //Self explanitory.
+ to_chat(src, "\red Your move intent is now set to walk, as your targeter permits it.")//Self explanitory.
+
set_m_intent("walk")*/
//Processing the aiming. Should be probably in separate object with process() but lasy.
@@ -266,9 +267,9 @@ client/verb/ToggleGunMode()
set hidden = 1
gun_mode = !gun_mode
if(gun_mode)
- usr << "You will now take people captive."
+ to_chat(usr, "You will now take people captive.")
else
- usr << "You will now shoot where you target."
+ to_chat(usr, "You will now shoot where you target.")
for(var/obj/item/weapon/gun/G in usr)
G.stop_aim()
remove_gun_icons()
@@ -282,11 +283,11 @@ client/verb/ToggleGunMode()
//Changing client's permissions
target_can_move = !target_can_move
if(target_can_move)
- usr << "Target may now walk."
+ to_chat(usr, "Target may now walk.")
//usr.gun_run_icon = new /obj/screen/gun/run(null) //adding icon for running permission
screen += usr.gun_run_icon
else
- usr << "Target may no longer move."
+ to_chat(usr, "Target may no longer move.")
target_can_run = 0
qdel(usr.gun_run_icon) //no need for icon for running permission
@@ -301,12 +302,12 @@ client/verb/ToggleGunMode()
if(G.target)
for(var/mob/living/M in G.target)
if(target_can_move)
- M << "Your character may now walk at the discretion of their targeter."
+ to_chat(M, "Your character may now walk at the discretion of their targeter.")
if(!target_can_run && (ishuman(M)))
- M << "\red Your move intent is now set to walk, as your targeter permits it."
+ to_chat(M, "\red Your move intent is now set to walk, as your targeter permits it.")
M.set_m_intent("walk")
else
- M << "\red Your character will now be shot if they move."
+ to_chat(M, "\red Your character will now be shot if they move.")
mob/living/proc/set_m_intent(var/intent)
if (intent != "walk" && intent != "run")
@@ -322,9 +323,9 @@ client/verb/AllowTargetRun()
//Changing client's permissions
target_can_run = !target_can_run
if(target_can_run)
- usr << "Target may now run."
+ to_chat(usr, "Target may now run.")
else
- usr << "Target may no longer run."
+ to_chat(usr, "Target may no longer run.")
//Updating running permission button
if(usr.gun_run_icon)
@@ -337,9 +338,9 @@ client/verb/AllowTargetRun()
if(G.target)
for(var/mob/living/M in G.target)
if(target_can_run)
- M << "Your character may now run at the discretion of their targeter."
+ to_chat(M, "Your character may now run at the discretion of their targeter.")
else
- M << "\red Your character will now be shot if they run."*/
+ to_chat(M, "\red Your character will now be shot if they run.")*/
client/verb/AllowTargetClick()
set hidden=1
@@ -347,9 +348,9 @@ client/verb/AllowTargetClick()
//Changing client's permissions
target_can_click = !target_can_click
if(target_can_click)
- usr << "Target may now use items."
+ to_chat(usr, "Target may now use items.")
else
- usr << "Target may no longer use items."
+ to_chat(usr, "Target may no longer use items.")
if(usr.item_use_icon)
usr.item_use_icon.icon_state = "no_item[target_can_click]"
@@ -361,6 +362,6 @@ client/verb/AllowTargetClick()
if(G.target)
for(var/mob/living/M in G.target)
if(target_can_click)
- M << "Your character may now use items at the discretion of their targeter."
+ to_chat(M, "Your character may now use items at the discretion of their targeter.")
else
- M << "\red Your character will now be shot if they use items."
+ to_chat(M, "\red Your character will now be shot if they use items.")
diff --git a/code/modules/reagents/Chemistry-Colours.dm b/code/modules/reagents/Chemistry-Colours.dm
index 0fcc50b6f4d..176ec99c4d4 100644
--- a/code/modules/reagents/Chemistry-Colours.dm
+++ b/code/modules/reagents/Chemistry-Colours.dm
@@ -12,7 +12,7 @@
var/vol_temp
// see libs/IconProcs/IconProcs.dm
for(var/datum/reagent/reagent in reagent_list)
- if(reagent.id == "blood" && reagent.data["blood_colour"])
+ if(reagent.id == "blood" && reagent.data && reagent.data["blood_colour"])
reagent_color = reagent.data["blood_colour"]
else
reagent_color = reagent.color
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index dada24d2bcc..1b2e9a0b3d4 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -302,21 +302,14 @@ var/const/INGEST = 2
var/list/seen = viewers(4, get_turf(my_atom))
for(var/mob/M in seen)
if(!C.no_message)
- M << "\blue \icon[my_atom] [C.mix_message]"
+ to_chat(M, "\blue \icon[my_atom] [C.mix_message]")
- /* if(istype(my_atom, /obj/item/slime_core))
- var/obj/item/slime_core/ME = my_atom
- ME.Uses--
- if(ME.Uses <= 0) // give the notification that the slime core is dead
- for(var/mob/M in viewers(4, get_turf(my_atom)) )
- M << "\blue \icon[my_atom] The innards begin to boil!"
- */
if(istype(my_atom, /obj/item/slime_extract))
var/obj/item/slime_extract/ME2 = my_atom
ME2.Uses--
if(ME2.Uses <= 0) // give the notification that the slime core is dead
for(var/mob/M in seen)
- M << "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction."
+ to_chat(M, "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction.")
ME2.name = "used slime extract"
ME2.desc = "This extract has been used up."
@@ -435,6 +428,11 @@ var/const/INGEST = 2
else R.reaction_obj(A, R.volume+volume_modifier)
return
+/datum/reagents/proc/add_reagent_list(list/list_reagents, list/data=null) // Like add_reagent but you can enter a list. Format it like this: list("toxin" = 10, "beer" = 15)
+ for(var/r_id in list_reagents)
+ var/amt = list_reagents[r_id]
+ add_reagent(r_id, amt, data)
+
/datum/reagents/proc/add_reagent(var/reagent, var/amount, var/list/data=null, var/reagtemp = 300)
if(!isnum(amount)) return 1
update_total()
@@ -449,33 +447,7 @@ var/const/INGEST = 2
R.volume += amount
update_total()
my_atom.on_reagent_change()
-/*
- // mix dem viruses
- if(R.id == "blood" && reagent == "blood")
- if(R.data && data)
-
- if(R.data["viruses"] || data["viruses"])
-
- var/list/mix1 = R.data["viruses"]
- var/list/mix2 = data["viruses"]
-
- // Stop issues with the list changing during mixing.
- var/list/to_mix = list()
-
- for(var/datum/disease/advance/AD in mix1)
- to_mix += AD
- for(var/datum/disease/advance/AD in mix2)
- to_mix += AD
-
- var/datum/disease/advance/AD = Advance_Mix(to_mix)
- if(AD)
- var/list/preserve = list(AD)
- for(var/D in R.data["viruses"])
- if(!istype(D, /datum/disease/advance))
- preserve += D
- R.data["viruses"] = preserve
-*/
-
+ R.on_merge(data)
handle_reactions()
return 0
@@ -486,13 +458,10 @@ var/const/INGEST = 2
reagent_list += R
R.holder = src
R.volume = amount
-// SetViruses(R, data) // Includes setting data
- if(data) R.data = data
- //debug
- //world << "Adding data"
- //for(var/D in R.data)
- // world << "Container data: [D] = [R.data[D]]"
- //debug
+ if(data)
+ R.data = data
+ R.on_new(data)
+
update_total()
my_atom.on_reagent_change()
handle_reactions()
@@ -583,13 +552,13 @@ var/const/INGEST = 2
/datum/reagents/proc/get_data(var/reagent_id)
for(var/datum/reagent/D in reagent_list)
if(D.id == reagent_id)
- //world << "proffering a data-carrying reagent ([reagent_id])"
+// to_chat(world, "proffering a data-carrying reagent ([reagent_id])")
return D.data
/datum/reagents/proc/set_data(var/reagent_id, var/new_data)
for(var/datum/reagent/D in reagent_list)
if(D.id == reagent_id)
- //world << "reagent data set ([reagent_id])"
+// to_chat(world, "reagent data set ([reagent_id])")
D.data = new_data
/datum/reagents/proc/copy_data(var/datum/reagent/current_reagent)
@@ -605,9 +574,9 @@ var/const/INGEST = 2
// Technically we should probably copy all data lists, but
// that could possibly eat up a lot of memory needlessly
// if most data lists are read-only.
- if (trans_data["virus2"])
- var/list/v = trans_data["virus2"]
- trans_data["virus2"] = v.Copy()
+ if(trans_data["viruses"])
+ var/list/v = trans_data["viruses"]
+ trans_data["viruses"] = v.Copy()
return trans_data
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 94491e74e64..15ea3a5343f 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -110,7 +110,7 @@
/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main",var/datum/nanoui/ui = null, var/force_open = 1)
if(broken_requirements.len)
- user << "[src] is broken. [broken_requirements[broken_requirements[1]]]"
+ to_chat(user, "[src] is broken. [broken_requirements[broken_requirements[1]]]")
return
@@ -207,24 +207,24 @@
S.use(1)
else
if(!user.drop_item())
- user << "\The [B] is stuck to you!"
+ to_chat(user, "\The [B] is stuck to you!")
return
qdel(B)
broken_requirements -= broken_requirements[1]
- user << "You fix [src]."
+ to_chat(user, "You fix [src].")
return
if(src.beaker)
- user << "Something is already loaded into the machine."
+ to_chat(user, "Something is already loaded into the machine.")
return
if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food/drinks))
src.beaker = B
if(!user.drop_item())
- user << "\The [B] is stuck to you!"
+ to_chat(user, "\The [B] is stuck to you!")
return
B.forceMove(src)
- user << "You set [B] on the machine."
+ to_chat(user, "You set [B] on the machine.")
nanomanager.update_uis(src) // update all UIs attached to src
if(!icon_beaker)
icon_beaker = image('icons/obj/chemical.dmi', src, "disp_beaker") //randomize beaker overlay position.
@@ -236,13 +236,13 @@
..()
if(istype(B, /obj/item/device/multitool))
if(hackedcheck == 0)
- user << hack_message
+ to_chat(user, hack_message)
dispensable_reagents += hacked_reagents
hackedcheck = 1
return
else
- user << unhack_message
+ to_chat(user, unhack_message)
dispensable_reagents -= hacked_reagents
hackedcheck = 0
return
@@ -344,7 +344,7 @@
/obj/machinery/chem_dispenser/constructable/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/weapon/reagent_containers/glass))
if(panel_open)
- user << "Close the maintenance panel first."
+ to_chat(user, "Close the maintenance panel first.")
return
..()
else
@@ -360,10 +360,10 @@
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
if(anchored)
anchored = 0
- user << "\The [src] can now be moved."
+ to_chat(user, "\The [src] can now be moved.")
else if(!anchored)
anchored = 1
- user << "\The [src] is now secured."
+ to_chat(user, "\The [src] is now secured.")
if(panel_open)
if(istype(I, /obj/item/weapon/crowbar))
@@ -429,29 +429,29 @@
if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass))
if(src.beaker)
- user << "A beaker is already loaded into the machine."
+ to_chat(user, "A beaker is already loaded into the machine.")
return
if(!user.drop_item())
- user << "\The [B] is stuck to you!"
+ to_chat(user, "\The [B] is stuck to you!")
return
src.beaker = B
B.forceMove(src)
- user << "You add the beaker to the machine!"
+ to_chat(user, "You add the beaker to the machine!")
src.updateUsrDialog()
icon_state = "mixer1"
else if(istype(B, /obj/item/weapon/storage/pill_bottle))
if(src.loaded_pill_bottle)
- user << "A pill bottle is already loaded into the machine."
+ to_chat(user, "A pill bottle is already loaded into the machine.")
return
if(!user.drop_item())
- user << "\The [B] is stuck to you!"
+ to_chat(user, "\The [B] is stuck to you!")
return
src.loaded_pill_bottle = B
B.forceMove(src)
- user << "You add the pill bottle into the dispenser slot!"
+ to_chat(user, "You add the pill bottle into the dispenser slot!")
src.updateUsrDialog()
return
@@ -793,7 +793,7 @@
default_deconstruction_crowbar(B)
return 1
else
- user << "You can't use the [src.name] while it's panel is opened!"
+ to_chat(user, "You can't use the [src.name] while it's panel is opened!")
return 1
else
..()
@@ -817,7 +817,7 @@
var/list/blend_items = list (
//Sheets
- /obj/item/stack/sheet/mineral/plasma = list("plasma" = 20),
+ /obj/item/stack/sheet/mineral/plasma = list("plasma_dust" = 20),
/obj/item/stack/sheet/mineral/uranium = list("uranium" = 20),
/obj/item/stack/sheet/mineral/bananium = list("banana" = 20),
/obj/item/stack/sheet/mineral/tranquillite = list("nothing" = 20),
@@ -883,7 +883,7 @@
return 1
else
if(!user.drop_item())
- user << "\The [O] is stuck to you!"
+ to_chat(user, "\The [O] is stuck to you!")
return
src.beaker = O
O.forceMove(src)
@@ -892,7 +892,7 @@
return 0
if(holdingitems && holdingitems.len >= limit)
- usr << "The machine cannot hold anymore items."
+ to_chat(usr, "The machine cannot hold anymore items.")
return 1
//Fill machine with the plantbag!
@@ -903,18 +903,18 @@
G.forceMove(src)
holdingitems += G
if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill
- user << "You fill the All-In-One grinder to the brim.")
break
if(!O.contents.len)
- user << "You empty the plant bag into the All-In-One grinder."
+ to_chat(user, "You empty the plant bag into the All-In-One grinder.")
src.updateUsrDialog()
return 0
if (!is_type_in_list(O, blend_items) && !is_type_in_list(O, juice_items))
- user << "Cannot refine into a reagent."
+ to_chat(user, "Cannot refine into a reagent.")
return 1
user.unEquip(O)
diff --git a/code/modules/reagents/Chemistry-Readme.dm b/code/modules/reagents/Chemistry-Readme.dm
index 61e2a0c82a0..fee6e61e2b9 100644
--- a/code/modules/reagents/Chemistry-Readme.dm
+++ b/code/modules/reagents/Chemistry-Readme.dm
@@ -227,9 +227,9 @@ About the Tools:
By default, all atom have a reagents var - but its empty. if you want to use an object for the chem.
system you'll need to add something like this in its new proc:
- var/datum/reagents/R = new/datum/reagents(100) <<<<< create a new datum , 100 is the maximum_volume of the new holder datum.
- reagents = R <<<<< assign the new datum to the objects reagents var
- R.my_atom = src <<<<< set the holders my_atom to src so that we know where we are.
+ var/datum/reagents/R = new/datum/reagents(100), <<< create a new datum, 100 is the maximum_volume of the new holder datum.
+ reagents = R, <<< assign the new datum to the objects reagents var
+ R.my_atom = src, <<< set the holders my_atom to src so that we know where we are.
This can also be done by calling a convenience proc:
atom/proc/create_reagents(var/max_volume)
diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm
index 52b297d88eb..4fb705dbcf9 100644
--- a/code/modules/reagents/dartgun.dm
+++ b/code/modules/reagents/dartgun.dm
@@ -60,11 +60,11 @@
/obj/item/weapon/gun/dartgun/examine(mob/user)
if(..(user, 2))
if(beakers.len)
- user << "[src] contains:")
for(var/obj/item/weapon/reagent_containers/glass/beaker/B in beakers)
if(B.reagents && B.reagents.reagent_list.len)
for(var/datum/reagent/R in B.reagents.reagent_list)
- user << "[R.volume] units of [R.name]")
/obj/item/weapon/gun/dartgun/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weapon/dart_cartridge))
@@ -72,36 +72,36 @@
var/obj/item/weapon/dart_cartridge/D = I
if(!D.darts)
- user << "[D] is empty."
+ to_chat(user, "[D] is empty.")
return 0
if(cartridge)
if(cartridge.darts <= 0)
src.remove_cartridge()
else
- user << "There's already a cartridge in [src]."
+ to_chat(user, "There's already a cartridge in [src].")
return 0
user.drop_item()
cartridge = D
D.forceMove(src)
- user << "You slot [D] into [src]."
+ to_chat(user, "You slot [D] into [src].")
update_icon()
return
if(istype(I, /obj/item/weapon/reagent_containers/glass))
if(!istype(I, container_type))
- user << "[I] doesn't seem to fit into [src]."
+ to_chat(user, "[I] doesn't seem to fit into [src].")
return
if(beakers.len >= max_beakers)
- user << "[src] already has [max_beakers] beakers in it - another one isn't going to fit!"
+ to_chat(user, "[src] already has [max_beakers] beakers in it - another one isn't going to fit!")
return
var/obj/item/weapon/reagent_containers/glass/beaker/B = I
if(!user.drop_item())
- user << "\The [B] is stuck to you!"
+ to_chat(user, "\The [B] is stuck to you!")
return
B.forceMove(src)
beakers += B
- user << "You slot [B] into [src].")
src.updateUsrDialog()
/obj/item/weapon/gun/dartgun/can_fire()
@@ -115,7 +115,7 @@
/obj/item/weapon/gun/dartgun/proc/remove_cartridge()
if(cartridge)
- usr << "You pop the cartridge out of [src]."
+ to_chat(usr, "You pop the cartridge out of [src].")
var/obj/item/weapon/dart_cartridge/C = cartridge
C.forceMove(get_turf(src))
C.update_icon()
@@ -145,10 +145,10 @@
var/obj/effect/syringe_gun_dummy/D = new/obj/effect/syringe_gun_dummy(get_turf(src))
var/obj/item/weapon/reagent_containers/syringe/S = get_mixed_syringe()
if(!S)
- user << "There are no darts in [src]!"
+ to_chat(user, "There are no darts in [src]!")
return
if(!S.reagents)
- user << "There are no reagents available!"
+ to_chat(user, "There are no reagents available!")
return
cartridge.darts--
src.update_icon()
@@ -190,7 +190,7 @@
if(D.reagents)
D.reagents.trans_to(M, 15)
- M << "You feel a slight prick."
+ to_chat(M, "You feel a slight prick.")
qdel(D)
break
@@ -271,7 +271,7 @@
if(index <= beakers.len)
if(beakers[index])
var/obj/item/weapon/reagent_containers/glass/beaker/B = beakers[index]
- usr << "You remove [B] from [src]."
+ to_chat(usr, "You remove [B] from [src].")
mixing -= B
beakers -= B
B.forceMove(get_turf(src))
@@ -284,7 +284,7 @@
if(cartridge)
spawn(0) fire_dart(target,user)
else
- usr << "[src] is empty."
+ to_chat(usr, "[src] is empty.")
/obj/item/weapon/gun/dartgun/vox
diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm
index 16c41141815..9b9484ba60e 100644
--- a/code/modules/reagents/grenade_launcher.dm
+++ b/code/modules/reagents/grenade_launcher.dm
@@ -19,7 +19,7 @@
/obj/item/weapon/gun/grenadelauncher/examine(mob/user)
if(..(user, 2))
- user << "\blue [grenades.len] / [max_grenades] [ammo_name]s."
+ to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.")
/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params)
@@ -28,10 +28,10 @@
user.drop_item()
I.loc = src
grenades += I
- user << "\blue You put the [ammo_name] in the [name]."
- user << "\blue [grenades.len] / [max_grenades] [ammo_name]s."
+ to_chat(user, "\blue You put the [ammo_name] in the [name].")
+ to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.")
else
- usr << "\red The grenade launcher cannot hold more [ammo_name]s."
+ to_chat(usr, "\red The grenade launcher cannot hold more [ammo_name]s.")
/obj/item/weapon/gun/grenadelauncher/afterattack(obj/target, mob/user , flag)
@@ -47,12 +47,12 @@
if(grenades.len)
spawn(0) fire_grenade(target,user)
else
- usr << "\red The [name] is empty."
+ to_chat(usr, "\red The [name] is empty.")
/obj/item/weapon/gun/grenadelauncher/proc/fire_grenade(atom/target, mob/user)
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red [] fired a [ammo_name]!", user), 1)
- user << "\red You fire the [name]!"
+ to_chat(user, "\red You fire the [name]!")
var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta!
grenades -= F
F.loc = user.loc
@@ -93,16 +93,16 @@
user.drop_item()
I.loc = src
grenades += I
- user << "\blue You put the [ammo_name] in the [name]."
- user << "\blue [grenades.len] / [max_grenades] [ammo_name]s."
+ to_chat(user, "\blue You put the [ammo_name] in the [name].")
+ to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.")
icon_state = "piecannon1"
else
- usr << "\red The grenade launcher cannot hold more [ammo_name]s."
+ to_chat(usr, "\red The grenade launcher cannot hold more [ammo_name]s.")
/obj/item/weapon/gun/grenadelauncher/piecannon/fire_grenade(atom/target, mob/user)
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red [] fired a [ammo_name]!", user), 1)
- user << "\red You fire the [name]!"
+ to_chat(user, "\red You fire the [name]!")
var/obj/item/weapon/reagent_containers/food/snacks/pie/P = grenades[1] //Now with less copypasta!
grenades -= P
P.loc = user.loc
diff --git a/code/modules/reagents/newchem/Blob-Reagents.dm b/code/modules/reagents/newchem/Blob-Reagents.dm
index 80c36713bbe..f4fcdf9a2b1 100644
--- a/code/modules/reagents/newchem/Blob-Reagents.dm
+++ b/code/modules/reagents/newchem/Blob-Reagents.dm
@@ -150,4 +150,4 @@
if(message_living && !issilicon(M))
totalmessage += message_living
totalmessage += "!"
- M << "[totalmessage]"
\ No newline at end of file
+ to_chat(M, "[totalmessage]")
diff --git a/code/modules/reagents/newchem/chem_heater.dm b/code/modules/reagents/newchem/chem_heater.dm
index e6e4ca61958..b3c6c6a5e8c 100644
--- a/code/modules/reagents/newchem/chem_heater.dm
+++ b/code/modules/reagents/newchem/chem_heater.dm
@@ -74,13 +74,13 @@
if(istype(I, /obj/item/weapon/reagent_containers/glass))
if(beaker)
- user << "A beaker is already loaded into the machine."
+ to_chat(user, "A beaker is already loaded into the machine.")
return
if(user.drop_item())
beaker = I
I.forceMove(src)
- user << "You add the beaker to the machine!"
+ to_chat(user, "You add the beaker to the machine!")
icon_state = "mixer1b"
nanomanager.update_uis(src)
diff --git a/code/modules/reagents/newchem/disease.dm b/code/modules/reagents/newchem/disease.dm
index d89d61e3454..9c18efe308d 100644
--- a/code/modules/reagents/newchem/disease.dm
+++ b/code/modules/reagents/newchem/disease.dm
@@ -5,10 +5,251 @@
reagent_state = SOLID
color = "#FFFFFF"
-/datum/reagent/spider_eggs/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
+/datum/reagent/spider_eggs/on_mob_life(mob/living/M)
if(volume > 2.5)
if(iscarbon(M))
if(!M.get_int_organ(/obj/item/organ/internal/body_egg))
new/obj/item/organ/internal/body_egg/spider_eggs(M) //Yes, even Xenos can fall victim to the plague that is spider infestation.
- ..()
\ No newline at end of file
+ ..()
+
+
+/datum/reagent/nanomachines
+ name = "Nanomachines"
+ id = "nanomachines"
+ description = "Microscopic construction robots."
+ color = "#535E66" // rgb: 83, 94, 102
+
+/datum/reagent/nanomachines/on_mob_life(var/mob/living/carbon/M as mob)
+ if(!M) M = holder.my_atom
+ if(volume > 1.5)
+ M.ForceContractDisease(new /datum/disease/transformation/robot(0))
+ ..()
+
+
+/datum/reagent/xenomicrobes
+ name = "Xenomicrobes"
+ id = "xenomicrobes"
+ description = "Microbes with an entirely alien cellular structure."
+ color = "#535E66" // rgb: 83, 94, 102
+
+/datum/reagent/xenomicrobes/on_mob_life(var/mob/living/carbon/M as mob)
+ if(!M) M = holder.my_atom
+ if(volume > 1.5)
+ M.ContractDisease(new /datum/disease/transformation/xeno(0))
+ ..()
+
+/datum/reagent/fungalspores
+ name = "Tubercle bacillus Cosmosis microbes"
+ id = "fungalspores"
+ description = "Active fungal spores."
+ color = "#92D17D" // rgb: 146, 209, 125
+
+/datum/reagent/fungalspores/on_mob_life(var/mob/living/carbon/M as mob)
+ if(!M) M = holder.my_atom
+ if(volume > 2.5)
+ M.ForceContractDisease(new /datum/disease/tuberculosis(0))
+ ..()
+
+/datum/reagent/spore
+ name = "Blob Spores"
+ id = "spore"
+ description = "Spores of some blob creature thingy."
+ reagent_state = LIQUID
+ color = "#CE760A" // rgb: 206, 118, 10
+ var/client/blob_client = null
+ var/blob_point_rate = 3
+
+/datum/reagent/spore/on_mob_life(var/mob/living/M)
+ if(!M) M = holder.my_atom
+ if(holder.has_reagent("atrazine",45))
+ holder.del_reagent("spore") //apparently this never metabolizes and stays in forever unless you have 45 units of atrazine in you or some stupid thing like that.
+ if(prob(1))
+ to_chat(M, "Your mouth tastes funny.")
+ if(prob(1) && prob(25))
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(directory[ckey(C.key)])
+ blob_client = directory[ckey(C.key)]
+ C.gib()
+ if(blob_client)
+ var/obj/effect/blob/core/core = new(get_turf(C), 200, blob_client, blob_point_rate)
+ if(core.overmind && core.overmind.mind)
+ core.overmind.mind.name = C.name
+
+//virus food
+/datum/reagent/virus_food
+ name = "Virus Food"
+ id = "virusfood"
+ description = "A mixture of water, milk, and oxygen. Virus cells can use this mixture to reproduce."
+ reagent_state = LIQUID
+ nutriment_factor = 2 * REAGENTS_METABOLISM
+ color = "#899613" // rgb: 137, 150, 19
+
+/datum/reagent/virus_food/on_mob_life(mob/living/M)
+ M.nutrition += nutriment_factor * REAGENTS_EFFECT_MULTIPLIER
+ ..()
+
+/datum/reagent/mutagen/mutagenvirusfood
+ name = "mutagenic agar"
+ id = "mutagenvirusfood"
+ description = "mutates blood"
+ color = "#A3C00F" // rgb: 163,192,15
+
+/datum/reagent/mutagen/mutagenvirusfood/sugar
+ name = "sucrose agar"
+ id = "sugarvirusfood"
+ color = "#41B0C0" // rgb: 65,176,192
+
+/datum/reagent/diphenhydramine/diphenhydraminevirusfood
+ name = "virus rations"
+ id = "diphenhydraminevirusfood"
+ description = "mutates blood"
+ color = "#D18AA5" // rgb: 209,138,165
+
+/datum/reagent/plasma_dust/plasmavirusfood
+ name = "virus plasma"
+ id = "plasmavirusfood"
+ description = "mutates blood"
+ color = "#A69DA9" // rgb: 166,157,169
+
+/datum/reagent/plasma_dust/plasmavirusfood/weak
+ name = "weakened virus plasma"
+ id = "weakplasmavirusfood"
+ color = "#CEC3C6" // rgb: 206,195,198
+
+//reactions
+/datum/chemical_reaction/virus_food
+ name = "Virus Food"
+ id = "virusfood"
+ result = "virusfood"
+ required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/virus_food_mutagen
+ name = "mutagenic agar"
+ id = "mutagenvirusfood"
+ result = "mutagenvirusfood"
+ required_reagents = list("mutagen" = 1, "virusfood" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/virus_food_diphenhydramine
+ name = "virus rations"
+ id = "diphenhydraminevirusfood"
+ result = "diphenhydraminevirusfood"
+ required_reagents = list("diphenhydramine" = 1, "virusfood" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/virus_food_plasma
+ name = "virus plasma"
+ id = "plasmavirusfood"
+ result = "plasmavirusfood"
+ required_reagents = list("plasma_dust" = 1, "virusfood" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/virus_food_plasma_diphenhydramine
+ name = "weakened virus plasma"
+ id = "weakplasmavirusfood"
+ result = "weakplasmavirusfood"
+ required_reagents = list("diphenhydramine" = 1, "plasmavirusfood" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/virus_food_mutagen_sugar
+ name = "sucrose agar"
+ id = "sugarvirusfood"
+ result = "sugarvirusfood"
+ required_reagents = list("sugar" = 1, "mutagenvirusfood" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/virus_food_mutagen_salineglucose
+ name = "sucrose agar"
+ id = "salineglucosevirusfood"
+ result = "sugarvirusfood"
+ required_reagents = list("salglu_solution" = 1, "mutagenvirusfood" = 1)
+ result_amount = 2
+
+
+//mix virus
+/datum/chemical_reaction/mix_virus
+ name = "Mix Virus"
+ id = "mixvirus"
+ required_reagents = list("virusfood" = 1)
+ required_catalysts = list("blood" = 1)
+ var/level_min = 0
+ var/level_max = 2
+
+/datum/chemical_reaction/mix_virus/on_reaction(datum/reagents/holder, created_volume)
+ var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
+ if(B && B.data)
+ var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
+ if(D)
+ D.Evolve(level_min, level_max)
+
+
+/datum/chemical_reaction/mix_virus/mix_virus_2
+ name = "Mix Virus 2"
+ id = "mixvirus2"
+ required_reagents = list("mutagen" = 1)
+ level_min = 2
+ level_max = 4
+
+/datum/chemical_reaction/mix_virus/mix_virus_3
+ name = "Mix Virus 3"
+ id = "mixvirus3"
+ required_reagents = list("plasma_dust" = 1)
+ level_min = 4
+ level_max = 6
+
+/datum/chemical_reaction/mix_virus/mix_virus_4
+ name = "Mix Virus 4"
+ id = "mixvirus4"
+ required_reagents = list("uranium" = 1)
+ level_min = 5
+ level_max = 6
+
+/datum/chemical_reaction/mix_virus/mix_virus_5
+ name = "Mix Virus 5"
+ id = "mixvirus5"
+ required_reagents = list("mutagenvirusfood" = 1)
+ level_min = 3
+ level_max = 3
+
+/datum/chemical_reaction/mix_virus/mix_virus_6
+ name = "Mix Virus 6"
+ id = "mixvirus6"
+ required_reagents = list("sugarvirusfood" = 1)
+ level_min = 4
+ level_max = 4
+
+/datum/chemical_reaction/mix_virus/mix_virus_7
+ name = "Mix Virus 7"
+ id = "mixvirus7"
+ required_reagents = list("weakplasmavirusfood" = 1)
+ level_min = 5
+ level_max = 5
+
+/datum/chemical_reaction/mix_virus/mix_virus_8
+ name = "Mix Virus 8"
+ id = "mixvirus8"
+ required_reagents = list("plasmavirusfood" = 1)
+ level_min = 6
+ level_max = 6
+
+/datum/chemical_reaction/mix_virus/mix_virus_9
+ name = "Mix Virus 9"
+ id = "mixvirus9"
+ required_reagents = list("diphenhydraminevirusfood" = 1)
+ level_min = 1
+ level_max = 1
+
+/datum/chemical_reaction/mix_virus/rem_virus
+ name = "Devolve Virus"
+ id = "remvirus"
+ required_reagents = list("diphenhydramine" = 1)
+ required_catalysts = list("blood" = 1)
+
+/datum/chemical_reaction/mix_virus/rem_virus/on_reaction(datum/reagents/holder, created_volume)
+ var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
+ if(B && B.data)
+ var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
+ if(D)
+ D.Devolve()
\ No newline at end of file
diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index 4c5ecd14a0a..323bb24e832 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -27,7 +27,7 @@
if(prob(50))
M.say("[sonic_message]")
else
- M << "[sonic_message ]"
+ to_chat(M, "[sonic_message ]")
..()
return
@@ -39,6 +39,7 @@
slur_start = 30
brawl_start = 40
confused_start = 100
+ alcohol_perc = 0.4
/datum/chemical_reaction/applejack
name = "applejack"
@@ -55,6 +56,7 @@
id = "jackrose"
description = "A classic cocktail that had fallen out of fashion, but never out of taste,"
color = "#664300"
+ alcohol_perc = 0.4
/datum/chemical_reaction/jackrose
name = "jackrose"
@@ -79,12 +81,13 @@
metabolization_rate = 0.4
vomit_start = INFINITY //
blur_start = INFINITY //
- pass_out = INFINITY //INFINITY, so that IPCs don't puke and stuff
+ pass_out = INFINITY //INFINITY, so that IPCs don't puke and stuff
var/spark_start = 50 //amount absorbed after which mob starts sparking
- var/collapse_start = 150 //amount absorbed after wich mob starts sparking and collapsing (DOUBLE THE SPARKS, DOUBLE THE FUN)
+ var/collapse_start = 80 //amount absorbed after wich mob starts sparking and collapsing (DOUBLE THE SPARKS, DOUBLE THE FUN)
var/braindamage_start = 250 //amount absorbed after which mob starts taking a small amount of brain damage
+
/datum/chemical_reaction/synthanol
name = "Synthanol"
id = "synthanol"
@@ -96,7 +99,11 @@
/datum/reagent/ethanol/synthanol/on_mob_life(var/mob/living/M as mob, var/alien)
- var/d = data
+ var/d = 0
+ // make all the beverages work together
+ for(var/datum/reagent/ethanol/synthanol/A in holder.reagent_list)
+ if(isnum(A.current_cycle)) d += A.current_cycle * A.alcohol_perc
+
if(M.isSynthetic()) //works normally on synthetics
if(d >= spark_start && prob(25))
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
@@ -107,7 +114,7 @@
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(3, 1, M)
s.start()
- if(d >= braindamage_start && prob(33))
+ if(d >= braindamage_start && prob(10))
M.adjustBrainLoss(1)
else
@@ -123,7 +130,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
if(M.isSynthetic())
return
if(method == INGEST)
- M << pick("That was awful!", "Yuck!")
+ to_chat(M, pick("That was awful!", "Yuck!"))
/datum/reagent/ethanol/synthanol/robottears
name = "Robot Tears"
@@ -131,6 +138,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "An oily substance that an IPC could technically consider a 'drink'."
reagent_state = LIQUID
color = "#363636"
+ alcohol_perc = 0.5
/datum/chemical_reaction/synthanol/robottears
name = "Robot Tears"
@@ -146,6 +154,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "A fruit drink meant only for synthetics, however that works."
reagent_state = LIQUID
color = "#adb21f"
+ alcohol_perc = 0.3
/datum/chemical_reaction/synthanol/trinary
name = "Trinary"
@@ -161,6 +170,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "A drink containing some organic ingredients, but meant only for synthetics."
reagent_state = LIQUID
color = "#5b3210"
+ alcohol_perc = 0.5
/datum/chemical_reaction/synthanol/servo
name = "Servo"
@@ -176,6 +186,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "A potent mix of alcohol and synthanol. Will only work on synthetics."
reagent_state = LIQUID
color = "#e7ae04"
+ alcohol_perc = 0.2
/datum/chemical_reaction/synthanol/uplink
name = "Uplink"
@@ -190,6 +201,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "The classic drink adjusted for a robot's tastes."
reagent_state = LIQUID
color = "#7204e7"
+ alcohol_perc = 0.5
/datum/chemical_reaction/synthanol/synthnsoda
name = "Synth 'n Soda"
@@ -204,6 +216,7 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo
description = "Someone mixed wine and alcohol for robots. Hope you're proud of yourself."
reagent_state = LIQUID
color = "#d004e7"
+ alcohol_perc = 0.5
/datum/chemical_reaction/synthanol/synthignon
name = "Synthignon"
diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm
index 6ac4984bb9a..6d8a7d4117f 100644
--- a/code/modules/reagents/newchem/drugs.dm
+++ b/code/modules/reagents/newchem/drugs.dm
@@ -17,7 +17,7 @@
if(!M) M = holder.my_atom
var/smoke_message = pick("You feel relaxed.", "You feel calmed.", "You feel less stressed.", "You feel more placid.", "You feel more undivided.")
if(prob(5))
- M << "[smoke_message]"
+ to_chat(M, "[smoke_message]")
if(prob(50))
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
@@ -49,14 +49,14 @@
if(prob(15))
M.emote(pick("twitch", "twitch_s", "grumble", "laugh"))
if(prob(8))
- M << "You feel great!"
+ to_chat(M, "You feel great!")
M.reagents.add_reagent("methamphetamine", rand(1,2))
M.emote(pick("laugh", "giggle"))
if(prob(6))
- M << "You feel warm."
+ to_chat(M, "You feel warm.")
M.bodytemperature += rand(1,10)
if(prob(4))
- M << "You feel kinda awful!"
+ to_chat(M, "You feel kinda awful!")
M.adjustToxLoss(1)
M.jitteriness += 30
M.emote(pick("groan", "moan"))
@@ -104,18 +104,18 @@
if(prob(15))
M.emote(pick("smile", "grin", "yawn", "laugh", "drool"))
if(prob(10))
- M << "You feel pretty chill."
+ to_chat(M, "You feel pretty chill.")
M.bodytemperature--
M.emote("smile")
if(prob(5))
- M << "You feel too chill!"
+ to_chat(M, "You feel too chill!")
M.emote(pick("yawn", "drool"))
M.Stun(1)
M.adjustToxLoss(1)
M.adjustBrainLoss(1)
M.bodytemperature -= 20
if(prob(2))
- M << "Your skin feels all rough and dry."
+ to_chat(M, "Your skin feels all rough and dry.")
M.adjustBruteLoss(2)
..()
return
@@ -231,7 +231,7 @@
if(!M) M = holder.my_atom
var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.")
if(prob(5))
- M << "[high_message]"
+ to_chat(M, "[high_message]")
M.AdjustParalysis(-5)
M.AdjustStunned(-5)
M.AdjustWeakened(-5)
@@ -292,9 +292,9 @@
M.emote(pick("twitch", "shake", "tremble","quiver", "twitch_s"))
var/high_message = pick("really buff", "on top of the world","like you're made of steel", "energized", "invigorated", "full of energy")
if(prob(8))
- M << "[high_message]!"
+ to_chat(M, "[high_message]!")
if(prob(5))
- M << "You cannot breathe!"
+ to_chat(M, "You cannot breathe!")
M.adjustOxyLoss(15)
M.Stun(1)
M.losebreath++
@@ -315,7 +315,7 @@
if(prob(5))
M.emote(pick("laugh","giggle","smile"))
if(prob(5))
- M << "[pick("You feel hungry.","Your stomach rumbles.","You feel cold.","You feel warm.")]"
+ to_chat(M, "[pick("You feel hungry.","Your stomach rumbles.","You feel cold.","You feel warm.")]")
if(prob(4))
M.confused = max(M.confused, 10)
if(volume >= 50 && prob(25))
@@ -389,11 +389,11 @@
M.emote("laugh")
M.adjustToxLoss(1)
if(2)
- M << "[M] can't seem to control their legs!"
+ to_chat(M, "[M] can't seem to control their legs!")
M.Weaken(8)
M.adjustToxLoss(1)
if(3)
- M << "[M]'s hands flip out and flail everywhere!"
+ to_chat(M, "[M]'s hands flip out and flail everywhere!")
M.drop_l_hand()
M.drop_r_hand()
M.adjustToxLoss(1)
@@ -432,7 +432,7 @@
if(prob(1))
high_message = "0100011101001111010101000101010001000001010001110100111101000110010000010101001101010100!"
if(prob(5))
- M << "[high_message]"
+ to_chat(M, "[high_message]")
M.AdjustParalysis(-2)
M.AdjustStunned(-2)
M.AdjustWeakened(-2)
@@ -480,7 +480,7 @@
if(prob(1))
high_message = "01010100010100100100000101001110010100110100001101000101010011100100010001000101010011100100001101000101."
if(prob(5))
- M << "[high_message]"
+ to_chat(M, "[high_message]")
..()
return
@@ -491,7 +491,7 @@
M.Jitter(20)
M.apply_effect(STUTTER, 5)
if(prob(10))
- M << "You experience a violent electrical discharge!"
+ to_chat(M, "You experience a violent electrical discharge!")
playsound(get_turf(M), 'sound/effects/eleczap.ogg', 75, 1)
//Lightning effect for electrical discharge visualization
var/icon/I=new('icons/obj/zap.dmi',"lightningend")
diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm
index 4f83e21bc6b..ed65daca83a 100644
--- a/code/modules/reagents/newchem/food.dm
+++ b/code/modules/reagents/newchem/food.dm
@@ -11,7 +11,7 @@ datum/reagent/questionmark/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
return
if(method == INGEST)
M.Weaken(2)
- M << "Ugh! Eating that was a terrible idea!"
+ to_chat(M, "Ugh! Eating that was a terrible idea!")
datum/reagent/egg
name = "Egg"
@@ -201,11 +201,12 @@ datum/reagent/fungus/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
if(method == INGEST)
var/ranchance = rand(1,10)
if(ranchance == 1)
- M << "You feel very sick."
+ to_chat(M, "You feel very sick.")
M.reagents.add_reagent("toxin", rand(1,5))
else if(ranchance <= 5)
- M << "That tasted absolutely FOUL."
- else M << "Yuck!"
+ to_chat(M, "That tasted absolutely FOUL.")
+ else
+ to_chat(M, "Yuck!")
/datum/reagent/chicken_soup
name = "Chicken soup"
@@ -232,7 +233,7 @@ datum/reagent/msg/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
if(!istype(M, /mob/living))
return
if(method == INGEST)
- M << "That tasted amazing!"
+ to_chat(M, "That tasted amazing!")
/datum/reagent/msg/on_mob_life(var/mob/living/M as mob)
@@ -240,7 +241,7 @@ datum/reagent/msg/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
if(prob(10))
M.adjustToxLoss(rand(2.4))
if(prob(7))
- M << "A horrible migraine overpowers you."
+ to_chat(M, "A horrible migraine overpowers you.")
M.Stun(rand(2,5))
..()
return
@@ -284,11 +285,10 @@ datum/reagent/cheese/reaction_turf(var/turf/T, var/volume)
reagent_state = LIQUID
color = "#B2B139"
overdose_threshold = 50
- addiction_chance = 10
/datum/reagent/fake_cheese/overdose_process(var/mob/living/M as mob)
if(prob(8))
- M << "You feel something squirming in your stomach. Your thoughts turn to cheese and you begin to sweat."
+ to_chat(M, "You feel something squirming in your stomach. Your thoughts turn to cheese and you begin to sweat.")
M.adjustToxLoss(rand(1,2))
..()
@@ -394,12 +394,12 @@ datum/reagent/ectoplasm/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
return
if(method == INGEST)
var/spooky_eat = pick("Ugh, why did you eat that? Your mouth feels haunted. Haunted with bad flavors.", "Ugh, why did you eat that? It has the texture of ham aspic. From the 1950s. Left out in the sun.", "Ugh, why did you eat that? It tastes like a ghost fart.", "Ugh, why did you eat that? It tastes like flavor died.")
- M << "[spooky_eat]"
+ to_chat(M, "[spooky_eat]")
/datum/reagent/ectoplasm/on_mob_life(var/mob/living/M as mob)
var/spooky_message = pick("You notice something moving out of the corner of your eye, but nothing is there...", "Your eyes twitch, you feel like something you can't see is here...", "You've got the heebie-jeebies.", "You feel uneasy.", "You shudder as if cold...", "You feel something gliding across your back...")
if(prob(8))
- M << "[spooky_message]"
+ to_chat(M, "[spooky_message]")
..()
return
@@ -447,12 +447,12 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume)
/datum/reagent/hydrogenated_soybeanoil/overdose_process(var/mob/living/M as mob)
if(prob(33))
- M << "You feel horribly weak."
+ to_chat(M, "You feel horribly weak.")
if(prob(10))
- M << "You cannot breathe!"
+ to_chat(M, "You cannot breathe!")
M.adjustOxyLoss(5)
if(prob(5))
- M << "You feel a sharp pain in your chest!"
+ to_chat(M, "You feel a sharp pain in your chest!")
M.adjustOxyLoss(25)
M.Stun(5)
M.Paralyse(10)
@@ -530,7 +530,7 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume)
if(prob(8))
M.reagents.add_reagent(pick("blood", "corn_syrup", "synthflesh", "hydrogenated_soybeanoil", "porktonium", "toxic_slurry"), 0.8)
else if(prob(6))
- M << "[pick("You feel ill.","Your stomach churns.","You feel queasy.","You feel sick.")]"
+ to_chat(M, "[pick("You feel ill.","Your stomach churns.","You feel queasy.","You feel sick.")]")
M.emote(pick("groan","moan"))
..()
return
@@ -557,20 +557,20 @@ datum/reagent/pepperoni/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vol
var/mob/living/carbon/human/H = M
if(H.wear_mask)
- H << "The pepperoni bounces off your mask!"
+ to_chat(H, "The pepperoni bounces off your mask!")
return
if(H.head)
- H << "Your mask protects you from the errant pepperoni!"
+ to_chat(H, "Your mask protects you from the errant pepperoni!")
return
if(prob(50))
M.adjustBruteLoss(1)
playsound(M, 'sound/effects/woodhit.ogg', 50, 1)
- M << "A slice of pepperoni slaps you!"
+ to_chat(M, "A slice of pepperoni slaps you!")
else
M.emote("burp")
- M << "My goodness, that was tasty!"
+ to_chat(M, "My goodness, that was tasty!")
/datum/chemical_reaction/pepperoni
@@ -591,14 +591,14 @@ datum/reagent/pepperoni/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vol
/datum/reagent/cholesterol/on_mob_life(var/mob/living/M as mob)
if(volume >= 25 && prob(volume*0.15))
- M << "Your chest feels [pick("weird","uncomfortable","nasty","gross","odd","unusual","warm")]!"
+ to_chat(M, "Your chest feels [pick("weird","uncomfortable","nasty","gross","odd","unusual","warm")]!")
M.adjustToxLoss(rand(1,2))
else if(volume >= 45 && prob(volume*0.08))
- M << "Your chest [pick("hurts","stings","aches","burns")]!"
+ to_chat(M, "Your chest [pick("hurts","stings","aches","burns")]!")
M.adjustToxLoss(rand(2,4))
M.Stun(1)
else if(volume >= 150 && prob(volume*0.01))
- M << "Your chest is burning with pain!"
+ to_chat(M, "Your chest is burning with pain!")
M.Stun(1)
M.Weaken(1)
if(ishuman(M))
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index 3e934f49a79..90980c3a421 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -17,11 +17,11 @@ datum/reagent/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/meth
if(method == TOUCH)
M.adjustFireLoss(-volume)
if(show_message)
- M << "The silver sulfadiazine soothes your burns."
+ to_chat(M, "The silver sulfadiazine soothes your burns.")
if(method == INGEST)
M.adjustToxLoss(0.5*volume)
if(show_message)
- M << "You feel sick..."
+ to_chat(M, "You feel sick...")
..()
return
@@ -44,12 +44,12 @@ datum/reagent/styptic_powder/reaction_mob(var/mob/living/M as mob, var/method=TO
if(method == TOUCH)
M.adjustBruteLoss(-volume)
if(show_message)
- M << "The styptic powder stings like hell as it closes some of your wounds!"
+ to_chat(M, "The styptic powder stings like hell as it closes some of your wounds!")
M.emote("scream")
if(method == INGEST)
M.adjustToxLoss(0.5*volume)
if(show_message)
- M << "You feel gross!"
+ to_chat(M, "You feel gross!")
..()
return
@@ -89,7 +89,7 @@ datum/reagent/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vo
M.adjustBruteLoss(-1.5*volume)
M.adjustFireLoss(-1.5*volume)
if(show_message)
- M << "The synthetic flesh integrates itself into your wounds, healing you."
+ to_chat(M, "The synthetic flesh integrates itself into your wounds, healing you.")
..()
return
@@ -384,7 +384,8 @@ datum/reagent/ephedrine/on_mob_life(var/mob/living/M as mob)
M.adjustOxyLoss(-1)
if(M.health < 0 || M.health > 0 && prob(33))
M.adjustToxLoss(-1)
- M.heal_organ_damage(1,1)
+ M.adjustBruteLoss(-1)
+ M.adjustFireLoss(-1)
..()
return
@@ -630,8 +631,8 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/M as mob, var/method=T
return
var/mob/dead/observer/ghost = M.get_ghost()
if(ghost)
- ghost << "Your are attempting to be revived with Strange Reagent. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)"
- ghost << sound('sound/effects/genetics.ogg')
+ to_chat(ghost, "Your are attempting to be revived with Strange Reagent. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)")
+ to_chat(ghost, sound('sound/effects/genetics.ogg'))
M.visible_message("[M] doesn't appear to respond, perhaps try again later?")
if(!M.suiciding && !ghost && !(NOCLONE in M.mutations))
M.visible_message("[M] seems to rise from the dead!")
@@ -680,34 +681,6 @@ datum/reagent/life
/datum/chemical_reaction/life/on_reaction(var/datum/reagents/holder, var/created_volume)
chemical_mob_spawn(holder, 1, "Life")
-proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reaction_name, var/mob_faction = "chemicalsummon")
- if(holder && holder.my_atom)
- var/blocked = blocked_mobs //global variable for blocked mobs
-
- var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
- var/atom/A = holder.my_atom
- var/turf/T = get_turf(A)
- var/area/my_area = get_area(T)
- var/message = "A [reaction_name] reaction has occured in ([my_area.name])"
- var/mob/M = get(A, /mob)
- if(M)
- message += " - carried by: [key_name_admin(M)]"
- else
- message += " - last fingerprint: [(A.fingerprintslast ? A.fingerprintslast : "N/A")]"
-
- message_admins(message, 0, 1)
-
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
-
- for(var/i = 1, i <= amount_to_spawn, i++)
- var/chosen = pick(critters)
- var/mob/living/simple_animal/hostile/C = new chosen
- C.faction |= mob_faction
- C.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(C, pick(NORTH,SOUTH,EAST,WEST))
-
/datum/reagent/mannitol/on_mob_life(mob/living/M as mob)
M.adjustBrainLoss(-3)
..()
diff --git a/code/modules/reagents/newchem/newchem_procs.dm b/code/modules/reagents/newchem/newchem_procs.dm
index 4a6ec32366e..97516f916c9 100644
--- a/code/modules/reagents/newchem/newchem_procs.dm
+++ b/code/modules/reagents/newchem/newchem_procs.dm
@@ -77,7 +77,7 @@
if(5)
R.addiction_act_stage5(M)
if(prob(20) && (world.timeofday > (R.last_addiction_dose + ADDICTION_TIME))) //Each addiction lasts 8 minutes before it can end
- M << "You no longer feel reliant on [R.name]!"
+ to_chat(M, "You no longer feel reliant on [R.name]!")
addiction_list.Remove(R)
update_total()
@@ -132,7 +132,7 @@
if(prob(8))
M.emote("sneeze")
if(prob(4))
- M << "You feel a dull headache."
+ to_chat(M, "You feel a dull headache.")
/datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob)
if(prob(8))
@@ -140,30 +140,73 @@
if(prob(8))
M.emote("shiver")
if(prob(4))
- M << "You begin craving [name]!"
+ to_chat(M, "You begin craving [name]!")
/datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob)
if(prob(8))
M.emote("twitch")
if(prob(4))
- M << "You have the strong urge for some [name]!"
+ to_chat(M, "You have the strong urge for some [name]!")
if(prob(4))
- M << "You REALLY crave some [name]!"
+ to_chat(M, "You REALLY crave some [name]!")
/datum/reagent/proc/addiction_act_stage5(var/mob/living/M as mob)
if(prob(8))
M.emote("twitch")
if(prob(6))
- M << "Your stomach lurches painfully!"
+ to_chat(M, "Your stomach lurches painfully!")
M.visible_message("[M] gags and retches!")
M.Stun(rand(2,4))
M.Weaken(rand(2,4))
if(prob(5))
- M << "You feel like you can't live without [name]!"
+ to_chat(M, "You feel like you can't live without [name]!")
if(prob(5))
- M << "You would DIE for some [name] right now!"
+ to_chat(M, "You would DIE for some [name] right now!")
/datum/reagent/proc/reagent_deleted()
return
+var/list/chemical_mob_spawn_meancritters = list() // list of possible hostile mobs
+var/list/chemical_mob_spawn_nicecritters = list() // and possible friendly mobs
+/datum/chemical_reaction/proc/chemical_mob_spawn(datum/reagents/holder, amount_to_spawn, reaction_name, mob_faction = "chemicalsummon")
+ if(holder && holder.my_atom)
+ if(chemical_mob_spawn_meancritters.len <= 0 || chemical_mob_spawn_nicecritters.len <= 0)
+ for(var/T in typesof(/mob/living/simple_animal))
+ var/mob/living/simple_animal/SA = T
+ switch(initial(SA.gold_core_spawnable))
+ if(CHEM_MOB_SPAWN_HOSTILE)
+ chemical_mob_spawn_meancritters += T
+ if(CHEM_MOB_SPAWN_FRIENDLY)
+ chemical_mob_spawn_nicecritters += T
+ var/atom/A = holder.my_atom
+ var/turf/T = get_turf(A)
+ var/area/my_area = get_area(T)
+ var/message = "A [reaction_name] reaction has occured in [my_area.name]. (JMP)"
+ message += " (VV)"
+
+ var/mob/M = get(A, /mob)
+ if(M)
+ message += " - Carried By: [key_name_admin(M)](?) (FLW)"
+ else
+ message += " - Last Fingerprint: [(A.fingerprintslast ? A.fingerprintslast : "N/A")]"
+
+ message_admins(message, 0, 1)
+
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+
+ for(var/mob/living/carbon/C in viewers(get_turf(holder.my_atom), null))
+ C.flash_eyes()
+ for(var/i = 1, i <= amount_to_spawn, i++)
+ var/chosen
+ if(reaction_name == "Friendly Gold Slime")
+ chosen = pick(chemical_mob_spawn_nicecritters)
+ else
+ chosen = pick(chemical_mob_spawn_meancritters)
+ var/mob/living/simple_animal/C = new chosen
+ C.faction |= mob_faction
+ C.forceMove(get_turf(holder.my_atom))
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(C, pick(NORTH,SOUTH,EAST,WEST))
+
#undef ADDICTION_TIME
\ No newline at end of file
diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm
index 9d138407d96..7cd45d056d3 100644
--- a/code/modules/reagents/newchem/other.dm
+++ b/code/modules/reagents/newchem/other.dm
@@ -265,7 +265,7 @@ datum/reagent/super_hairgrownium/on_mob_life(var/mob/living/M as mob)
H.unEquip(H.wear_mask)
var/obj/item/clothing/mask/fakemoustache = new /obj/item/clothing/mask/fakemoustache
H.equip_to_slot(fakemoustache, slot_wear_mask)
- H << "Hair bursts forth from your every follicle!"
+ to_chat(H, "Hair bursts forth from your every follicle!")
..()
return
@@ -292,7 +292,7 @@ datum/reagent/fartonium/on_mob_life(var/mob/living/M as mob)
if(holder.has_reagent("simethicone"))
if(prob(25))
- M << "[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gonna die!")]"
+ to_chat(M, "[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gonna die!")]")
M.adjustBruteLoss(1)
if(prob(10))
M.custom_emote(1,"strains, but nothing happens.")
diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm
index 719d95b6c3c..b4070440ab3 100644
--- a/code/modules/reagents/newchem/pyro.dm
+++ b/code/modules/reagents/newchem/pyro.dm
@@ -249,13 +249,12 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
s.set_up(2, 1, location)
s.start()
for(var/mob/living/carbon/C in viewers(5, location))
- if(C.eyecheck())
- continue
- flick("e_flash", C.flash)
- if(get_dist(C, location) < 4)
- C.Weaken(5)
- continue
- C.Stun(5)
+ if(C.flash_eyes())
+ if(get_dist(C, location) < 4)
+ C.Weaken(5)
+ continue
+ C.Stun(5)
+
/datum/chemical_reaction/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
if(holder.has_reagent("stabilizing_agent"))
@@ -265,13 +264,11 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
s.set_up(2, 1, location)
s.start()
for(var/mob/living/carbon/C in viewers(5, location))
- if(C.eyecheck())
- continue
- flick("e_flash", C.flash)
- if(get_dist(C, location) < 4)
- C.Weaken(5)
- continue
- C.Stun(5)
+ if(C.flash_eyes())
+ if(get_dist(C, location) < 4)
+ C.Weaken(5)
+ continue
+ C.Stun(5)
holder.remove_reagent("flash_powder", created_volume)
/datum/reagent/smoke_powder
@@ -365,20 +362,20 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
var/mob/living/carbon/human/H = C
if((H.r_ear && (H.r_ear.flags & EARBANGPROTECT)) || (H.l_ear && (H.l_ear.flags & EARBANGPROTECT)) || (H.head && (H.head.flags & HEADBANGPROTECT)))
ear_safety++
- M << "BANG"
+ to_chat(M, "BANG")
if(!ear_safety)
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
M.ear_damage += rand(0, 5)
M.ear_deaf = max(M.ear_deaf,15)
if (M.ear_damage >= 15)
- M << "Your ears start to ring badly!"
+ to_chat(M, "Your ears start to ring badly!")
if(prob(M.ear_damage - 10 + 5))
- M << "You can't hear anything!"
+ to_chat(M, "You can't hear anything!")
M.disabilities |= DEAF
else
if (M.ear_damage >= 5)
- M << "Your ears start to ring!"
+ to_chat(M, "Your ears start to ring!")
/datum/chemical_reaction/sonic_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
if(holder.has_reagent("stabilizing_agent"))
@@ -394,20 +391,20 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
var/mob/living/carbon/human/H = C
if((H.r_ear && (H.r_ear.flags & EARBANGPROTECT)) || (H.l_ear && (H.l_ear.flags & EARBANGPROTECT)) || (H.head && (H.head.flags & HEADBANGPROTECT)))
ear_safety++
- C << "BANG"
+ to_chat(C, "BANG")
if(!ear_safety)
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
M.ear_damage += rand(0, 5)
M.ear_deaf = max(M.ear_deaf,15)
if (M.ear_damage >= 15)
- M << "Your ears start to ring badly!"
+ to_chat(M, "Your ears start to ring badly!")
if(prob(M.ear_damage - 10 + 5))
- M << "You can't hear anything!"
+ to_chat(M, "You can't hear anything!")
M.disabilities |= DEAF
else
if (M.ear_damage >= 5)
- M << "Your ears start to ring!"
+ to_chat(M, "Your ears start to ring!")
holder.remove_reagent("sonic_powder", created_volume)
/datum/reagent/phlogiston
@@ -629,3 +626,33 @@ datum/reagent/firefighting_foam/reaction_obj(var/obj/O, var/volume)
holder.del_reagent("teslium") //Clear all remaining Teslium and Uranium, but leave all other reagents untouched.
holder.del_reagent("uranium")
return
+
+/datum/reagent/plasma_dust
+ name = "Plasma Dust"
+ id = "plasma_dust"
+ description = "A fine dust of plasma. This chemical has unusual mutagenic properties for viruses and slimes alike."
+ color = "#500064" // rgb: 80, 0, 100
+
+/datum/reagent/plasma_dust/on_mob_life(mob/living/M)
+ M.adjustToxLoss(3)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ C.adjustPlasma(20)
+ ..()
+
+/datum/reagent/plasma_dust/reaction_obj(obj/O, volume)
+ if((!O) || (!volume))
+ return 0
+ O.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume)
+
+/datum/reagent/plasma_dust/reaction_turf(turf/simulated/T, volume)
+ if(istype(T))
+ T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume)
+
+/datum/reagent/plasma_dust/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with plasma dust is stronger than fuel!
+ if(!istype(M, /mob/living))
+ return
+ if(method == TOUCH)
+ M.adjust_fire_stacks(volume / 5)
+ return
+ ..()
\ No newline at end of file
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index c69baf5b76b..b602e282b1f 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -34,7 +34,7 @@
if(method == TOUCH)
M.reagents.add_reagent("histamine",10)
else
- M << "You feel a burning sensation in your throat..."
+ to_chat(M, "You feel a burning sensation in your throat...")
M.emote("drool")
/datum/reagent/histamine/on_mob_life(var/mob/living/M as mob)
@@ -42,7 +42,7 @@
if(prob(20))
M.emote(pick("twitch", "grumble", "sneeze", "cough"))
if(prob(10))
- M << "Your eyes itch."
+ to_chat(M, "Your eyes itch.")
M.emote(pick("blink", "sneeze"))
M.eye_blurry += 3
if(prob(10))
@@ -50,14 +50,14 @@
M.adjustBruteLoss(1)
M.emote("grumble")
if(prob(5))
- M << "You're getting a rash!"
+ to_chat(M, "You're getting a rash!")
M.adjustBruteLoss(2)
..()
return
/datum/reagent/histamine/overdose_process(var/mob/living/M as mob)
if(prob(2))
- M << "You feel mucus running down the back of your throat."
+ to_chat(M, "You feel mucus running down the back of your throat.")
M.adjustToxLoss(1)
M.jitteriness += 4
M.emote("sneeze", "cough")
@@ -67,7 +67,7 @@
M.emote(pick("choke","gasp"))
M.adjustOxyLoss(5)
else if(prob(7))
- M << "Your chest hurts!"
+ to_chat(M, "Your chest hurts!")
M.emote(pick("cough","gasp"))
M.adjustOxyLoss(3)
..()
@@ -196,11 +196,11 @@
if(prob(5))
M.emote("drool")
if(prob(10))
- M << "You cannot breathe!"
+ to_chat(M, "You cannot breathe!")
M.losebreath += 1
M.emote("gasp")
if(prob(8))
- M << "You feel horrendously weak!"
+ to_chat(M, "You feel horrendously weak!")
M.Stun(2)
M.adjustToxLoss(2)
..()
@@ -237,7 +237,7 @@
if(prob(25))
M.emote(pick("twitch", "laugh", "sneeze", "cry"))
if(prob(20))
- M << "Something tickles!"
+ to_chat(M, "Something tickles!")
M.emote(pick("laugh", "giggle"))
if(prob(15))
M.visible_message("[M] scratches at an itch.")
@@ -245,12 +245,12 @@
M.Stun(rand(0,1))
M.emote("grumble")
if(prob(10))
- M << "So itchy!"
+ to_chat(M, "So itchy!")
M.adjustBruteLoss(2)
if(prob(6))
M.reagents.add_reagent("histamine", rand(1,3))
if(prob(2))
- M << "AHHHHHH!"
+ to_chat(M, "AHHHHHH!")
M.adjustBruteLoss(5)
M.Weaken(5)
M.jitteriness += 6
@@ -291,7 +291,7 @@
var/mob/living/carbon/human/H = M
if(volume < 5)
- M << "The blueish acidic substance stings you, but isn't concentrated enough to harm you!"
+ to_chat(M, "The blueish acidic substance stings you, but isn't concentrated enough to harm you!")
if(volume >=5 && volume <=10)
if(!H.unacidable)
@@ -306,18 +306,18 @@
if(!H.wear_mask.unacidable)
qdel(H.wear_mask)
H.update_inv_wear_mask()
- H << "\red Your mask melts away but protects you from the acid!"
+ to_chat(H, "\red Your mask melts away but protects you from the acid!")
else
- H << "\red Your mask protects you from the acid!"
+ to_chat(H, "\red Your mask protects you from the acid!")
return
if(H.head)
if(!H.head.unacidable)
qdel(H.head)
H.update_inv_head()
- H << "\red Your helmet melts away but protects you from the acid"
+ to_chat(H, "\red Your helmet melts away but protects you from the acid")
else
- H << "\red Your helmet protects you from the acid!"
+ to_chat(H, "\red Your helmet protects you from the acid!")
return
if(!H.unacidable)
@@ -333,7 +333,7 @@
var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
I.desc = "Looks like this was \an [O] some time ago."
for(var/mob/M in viewers(5, O))
- M << "\red \the [O] melts."
+ to_chat(M, "\red \the [O] melts.")
qdel(O)
/datum/chemical_reaction/facid
@@ -358,14 +358,14 @@
if(prob(33))
M.adjustToxLoss(rand(5,25))
if(prob(33))
- M << "You feel horribly weak."
+ to_chat(M, "You feel horribly weak.")
M.Stun(2)
if(prob(10))
- M << "You cannot breathe!"
+ to_chat(M, "You cannot breathe!")
M.adjustOxyLoss(10)
M.losebreath++
if(prob(10))
- M << "Your chest is burning with pain!"
+ to_chat(M, "Your chest is burning with pain!")
M.adjustOxyLoss(10)
M.losebreath++
M.Stun(3)
@@ -409,7 +409,7 @@
M.emote(pick("drool", "tremble"))
if(6 to 10)
if(prob(8))
- M << "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")]."
+ to_chat(M, "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")].")
M.Stun(1)
else if(prob(8))
M.emote(pick("drool", "tremble"))
@@ -420,9 +420,9 @@
M.emote(pick("drool", "tremble", "gasp"))
M.losebreath++
if(prob(9))
- M << "You can't [pick("move", "feel your legs", "feel your face", "feel anything")]!"
+ to_chat(M, "You can't [pick("move", "feel your legs", "feel your face", "feel anything")]!")
if(prob(7))
- M << "You can't breathe!"
+ to_chat(M, "You can't breathe!")
M.losebreath += 3
..()
return
@@ -557,10 +557,10 @@
if(!M.nutrition)
switch(rand(1,3))
if(1)
- M << "You feel hungry..."
+ to_chat(M, "You feel hungry...")
if(2)
M.adjustToxLoss(1)
- M << "Your stomach grumbles painfully!"
+ to_chat(M, "Your stomach grumbles painfully!")
else
if(prob(60))
var/fat_to_burn = max(round(M.nutrition/100,1), 5)
@@ -604,7 +604,7 @@
if(6 to 10)
M.eye_blurry += 5
if(prob(8))
- M << "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")]."
+ to_chat(M, "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")].")
M.Stun(1)
else if(prob(8))
M.emote(pick("drool","pale", "gasp"))
@@ -614,7 +614,7 @@
if(prob(20))
M.emote(pick("drool", "faint", "pale", "gasp", "collapse"))
else if(prob(8))
- M << "You can't [pick("breathe", "move", "feel your legs", "feel your face", "feel anything")]!"
+ to_chat(M, "You can't [pick("breathe", "move", "feel your legs", "feel your face", "feel anything")]!")
M.losebreath++
..()
return
@@ -675,7 +675,7 @@
M.visible_message("[M] has a seizure!")
M.jitteriness = 1000
if(prob(5))
- M << "You can't breathe!"
+ to_chat(M, "You can't breathe!")
M.emote(pick("gasp", "choke", "cough"))
M.losebreath++
if(61 to INFINITY)
@@ -822,7 +822,7 @@
if(prob(10))
M.adjustToxLoss(rand(2.4))
if(prob(7))
- M << "A horrible migraine overpowers you."
+ to_chat(M, "A horrible migraine overpowers you.")
M.Stun(rand(2,5))
if(prob(7))
M.fakevomit(1)
@@ -869,7 +869,7 @@
/datum/reagent/ants/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) //NOT THE ANTS
if(iscarbon(M))
if(method == TOUCH || method==INGEST)
- M << "OH SHIT ANTS!!!!"
+ to_chat(M, "OH SHIT ANTS!!!!")
M.emote("scream")
M.adjustBruteLoss(4)
diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_med.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_med.dm
index 468316eab15..0550813849c 100644
--- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_med.dm
+++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_med.dm
@@ -1,20 +1,18 @@
-/datum/chemical_reaction/
-
- hydrocodone
+/datum/chemical_reaction/hydrocodone
name = "Hydrocodone"
id = "hydrocodone"
result = "hydrocodone"
required_reagents = list("morphine" = 1, "sacid" = 1, "water" = 1, "oil" = 1)
result_amount = 2
- mitocholide
+/datum/chemical_reaction/mitocholide
name = "mitocholide"
id = "mitocholide"
result = "mitocholide"
required_reagents = list("synthflesh" = 1, "cryoxadone" = 1, "plasma" = 1)
result_amount = 3
- cryoxadone
+/datum/chemical_reaction/cryoxadone
name = "Cryoxadone"
id = "cryoxadone"
result = "cryoxadone"
@@ -23,7 +21,7 @@
mix_message = "The solution bubbles softly."
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
- spaceacillin
+/datum/chemical_reaction/spaceacillin
name = "Spaceacillin"
id = "spaceacillin"
result = "spaceacillin"
@@ -31,62 +29,16 @@
result_amount = 2
mix_message = "The solvent extracts an antibiotic compound from the fungus."
- rezadone
+/datum/chemical_reaction/rezadone
name = "Rezadone"
id = "rezadone"
result = "rezadone"
required_reagents = list("carpotoxin" = 1, "spaceacillin" = 1, "copper" = 1)
result_amount = 3
- virus_food
- name = "Virus Food"
- id = "virusfood"
- result = "virusfood"
- required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1)
- result_amount = 3
-/*
- mix_virus
- name = "Mix Virus"
- id = "mixvirus"
- result = "blood"
- required_reagents = list("virusfood" = 5)
- required_catalysts = list("blood")
- var/level = 2
-
- on_reaction(var/datum/reagents/holder, var/created_volume)
-
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
- if(B && B.data)
- var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
- if(D)
- D.Evolve(level - rand(0, 1))
-
-
- mix_virus_2
-
- name = "Mix Virus 2"
- id = "mixvirus2"
- required_reagents = list("mutagen" = 5)
- level = 4
-
- rem_virus
-
- name = "Devolve Virus"
- id = "remvirus"
- required_reagents = list("synaptizine" = 5)
-
- on_reaction(var/datum/reagents/holder, var/created_volume)
-
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
- if(B && B.data)
- var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
- if(D)
- D.Devolve()
-*/
-
- sterilizine
+/datum/chemical_reaction/sterilizine
name = "Sterilizine"
id = "sterilizine"
result = "sterilizine"
required_reagents = list("antihol" = 2, "chlorine" = 1)
- result_amount = 3
\ No newline at end of file
+ result_amount = 3
diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_misc.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_misc.dm
index ff544e9129a..6d89c5a8e9c 100644
--- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_misc.dm
+++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_misc.dm
@@ -1,207 +1,147 @@
-/datum/chemical_reaction/
// foam and foam precursor
- surfactant
- name = "Foam surfactant"
- id = "foam surfactant"
- result = "fluorosurfactant"
- required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
- result_amount = 5
- mix_message = "A head of foam results from the mixture's constant fizzing."
+/datum/chemical_reaction/surfactant
+ name = "Foam surfactant"
+ id = "foam surfactant"
+ result = "fluorosurfactant"
+ required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
+ result_amount = 5
+ mix_message = "A head of foam results from the mixture's constant fizzing."
+
+/datum/chemical_reaction/foam
+ name = "Foam"
+ id = "foam"
+ result = null
+ required_reagents = list("fluorosurfactant" = 1, "water" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ holder.my_atom.visible_message("The solution spews out foam!")
+
+ var/datum/effect/system/foam_spread/s = new()
+ s.set_up(created_volume, location, holder, 0)
+ s.start()
+ holder.clear_reagents()
- foam
- name = "Foam"
- id = "foam"
- result = null
- required_reagents = list("fluorosurfactant" = 1, "water" = 1)
- result_amount = 2
+/datum/chemical_reaction/metalfoam
+ name = "Metal Foam"
+ id = "metalfoam"
+ result = null
+ required_reagents = list("aluminum" = 3, "fluorosurfactant" = 1, "sacid" = 1)
+ result_amount = 5
- on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/chemical_reaction/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+
+ holder.my_atom.visible_message("The solution spews out a metalic foam!")
+
+ var/datum/effect/system/foam_spread/s = new()
+ s.set_up(created_volume, location, holder, MFOAM_ALUMINUM)
+ s.start()
- var/location = get_turf(holder.my_atom)
- for(var/mob/M in viewers(5, location))
- M << "\red The solution violently bubbles!"
+/datum/chemical_reaction/ironfoam
+ name = "Iron Foam"
+ id = "ironlfoam"
+ result = null
+ required_reagents = list("iron" = 3, "fluorosurfactant" = 1, "sacid" = 1)
+ result_amount = 5
- location = get_turf(holder.my_atom)
+/datum/chemical_reaction/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
- for(var/mob/M in viewers(5, location))
- M << "\red The solution spews out foam!"
+ holder.my_atom.visible_message("The blood writhes and wriggles and sizzles away from the container!", 1, "You hear bubbling and sizzling.", 2)
- else
- for(var/mob/M in viewers(get_turf(holder.my_atom), null))
- M.show_message( "The blood seems to break apart in the fuel.", 1)
- holder.del_reagent("blood")
- return
-*/
+/datum/chemical_reaction/plastication
+ name = "Plastic"
+ id = "solidplastic"
+ result = null
+ required_reagents = list("facid" = 10, "plasticide" = 20)
+ result_amount = 1
- plastication
- name = "Plastic"
- id = "solidplastic"
- result = null
- required_reagents = list("facid" = 10, "plasticide" = 20)
- result_amount = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/mineral/plastic
- M.amount = 10
- M.loc = get_turf(holder.my_atom)
- return
+/datum/chemical_reaction/plastication/on_reaction(var/datum/reagents/holder)
+ var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/mineral/plastic
+ M.amount = 10
+ M.forceMove(get_turf(holder.my_atom))
+/datum/chemical_reaction/space_drugs
+ name = "Space Drugs"
+ id = "space_drugs"
+ result = "space_drugs"
+ required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
+ result_amount = 3
+ mix_message = "Slightly dizzying fumes drift from the solution."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
-//Not really misc chems, but not enough to deserve their own file
-/*
- silicate
- name = "Silicate"
- id = "silicate"
- result = "silicate"
- required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
- result_amount = 3
-*/
+/datum/chemical_reaction/lube
+ name = "Space Lube"
+ id = "lube"
+ result = "lube"
+ required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
+ result_amount = 3
+ mix_message = "The substance turns a striking cyan and becomes oily."
- space_drugs
- name = "Space Drugs"
- id = "space_drugs"
- result = "space_drugs"
- required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
- result_amount = 3
- mix_message = "Slightly dizzying fumes drift from the solution."
- mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+/datum/chemical_reaction/holy_water
+ name = "Holy Water"
+ id = "holywater"
+ result = "holywater"
+ required_reagents = list("water" = 1, "mercury" = 1, "wine" = 1)
+ result_amount = 3
+ mix_message = "The water somehow seems purified. Or maybe defiled."
- lube
- name = "Space Lube"
- id = "lube"
- result = "lube"
- required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
- result_amount = 3
- mix_message = "The substance turns a striking cyan and becomes oily."
+/datum/chemical_reaction/lsd
+ name = "Lysergic acid diethylamide"
+ id = "lsd"
+ result = "lsd"
+ required_reagents = list("diethylamine" = 1, "fungus" = 1)
+ result_amount = 3
+ mix_message = "The mixture turns a rather unassuming color and settles."
- holy_water
- name = "Holy Water"
- id = "holywater"
- result = "holywater"
- required_reagents = list("water" = 1, "mercury" = 1, "wine" = 1)
- result_amount = 3
- mix_message = "The water somehow seems purified. Or maybe defiled."
-
-
- lsd
- name = "Lysergic acid diethylamide"
- id = "lsd"
- result = "lsd"
- required_reagents = list("diethylamine" = 1, "fungus" = 1)
- result_amount = 3
- mix_message = "The mixture turns a rather unassuming color and settles."
-
- drying_agent
- name = "Drying agent"
- id = "drying_agent"
- result = "drying_agent"
- required_reagents = list("plasma" = 2, "ethanol" = 1, "sodium" = 1)
- result_amount = 3
\ No newline at end of file
+/datum/chemical_reaction/drying_agent
+ name = "Drying agent"
+ id = "drying_agent"
+ result = "drying_agent"
+ required_reagents = list("plasma" = 2, "ethanol" = 1, "sodium" = 1)
+ result_amount = 3
\ No newline at end of file
diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm
index d6e1ed34ce4..ee51efe2b1e 100644
--- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm
+++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm
@@ -1,557 +1,664 @@
-/////////////////////////////////////////////NEW SLIME CORE REACTIONS/////////////////////////////////////////////
//Grey
-/datum/chemical_reaction/
+/datum/chemical_reaction/slimespawn
+ name = "Slime Spawn"
+ id = "m_spawn"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/grey
+ required_other = 1
- slimespawn
- name = "Slime Spawn"
- id = "m_spawn"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/grey
- required_other = 1
+/datum/chemical_reaction/slimespawn/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/mob/living/carbon/slime/S = new /mob/living/carbon/slime
+ S.forceMove(get_turf(holder.my_atom))
+ S.visible_message("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!")
- on_reaction(var/datum/reagents/holder)
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1)
- var/mob/living/carbon/slime/S = new /mob/living/carbon/slime
- S.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimeinaprov
+ name = "Slime epinephrine"
+ id = "m_inaprov"
+ result = "epinephrine"
+ required_reagents = list("water" = 5)
+ result_amount = 3
+ required_other = 1
+ required_container = /obj/item/slime_extract/grey
+/datum/chemical_reaction/slimeinaprov/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
- slimeinaprov
- name = "Slime Epinephrine"
- id = "m_epinephrine"
- result = "epinephrine"
- required_reagents = list("water" = 5)
- result_amount = 3
- required_other = 1
- required_container = /obj/item/slime_extract/grey
+/datum/chemical_reaction/slimemonkey
+ name = "Slime Monkey"
+ id = "m_monkey"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/grey
+ required_other = 1
- on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
-
- slimemonkey
- name = "Slime Monkey"
- id = "m_monkey"
- result = null
- required_reagents = list("blood" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/grey
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/i = 1, i <= 3, i++)
- var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube
- M.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ for(var/i = 1, i <= 3, i++)
+ var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube
+ M.forceMove(get_turf(holder.my_atom))
//Green
- slimemutate
- name = "Mutation Toxin"
- id = "mutationtoxin"
- result = "mutationtoxin"
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_other = 1
- required_container = /obj/item/slime_extract/green
+/datum/chemical_reaction/slimemutate
+ name = "Mutation Toxin"
+ id = "mutationtoxin"
+ result = "mutationtoxin"
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_other = 1
+ required_container = /obj/item/slime_extract/green
+
+/datum/chemical_reaction/slimemutate/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
//Metal
- slimemetal
- name = "Slime Metal"
- id = "m_metal"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/metal
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal
- M.amount = 15
- M.loc = get_turf(holder.my_atom)
- var/obj/item/stack/sheet/plasteel/P = new /obj/item/stack/sheet/plasteel
- P.amount = 5
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimemetal
+ name = "Slime Metal"
+ id = "m_metal"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/metal
+ required_other = 1
+
+/datum/chemical_reaction/slimemetal/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal
+ M.amount = 15
+ M.forceMove(get_turf(holder.my_atom))
+ var/obj/item/stack/sheet/plasteel/P = new /obj/item/stack/sheet/plasteel
+ P.amount = 5
+ P.forceMove(get_turf(holder.my_atom))
//Gold
- slimecrit
- name = "Slime Crit"
- id = "m_tele"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/gold
- required_other = 1
- on_reaction(var/datum/reagents/holder)
+/datum/chemical_reaction/slimecrit
+ name = "Slime Crit"
+ id = "m_tele"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/gold
+ required_other = 1
- var/blocked = blocked_mobs //global variable of blocked mobs
+/datum/chemical_reaction/slimecrit/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/turf/T = get_turf(holder.my_atom)
+ T.visible_message("The slime extract begins to vibrate violently !")
+ spawn(50)
+ chemical_mob_spawn(holder, 5, "Gold Slime")
- var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
+/datum/chemical_reaction/slimecritlesser
+ name = "Slime Crit Lesser"
+ id = "m_tele3"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/gold
+ required_other = 1
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+/datum/chemical_reaction/slimecritlesser/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/turf/T = get_turf(holder.my_atom)
+ T.visible_message("The slime extract begins to vibrate violently !")
+ spawn(50)
+ chemical_mob_spawn(holder, 3, "Lesser Gold Slime", "neutral")
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash)
+/datum/chemical_reaction/slimecritfriendly
+ name = "Slime Crit Friendly"
+ id = "m_tele5"
+ result = null
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/gold
+ required_other = 1
- for(var/i = 1, i <= 5, i++)
- var/chosen = pick(critters)
- var/mob/living/simple_animal/hostile/C = new chosen
- C.faction |= "slimesummon"
- C.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(C, pick(NORTH,SOUTH,EAST,WEST))
-// for(var/mob/O in viewers(get_turf(holder.my_atom), null))
-// O.show_message(text("\red The slime core fizzles disappointingly,"), 1)
-
-
- slimecritlesser
- name = "Slime Crit Lesser"
- id = "m_tele3"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/gold
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("The slime extract begins to vibrate violently!"), 1)
- spawn(50)
-
- if(holder && holder.my_atom)
-
- var/blocked = blocked_mobs
-
- var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
-
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
-
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash)
-
- var/chosen = pick(critters)
- var/mob/living/simple_animal/hostile/C = new chosen
- C.faction |= "neutral"
- C.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimecritfriendly/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/turf/T = get_turf(holder.my_atom)
+ T.visible_message("The slime extract begins to vibrate adorably !")
+ spawn(50)
+ chemical_mob_spawn(holder, 1, "Friendly Gold Slime", "neutral")
//Silver
- slimebork
- name = "Slime Bork"
- id = "m_tele2"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/silver
- required_other = 1
- on_reaction(var/datum/reagents/holder)
+/datum/chemical_reaction/slimebork
+ name = "Slime Bork"
+ id = "m_tele2"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/silver
+ required_other = 1
- var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/snacks)
- borks = adminReagentCheck(borks)
- // BORK BORK BORK
+/datum/chemical_reaction/slimebork/on_reaction(datum/reagents/holder)
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+ feedback_add_details("slime_cores_used","[type]")
+ var/list/blocked = list(/obj/item/weapon/reagent_containers/food/snacks,
+ /obj/item/weapon/reagent_containers/food/snacks/breadslice,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable,
+ /obj/item/weapon/reagent_containers/food/snacks/margheritaslice,
+ /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice,
+ /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice,
+ /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice,
+ /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/slab,
+ /obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
+ )
+ blocked |= typesof(/obj/item/weapon/reagent_containers/food/snacks/customizable)
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash)
+ var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - blocked
+ // BORK BORK BORK
- for(var/i = 1, i <= 4 + rand(1,2), i++)
- var/chosen = pick(borks)
- var/obj/B = new chosen
- if(B)
- B.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(B, pick(NORTH,SOUTH,EAST,WEST))
- slimedrinks
- name = "Slime Drinks"
- id = "m_tele3"
- result = null
- required_reagents = list("water" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/silver
- required_other = 1
- on_reaction(var/datum/reagents/holder)
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
- var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/drinks)
- borks = adminReagentCheck(borks)
- // BORK BORK BORK
+ for(var/mob/living/carbon/C in viewers(get_turf(holder.my_atom), null))
+ C.flash_eyes()
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+ for(var/i = 1, i <= 4 + rand(1,2), i++)
+ var/chosen = pick(borks)
+ var/obj/B = new chosen
+ if(B)
+ B.forceMove(get_turf(holder.my_atom))
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(B, pick(NORTH,SOUTH,EAST,WEST))
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- if(M:eyecheck() <= 0)
- flick("e_flash", M.flash)
- for(var/i = 1, i <= 4 + rand(1,2), i++)
- var/chosen = pick(borks)
- var/obj/B = new chosen
- if(B)
- B.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(B, pick(NORTH,SOUTH,EAST,WEST))
+/datum/chemical_reaction/slimebork2
+ name = "Slime Bork 2"
+ id = "m_tele4"
+ result = null
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/silver
+ required_other = 1
+
+/datum/chemical_reaction/slimebork2/on_reaction(datum/reagents/holder)
+
+ feedback_add_details("slime_cores_used","[type]")
+ var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/drinks)
+ // BORK BORK BORK
+
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+
+ for(var/mob/living/carbon/M in viewers(get_turf(holder.my_atom), null))
+ M.flash_eyes()
+
+ for(var/i = 1, i <= 4 + rand(1,2), i++)
+ var/chosen = pick(borks)
+ var/obj/B = new chosen
+ if(B)
+ B.forceMove(get_turf(holder.my_atom))
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(B, pick(NORTH,SOUTH,EAST,WEST))
//Blue
- slimefrost
- name = "Slime Frost Oil"
- id = "m_frostoil"
- result = "frostoil"
- required_reagents = list("plasma" = 5)
- result_amount = 10
- required_container = /obj/item/slime_extract/blue
- required_other = 1
+/datum/chemical_reaction/slimefrost
+ name = "Slime Frost Oil"
+ id = "m_frostoil"
+ result = "frostoil"
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 10
+ required_container = /obj/item/slime_extract/blue
+ required_other = 1
+
+/datum/chemical_reaction/slimefrost/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+
+
+/datum/chemical_reaction/slimestabilizer
+ name = "Slime Stabilizer"
+ id = "m_slimestabilizer"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/blue
+ required_other = 1
+
+/datum/chemical_reaction/slimestabilizer/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/slimepotion/stabilizer/P = new /obj/item/slimepotion/stabilizer
+ P.forceMove(get_turf(holder.my_atom))
+
+
//Dark Blue
- slimefreeze
- name = "Slime Freeze"
- id = "m_freeze"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/darkblue
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
- spawn(50)
- if(holder && holder.my_atom)
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
- for(var/mob/living/M in range (get_turf(holder.my_atom), 7))
- M.bodytemperature -= 140
- M << "\blue You feel a chill!"
+/datum/chemical_reaction/slimefreeze
+ name = "Slime Freeze"
+ id = "m_freeze"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/darkblue
+ required_other = 1
+
+/datum/chemical_reaction/slimefreeze/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/turf/T = get_turf(holder.my_atom)
+ T.visible_message("The slime extract begins to vibrate adorably !")
+ spawn(50)
+ if(holder && holder.my_atom)
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+ for(var/mob/living/M in range (get_turf(holder.my_atom), 7))
+ M.bodytemperature -= 240
+ to_chat(M, "You feel a chill!")
- slimefireproof
- name = "Slime Fireproof"
- id = "m_fireproof"
- result = null
- required_reagents = list("water" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/darkblue
- required_other = 1
+/datum/chemical_reaction/slimefireproof
+ name = "Slime Fireproof"
+ id = "m_fireproof"
+ result = null
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/darkblue
+ required_other = 1
- on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
- var/obj/item/weapon/slimefireproof/P = new /obj/item/weapon/slimefireproof
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimefireproof/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/slimepotion/fireproof/P = new /obj/item/slimepotion/fireproof
+ P.forceMove(get_turf(holder.my_atom))
//Orange
- slimecasp
- name = "Slime Capsaicin Oil"
- id = "m_capsaicinoil"
- result = "capsaicin"
- required_reagents = list("blood" = 5)
- result_amount = 10
- required_container = /obj/item/slime_extract/orange
- required_other = 1
+/datum/chemical_reaction/slimecasp
+ name = "Slime Capsaicin Oil"
+ id = "m_capsaicinoil"
+ result = "capsaicin"
+ required_reagents = list("blood" = 1)
+ result_amount = 10
+ required_container = /obj/item/slime_extract/orange
+ required_other = 1
- slimefire
- name = "Slime fire"
- id = "m_fire"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/orange
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
- spawn(50)
- if(holder && holder.my_atom)
- var/turf/simulated/T = get_turf(holder.my_atom)
- if(istype(T))
- T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 50)
+/datum/chemical_reaction/slimecasp/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+
+/datum/chemical_reaction/slimefire
+ name = "Slime fire"
+ id = "m_fire"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/orange
+ required_other = 1
+
+/datum/chemical_reaction/slimefire/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/turf/TU = get_turf(holder.my_atom)
+ TU.visible_message("The slime extract begins to vibrate adorably !")
+ spawn(50)
+ if(holder && holder.my_atom)
+ var/turf/simulated/T = get_turf(holder.my_atom)
+ if(istype(T))
+ T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 50)
//Yellow
- slimeoverload
- name = "Slime EMP"
- id = "m_emp"
- result = null
- required_reagents = list("blood" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/yellow
- required_other = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- empulse(get_turf(holder.my_atom), 3, 7)
+
+/datum/chemical_reaction/slimeoverload
+ name = "Slime EMP"
+ id = "m_emp"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/yellow
+ required_other = 1
+
+/datum/chemical_reaction/slimeoverload/on_reaction(datum/reagents/holder, created_volume)
+ feedback_add_details("slime_cores_used","[type]")
+ empulse(get_turf(holder.my_atom), 3, 7)
- slimecell
- name = "Slime Powercell"
- id = "m_cell"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/yellow
- required_other = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/obj/item/weapon/stock_parts/cell/slime/P = new /obj/item/weapon/stock_parts/cell/slime
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimecell
+ name = "Slime Powercell"
+ id = "m_cell"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/yellow
+ required_other = 1
- slimeglow
- name = "Slime Glow"
- id = "m_glow"
- result = null
- required_reagents = list("water" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/yellow
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The contents of the slime core harden and begin to emit a warm, bright light."), 1)
- var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
- F.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimecell/on_reaction(datum/reagents/holder, created_volume)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/weapon/stock_parts/cell/high/slime/P = new /obj/item/weapon/stock_parts/cell/high/slime
+ P.forceMove(get_turf(holder.my_atom))
+
+/datum/chemical_reaction/slimeglow
+ name = "Slime Glow"
+ id = "m_glow"
+ result = null
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/yellow
+ required_other = 1
+
+/datum/chemical_reaction/slimeglow/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/turf/T = get_turf(holder.my_atom)
+ T.visible_message("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly.")
+ var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
+ F.forceMove(get_turf(holder.my_atom))
//Purple
- slimepsteroid
- name = "Slime Steroid"
- id = "m_steroid"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/purple
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimepsteroid
+ name = "Slime Steroid"
+ id = "m_steroid"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/purple
+ required_other = 1
+/datum/chemical_reaction/slimepsteroid/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/slimepotion/steroid/P = new /obj/item/slimepotion/steroid
+ P.forceMove(get_turf(holder.my_atom))
+/datum/chemical_reaction/slimejam
+ name = "Slime Jam"
+ id = "m_jam"
+ result = "slimejelly"
+ required_reagents = list("sugar" = 1)
+ result_amount = 10
+ required_container = /obj/item/slime_extract/purple
+ required_other = 1
- slimejam
- name = "Slime Jam"
- id = "m_jam"
- result = "slimejelly"
- required_reagents = list("sugar" = 5)
- result_amount = 10
- required_container = /obj/item/slime_extract/purple
- required_other = 1
+/datum/chemical_reaction/slimejam/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
//Dark Purple
- slimeplasma
- name = "Slime Plasma"
- id = "m_plasma"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/darkpurple
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/stack/sheet/mineral/plasma/P = new /obj/item/stack/sheet/mineral/plasma
- P.amount = 10
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimeplasma
+ name = "Slime Plasma"
+ id = "m_plasma"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/darkpurple
+ required_other = 1
+
+/datum/chemical_reaction/slimeplasma/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/stack/sheet/mineral/plasma/P = new /obj/item/stack/sheet/mineral/plasma
+ P.amount = 3
+ P.forceMove(get_turf(holder.my_atom))
//Red
- slimeglycerol
- name = "Slime Glycerol"
- id = "m_glycerol"
- result = "glycerol"
- required_reagents = list("plasma" = 5)
- result_amount = 8
- required_container = /obj/item/slime_extract/red
- required_other = 1
+
+/datum/chemical_reaction/slimemutator
+ name = "Slime Mutator"
+ id = "m_slimemutator"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/red
+ required_other = 1
+
+/datum/chemical_reaction/slimemutator/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/slimepotion/mutator/P = new /obj/item/slimepotion/mutator
+ P.forceMove(get_turf(holder.my_atom))
+
+/datum/chemical_reaction/slimebloodlust
+ name = "Bloodlust"
+ id = "m_bloodlust"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/red
+ required_other = 1
+
+/datum/chemical_reaction/slimebloodlust/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null))
+ slime.rabid = 1
+ slime.visible_message("The [slime] is driven into a frenzy!")
- slimebloodlust
- name = "Bloodlust"
- id = "m_bloodlust"
- result = null
- required_reagents = list("blood" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/red
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/living/carbon/slime/slime in viewers(get_turf(holder.my_atom), null))
- slime.rabid = 1
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The [slime] is driven into a frenzy!."), 1)
+/datum/chemical_reaction/slimespeed
+ name = "Slime Speed"
+ id = "m_speed"
+ result = null
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/red
+ required_other = 1
+/datum/chemical_reaction/slimespeed/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/slimepotion/speed/P = new /obj/item/slimepotion/speed
+ P.forceMove(get_turf(holder.my_atom))
- slimespeed
- name = "Slime Speed"
- id = "m_speed"
- result = null
- required_reagents = list("water" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/red
- required_other = 1
-
- on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
- var/obj/item/weapon/slimespeed/P = new /obj/item/weapon/slimespeed
- P.loc = get_turf(holder.my_atom)
//Pink
- slimeppotion
- name = "Slime Potion"
- id = "m_potion"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/pink
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/weapon/slimepotion/P = new /obj/item/weapon/slimepotion
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/docility
+ name = "Docility Potion"
+ id = "m_potion"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/pink
+ required_other = 1
+
+/datum/chemical_reaction/docility/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/slimepotion/docility/P = new /obj/item/slimepotion/docility
+ P.forceMove(get_turf(holder.my_atom))
//Black
- slimemutate2
- name = "Advanced Mutation Toxin"
- id = "mutationtoxin2"
- result = "amutationtoxin"
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_other = 1
- required_container = /obj/item/slime_extract/black
+/datum/chemical_reaction/slimemutate2
+ name = "Advanced Mutation Toxin"
+ id = "mutationtoxin2"
+ result = "amutationtoxin"
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_other = 1
+ required_container = /obj/item/slime_extract/black
+
+/datum/chemical_reaction/slimemutate2/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
//Oil
- slimeexplosion
- name = "Slime Explosion"
- id = "m_explosion"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/oil
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
- spawn(50)
- if(holder && holder.my_atom)
- explosion(get_turf(holder.my_atom), 1 ,3, 6)
+/datum/chemical_reaction/slimeexplosion
+ name = "Slime Explosion"
+ id = "m_explosion"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/oil
+ required_other = 1
+
+/datum/chemical_reaction/slimeexplosion/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/turf/T = get_turf(holder.my_atom)
+ T.visible_message("The slime extract begins to vibrate violently !")
+ spawn(50)
+ if(holder && holder.my_atom)
+ explosion(get_turf(holder.my_atom), 1 ,3, 6)
+
//Light Pink
- slimepotion2
- name = "Slime Potion 2"
- id = "m_potion2"
- result = null
- result_amount = 1
- required_container = /obj/item/slime_extract/lightpink
- required_reagents = list("plasma" = 5)
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- var/obj/item/weapon/sentience_potion/P = new /obj/item/weapon/sentience_potion
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimepotion2
+ name = "Slime Potion 2"
+ id = "m_potion2"
+ result = null
+ result_amount = 1
+ required_container = /obj/item/slime_extract/lightpink
+ required_reagents = list("plasma_dust" = 1)
+ required_other = 1
+
+/datum/chemical_reaction/slimepotion2/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/slimepotion/sentience/P = new /obj/item/slimepotion/sentience
+ P.forceMove(get_turf(holder.my_atom))
+
//Adamantine
- slimegolem
- name = "Slime Golem"
- id = "m_golem"
- result = null
- required_reagents = list("plasma" = 5)
- result_amount = 1
- required_container = /obj/item/slime_extract/adamantine
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/effect/goleRUNe/Z = new /obj/effect/goleRUNe
- Z.loc = get_turf(holder.my_atom)
- Z.announce_to_ghosts()
+/datum/chemical_reaction/slimegolem
+ name = "Slime Golem"
+ id = "m_golem"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/adamantine
+ required_other = 1
+
+/datum/chemical_reaction/slimegolem/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/effect/golemrune/Z = new /obj/effect/golemrune
+ Z.forceMove(get_turf(holder.my_atom))
+ notify_ghosts("Golem rune created in [get_area(Z)].", 'sound/effects/ghost2.ogg')
+
//Bluespace
- slimefloor2
- name = "Bluespace Floor"
- id = "m_floor2"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/bluespace
- required_other = 1
- on_reaction(datum/reagents/holder, created_volume)
- feedback_add_details("slime_cores_used","[type]")
- var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace
- P.amount = 25
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimefloor2
+ name = "Bluespace Floor"
+ id = "m_floor2"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/bluespace
+ required_other = 1
+
+/datum/chemical_reaction/slimefloor2/on_reaction(datum/reagents/holder, created_volume)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace
+ P.amount = 25
+ P.forceMove(get_turf(holder.my_atom))
+
+
+/datum/chemical_reaction/slimecrystal
+ name = "Slime Crystal"
+ id = "m_crystal"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/bluespace
+ required_other = 1
+
+/datum/chemical_reaction/slimecrystal/on_reaction(datum/reagents/holder, created_volume)
+ feedback_add_details("slime_cores_used","[type]")
+ if(holder.my_atom)
+ var/obj/item/weapon/ore/bluespace_crystal/BC = new(get_turf(holder.my_atom))
+ BC.visible_message("The [BC.name] appears out of thin air!")
- slimecrystal
- name = "Slime Crystal"
- id = "m_crystal"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/bluespace
- required_other = 1
- on_reaction(var/datum/reagents/holder, var/created_volume)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- if(holder.my_atom)
- var/obj/item/weapon/ore/bluespace_crystal/BC = new(get_turf(holder.my_atom))
- BC.visible_message("The [BC.name] appears out of thin air!")
//Cerulean
- slimepsteroid2
- name = "Slime Steroid 2"
- id = "m_steroid2"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/cerulean
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/weapon/slimesteroid2/P = new /obj/item/weapon/slimesteroid2
- P.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimepsteroid2
+ name = "Slime Steroid 2"
+ id = "m_steroid2"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/cerulean
+ required_other = 1
+
+/datum/chemical_reaction/slimepsteroid2/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/slimepotion/enhancer/P = new /obj/item/slimepotion/enhancer
+ P.forceMove(get_turf(holder.my_atom))
+
+
+
+/datum/chemical_reaction/slime_territory
+ name = "Slime Territory"
+ id = "s_territory"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/cerulean
+ required_other = 1
+
+/datum/chemical_reaction/slime_territory/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/areaeditor/blueprints/slime/P = new /obj/item/areaeditor/blueprints/slime
+ P.forceMove(get_turf(holder.my_atom))
+
//Sepia
- slimestop
- name = "Slime Stop"
- id = "m_stop"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/sepia
- required_other = 1
- on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
- spawn(0) //otherwise the reagent won't be used up until after the full timstop is gone through.
- var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast)
- var/obj/effect/timestop/T = new (get_turf(holder.my_atom))
- T.immune += mob
- T.timestop()
+/datum/chemical_reaction/slimestop
+ name = "Slime Stop"
+ id = "m_stop"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/sepia
+ required_other = 1
+
+/datum/chemical_reaction/slimestop/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast)
+ var/obj/effect/timestop/T = new /obj/effect/timestop
+ T.forceMove(get_turf(holder.my_atom))
+ T.immune += mob
+ T.timestop()
- slimecamera
- name = "Slime Camera"
- id = "m_camera"
- result = null
- required_reagents = list("water" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/sepia
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/device/camera/P = new /obj/item/device/camera
- P.loc = get_turf(holder.my_atom)
- var/obj/item/device/camera_film/Z = new /obj/item/device/camera_film
- Z.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/slimecamera
+ name = "Slime Camera"
+ id = "m_camera"
+ result = null
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/sepia
+ required_other = 1
+
+/datum/chemical_reaction/slimecamera/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/device/camera/P = new /obj/item/device/camera
+ P.forceMove(get_turf(holder.my_atom))
+ var/obj/item/device/camera_film/Z = new /obj/item/device/camera_film
+ Z.forceMove(get_turf(holder.my_atom))
+
+/datum/chemical_reaction/slimefloor
+ name = "Sepia Floor"
+ id = "m_floor"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/sepia
+ required_other = 1
+
+/datum/chemical_reaction/slimefloor/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia
+ P.amount = 25
+ P.forceMove(get_turf(holder.my_atom))
- slimefloor
- name = "Sepia Floor"
- id = "m_floor"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/sepia
- required_other = 1
- on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[type]")
- var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia
- P.amount = 25
- P.loc = get_turf(holder.my_atom)
//Pyrite
- slimepaint
- name = "Slime Paint"
- id = "s_paint"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/pyrite
- required_other = 1
- on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/list/paints = subtypesof(/obj/item/weapon/reagent_containers/glass/paint)
- var/chosen = pick(paints)
- var/obj/P = new chosen
- if(P)
- P.loc = get_turf(holder.my_atom)
\ No newline at end of file
+
+
+/datum/chemical_reaction/slimepaint
+ name = "Slime Paint"
+ id = "s_paint"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/pyrite
+ required_other = 1
+
+/datum/chemical_reaction/slimepaint/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/list/paints = subtypesof(/obj/item/weapon/reagent_containers/glass/paint)
+ var/chosen = pick(paints)
+ var/obj/P = new chosen
+ if(P)
+ P.forceMove(get_turf(holder.my_atom))
+
+//Rainbow :o)
+/datum/chemical_reaction/slimeRNG
+ name = "Random Core"
+ id = "slimerng"
+ result = null
+ required_reagents = list("plasma_dust" = 1)
+ result_amount = 1
+ required_other = 1
+ required_container = /obj/item/slime_extract/rainbow
+
+/datum/chemical_reaction/slimeRNG/on_reaction(datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[type]")
+ var/mob/living/carbon/slime/S = new /mob/living/carbon/slime
+ S.colour = pick("grey","orange", "metal", "blue", "purple", "dark purple", "dark blue", "green", "silver", "yellow", "gold", "yellow", "red", "silver", "pink", "cerulean", "sepia", "bluespace", "pyrite", "light pink", "oil", "adamantine", "black")
+ S.forceMove(get_turf(holder.my_atom))
+ S.visible_message("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!")
diff --git a/code/modules/reagents/oldchem/reagents/_reagent_base.dm b/code/modules/reagents/oldchem/reagents/_reagent_base.dm
index a4ce0bcb429..9221c42f0c8 100644
--- a/code/modules/reagents/oldchem/reagents/_reagent_base.dm
+++ b/code/modules/reagents/oldchem/reagents/_reagent_base.dm
@@ -39,12 +39,12 @@
if(can_become_addicted)
if(prob(self.addiction_chance) && !is_type_in_list(self, M.reagents.addiction_list))
- M << "You suddenly feel invigorated and guilty..."
+ to_chat(M, "You suddenly feel invigorated and guilty...")
var/datum/reagent/new_reagent = new self.type()
new_reagent.last_addiction_dose = world.timeofday
M.reagents.addiction_list.Add(new_reagent)
else if(is_type_in_list(self, M.reagents.addiction_list))
- M << "You feel slightly better, but for how long?"
+ to_chat(M, "You feel slightly better, but for how long?")
for(var/A in M.reagents.addiction_list)
var/datum/reagent/AD = A
if(AD && istype(AD, self))
@@ -81,6 +81,10 @@
/datum/reagent/proc/on_update(var/atom/A)
return
+// Called after add_reagents creates a new reagent.
+/datum/reagent/proc/on_new(data)
+ return
+
/datum/reagent/Destroy()
. = ..()
holder = null
\ No newline at end of file
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
index d633bb020ad..2d85730193f 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm
@@ -11,31 +11,29 @@
var/dizzy_adj = 3
var/slurr_adj = 3
var/confused_adj = 2
- var/slur_start = 65 //amount absorbed after which mob starts slurring
- var/brawl_start = 75 //amount absorbed after which mob switches to drunken brawling as a fighting style
- var/confused_start = 130 //amount absorbed after which mob starts confusing directions
- var/vomit_start = 180 //amount absorbed after which mob starts vomitting
- var/blur_start = 260 //amount absorbed after which mob starts getting blurred vision
- var/pass_out = 325 //amount absorbed after which mob starts passing out
+ var/slur_start = 20 //amount absorbed after which mob starts slurring
+ var/brawl_start = 25 //amount absorbed after which mob switches to drunken brawling as a fighting style
+ var/confused_start = 30 //amount absorbed after which mob starts confusing directions
+ var/vomit_start = 45 //amount absorbed after which mob starts vomitting
+ var/blur_start = 70 //amount absorbed after which mob starts getting blurred vision
+ var/pass_out = 90 //amount absorbed after which mob starts passing out
+ var/alcohol_perc = 1 //percentage of ethanol in a beverage 0.0 - 1.0
/datum/reagent/ethanol/on_mob_life(var/mob/living/M as mob, var/alien)
// Sobering multiplier.
// Sober block makes it more difficult to get drunk
var/sober_str=!(SOBER in M.mutations)?1:2
M.nutrition += nutriment_factor
- if(!src.data) data = 1
- src.data++
-
- var/d = data
+ var/d = 0
// make all the beverages work together
for(var/datum/reagent/ethanol/A in holder.reagent_list)
- if(isnum(A.data)) d += A.data
+ if(isnum(A.current_cycle)) d += A.current_cycle * A.alcohol_perc
d/=sober_str
var/obj/item/organ/internal/liver/L
- if(ishuman(M))
+ if(ishuman(M) && !M.isSynthetic())
var/mob/living/carbon/human/H = M
L = H.get_int_organ(/obj/item/organ/internal/liver)
if(!L || (istype(L) && L.dna.species in list("Skrell", "Neara")))
@@ -71,18 +69,19 @@
..()
return
+
/datum/reagent/ethanol/reaction_obj(var/obj/O, var/volume)
if(istype(O,/obj/item/weapon/paper))
var/obj/item/weapon/paper/paperaffected = O
paperaffected.clearpaper()
- usr << "The solution melts away the ink on the paper."
+ to_chat(usr, "The solution melts away the ink on the paper.")
if(istype(O,/obj/item/weapon/book))
if(volume >= 5)
var/obj/item/weapon/book/affectedbook = O
affectedbook.dat = null
- usr << "The solution melts away the ink on the book."
+ to_chat(usr, "The solution melts away the ink on the book.")
else
- usr << "It wasn't enough..."
+ to_chat(usr, "It wasn't enough...")
return
/datum/reagent/ethanol/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with ethanol isn't quite as good as fuel.
@@ -93,12 +92,13 @@
return
-/datum/reagent/ethanol/beer //It's really much more stronger than other drinks.
+/datum/reagent/ethanol/beer
name = "Beer"
id = "beer"
description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
nutriment_factor = 2 * FOOD_METABOLISM
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/beer/on_mob_life(var/mob/living/M as mob)
..()
@@ -110,6 +110,7 @@
id = "cider"
description = "An alcoholic beverage derived from apples."
color = "#174116"
+ alcohol_perc = 0.1
/datum/reagent/ethanol/whiskey
name = "Whiskey"
@@ -117,14 +118,14 @@
description = "A superb and well-aged single-malt whiskey. Damn."
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
+ alcohol_perc = 0.4
/datum/reagent/ethanol/specialwhiskey
name = "Special Blend Whiskey"
id = "specialwhiskey"
description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
color = "#664300" // rgb: 102, 67, 0
- slur_start = 30 //amount absorbed after which mob starts slurring
- brawl_start = 40
+ alcohol_perc = 0.5
/datum/reagent/ethanol/gin
name = "Gin"
@@ -132,6 +133,7 @@
description = "It's gin. In space. I say, good sir."
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 3
+ alcohol_perc = 0.5
/datum/reagent/ethanol/absinthe
name = "Absinthe"
@@ -140,15 +142,11 @@
color = "#33EE00" // rgb: lots, ??, ??
overdose_threshold = 30
dizzy_adj = 5
- slur_start = 25
- brawl_start = 40
- confused_start = 100
+ alcohol_perc = 0.7
//copy paste from LSD... shoot me
/datum/reagent/ethanol/absinthe/on_mob_life(var/mob/living/M)
if(!M) M = holder.my_atom
- if(!data) data = 1
- data++
M.hallucination += 5
..()
return
@@ -164,6 +162,7 @@
description = "Popular with the sailors. Not very popular with everyone else."
color = "#664300" // rgb: 102, 67, 0
overdose_threshold = 30
+ alcohol_perc = 0.4
/datum/reagent/ethanol/rum/on_mob_life(var/mob/living/M as mob)
..()
@@ -180,30 +179,35 @@
id = "mojito"
description = "If it's good enough for Spesscuba, it's good enough for you."
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/vodka
name = "Vodka"
id = "vodka"
description = "Number one drink AND fueling choice for Russians worldwide."
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.4
/datum/reagent/ethanol/sake
name = "Sake"
id = "sake"
description = "Anime's favorite drink."
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/tequilla
name = "Tequila"
id = "tequilla"
description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?"
color = "#A8B0B7" // rgb: 168, 176, 183
+ alcohol_perc = 0.4
/datum/reagent/ethanol/vermouth
name = "Vermouth"
id = "vermouth"
description = "You suddenly feel a craving for a martini..."
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/wine
name = "Wine"
@@ -211,8 +215,7 @@
description = "An premium alchoholic beverage made from distilled grape juice."
color = "#7E4043" // rgb: 126, 64, 67
dizzy_adj = 2
- slur_start = 65 //amount absorbed after which mob starts slurring
- confused_start = 145 //amount absorbed after which mob starts confusing directions
+ alcohol_perc = 0.2
/datum/reagent/ethanol/cognac
name = "Cognac"
@@ -220,7 +223,7 @@
description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
- confused_start = 115 //amount absorbed after which mob starts confusing directions
+ alcohol_perc = 0.4
/datum/reagent/ethanol/suicider //otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning".
name = "Suicider"
@@ -230,17 +233,14 @@
dizzy_adj = 20
slurr_adj = 20
confused_adj = 3
- slur_start = 15
- brawl_start = 25
- confused_start = 40
- blur_start = 60
- pass_out = 80
+ alcohol_perc = 1 //because that's a thing it's supposed to do, I guess
/datum/reagent/ethanol/ale
name = "Ale"
id = "ale"
description = "A dark alchoholic beverage made by malted barley and yeast."
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/thirteenloko
name = "Thirteen Loko"
@@ -248,6 +248,7 @@
description = "A potent mixture of caffeine and alcohol."
reagent_state = LIQUID
color = "#102000" // rgb: 16, 32, 0
+ alcohol_perc = 0.3
/datum/reagent/ethanol/thirteenloko/on_mob_life(var/mob/living/M as mob)
..()
@@ -269,6 +270,7 @@
description = "This appears to be beer mixed with milk. Disgusting."
reagent_state = LIQUID
color = "#895C4C" // rgb: 137, 92, 76
+ alcohol_perc = 0.1
/datum/reagent/ethanol/atomicbomb
name = "Atomic Bomb"
@@ -276,6 +278,7 @@
description = "Nuclear proliferation never tasted so good."
reagent_state = LIQUID
color = "#666300" // rgb: 102, 99, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/threemileisland
name = "THree Mile Island Iced Tea"
@@ -283,6 +286,7 @@
description = "Made for a woman, strong enough for a man."
reagent_state = LIQUID
color = "#666340" // rgb: 102, 99, 64
+ alcohol_perc = 0.2
/datum/reagent/ethanol/goldschlager
name = "Goldschlager"
@@ -290,6 +294,7 @@
description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.4
/datum/reagent/ethanol/patron
name = "Patron"
@@ -297,6 +302,7 @@
description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
reagent_state = LIQUID
color = "#585840" // rgb: 88, 88, 64
+ alcohol_perc = 0.4
/datum/reagent/ethanol/gintonic
name = "Gin and Tonic"
@@ -304,6 +310,7 @@
description = "An all time classic, mild cocktail."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.4
/datum/reagent/ethanol/cuba_libre
name = "Cuba Libre"
@@ -311,6 +318,7 @@
description = "Rum, mixed with cola. Viva la revolution."
reagent_state = LIQUID
color = "#3E1B00" // rgb: 62, 27, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/whiskey_cola
name = "Whiskey Cola"
@@ -318,6 +326,7 @@
description = "Whiskey, mixed with cola. Surprisingly refreshing."
reagent_state = LIQUID
color = "#3E1B00" // rgb: 62, 27, 0
+ alcohol_perc = 0.3
/datum/reagent/ethanol/martini
name = "Classic Martini"
@@ -325,6 +334,7 @@
description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.5
/datum/reagent/ethanol/vodkamartini
name = "Vodka Martini"
@@ -332,6 +342,7 @@
description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.4
/datum/reagent/ethanol/white_russian
name = "White Russian"
@@ -339,6 +350,7 @@
description = "That's just, like, your opinion, man..."
reagent_state = LIQUID
color = "#A68340" // rgb: 166, 131, 64
+ alcohol_perc = 0.3
/datum/reagent/ethanol/screwdrivercocktail
name = "Screwdriver"
@@ -346,6 +358,7 @@
description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
+ alcohol_perc = 0.3
/datum/reagent/ethanol/booger
name = "Booger"
@@ -353,6 +366,7 @@
description = "Ewww..."
reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
+ alcohol_perc = 0.2
/datum/reagent/ethanol/bloody_mary
name = "Bloody Mary"
@@ -360,6 +374,7 @@
description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
@@ -367,6 +382,7 @@
description = "Whoah, this stuff looks volatile!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.7 //ouch
/datum/reagent/ethanol/brave_bull
name = "Brave Bull"
@@ -374,6 +390,7 @@
description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.3
/datum/reagent/ethanol/tequilla_sunrise
name = "Tequila Sunrise"
@@ -381,6 +398,7 @@
description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.3
/datum/reagent/ethanol/toxins_special
name = "Toxins Special"
@@ -388,6 +406,7 @@
description = "This thing is FLAMING!. CALL THE DAMN SHUTTLE!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.5
/datum/reagent/ethanol/beepsky_smash
name = "Beepsky Smash"
@@ -395,24 +414,19 @@
description = "Deny drinking this and prepare for THE LAW."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.5
/datum/reagent/ethanol/beepsky_smash/on_mob_life(mob/living/M)
M.Stun(1)
..()
-/datum/reagent/ethanol/changelingsting
- name = "Changeling Sting"
- id = "changelingsting"
- description = "You take a tiny sip and feel a burning sensation..."
- reagent_state = LIQUID
- color = "#2E6671" // rgb: 46, 102, 113
-
/datum/reagent/ethanol/irish_cream
name = "Irish Cream"
id = "irishcream"
description = "Whiskey-imbued cream, what else would you expect from the Irish."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.3
/datum/reagent/ethanol/manly_dorf
name = "The Manly Dorf"
@@ -420,6 +434,7 @@
description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/longislandicedtea
name = "Long Island Iced Tea"
@@ -427,6 +442,7 @@
description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.5
/datum/reagent/ethanol/moonshine
name = "Moonshine"
@@ -434,6 +450,7 @@
description = "You've really hit rock bottom now... your liver packed its bags and left last night."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.8 //yeeehaw
/datum/reagent/ethanol/b52
name = "B-52"
@@ -441,6 +458,7 @@
description = "Coffee, Irish Cream, and congac. You will get bombed."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.3
/datum/reagent/ethanol/irishcoffee
name = "Irish Coffee"
@@ -448,6 +466,7 @@
description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/margarita
name = "Margarita"
@@ -455,6 +474,7 @@
description = "On the rocks with salt on the rim. Arriba~!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.3
/datum/reagent/ethanol/black_russian
name = "Black Russian"
@@ -462,6 +482,7 @@
description = "For the lactose-intolerant. Still as classy as a White Russian."
reagent_state = LIQUID
color = "#360000" // rgb: 54, 0, 0
+ alcohol_perc = 0.4
/datum/reagent/ethanol/manhattan
name = "Manhattan"
@@ -469,6 +490,7 @@
description = "The Detective's undercover drink of choice. He never could stomach gin..."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.4
/datum/reagent/ethanol/manhattan_proj
name = "Manhattan Project"
@@ -476,6 +498,7 @@
description = "A scienitst's drink of choice, for pondering ways to blow up the station."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.4
/datum/reagent/ethanol/whiskeysoda
name = "Whiskey Soda"
@@ -483,6 +506,7 @@
description = "Ultimate refreshment."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.3
/datum/reagent/ethanol/antifreeze
name = "Anti-freeze"
@@ -490,6 +514,7 @@
description = "Ultimate refreshment."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/barefoot
name = "Barefoot"
@@ -497,6 +522,7 @@
description = "Barefoot and pregnant"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/snowwhite
name = "Snow White"
@@ -504,6 +530,7 @@
description = "A cold refreshment"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/demonsblood
name = "Demons Blood"
@@ -513,6 +540,7 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 10
slurr_adj = 10
+ alcohol_perc = 0.4
/datum/reagent/ethanol/vodkatonic
name = "Vodka and Tonic"
@@ -522,6 +550,7 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
slurr_adj = 3
+ alcohol_perc = 0.3
/datum/reagent/ethanol/ginfizz
name = "Gin Fizz"
@@ -531,6 +560,7 @@
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 4
slurr_adj = 3
+ alcohol_perc = 0.4
/datum/reagent/ethanol/bahama_mama
name = "Bahama mama"
@@ -538,6 +568,7 @@
description = "Tropic cocktail."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/singulo
name = "Singulo"
@@ -547,6 +578,7 @@
color = "#2E6671" // rgb: 46, 102, 113
dizzy_adj = 15
slurr_adj = 15
+ alcohol_perc = 0.7
/datum/reagent/ethanol/sbiten
name = "Sbiten"
@@ -554,6 +586,7 @@
description = "A spicy Vodka! Might be a little hot for the little guys!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.4
/datum/reagent/ethanol/sbiten/on_mob_life(var/mob/living/M as mob)
..()
@@ -567,6 +600,7 @@
description = "Creepy time!"
reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
+ alcohol_perc = 0.3
/datum/reagent/ethanol/red_mead
name = "Red Mead"
@@ -574,6 +608,7 @@
description = "The true Viking drink! Even though it has a strange red color."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/mead
name = "Mead"
@@ -581,6 +616,7 @@
description = "A Vikings drink, though a cheap one."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/iced_beer
name = "Iced Beer"
@@ -588,6 +624,7 @@
description = "A beer which is so cold the air around it freezes."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.1
/datum/reagent/ethanol/iced_beer/on_mob_life(var/mob/living/M as mob)
..()
@@ -601,6 +638,7 @@
description = "Watered down rum, Nanotrasen approves!"
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/aloe
name = "Aloe"
@@ -608,6 +646,7 @@
description = "So very, very, very good."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/andalusia
name = "Andalusia"
@@ -615,6 +654,7 @@
description = "A nice, strange named drink."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.4
/datum/reagent/ethanol/alliescocktail
name = "Allies Cocktail"
@@ -622,6 +662,7 @@
description = "A drink made from your allies."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.5
/datum/reagent/ethanol/acid_spit
name = "Acid Spit"
@@ -629,6 +670,7 @@
description = "A drink by Nanotrasen. Made from live aliens."
reagent_state = LIQUID
color = "#365000" // rgb: 54, 80, 0
+ alcohol_perc = 0.3
/datum/reagent/ethanol/amasec
name = "Amasec"
@@ -636,7 +678,7 @@
description = "Official drink of the Imperium."
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
-
+ alcohol_perc = 0.3
/datum/reagent/ethanol/neurotoxin
name = "Neuro-toxin"
@@ -644,22 +686,20 @@
description = "A strong neurotoxin that puts the subject into a death-like state."
reagent_state = LIQUID
color = "#2E2E61" // rgb: 46, 46, 97
+ alcohol_perc = 0.7
/datum/reagent/ethanol/neurotoxin/on_mob_life(var/mob/living/M as mob)
M.weakened = max(M.weakened, 3)
- if(!data)
- data = 1
- data++
M.dizziness +=6
- if(data >= 15 && data <45)
+ if(current_cycle >= 15 && current_cycle <45)
if (!M.slurring)
M.slurring = 1
M.slurring += 3
- else if(data >= 45 && prob(50) && data <55)
+ else if(current_cycle >= 45 && prob(50) && current_cycle <55)
M.confused = max(M.confused+3,0)
- else if(data >=55)
+ else if(current_cycle >=55)
M.druggy = max(M.druggy, 55)
- else if(data >=200)
+ else if(current_cycle >=200)
M.adjustToxLoss(2)
..()
return
@@ -670,6 +710,7 @@
description = "A stingy drink."
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
+ alcohol_perc = 0.7
/datum/reagent/ethanol/changelingsting/on_mob_life(var/mob/living/M as mob)
..()
@@ -682,6 +723,7 @@
description = "Mmm, tastes like chocolate cake..."
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
+ alcohol_perc = 0.3
/datum/reagent/ethanol/irishcarbomb/on_mob_life(var/mob/living/M as mob)
..()
@@ -694,6 +736,7 @@
description = "A Syndicate bomb"
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
+ alcohol_perc = 0.2
/datum/reagent/ethanol/erikasurprise
name = "Erika Surprise"
@@ -701,6 +744,7 @@
description = "The surprise is, it's green!"
reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
+ alcohol_perc = 0.1
/datum/reagent/ethanol/driestmartini
name = "Driest Martini"
@@ -708,15 +752,14 @@
description = "Only for the experienced. You think you see sand floating in the glass."
nutriment_factor = 1 * FOOD_METABOLISM
color = "#2E6671" // rgb: 46, 102, 113
+ alcohol_perc = 0.5
/datum/reagent/ethanol/driestmartini/on_mob_life(var/mob/living/M as mob)
- if(!data) data = 1
- data++
M.dizziness +=10
- if(data >= 55 && data <115)
+ if(current_cycle >= 55 && current_cycle <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 10
- else if(data >= 115 && prob(33))
+ else if(current_cycle >= 115 && prob(33))
M.confused = max(M.confused+15,15)
..()
@@ -727,6 +770,7 @@
id = "kahlua"
description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
color = "#664300" // rgb: 102, 67, 0
+ alcohol_perc = 0.2
/datum/reagent/ethanol/kahlua/on_mob_life(var/mob/living/M as mob)
M.dizziness = max(0,M.dizziness-5)
diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
index 4f79fbac781..9daf9cb9ec1 100644
--- a/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
+++ b/code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm
@@ -17,7 +17,7 @@
/datum/reagent/drink/tomatojuice/on_mob_life(var/mob/living/M as mob)
..()
- if(M.getFireLoss() && prob(20)) M.heal_organ_damage(0,1)
+ if(M.getFireLoss() && prob(20)) M.adjustFireLoss(-1)
return
/datum/reagent/drink/limejuice
@@ -110,7 +110,8 @@
M.nutrition += nutriment_factor
if(istype(M, /mob/living/carbon/human) && M.job in list("Clown"))
if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
+ M.adjustBruteLoss(-1)
+ M.adjustFireLoss(-1)
M.nutrition += nutriment_factor
..()
return
@@ -125,7 +126,8 @@
M.nutrition += nutriment_factor
if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
+ M.adjustBruteLoss(-1)
+ M.adjustFireLoss(-1)
M.nutrition += nutriment_factor
..()
return
@@ -145,7 +147,7 @@
color = "#DFDFDF" // rgb: 223, 223, 223
/datum/reagent/drink/milk/on_mob_life(var/mob/living/M as mob)
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
+ if(M.getBruteLoss() && prob(20)) M.adjustBruteLoss(-1)
if(holder.has_reagent("capsaicin"))
holder.remove_reagent("capsaicin", 2)
..()
@@ -187,7 +189,7 @@
adj_sleepy = -2
adj_temp = 25
overdose_threshold = 45
- addiction_chance = 5 // It's true.
+ addiction_chance = 1 // It's true.
/datum/reagent/drink/coffee/on_mob_life(var/mob/living/M as mob)
if(holder.has_reagent("frostoil"))
@@ -224,7 +226,7 @@
/datum/reagent/drink/coffee/soy_latte/on_mob_life(var/mob/living/M as mob)
..()
M.sleeping = 0
- if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0)
+ if(M.getBruteLoss() && prob(20)) M.adjustBruteLoss(-1)
return
/datum/reagent/drink/coffee/cafe_latte
@@ -239,7 +241,7 @@
..()
M.sleeping = 0
if(M.getBruteLoss() && prob(20))
- M.heal_organ_damage(1,0)
+ M.adjustBruteLoss(-1)
return
/datum/reagent/drink/tea
@@ -276,7 +278,8 @@
M.nutrition += nutriment_factor
if(istype(M, /mob/living/carbon/human) && M.job in list("Clown"))
if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
+ M.adjustBruteLoss(-1)
+ M.adjustFireLoss(-1)
M.nutrition += nutriment_factor
..()
return
@@ -293,7 +296,8 @@
M.nutrition += nutriment_factor
if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
+ M.adjustBruteLoss(-1)
+ M.adjustFireLoss(-1)
M.nutrition += nutriment_factor
..()
return
diff --git a/code/modules/reagents/oldchem/reagents/reagents_admin.dm b/code/modules/reagents/oldchem/reagents/reagents_admin.dm
index 765bc480487..92cfbfd4c36 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_admin.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_admin.dm
@@ -15,7 +15,8 @@
M.setCloneLoss(0)
M.setOxyLoss(0)
M.radiation = 0
- M.heal_organ_damage(5,5)
+ M.adjustBruteLoss(-5)
+ M.adjustFireLoss(-5)
M.adjustToxLoss(-5)
M.hallucination = 0
M.setBrainLoss(0)
@@ -41,13 +42,9 @@
M.jitteriness = 0
if(istype(M,/mob/living/carbon)) // make sure to only use it on carbon mobs
var/mob/living/carbon/C = M
- if(C.virus2.len)
- for (var/ID in C.virus2)
- var/datum/disease2/disease/V = C.virus2[ID]
- C.antibodies |= V.antigen
+ for(var/datum/disease/D in C.viruses)
+ D.cure(0)
..()
- return
-
/datum/reagent/adminordrazine/nanites
name = "Nanites"
diff --git a/code/modules/reagents/oldchem/reagents/reagents_flammable.dm b/code/modules/reagents/oldchem/reagents/reagents_flammable.dm
index 361507d19e6..8494ff3957b 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_flammable.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_flammable.dm
@@ -48,7 +48,7 @@
holder.remove_reagent("epinephrine", 2)
if(iscarbon(M))
var/mob/living/carbon/C = M
- C.adjustPlasma(20)
+ C.adjustPlasma(10)
..()
return
diff --git a/code/modules/reagents/oldchem/reagents/reagents_food.dm b/code/modules/reagents/oldchem/reagents/reagents_food.dm
index f978f56aef7..05a3fad7808 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_food.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_food.dm
@@ -16,7 +16,7 @@
var/mob/living/carbon/human/H = M
if(H.can_eat()) //Make sure the species has it's dietflag set, otherwise it can't digest any nutrients
H.nutrition += nutriment_factor // For hunger and fatness
- if(prob(50)) M.heal_organ_damage(1,0)
+ if(prob(50)) M.adjustBruteLoss(-1)
if(istype(M,/mob/living/simple_animal)) //Any nutrients can heal simple animals
if(prob(50)) M.heal_organ_damage(1,0)
..()
@@ -38,7 +38,7 @@
var/mob/living/carbon/human/H = M
if(H.can_eat(DIET_CARN | DIET_OMNI)) //Make sure that it is not a herbivore
H.nutrition += nutriment_factor // For hunger and fatness
- if(prob(50)) M.heal_organ_damage(1,0)
+ if(prob(50)) M.adjustBruteLoss(-1)
if(istype(M,/mob/living/simple_animal)) //Any nutrients can heal simple animals
if(prob(50)) M.heal_organ_damage(1,0)
..()
@@ -60,7 +60,7 @@
var/mob/living/carbon/human/H = M
if(H.can_eat(DIET_HERB | DIET_OMNI)) //Make sure that it is not a carnivore
H.nutrition += nutriment_factor // For hunger and fatness
- if(prob(50)) M.heal_organ_damage(1,0)
+ if(prob(50)) M.adjustBruteLoss(-1)
if(istype(M,/mob/living/simple_animal)) //Any nutrients can heal simple animals
if(prob(50)) M.heal_organ_damage(1,0)
..()
@@ -257,7 +257,8 @@
M.nutrition += nutriment_factor
if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden"))
if(!M) M = holder.my_atom
- M.heal_organ_damage(1,1)
+ M.adjustBruteLoss(-1)
+ M.adjustFireLoss(-1)
M.nutrition += nutriment_factor
..()
return
@@ -449,7 +450,7 @@
return
/datum/reagent/sugar/overdose_start(var/mob/living/M as mob)
- M << "You pass out from hyperglycemic shock!"
+ to_chat(M, "You pass out from hyperglycemic shock!")
M.emote("collapse")
..()
diff --git a/code/modules/reagents/oldchem/reagents/reagents_med.dm b/code/modules/reagents/oldchem/reagents/reagents_med.dm
index ae6fd9bb8a3..64e3b00936d 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_med.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_med.dm
@@ -16,20 +16,6 @@
..()
return
-/datum/reagent/virus_food
- name = "Virus Food"
- id = "virusfood"
- description = "A mixture of water, milk, and oxygen. Virus cells can use this mixture to reproduce."
- reagent_state = LIQUID
- nutriment_factor = 2 * REAGENTS_METABOLISM
- color = "#899613" // rgb: 137, 150, 19
-
-/datum/reagent/virus_food/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition += nutriment_factor*REM
- ..()
- return
-
/datum/reagent/sterilizine
name = "Sterilizine"
id = "sterilizine"
@@ -87,6 +73,11 @@
..()
return
+/datum/reagent/mitocholide/reaction_obj(var/obj/O, var/volume)
+ if(istype(O, /obj/item/organ))
+ var/obj/item/organ/Org = O
+ Org.rejuvenate()
+
/datum/reagent/cryoxadone
name = "Cryoxadone"
id = "cryoxadone"
@@ -100,7 +91,8 @@
M.adjustCloneLoss(-4)
M.adjustOxyLoss(-10)
M.adjustToxLoss(-3)
- M.heal_organ_damage(12,12)
+ M.adjustBruteLoss(-12)
+ M.adjustFireLoss(-12)
M.status_flags &= ~DISFIGURED
..()
return
@@ -116,7 +108,8 @@
/datum/reagent/rezadone/on_mob_life(mob/living/M)
M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
M.adjustCloneLoss(-1) //What? We just set cloneloss to 0. Why? Simple; this is so external organs properly unmutate.
- M.heal_organ_damage(1,1)
+ M.adjustBruteLoss(-1)
+ M.adjustFireLoss(-1)
M.status_flags &= ~DISFIGURED
..()
return
diff --git a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm
index 1013c237462..9fc7592d346 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm
@@ -64,10 +64,10 @@
/datum/reagent/slimejelly/on_mob_life(var/mob/living/M as mob)
if(prob(10))
- M << "\red Your insides are burning!"
+ to_chat(M, "\red Your insides are burning!")
M.adjustToxLoss(rand(20,60)*REM)
else if(prob(40))
- M.heal_organ_damage(5*REM,0)
+ M.adjustBruteLoss(-5*REM)
..()
return
@@ -83,10 +83,10 @@
if(ishuman(M))
var/mob/living/carbon/human/human = M
if(human.species.name != "Shadow")
- M << "\red Your flesh rapidly mutates!"
- M << "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids."
- M << "\red Your body reacts violently to light. \green However, it naturally heals in darkness."
- M << "Aside from your new traits, you are mentally unchanged and retain your prior obligations."
+ to_chat(M, "\red Your flesh rapidly mutates!")
+ to_chat(M, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.")
+ to_chat(M, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.")
+ to_chat(M, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.")
human.set_species("Shadow")
..()
return
@@ -98,33 +98,9 @@
reagent_state = LIQUID
color = "#13BC5E" // rgb: 19, 188, 94
-/datum/reagent/aslimetoxin/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(istype(M, /mob/living/carbon) && M.stat != DEAD)
- M << "\red Your flesh rapidly mutates!"
- if(M.notransform) return
- M.notransform = 1
- M.canmove = 0
- M.icon = null
- M.overlays.Cut()
- M.invisibility = 101
- for(var/obj/item/W in M)
- if(istype(W, /obj/item/weapon/implant)) //TODO: Carn. give implants a dropped() or something
- qdel(W)
- continue
- W.layer = initial(W.layer)
- W.loc = M.loc
- W.dropped(M)
- var/mob/living/carbon/slime/new_mob = new /mob/living/carbon/slime(M.loc)
- new_mob.a_intent = I_HARM
- new_mob.universal_speak = 1
- if(M.mind)
- M.mind.transfer_to(new_mob)
- else
- new_mob.key = M.key
- qdel(M)
- ..()
- return
+/datum/reagent/aslimetoxin/reaction_mob(mob/M, method=TOUCH, reac_volume)
+ if(method != TOUCH)
+ M.ForceContractDisease(new /datum/disease/transformation/slime(0))
/datum/reagent/mercury
@@ -189,19 +165,7 @@
if(!M) M = holder.my_atom
if(M.radiation < 80)
M.apply_effect(4, IRRADIATE, negate_armor = 1)
- // radium may increase your chances to cure a disease
- if(istype(M,/mob/living/carbon)) // make sure to only use it on carbon mobs
- var/mob/living/carbon/C = M
- if(C.virus2.len)
- for (var/ID in C.virus2)
- var/datum/disease2/disease/V = C.virus2[ID]
- if(prob(5))
- if(prob(50))
- M.apply_effect(50, IRRADIATE, negate_armor = 1) // curing it that way may kill you instead
- M.adjustToxLoss(100)
- C.antibodies |= V.antigen
..()
- return
/datum/reagent/radium/reaction_turf(var/turf/T, var/volume)
src = null
@@ -300,11 +264,11 @@
if(volume > 25)
if(H.wear_mask)
- H << "\red Your mask protects you from the acid!"
+ to_chat(H, "\red Your mask protects you from the acid!")
return
if(H.head)
- H << "\red Your helmet protects you from the acid!"
+ to_chat(H, "\red Your helmet protects you from the acid!")
return
if(!M.unacidable)
@@ -324,7 +288,7 @@
var/mob/living/carbon/human/H = M
if(volume < 10)
- M << "The greenish acidic substance stings you, but isn't concentrated enough to harm you!"
+ to_chat(M, "The greenish acidic substance stings you, but isn't concentrated enough to harm you!")
if(volume >=10 && volume <=25)
if(!H.unacidable)
@@ -349,7 +313,7 @@
var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
I.desc = "Looks like this was \an [O] some time ago."
for(var/mob/M in viewers(5, O))
- M << "\red \the [O] melts."
+ to_chat(M, "\red \the [O] melts.")
qdel(O)
@@ -432,60 +396,6 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/*
-/datum/reagent/nanomachines
- name = "Nanomachines"
- id = "nanomachines"
- description = "Microscopic construction robots."
- reagent_state = LIQUID
- color = "#535E66" // rgb: 83, 94, 102
-
-/datum/reagent/nanomachines/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- src = null
- if( (prob(10) && method==TOUCH) || method==INGEST)
- M.contract_disease(new /datum/disease/robotic_transformation(0),1)
-
-/datum/reagent/xenomicrobes
- name = "Xenomicrobes"
- id = "xenomicrobes"
- description = "Microbes with an entirely alien cellular structure."
- reagent_state = LIQUID
- color = "#535E66" // rgb: 83, 94, 102
-
-/datum/reagent/xenomicrobes/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- src = null
- if( (prob(10) && method==TOUCH) || method==INGEST)
- M.contract_disease(new /datum/disease/xeno_transformation(0),1)
-*/
-
-/datum/reagent/spore
- name = "Blob Spores"
- id = "spore"
- description = "Spores of some blob creature thingy."
- reagent_state = LIQUID
- color = "#CE760A" // rgb: 206, 118, 10
- var/client/blob_client = null
- var/blob_point_rate = 3
-
-/datum/reagent/spore/on_mob_life(var/mob/living/M)
- if(!M) M = holder.my_atom
- if (holder.has_reagent("atrazine",45))
- holder.del_reagent("spore")
- if (prob(1))
- M << "\red Your mouth tastes funny."
- if (prob(1) && prob(25))
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- if(directory[ckey(C.key)])
- blob_client = directory[ckey(C.key)]
- C.gib()
- if(blob_client)
- var/obj/effect/blob/core/core = new(get_turf(C), 200, blob_client, blob_point_rate)
- if(core.overmind && core.overmind.mind)
- core.overmind.mind.name = C.name
-
- return
-
/datum/reagent/condensedcapsaicin
name = "Condensed Capsaicin"
id = "condensedcapsaicin"
@@ -521,10 +431,10 @@
if ( !safe_thing )
safe_thing = victim.glasses
if ( eyes_covered && mouth_covered )
- victim << "\red Your [safe_thing] protects you from the pepperspray!"
+ to_chat(victim, "\red Your [safe_thing] protects you from the pepperspray!")
return
else if ( mouth_covered ) // Reduced effects if partially protected
- victim << "\red Your [safe_thing] protect you from most of the pepperspray!"
+ to_chat(victim, "\red Your [safe_thing] protect you from most of the pepperspray!")
if(prob(5))
victim.emote("scream")
victim.eye_blurry = max(M.eye_blurry, 3)
@@ -535,14 +445,14 @@
victim.drop_item()
return
else if ( eyes_covered ) // Eye cover is better than mouth cover
- victim << "\red Your [safe_thing] protects your eyes from the pepperspray!"
+ to_chat(victim, "\red Your [safe_thing] protects your eyes from the pepperspray!")
victim.eye_blurry = max(M.eye_blurry, 3)
victim.damageoverlaytemp = 30
return
else // Oh dear :D
if(prob(5))
victim.emote("scream")
- victim << "\red You're sprayed directly in the eyes with pepperspray!"
+ to_chat(victim, "\red You're sprayed directly in the eyes with pepperspray!")
victim.eye_blurry = max(M.eye_blurry, 5)
victim.eye_blind = max(M.eye_blind, 2)
victim.confused = max(M.confused, 6)
diff --git a/code/modules/reagents/oldchem/reagents/reagents_water.dm b/code/modules/reagents/oldchem/reagents/reagents_water.dm
index 3847a97d3bb..df9e0b29b64 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_water.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_water.dm
@@ -145,65 +145,103 @@
/datum/reagent/blood
- data = new/list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"blood_colour"= "#A10808","resistances"=null,"trace_chem"=null, "antibodies" = null)
+ data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"blood_colour"="#A10808","resistances"=null,"trace_chem"=null, "antibodies" = null)
name = "Blood"
id = "blood"
reagent_state = LIQUID
color = "#C80000" // rgb: 200, 0, 0
-/datum/reagent/blood/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- var/datum/reagent/blood/self = src
- src = null
- if(self.data && self.data["virus2"] && istype(M, /mob/living/carbon))//infecting...
- var/list/vlist = self.data["virus2"]
- if (vlist.len)
- for (var/ID in vlist)
- var/datum/disease2/disease/V = vlist[ID]
+/datum/reagent/blood/reaction_mob(mob/M, method=TOUCH, reac_volume)
+ if(data && data["viruses"])
+ for(var/datum/disease/D in data["viruses"])
- if(method == TOUCH)
- infect_virus2(M,V.getcopy())
- else
- infect_virus2(M,V.getcopy(),1) //injected, force infection!
- if(self.data && self.data["antibodies"] && istype(M, /mob/living/carbon))//... and curing
- var/mob/living/carbon/C = M
- C.antibodies |= self.data["antibodies"]
+ if(D.spread_flags & SPECIAL || D.spread_flags & NON_CONTAGIOUS)
+ continue
-/datum/reagent/blood/on_merge(var/data)
- if(data["blood_colour"])
- color = data["blood_colour"]
- return ..()
+ if(method == TOUCH)
+ M.ContractDisease(D)
+ else //ingest, patch or inject
+ M.ForceContractDisease(D)
+
+/datum/reagent/blood/on_new(list/data)
+ if(istype(data))
+ SetViruses(src, data)
+
+/datum/reagent/blood/on_merge(list/mix_data)
+ if(data && mix_data)
+ if(data["viruses"] || mix_data["viruses"])
+
+ var/list/mix1 = data["viruses"]
+ var/list/mix2 = mix_data["viruses"]
+
+ // Stop issues with the list changing during mixing.
+ var/list/to_mix = list()
+
+ for(var/datum/disease/advance/AD in mix1)
+ to_mix += AD
+ for(var/datum/disease/advance/AD in mix2)
+ to_mix += AD
+
+ var/datum/disease/advance/AD = Advance_Mix(to_mix)
+ if(AD)
+ var/list/preserve = list(AD)
+ for(var/D in data["viruses"])
+ if(!istype(D, /datum/disease/advance))
+ preserve += D
+ data["viruses"] = preserve
+
+ if(mix_data["blood_colour"])
+ color = mix_data["blood_colour"]
+ return 1
/datum/reagent/blood/on_update(var/atom/A)
if(data["blood_colour"])
color = data["blood_colour"]
return ..()
-
-
-/datum/reagent/blood/reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place
- if(!istype(T)) return
- var/datum/reagent/blood/self = src
- src = null
- var/big_splash = 1
- if(volume < 3)
- big_splash = 0
- //var/datum/disease/D = self.data["virus"]
- if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
- blood_splatter(T, src, big_splash)
+/datum/reagent/blood/reaction_turf(turf/simulated/T, reac_volume)//splash the blood all over the place
+ if(!istype(T))
+ return
+ if(reac_volume < 3)
+ return
+ if(!data["donor"] || istype(data["donor"], /mob/living/carbon/human))
var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
+ if(!blood_prop) //first blood!
+ blood_prop = new(T)
+ blood_prop.blood_DNA[data["blood_DNA"]] = data["blood_type"]
- if(blood_prop)
- blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"]
- if(self.data["virus2"])
- blood_prop.virus2 = virus_copylist(self.data["virus2"])
+ for(var/datum/disease/D in data["viruses"])
+ var/datum/disease/newVirus = D.Copy(1)
+ blood_prop.viruses += newVirus
+ newVirus.holder = blood_prop
- else if(istype(self.data["donor"], /mob/living/carbon/alien))
+ else if(istype(data["donor"], /mob/living/carbon/alien))
var/obj/effect/decal/cleanable/blood/xeno/blood_prop = locate() in T
if(!blood_prop)
blood_prop = new(T)
blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"
- return
+ for(var/datum/disease/D in data["viruses"])
+ var/datum/disease/newVirus = D.Copy(1)
+ blood_prop.viruses += newVirus
+ newVirus.holder = blood_prop
+
+/datum/reagent/vaccine
+ //data must contain virus type
+ name = "Vaccine"
+ id = "vaccine"
+ color = "#C81040" // rgb: 200, 16, 64
+
+/datum/reagent/vaccine/reaction_mob(mob/M, method=TOUCH, reac_volume)
+ if(islist(data) && (method == INGEST))
+ for(var/datum/disease/D in M.viruses)
+ if(D.GetDiseaseID() in data)
+ D.cure()
+ M.resistances |= data
+
+/datum/reagent/vaccine/on_merge(list/data)
+ if(istype(data))
+ src.data |= data.Copy()
/datum/reagent/fishwater
name = "Fish Water"
@@ -216,7 +254,7 @@
if(!istype(M, /mob/living))
return
if(method == INGEST)
- M << "Oh god, why did you drink that?"
+ to_chat(M, "Oh god, why did you drink that?")
/datum/reagent/fishwater/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -269,14 +307,14 @@
if(ishuman(M) && M.mind && M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full) && prob(80))
switch(data)
if(1 to 4)
- M << "Something sizzles in your veins!"
+ to_chat(M, "Something sizzles in your veins!")
M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
if(5 to 12)
- M << "You feel an intense burning inside of you!"
+ to_chat(M, "You feel an intense burning inside of you!")
M.adjustFireLoss(1)
M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
if(13 to INFINITY)
- M << "You suddenly ignite in a holy fire!"
+ to_chat(M, "You suddenly ignite in a holy fire!")
for(var/mob/O in viewers(M, null))
O.show_message(text("[] suddenly bursts into flames!", M), 1)
M.fire_stacks = min(5,M.fire_stacks + 3)
@@ -292,13 +330,13 @@
var/mob/living/carbon/human/H=M
if(method == TOUCH)
if(H.wear_mask)
- H << "\red Your mask protects you from the holy water!"
+ to_chat(H, "\red Your mask protects you from the holy water!")
return
else if(H.head)
- H << "\red Your helmet protects you from the holy water!"
+ to_chat(H, "\red Your helmet protects you from the holy water!")
return
else
- M << "Something holy interferes with your powers!"
+ to_chat(M, "Something holy interferes with your powers!")
M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
@@ -350,28 +388,3 @@
var/t_loc = get_turf(O)
qdel(O)
new /obj/item/clothing/shoes/galoshes/dry(t_loc)
-
-/*
-/datum/reagent/vaccine
- //data must contain virus type
- name = "Vaccine"
- id = "vaccine"
- reagent_state = LIQUID
- color = "#C81040" // rgb: 200, 16, 64
-
-/datum/reagent/vaccine/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- var/datum/reagent/vaccine/self = src
- src = null
- if(self.data&&method == INGEST)
- for(var/datum/disease/D in M.viruses)
- if(istype(D, /datum/disease/advance))
- var/datum/disease/advance/A = D
- if(A.GetDiseaseID() == self.data)
- D.cure()
- else
- if(D.type == self.data)
- D.cure()
-
- M.resistances += self.data
- return
-*/
\ No newline at end of file
diff --git a/code/modules/reagents/pandemic.dm b/code/modules/reagents/pandemic.dm
new file mode 100644
index 00000000000..bec2b92f049
--- /dev/null
+++ b/code/modules/reagents/pandemic.dm
@@ -0,0 +1,295 @@
+/obj/machinery/computer/pandemic
+ name = "PanD.E.M.I.C 2200"
+ desc = "Used to work with viruses."
+ density = 1
+ anchored = 1
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "mixer0"
+ circuit = /obj/item/weapon/circuitboard/pandemic
+ use_power = 1
+ idle_power_usage = 20
+ var/temp_html = ""
+ var/wait = null
+ var/obj/item/weapon/reagent_containers/beaker = null
+
+/obj/machinery/computer/pandemic/New()
+ ..()
+ update_icon()
+
+/obj/machinery/computer/pandemic/set_broken()
+ icon_state = (beaker ? "mixer1_b" : "mixer0_b")
+ overlays.Cut()
+ stat |= BROKEN
+
+/obj/machinery/computer/pandemic/proc/GetVirusByIndex(index)
+ if(beaker && beaker.reagents)
+ if(beaker.reagents.reagent_list.len)
+ var/datum/reagent/blood/BL = locate() in beaker.reagents.reagent_list
+ if(BL)
+ if(BL.data && BL.data["viruses"])
+ var/list/viruses = BL.data["viruses"]
+ return viruses[index]
+ return null
+
+/obj/machinery/computer/pandemic/proc/GetResistancesByIndex(index)
+ if(beaker && beaker.reagents)
+ if(beaker.reagents.reagent_list.len)
+ var/datum/reagent/blood/BL = locate() in beaker.reagents.reagent_list
+ if(BL)
+ if(BL.data && BL.data["resistances"])
+ var/list/resistances = BL.data["resistances"]
+ return resistances[index]
+ return null
+
+/obj/machinery/computer/pandemic/proc/GetVirusTypeByIndex(index)
+ var/datum/disease/D = GetVirusByIndex(index)
+ if(D)
+ return D.GetDiseaseID()
+ return null
+
+/obj/machinery/computer/pandemic/proc/replicator_cooldown(waittime)
+ wait = 1
+ update_icon()
+ spawn(waittime)
+ src.wait = null
+ update_icon()
+ playsound(src.loc, 'sound/machines/ping.ogg', 30, 1)
+
+/obj/machinery/computer/pandemic/update_icon()
+ if(stat & BROKEN)
+ icon_state = (beaker ? "mixer1_b" : "mixer0_b")
+ return
+
+ icon_state = "mixer[(beaker)?"1":"0"][(powered()) ? "" : "_nopower"]"
+
+ if(wait)
+ overlays.Cut()
+ else
+ overlays += "waitlight"
+
+/obj/machinery/computer/pandemic/Topic(href, href_list)
+ if(..())
+ return
+
+ usr.set_machine(src)
+ if(!beaker) return
+
+ if (href_list["create_vaccine"])
+ if(!src.wait)
+ var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
+ if(B)
+ B.pixel_x = rand(-3, 3)
+ B.pixel_y = rand(-3, 3)
+ var/path = GetResistancesByIndex(text2num(href_list["create_vaccine"]))
+ var/vaccine_type = path
+ var/vaccine_name = "Unknown"
+
+ if(!ispath(vaccine_type))
+ if(archive_diseases[path])
+ var/datum/disease/D = archive_diseases[path]
+ if(D)
+ vaccine_name = D.name
+ vaccine_type = path
+ else if(vaccine_type)
+ var/datum/disease/D = new vaccine_type(0, null)
+ if(D)
+ vaccine_name = D.name
+
+ if(vaccine_type)
+
+ B.name = "[vaccine_name] vaccine bottle"
+ B.reagents.add_reagent("vaccine", 15, list(vaccine_type))
+ replicator_cooldown(200)
+ else
+ src.temp_html = "The replicator is not ready yet."
+ src.updateUsrDialog()
+ return
+ else if (href_list["create_virus_culture"])
+ if(!wait)
+ var/type = GetVirusTypeByIndex(text2num(href_list["create_virus_culture"]))//the path is received as string - converting
+ var/datum/disease/D = null
+ if(!ispath(type))
+ D = GetVirusByIndex(text2num(href_list["create_virus_culture"]))
+ var/datum/disease/advance/A = archive_diseases[D.GetDiseaseID()]
+ if(A)
+ D = new A.type(0, A)
+ else if(type)
+ if(type in diseases) // Make sure this is a disease
+ 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 || wait)
+ 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))
+ B.name = "[name] culture bottle"
+ B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium."
+ B.reagents.add_reagent("blood",20,data)
+ src.updateUsrDialog()
+ else
+ src.temp_html = "The replicator is not ready yet."
+ src.updateUsrDialog()
+ return
+ else if (href_list["empty_beaker"])
+ beaker.reagents.clear_reagents()
+ src.updateUsrDialog()
+ return
+ else if (href_list["eject"])
+ beaker:loc = src.loc
+ beaker = null
+ icon_state = "mixer0"
+ src.updateUsrDialog()
+ return
+ else if(href_list["clear"])
+ src.temp_html = ""
+ src.updateUsrDialog()
+ 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"]))
+ if(archive_diseases[id])
+ var/datum/disease/advance/A = archive_diseases[id]
+ A.AssignName(new_name)
+ for(var/datum/disease/advance/AD in disease_master.processing)
+ AD.Refresh()
+ src.updateUsrDialog()
+
+
+ else
+ usr << browse(null, "window=pandemic")
+ src.updateUsrDialog()
+ return
+
+ src.add_fingerprint(usr)
+ return
+
+/obj/machinery/computer/pandemic/attack_hand(mob/user)
+ if(..())
+ return
+ user.set_machine(src)
+ var/dat = ""
+ if(src.temp_html)
+ dat = "[src.temp_html]
Main Menu"
+ else if(!beaker)
+ dat += "Please insert beaker.
"
+ dat += "Close"
+ else
+ var/datum/reagents/R = beaker.reagents
+ var/datum/reagent/blood/Blood = null
+ for(var/datum/reagent/blood/B in R.reagent_list)
+ if(B)
+ Blood = B
+ break
+ if(!R.total_volume||!R.reagent_list.len)
+ dat += "The beaker is empty
"
+ else if(!Blood)
+ dat += "No blood sample found in beaker."
+ else if(!Blood.data)
+ dat += "No blood data found in beaker."
+ else
+ dat += "Blood sample data:
"
+ dat += "Blood DNA: [(Blood.data["blood_DNA"]||"none")]
"
+ dat += "Blood Type: [(Blood.data["blood_type"]||"none")]
"
+
+
+ if(Blood.data["viruses"])
+ var/list/vir = Blood.data["viruses"]
+ if(vir.len)
+ var/i = 0
+ for(var/datum/disease/D in Blood.data["viruses"])
+ i++
+ if(!(D.visibility_flags & HIDDEN_PANDEMIC))
+
+ if(istype(D, /datum/disease/advance))
+
+ var/datum/disease/advance/A = D
+ D = archive_diseases[A.GetDiseaseID()]
+ if(D && D.name == "Unknown")
+ dat += "Name Disease
"
+
+ if(!D)
+ CRASH("We weren't able to get the advance disease from the archive.")
+
+ dat += "Disease Agent: [D?"[D.agent] - Create virus culture bottle":"none"]
"
+ dat += "Common name: [(D.name||"none")]
"
+ dat += "Description: [(D.desc||"none")]
"
+ dat += "Spread: [(D.spread_text||"none")]
"
+ dat += "Possible cure: [(D.cure_text||"none")]
"
+
+ if(istype(D, /datum/disease/advance))
+ var/datum/disease/advance/A = D
+ dat += "Symptoms: "
+ var/english_symptoms = list()
+ for(var/datum/symptom/S in A.symptoms)
+ english_symptoms += S.name
+ dat += english_list(english_symptoms)
+
+ else
+ dat += "No detectable virus in the sample."
+ else
+ dat += "No detectable virus in the sample."
+
+ dat += "
Contains antibodies to: "
+ if(Blood.data["resistances"])
+ var/list/res = Blood.data["resistances"]
+ if(res.len)
+ dat += ""
+ var/i = 0
+ for(var/type in Blood.data["resistances"])
+ i++
+ var/disease_name = "Unknown"
+
+ if(!ispath(type))
+ var/datum/disease/advance/A = archive_diseases[type]
+ if(A)
+ disease_name = A.name
+ else
+ var/datum/disease/D = new type(0, null)
+ disease_name = D.name
+
+ dat += "- [disease_name] - Create vaccine bottle
"
+ dat += "
"
+ else
+ dat += "nothing
"
+ else
+ dat += "nothing
"
+ dat += "
Eject beaker[((R.total_volume&&R.reagent_list.len) ? "-- Empty beaker":"")]
"
+ dat += "Close"
+
+ user << browse("[src.name]
[dat]", "window=pandemic;size=575x400")
+ onclose(user, "pandemic")
+ return
+
+
+/obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/weapon/reagent_containers) && (I.flags & OPENCONTAINER))
+ if(stat & (NOPOWER|BROKEN)) return
+ if(beaker)
+ to_chat(user, "A beaker is already loaded into the machine!")
+ return
+ if(!user.drop_item())
+ return
+
+ beaker = I
+ beaker.loc = src
+ to_chat(user, "You add the beaker to the machine.")
+ src.updateUsrDialog()
+ icon_state = "mixer1"
+
+ else if(istype(I, /obj/item/weapon/screwdriver))
+ if(src.beaker)
+ beaker.loc = get_turf(src)
+ ..()
+ return
+ else
+ ..()
+ return
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 45df570eb07..e8df519fe43 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -7,6 +7,9 @@
var/amount_per_transfer_from_this = 5
var/possible_transfer_amounts = list(5,10,15,25,30)
var/volume = 30
+ var/list/list_reagents = null
+ var/spawned_disease = null
+ var/disease_amount = 20
/obj/item/weapon/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this
set name = "Set transfer amount"
@@ -30,6 +33,12 @@
reagents = R
R.my_atom = src
processing_objects.Add(src)
+ if(spawned_disease)
+ var/datum/disease/F = new spawned_disease(0)
+ var/list/data = list("viruses" = list(F), "blood_colour" = "#A10808")
+ reagents.add_reagent("blood", disease_amount, data)
+ if(list_reagents)
+ reagents.add_reagent_list(list_reagents)
/obj/item/weapon/reagent_containers/process()
if(reagents)
@@ -70,7 +79,11 @@
/obj/item/weapon/reagent_containers/wash(mob/user, atom/source)
if(is_open_container())
- reagents.add_reagent("water", min(volume - reagents.total_volume, amount_per_transfer_from_this))
- user << "You fill [src] from [source]."
- return
+ if(reagents.total_volume >= volume)
+ to_chat(user, "span class='warning'>\The [src] is full.")
+ return
+ else
+ reagents.add_reagent("water", min(volume - reagents.total_volume, amount_per_transfer_from_this))
+ to_chat(user, "You fill [src] from [source].")
+ return
..()
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index e723005e60e..b92aceb4c79 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -72,13 +72,13 @@
/obj/item/weapon/reagent_containers/borghypo/attack(mob/living/M as mob, mob/user as mob)
var/datum/reagents/R = reagent_list[mode]
if(!R.total_volume)
- user << "The injector is empty."
+ to_chat(user, "The injector is empty.")
return
if (!istype(M))
return
if (R.total_volume && M.can_inject(user, 1, penetrate_thick = bypass_protection))
- user << "You inject [M] with the injector."
- M << "You feel a tiny prick!"
+ to_chat(user, "You inject [M] with the injector.")
+ to_chat(M, "You feel a tiny prick!")
R.add_reagent(M)
if(M.reagents)
@@ -91,7 +91,7 @@
M.LAssailant = user
var/trans = R.trans_to(M, amount_per_transfer_from_this)
- user << "[trans] units injected. [R.total_volume] units remaining."
+ to_chat(user, "[trans] units injected. [R.total_volume] units remaining.")
return
/obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user as mob)
@@ -102,7 +102,7 @@
charge_tick = 0 //Prevents wasted chems/cell charge if you're cycling through modes.
var/datum/reagent/R = chemical_reagents_list[reagent_ids[mode]]
- user << "Synthesizer is now producing '[R.name]'."
+ to_chat(user, "Synthesizer is now producing '[R.name]'.")
return
/obj/item/weapon/reagent_containers/borghypo/examine(mob/user)
@@ -114,8 +114,8 @@
for(var/datum/reagents/RS in reagent_list)
var/datum/reagent/R = locate() in RS.reagent_list
if(R)
- user << "It currently has [R.volume] units of [R.name] stored."
+ to_chat(user, "It currently has [R.volume] units of [R.name] stored.")
empty = 0
if(empty)
- user << "It is currently empty. Allow some time for the internal syntheszier to produce more."
+ to_chat(user, "It is currently empty. Allow some time for the internal syntheszier to produce more.")
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 1526ebcb695..2fedf8dd27f 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -17,11 +17,11 @@
if(filled)
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "\red [target] is full."
+ to_chat(user, "\red [target] is full.")
return
if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/cigarette)) //You can inject humans and food but you cant remove the shit.
- user << "\red You cannot directly fill this object."
+ to_chat(user, "\red You cannot directly fill this object.")
return
var/trans = 0
@@ -53,7 +53,7 @@
- user << "\blue You transfer [trans] units of the solution."
+ to_chat(user, "\blue You transfer [trans] units of the solution.")
if (src.reagents.total_volume<=0)
filled = 0
icon_state = "[initial(icon_state)]"
@@ -92,7 +92,7 @@
log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << "\blue You transfer [trans] units of the solution."
+ to_chat(user, "\blue You transfer [trans] units of the solution.")
if (src.reagents.total_volume<=0)
filled = 0
icon_state = "[initial(icon_state)]"
@@ -100,16 +100,16 @@
else
if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers))
- user << "\red You cannot directly remove reagents from [target]."
+ to_chat(user, "\red You cannot directly remove reagents from [target].")
return
if(!target.reagents.total_volume)
- user << "\red [target] is empty."
+ to_chat(user, "\red [target] is empty.")
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
- user << "\blue You fill the [src] with [trans] units of the solution."
+ to_chat(user, "\blue You fill the [src] with [trans] units of the solution.")
filled = 1
icon_state = "[initial(icon_state)][filled]"
diff --git a/code/modules/reagents/reagent_containers/drugs.dm b/code/modules/reagents/reagent_containers/drugs.dm
index 53d9310f6cc..db162b6f7cc 100644
--- a/code/modules/reagents/reagent_containers/drugs.dm
+++ b/code/modules/reagents/reagent_containers/drugs.dm
@@ -24,28 +24,28 @@
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if(!target.reagents.total_volume && target.reagents)
- user << "\red [target] is empty."
+ to_chat(user, "\red [target] is empty.")
return
if(reagents.total_volume >= reagents.maximum_volume)
- user << "\red [src] is full."
+ to_chat(user, "\red [src] is full.")
return
for(var/datum/reagent/A in target.reagents.reagent_list)
if(A.reagent_state != 1)
- user << "\red You can only put powders in [src]."
+ to_chat(user, "\red You can only put powders in [src].")
return
var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
- user << "\blue You fill [src] with [trans] units of the contents of [target]."
+ to_chat(user, "\blue You fill [src] with [trans] units of the contents of [target].")
else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it.
if(!reagents.total_volume)
- user << "\red [src] is empty."
+ to_chat(user, "\red [src] is empty.")
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "\red [target] is full."
+ to_chat(user, "\red [target] is full.")
return
// /vg/: Logging transfers of bad things
@@ -60,7 +60,7 @@
log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << "\blue You transfer [trans] units of the solution to [target]."
+ to_chat(user, "\blue You transfer [trans] units of the solution to [target].")
//Safety for dumping stuff into a ninja suit. It handles everything through attackby() and this is unnecessary.
@@ -75,9 +75,9 @@
if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text))
if(length(tmp_label) > 10)
- user << "\red The label can be at most 10 characters long."
+ to_chat(user, "\red The label can be at most 10 characters long.")
else
- user << "\blue You set the label to \"[tmp_label]\"."
+ to_chat(user, "\blue You set the label to \"[tmp_label]\".")
src.label_text = tmp_label
src.update_name_label()
diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index 4a4479c8b1e..9aaf72b6f8c 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -8,7 +8,7 @@
attack_self(mob/user as mob)
if (canopened == 0)
playsound(src.loc,'sound/effects/canopen.ogg', rand(10,50), 1)
- user << "You open the drink with an audible pop!"
+ to_chat(user, "You open the drink with an audible pop!")
canopened = 1
flags |= OPENCONTAINER
else
@@ -16,7 +16,7 @@
attack(mob/M as mob, mob/user as mob, def_zone)
if (canopened == 0)
- user << "You need to open the drink!"
+ to_chat(user, "You need to open the drink!")
return
return ..(M, user, def_zone)
@@ -24,10 +24,10 @@
afterattack(obj/target, mob/user, proximity)
if(!proximity) return
if(istype(target, /obj/structure/reagent_dispensers) && (canopened == 0))
- user << "You need to open the drink!"
+ to_chat(user, "You need to open the drink!")
return
else if(target.is_open_container() && (canopened == 0))
- user << "You need to open the drink!"
+ to_chat(user, "You need to open the drink!")
return
else
return ..(target, user, proximity)
@@ -36,15 +36,15 @@
if(!..(user, 1))
return
if(!reagents || reagents.total_volume==0)
- user << "\blue \The [src] is empty!"
+ to_chat(user, "\blue \The [src] is empty!")
else if (reagents.total_volume<=src.volume/4)
- user << "\blue \The [src] is almost empty!"
+ to_chat(user, "\blue \The [src] is almost empty!")
else if (reagents.total_volume<=src.volume*0.66)
- user << "\blue \The [src] is half full!"
+ to_chat(user, "\blue \The [src] is half full!")
else if (reagents.total_volume<=src.volume*0.90)
- user << "\blue \The [src] is almost full!"
+ to_chat(user, "\blue \The [src] is almost full!")
else
- user << "\blue \The [src] is full!"*/
+ to_chat(user, "\blue \The [src] is full!")*/
//DRINKS
diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm
index 5cb063ee86f..e1fb06f1be7 100644
--- a/code/modules/reagents/reagent_containers/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/food/condiment.dm
@@ -39,11 +39,11 @@
var/datum/reagents/R = src.reagents
if(!R || !R.total_volume)
- user << "\red None of [src] left, oh no!"
+ to_chat(user, "\red None of [src] left, oh no!")
return 0
if(M == user)
- M << "\blue You swallow some of contents of the [src]."
+ to_chat(M, "\blue You swallow some of contents of the [src].")
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(0)
@@ -85,26 +85,26 @@
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if(!target.reagents.total_volume)
- user << "\red [target] is empty."
+ to_chat(user, "\red [target] is empty.")
return
if(reagents.total_volume >= reagents.maximum_volume)
- user << "\red [src] is full."
+ to_chat(user, "\red [src] is full.")
return
var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
- user << "\blue You fill [src] with [trans] units of the contents of [target]."
+ to_chat(user, "\blue You fill [src] with [trans] units of the contents of [target].")
//Something like a glass or a food item. Player probably wants to transfer TO it.
else if(target.is_open_container() || istype(target, /obj/item/weapon/reagent_containers/food/snacks))
if(!reagents.total_volume)
- user << "\red [src] is empty."
+ to_chat(user, "\red [src] is empty.")
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "\red you can't add anymore to [target]."
+ to_chat(user, "\red you can't add anymore to [target].")
return
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << "\blue You transfer [trans] units of the condiment to [target]."
+ to_chat(user, "\blue You transfer [trans] units of the condiment to [target].")
/obj/item/weapon/reagent_containers/food/condiment/on_reagent_change()
if(!possible_states.len)
@@ -230,15 +230,16 @@
//You can tear the bag open above food to put the condiments on it, obviously.
if(istype(target, /obj/item/weapon/reagent_containers/food/snacks))
if(!reagents.total_volume)
- user << "You tear open [src], but there's nothing in it."
+ to_chat(user, "You tear open [src], but there's nothing in it.")
qdel(src)
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "You tear open [src], but [target] is stacked so high that it just drips off!" //Not sure if food can ever be full, but better safe than sorry.
+ to_chat(user, "You tear open [src], but [target] is stacked so high that it just drips off!")//Not sure if food can ever be full, but better safe than sorry.
+
qdel(src)
return
else
- user << "You tear open [src] above [target] and the condiments drip onto it."
+ to_chat(user, "You tear open [src] above [target] and the condiments drip onto it.")
src.reagents.trans_to(target, amount_per_transfer_from_this)
qdel(src)
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index e4860b880d0..d6a5d37012a 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -22,7 +22,7 @@
/obj/item/weapon/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone)
if(!reagents || !reagents.total_volume)
- user << " None of [src] left, oh no!"
+ to_chat(user, " None of [src] left, oh no!")
return 0
if(istype(M, /mob/living/carbon))
@@ -45,29 +45,29 @@
if (istype(target, /obj/item/weapon/reagent_containers/food/drinks/cans))
var/obj/item/weapon/reagent_containers/food/drinks/cans/cantarget = target
if(cantarget.canopened == 0)
- user << "You need to open the drink you want to pour into!"
+ to_chat(user, "You need to open the drink you want to pour into!")
return
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if(!target.reagents.total_volume)
- user << " [target] is empty."
+ to_chat(user, " [target] is empty.")
return
if(reagents.total_volume >= reagents.maximum_volume)
- user << " [src] is full."
+ to_chat(user, " [src] is full.")
return
var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
- user << " You fill [src] with [trans] units of the contents of [target]."
+ to_chat(user, " You fill [src] with [trans] units of the contents of [target].")
else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it.
if(!reagents.total_volume)
- user << " [src] is empty."
+ to_chat(user, " [src] is empty.")
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << " [target] is full."
+ to_chat(user, " [target] is full.")
return
@@ -79,19 +79,19 @@
refillName = reagents.get_master_reagent_name()
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << " You transfer [trans] units of the solution to [target]."
+ to_chat(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
if(refill in drinks) // Only synthesize drinks
var/mob/living/silicon/robot/bro = user
var/chargeAmount = max(30,4*trans)
bro.cell.use(chargeAmount)
- user << "Now synthesizing [trans] units of [refillName]..."
+ to_chat(user, "Now synthesizing [trans] units of [refillName]...")
spawn(300)
reagents.add_reagent(refill, trans)
- user << "Cyborg [src] refilled."
+ to_chat(user, "Cyborg [src] refilled.")
return
@@ -101,22 +101,23 @@
if(is_hot(I))
if(src.reagents)
src.reagents.chem_temp += 15
- user << "You heat [src] with [I]."
+ to_chat(user, "You heat [src] with [I].")
src.reagents.handle_reactions()
/obj/item/weapon/reagent_containers/food/drinks/examine(mob/user)
if(!..(user, 1))
return
if(!reagents || reagents.total_volume==0)
- user << " \The [src] is empty!"
+ to_chat(user, " \The [src] is empty!")
else if (reagents.total_volume<=src.volume/4)
- user << " \The [src] is almost empty!"
+ to_chat(user, " \The [src] is almost empty!")
else if (reagents.total_volume<=src.volume*0.66)
- user << " \The [src] is half full!" // We're all optimistic, right?!
+ to_chat(user, " \The [src] is half full!")// We're all optimistic, right?!
+
else if (reagents.total_volume<=src.volume*0.90)
- user << " \The [src] is almost full!"
+ to_chat(user, " \The [src] is almost full!")
else
- user << " \The [src] is full!"
+ to_chat(user, " \The [src] is full!")
////////////////////////////////////////////////////////////////////////////////
/// Drinks. END
diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm
index 943c5022dc4..75919c4314f 100644
--- a/code/modules/reagents/reagent_containers/food/sandwich.dm
+++ b/code/modules/reagents/reagent_containers/food/sandwich.dm
@@ -25,16 +25,16 @@
sandwich_limit += 4
if(src.contents.len > sandwich_limit)
- user << "\red If you put anything else on \the [src] it's going to collapse."
+ to_chat(user, "\red If you put anything else on \the [src] it's going to collapse.")
return
else if(istype(W,/obj/item/weapon/shard))
- user << "\blue You hide [W] in \the [src]."
+ to_chat(user, "\blue You hide [W] in \the [src].")
user.drop_item()
W.loc = src
update()
return
else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks))
- user << "\blue You layer [W] over \the [src]."
+ to_chat(user, "\blue You layer [W] over \the [src].")
var/obj/item/weapon/reagent_containers/F = W
F.reagents.trans_to(src, F.reagents.total_volume)
user.drop_item()
@@ -83,7 +83,7 @@
/obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user)
..(user)
var/obj/item/O = pick(contents)
- user << "\blue You think you can see [O.name] in there."
+ to_chat(user, "\blue You think you can see [O.name] in there.")
/obj/item/weapon/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone)
@@ -98,7 +98,7 @@
H = M
if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable.
- H << "\red You lacerate your mouth on a [shard.name] in the sandwich!"
+ to_chat(H, "\red You lacerate your mouth on a [shard.name] in the sandwich!")
H.adjustBruteLoss(5) //TODO: Target head if human.
..()
*/
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index eee8c78f9b0..d2754ba5972 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -21,7 +21,7 @@
spawn(0)
if(!reagents.total_volume)
if(M == usr)
- usr << "You finish eating \the [src]."
+ to_chat(usr, "You finish eating \the [src].")
usr.visible_message("[usr] finishes eating \the [src].")
usr.unEquip(src) //so icons update :[
@@ -39,7 +39,7 @@
/obj/item/weapon/reagent_containers/food/snacks/attack(mob/M as mob, mob/user as mob, def_zone)
if(reagents && !reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it.
- user << "None of [src] left, oh no!"
+ to_chat(user, "None of [src] left, oh no!")
M.unEquip(src) //so icons update :[
qdel(src)
return 0
@@ -60,11 +60,11 @@
if (bitecount==0)
return
else if (bitecount==1)
- user << "\blue \The [src] was bitten by someone!"
+ to_chat(user, "\blue \The [src] was bitten by someone!")
else if (bitecount<=3)
- user << "\blue \The [src] was bitten [bitecount] times!"
+ to_chat(user, "\blue \The [src] was bitten [bitecount] times!")
else
- user << "\blue \The [src] was bitten multiple times!"
+ to_chat(user, "\blue \The [src] was bitten multiple times!")
/obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W, mob/user, params)
@@ -81,7 +81,7 @@
var/obj/item/weapon/kitchen/utensil/U = W
if(U.contents.len >= U.max_contents)
- user << "You cannot fit anything else on your [U]."
+ to_chat(user, "You cannot fit anything else on your [U].")
return
user.visible_message( \
@@ -98,10 +98,18 @@
var/obj/item/weapon/reagent_containers/food/snacks/collected = new type
collected.loc = U
collected.reagents.remove_any(collected.reagents.total_volume)
+ collected.trash = null
if(reagents.total_volume > bitesize)
reagents.trans_to(collected, bitesize)
else
reagents.trans_to(collected, reagents.total_volume)
+ if(trash)
+ var/obj/item/TrashItem
+ if(ispath(trash,/obj/item))
+ TrashItem = new trash(src)
+ else if(istype(trash,/obj/item))
+ TrashItem = trash
+ TrashItem.forceMove(loc)
qdel(src)
return 1
@@ -124,7 +132,7 @@
else if(W.w_class <= 2 && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable))
if(!iscarbon(user))
return 1
- user << "\red You slip [W] inside [src]."
+ to_chat(user, "\red You slip [W] inside [src].")
user.unEquip(W)
if ((user.client && user.s_active != src))
user.client.screen -= W
@@ -140,7 +148,7 @@
!(locate(/obj/machinery/optable) in src.loc) && \
!(locate(/obj/item/weapon/storage/bag/tray) in src.loc) \
)
- user << "\red You cannot slice [src] here! You need a table or at least a tray to do it."
+ to_chat(user, "\red You cannot slice [src] here! You need a table or at least a tray to do it.")
return 1
var/slices_lost = 0
if (!inaccurate)
@@ -185,7 +193,7 @@
bitecount++
else if(ismouse(M))
var/mob/living/simple_animal/mouse/N = M
- N << text("\blue You nibble away at [src].")
+ to_chat(N, text("\blue You nibble away at [src]."))
if(prob(50))
N.visible_message("[N] nibbles away at [src].", "")
//N.emote("nibbles away at the [src]")
@@ -501,10 +509,10 @@
var/clr = C.colourName
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
- usr << "\blue The egg refuses to take on this color!"
+ to_chat(usr, "\blue The egg refuses to take on this color!")
return
- usr << "\blue You color \the [src] [clr]"
+ to_chat(usr, "\blue You color \the [src] [clr]")
icon_state = "egg-[clr]"
item_color = clr
else
@@ -846,6 +854,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("nanomachines", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/roburgerbig
@@ -857,7 +866,7 @@
New()
..()
- reagents.add_reagent("nanites", 100)
+ reagents.add_reagent("nanomachines", 100)
bitesize = 0.1
/obj/item/weapon/reagent_containers/food/snacks/xenoburger
@@ -1132,7 +1141,7 @@
bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
On_Consume()
if(prob(unpopped)) //lol ...what's the point?
- usr << "\red You bite down on an un-popped kernel!"
+ to_chat(usr, "\red You bite down on an un-popped kernel!")
unpopped = max(0, unpopped-1)
..()
@@ -1593,10 +1602,16 @@
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user, proximity)
if(!proximity) return
if(istype(O,/obj/structure/sink) && !wrapped)
- user << "You place [src] under a stream of water..."
+ to_chat(user, "You place [src] under a stream of water...")
user.drop_item()
forceMove(get_turf(O))
return Expand()
+ if(istype(O, /obj/machinery/computer/camera_advanced/xenobio))
+ var/obj/machinery/computer/camera_advanced/xenobio/X = O
+ X.monkeys++
+ to_chat(user, "You feed [src] to the [X]. It now has [X.monkeys] monkey cubes stored.")
+ qdel(src)
+ return
..()
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/attack_self(mob/user)
@@ -1623,7 +1638,7 @@
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Unwrap(mob/user)
icon_state = "monkeycube"
desc = "Just add water!"
- user << "You unwrap the cube."
+ to_chat(user, "You unwrap the cube.")
wrapped = 0
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped
@@ -2812,7 +2827,7 @@
if( open && pizza )
user.put_in_hands( pizza )
- user << "\red You take the [src.pizza] out of the [src]."
+ to_chat(user, "\red You take the [src.pizza] out of the [src].")
src.pizza = null
update_icon()
return
@@ -2826,7 +2841,7 @@
boxes -= box
user.put_in_hands( box )
- user << "\red You remove the topmost [src] from your hand."
+ to_chat(user, "\red You remove the topmost [src] from your hand.")
box.update_icon()
update_icon()
return
@@ -2865,11 +2880,11 @@
box.update_icon()
update_icon()
- user << "\red You put the [box] ontop of the [src]!"
+ to_chat(user, "\red You put the [box] ontop of the [src]!")
else
- user << "\red The stack is too high!"
+ to_chat(user, "\red The stack is too high!")
else
- user << "\red Close the [box] first!"
+ to_chat(user, "\red Close the [box] first!")
return
@@ -2882,9 +2897,9 @@
update_icon()
- user << "\red You put the [I] in the [src]!"
+ to_chat(user, "\red You put the [I] in the [src]!")
else
- user << "\red You try to push the [I] through the lid but it doesn't work!"
+ to_chat(user, "\red You try to push the [I] through the lid but it doesn't work!")
return
if( istype(I, /obj/item/weapon/pen/) )
@@ -3187,10 +3202,10 @@
if(istype(I, /obj/item/weapon/kitchen/rollingpin))
if(isturf(loc))
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(loc)
- user << "You flatten [src]."
+ to_chat(user, "You flatten [src].")
qdel(src)
else
- user << "You need to put [src] on a surface to roll it out!"
+ to_chat(user, "You need to put [src] on a surface to roll it out!")
else
..()
diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
index 12fb6f6db69..dc9999a7f4c 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
@@ -17,7 +17,7 @@
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
- user << "You cut the meat in thin strips."
+ to_chat(user, "You cut the meat in thin strips.")
qdel(src)
else
..()
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index e550e2c1cd6..d37460b4949 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -299,4 +299,120 @@
New()
..()
- reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide","spidereggs"), 40)
\ No newline at end of file
+ reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide","spidereggs","nanomachines"), 40)
+
+
+/obj/item/weapon/reagent_containers/glass/bottle/plasma
+ name = "plasma dust bottle"
+ desc = "A small bottle of plasma in dust form. Extremely toxic and reacts with micro-organisms inside blood."
+ icon_state = "bottle8"
+ list_reagents = list("plasma_dust" = 30)
+
+/obj/item/weapon/reagent_containers/glass/bottle/diphenhydramine
+ name = "diphenhydramine bottle"
+ desc = "A small bottle of diphenhydramine."
+ icon_state = "bottle20"
+ list_reagents = list("diphenhydramine" = 30)
+
+/obj/item/weapon/reagent_containers/glass/bottle/flu_virion
+ name = "Flu virion culture bottle"
+ desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/advance/flu
+
+/obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion
+ name = "Epiglottis virion culture bottle"
+ desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/advance/voice_change
+
+/obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion
+ name = "Liver enhancement virion culture bottle"
+ desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/advance/heal
+
+/obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion
+ name = "Hullucigen virion culture bottle"
+ desc = "A small bottle. Contains hullucigen virion culture in synthblood medium."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/advance/hullucigen
+
+/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat
+ name = "Pierrot's Throat culture bottle"
+ desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/pierrot_throat
+
+/obj/item/weapon/reagent_containers/glass/bottle/cold
+ name = "Rhinovirus culture bottle"
+ desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/advance/cold
+
+/obj/item/weapon/reagent_containers/glass/bottle/retrovirus
+ name = "Retrovirus culture bottle"
+ desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/dna_retrovirus
+
+/obj/item/weapon/reagent_containers/glass/bottle/gbs
+ name = "GBS culture bottle"
+ desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
+ icon_state = "bottle3"
+ amount_per_transfer_from_this = 5
+ spawned_disease = /datum/disease/gbs
+
+/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs
+ name = "GBS culture bottle"
+ desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/fake_gbs
+
+/obj/item/weapon/reagent_containers/glass/bottle/brainrot
+ name = "Brainrot culture bottle"
+ desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/brainrot
+
+/obj/item/weapon/reagent_containers/glass/bottle/magnitis
+ name = "Magnitis culture bottle"
+ desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/magnitis
+
+/obj/item/weapon/reagent_containers/glass/bottle/wizarditis
+ name = "Wizarditis culture bottle"
+ desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/wizarditis
+
+/obj/item/weapon/reagent_containers/glass/bottle/anxiety
+ name = "Severe Anxiety culture bottle"
+ desc = "A small bottle. Contains a sample of Lepidopticides."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/anxiety
+
+/obj/item/weapon/reagent_containers/glass/bottle/beesease
+ name = "Beesease culture bottle"
+ desc = "A small bottle. Contains a sample of invasive Apidae."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/beesease
+
+/obj/item/weapon/reagent_containers/glass/bottle/fluspanish
+ name = "Spanish flu culture bottle"
+ desc = "A small bottle. Contains a sample of Inquisitius."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/fluspanish
+
+/obj/item/weapon/reagent_containers/glass/bottle/tuberculosis
+ name = "Fungal Tuberculosis culture bottle"
+ desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus."
+ icon_state = "bottle3"
+ spawned_disease = /datum/disease/tuberculosis
+
+/obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure
+ name = "BVAK bottle"
+ desc = "A small bottle containing Bio Virus Antidote Kit."
+ icon_state = "bottle5"
+ list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10)
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index b7c891370b0..190b02c60d7 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -28,148 +28,151 @@
/obj/machinery/atmospherics/unary/cryo_cell,
/obj/machinery/dna_scannernew,
/obj/item/weapon/grenade/chem_grenade,
- /obj/machinery/bot/medbot,
+ /mob/living/simple_animal/bot/medbot,
/obj/item/weapon/storage/secure/safe,
/obj/machinery/iv_drip,
- /obj/machinery/disease2/incubator,
+ /obj/machinery/computer/pandemic,
/obj/machinery/disposal,
/obj/machinery/apiary,
/mob/living/simple_animal/cow,
/mob/living/simple_animal/hostile/retaliate/goat,
- /obj/machinery/computer/centrifuge,
/obj/machinery/sleeper,
/obj/machinery/smartfridge/,
/obj/machinery/biogenerator,
/obj/machinery/portable_atmospherics/hydroponics,
/obj/machinery/constructable_frame)
- New()
- ..()
- base_name = name
+/obj/item/weapon/reagent_containers/glass/New()
+ ..()
+ base_name = name
- examine(mob/user)
- if(!..(user, 2))
+/obj/item/weapon/reagent_containers/glass/examine(mob/user)
+ if(!..(user, 2))
+ return
+ if (!is_open_container())
+ to_chat(user, "Airtight lid seals it completely.")
+
+/obj/item/weapon/reagent_containers/glass/attack_self()
+ ..()
+ if (is_open_container())
+ to_chat(usr, "You put the lid on \the [src].")
+ flags ^= OPENCONTAINER
+ else
+ to_chat(usr, "You take the lid off \the [src].")
+ flags |= OPENCONTAINER
+ update_icon()
+
+/obj/item/weapon/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
+ if(!proximity) return
+ if (!is_open_container())
+ return
+
+ for(var/type in can_be_placed_into)
+ if(istype(target, type))
return
- if (!is_open_container())
- user << "\blue Airtight lid seals it completely."
- attack_self()
- ..()
- if (is_open_container())
- usr << "You put the lid on \the [src]."
- flags ^= OPENCONTAINER
+ if(ismob(target) && target.reagents && reagents.total_volume)
+ to_chat(user, "You splash the solution onto [target].")
+
+ var/mob/living/M = target
+ var/list/injected = list()
+ for(var/datum/reagent/R in reagents.reagent_list)
+ injected += R.name
+ var/contained = english_list(injected)
+ M.attack_log += text("\[[time_stamp()]\] Has been splashed with [name] by [key_name(user)]. Reagents: [contained]")
+ user.attack_log += text("\[[time_stamp()]\] Used the [name] to splash [key_name(M)]. Reagents: [contained]")
+ if(M.ckey)
+ msg_admin_attack("[key_name_admin(user)] splashed [key_name_admin(M)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
+ if(!iscarbon(user))
+ M.LAssailant = null
else
- usr << "You take the lid off \the [src]."
- flags |= OPENCONTAINER
- update_icon()
+ M.LAssailant = user
- afterattack(obj/target, mob/user, proximity)
- if(!proximity) return
- if (!is_open_container())
+ for(var/mob/O in viewers(world.view, user))
+ O.show_message(text("[] has been splashed with something by []!", target, user), 1)
+ reagents.reaction(target, TOUCH)
+ spawn(5) reagents.clear_reagents()
+ return
+ else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
+
+ if(!target.reagents.total_volume && target.reagents)
+ to_chat(user, "[target] is empty.")
return
- for(var/type in src.can_be_placed_into)
- if(istype(target, type))
- return
-
- if(ismob(target) && target.reagents && reagents.total_volume)
- user << "\blue You splash the solution onto [target]."
-
- var/mob/living/M = target
- var/list/injected = list()
- for(var/datum/reagent/R in src.reagents.reagent_list)
- injected += R.name
- var/contained = english_list(injected)
- M.attack_log += text("\[[time_stamp()]\] Has been splashed with [src.name] by [key_name(user)]. Reagents: [contained]")
- user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to splash [key_name(M)]. Reagents: [contained]")
- if(M.ckey)
- msg_admin_attack("[key_name_admin(user)] splashed [key_name_admin(M)] with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
- if(!iscarbon(user))
- M.LAssailant = null
- else
- M.LAssailant = user
-
- for(var/mob/O in viewers(world.view, user))
- O.show_message(text("\red [] has been splashed with something by []!", target, user), 1)
- src.reagents.reaction(target, TOUCH)
- spawn(5) src.reagents.clear_reagents()
- return
- else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
-
- if(!target.reagents.total_volume && target.reagents)
- user << "\red [target] is empty."
- return
-
- if(reagents.total_volume >= reagents.maximum_volume)
- user << "\red [src] is full."
- return
-
- var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
- user << "\blue You fill [src] with [trans] units of the contents of [target]."
-
- else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it.
- if(!reagents.total_volume)
- user << "\red [src] is empty."
- return
-
- if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "\red [target] is full."
- return
-
- // /vg/: Logging transfers of bad things
- if(target.reagents_to_log.len)
- var/list/badshit=list()
- for(var/bad_reagent in target.reagents_to_log)
- if(reagents.has_reagent(bad_reagent))
- badshit += reagents_to_log[bad_reagent]
- if(badshit.len)
- var/hl="\red ([english_list(badshit)]) \black"
- message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl]")
- log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
-
- var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << "\blue You transfer [trans] units of the solution to [target]."
-
- /*else if(istype(target, /obj/machinery/bunsen_burner))
+ if(reagents.total_volume >= reagents.maximum_volume)
+ to_chat(user, "[src] is full.")
return
- else if(istype(target, /obj/machinery/radiocarbon_spectrometer))
- return*/
+ var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
+ to_chat(user, "You fill [src] with [trans] units of the contents of [target].")
- else if(istype(target, /obj/effect/decal/cleanable)) //stops splashing while scooping up fluids
+ else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it.
+ if(!reagents.total_volume)
+ to_chat(user, "[src] is empty.")
return
- else if(reagents.total_volume)
- user << "\blue You splash the solution onto [target]."
- src.reagents.reaction(target, TOUCH)
- spawn(5) src.reagents.clear_reagents()
+ if(target.reagents.total_volume >= target.reagents.maximum_volume)
+ to_chat(user, "[target] is full.")
return
+ // /vg/: Logging transfers of bad things
+ if(target.reagents_to_log.len)
+ var/list/badshit=list()
+ for(var/bad_reagent in target.reagents_to_log)
+ if(reagents.has_reagent(bad_reagent))
+ badshit += reagents_to_log[bad_reagent]
+ if(badshit.len)
+ var/hl="\red ([english_list(badshit)]) \black"
+ message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl]")
+ log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
- attackby(var/obj/item/I, mob/user as mob, params)
- if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
- return
- if(is_hot(I))
- if(src.reagents)
- src.reagents.chem_temp += 15
- user << "You heat [src] with [I]."
- src.reagents.handle_reactions()
- if(istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/device/flashlight/pen))
- var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text))
- if(length(tmp_label) > 10)
- user << "\red The label can be at most 10 characters long."
- else
- user << "\blue You set the label to \"[tmp_label]\"."
- src.label_text = tmp_label
- src.update_name_label()
- if(istype(I,/obj/item/weapon/storage/bag))
- ..()
+ var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
+ to_chat(user, "You transfer [trans] units of the solution to [target].")
- proc/update_name_label()
- if(src.label_text == "")
- src.name = src.base_name
+ else if(istype(target, /obj/item/weapon/reagent_containers/glass) && !target.is_open_container())
+ to_chat(user, "You cannot fill [target] while it is sealed.")
+ return
+
+ /*else if(istype(target, /obj/machinery/bunsen_burner))
+ return
+
+ else if(istype(target, /obj/machinery/radiocarbon_spectrometer))
+ return*/
+
+ else if(istype(target, /obj/effect/decal/cleanable)) //stops splashing while scooping up fluids
+ return
+
+ else if(reagents.total_volume)
+ to_chat(user, "You splash the solution onto [target].")
+ reagents.reaction(target, TOUCH)
+ spawn(5) reagents.clear_reagents()
+ return
+
+
+/obj/item/weapon/reagent_containers/glass/attackby(var/obj/item/I, mob/user as mob, params)
+ if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
+ return
+ if(is_hot(I))
+ if(reagents)
+ reagents.chem_temp += 15
+ to_chat(user, "You heat [src] with [I].")
+ reagents.handle_reactions()
+ if(istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/device/flashlight/pen))
+ var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text))
+ if(length(tmp_label) > MAX_NAME_LEN)
+ to_chat(user, "The label can be at most [MAX_NAME_LEN] characters long.")
else
- src.name = "[src.base_name] ([src.label_text])"
+ to_chat(user, "You set the label to \"[tmp_label]\".")
+ label_text = tmp_label
+ update_name_label()
+ if(istype(I,/obj/item/weapon/storage/bag))
+ ..()
+
+/obj/item/weapon/reagent_containers/glass/proc/update_name_label()
+ if(label_text == "")
+ name = base_name
+ else
+ name = "[base_name] ([label_text])"
/obj/item/weapon/reagent_containers/glass/beaker
name = "beaker"
@@ -180,45 +183,45 @@
materials = list(MAT_GLASS=500)
var/obj/item/device/assembly_holder/assembly = null
- on_reagent_change()
- update_icon()
-
- pickup(mob/user)
- ..()
- update_icon()
-
- dropped(mob/user)
- ..()
- update_icon()
-
- attack_hand()
- ..()
- update_icon()
-
+/obj/item/weapon/reagent_containers/glass/beaker/on_reagent_change()
update_icon()
- overlays.Cut()
- if(reagents.total_volume)
- var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+/obj/item/weapon/reagent_containers/glass/beaker/pickup(mob/user)
+ ..()
+ update_icon()
- var/percent = round((reagents.total_volume / volume) * 100)
- switch(percent)
- if(0 to 9) filling.icon_state = "[icon_state]-10"
- if(10 to 24) filling.icon_state = "[icon_state]10"
- if(25 to 49) filling.icon_state = "[icon_state]25"
- if(50 to 74) filling.icon_state = "[icon_state]50"
- if(75 to 79) filling.icon_state = "[icon_state]75"
- if(80 to 90) filling.icon_state = "[icon_state]80"
- if(91 to INFINITY) filling.icon_state = "[icon_state]100"
+/obj/item/weapon/reagent_containers/glass/beaker/dropped(mob/user)
+ ..()
+ update_icon()
- filling.icon += mix_color_from_reagents(reagents.reagent_list)
- overlays += filling
+/obj/item/weapon/reagent_containers/glass/beaker/attack_hand()
+ ..()
+ update_icon()
- if (!is_open_container())
- var/image/lid = image(icon, src, "lid_[initial(icon_state)]")
- overlays += lid
- if(assembly)
- overlays += "assembly"
+/obj/item/weapon/reagent_containers/glass/beaker/update_icon()
+ overlays.Cut()
+
+ if(reagents.total_volume)
+ var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+
+ var/percent = round((reagents.total_volume / volume) * 100)
+ switch(percent)
+ if(0 to 9) filling.icon_state = "[icon_state]-10"
+ if(10 to 24) filling.icon_state = "[icon_state]10"
+ if(25 to 49) filling.icon_state = "[icon_state]25"
+ if(50 to 74) filling.icon_state = "[icon_state]50"
+ if(75 to 79) filling.icon_state = "[icon_state]75"
+ if(80 to 90) filling.icon_state = "[icon_state]80"
+ if(91 to INFINITY) filling.icon_state = "[icon_state]100"
+
+ filling.icon += mix_color_from_reagents(reagents.reagent_list)
+ overlays += filling
+
+ if (!is_open_container())
+ var/image/lid = image(icon, src, "lid_[initial(icon_state)]")
+ overlays += lid
+ if(assembly)
+ overlays += "assembly"
/obj/item/weapon/reagent_containers/glass/beaker/verb/remove_assembly()
set name = "Remove Assembly"
@@ -227,12 +230,12 @@
if(usr.stat || !usr.canmove || usr.restrained())
return
if (assembly)
- usr << "You detach [assembly] from \the [src]"
+ to_chat(usr, "You detach [assembly] from \the [src]")
usr.put_in_hands(assembly)
assembly = null
update_icon()
else
- usr << "There is no assembly to remove."
+ to_chat(usr, "There is no assembly to remove.")
/obj/item/weapon/reagent_containers/glass/beaker/proc/heat_beaker()
if(reagents)
@@ -242,7 +245,7 @@
/obj/item/weapon/reagent_containers/glass/beaker/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W,/obj/item/device/assembly_holder))
if (assembly)
- usr << "The [src] already has an assembly."
+ to_chat(usr, "The [src] already has an assembly.")
return ..()
assembly = W
user.drop_item()
@@ -310,23 +313,20 @@
possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
flags = OPENCONTAINER
-/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
- New()
- ..()
- reagents.add_reagent("cryoxadone", 30)
- update_icon()
+/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone/New()
+ ..()
+ reagents.add_reagent("cryoxadone", 30)
+ update_icon()
-/obj/item/weapon/reagent_containers/glass/beaker/sulphuric
- New()
- ..()
- reagents.add_reagent("sacid", 50)
- update_icon()
+/obj/item/weapon/reagent_containers/glass/beaker/sulphuric/New()
+ ..()
+ reagents.add_reagent("sacid", 50)
+ update_icon()
-/obj/item/weapon/reagent_containers/glass/beaker/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 50)
- update_icon()
+/obj/item/weapon/reagent_containers/glass/beaker/slime/New()
+ ..()
+ reagents.add_reagent("slimejelly", 50)
+ update_icon()
/obj/item/weapon/reagent_containers/glass/bucket
desc = "It's a bucket."
@@ -341,15 +341,15 @@
volume = 120
flags = OPENCONTAINER
- attackby(var/obj/D, mob/user as mob, params)
- if(isprox(D))
- user << "You add [D] to [src]."
- qdel(D)
- user.put_in_hands(new /obj/item/weapon/bucket_sensor)
- user.unEquip(src)
- qdel(src)
- else
- ..()
+/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/D, mob/user as mob, params)
+ if(isprox(D))
+ to_chat(user, "You add [D] to [src].")
+ qdel(D)
+ user.put_in_hands(new /obj/item/weapon/bucket_sensor)
+ user.unEquip(src)
+ qdel(src)
+ else
+ ..()
/obj/item/weapon/reagent_containers/glass/beaker/vial
name = "vial"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index eb932e8488f..22466811e3e 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -17,13 +17,13 @@
/obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M, mob/user)
if(!reagents.total_volume)
- user << "\red [src] is empty."
+ to_chat(user, "\red [src] is empty.")
return
if(!istype(M))
return
if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1)))
- user << "\blue You inject [M] with [src]."
- M << "\red You feel a tiny prick!"
+ to_chat(user, "\blue You inject [M] with [src].")
+ to_chat(M, "\red You feel a tiny prick!")
src.reagents.add_reagent(M)
if(M.reagents)
@@ -41,7 +41,7 @@
M.LAssailant = user
var/trans = reagents.trans_to(M, amount_per_transfer_from_this)
- user << "\blue [trans] units injected. [reagents.total_volume] units remaining in [src]."
+ to_chat(user, "\blue [trans] units injected. [reagents.total_volume] units remaining in [src].")
return
@@ -102,9 +102,9 @@
/obj/item/weapon/reagent_containers/hypospray/autoinjector/examine(mob/user)
..(user)
if(reagents && reagents.reagent_list.len)
- user << "\blue It is currently loaded."
+ to_chat(user, "\blue It is currently loaded.")
else
- user << "\blue It is spent."
+ to_chat(user, "\blue It is spent.")
/obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone //basilisks
name = "teporone autoinjector"
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 6dac43db7d1..4af5ab79bc7 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -33,7 +33,7 @@
if(target.is_open_container() != 0 && target.reagents)
if(!target.reagents.total_volume)
- user << "[target] is empty. Cant dissolve [src]."
+ to_chat(user, "[target] is empty. Cant dissolve [src].")
return
// /vg/: Logging transfers of bad things
@@ -47,7 +47,7 @@
message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (JMP)")
log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
- user << "You dissolve [src] in [target]."
+ to_chat(user, "You dissolve [src] in [target].")
reagents.trans_to(target, reagents.total_volume)
for(var/mob/O in viewers(2, user))
O.show_message("[user] puts something in [target].", 1)
diff --git a/code/modules/reagents/reagent_containers/robodropper.dm b/code/modules/reagents/reagent_containers/robodropper.dm
index c5da1639304..b035b2aea12 100644
--- a/code/modules/reagents/reagent_containers/robodropper.dm
+++ b/code/modules/reagents/reagent_containers/robodropper.dm
@@ -15,11 +15,11 @@
if(filled)
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "\red [target] is full."
+ to_chat(user, "\red [target] is full.")
return
if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food)) //You can inject humans and food but you cant remove the shit.
- user << "\red You cannot directly fill this object."
+ to_chat(user, "\red You cannot directly fill this object.")
return
@@ -62,7 +62,7 @@
src.reagents.reaction(safe_thing, TOUCH)
- user << "\blue You transfer [trans] units of the solution."
+ to_chat(user, "\blue You transfer [trans] units of the solution.")
if (src.reagents.total_volume<=0)
filled = 0
icon_state = "[initial(icon_state)]"
@@ -88,7 +88,7 @@
M.LAssailant = user
trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << "\blue You transfer [trans] units of the solution."
+ to_chat(user, "\blue You transfer [trans] units of the solution.")
if (src.reagents.total_volume<=0)
filled = 0
icon_state = "[initial(icon_state)]"
@@ -96,16 +96,16 @@
else
if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers))
- user << "\red You cannot directly remove reagents from [target]."
+ to_chat(user, "\red You cannot directly remove reagents from [target].")
return
if(!target.reagents.total_volume)
- user << "\red [target] is empty."
+ to_chat(user, "\red [target] is empty.")
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
- user << "\blue You fill the dropper with [trans] units of the solution."
+ to_chat(user, "\blue You fill the dropper with [trans] units of the solution.")
filled = 1
icon_state = "[initial(icon_state)][filled]"
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 04859c66c32..32a0e752913 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -27,19 +27,19 @@
if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) //this block copypasted from reagent_containers/glass, for lack of a better solution
if(!A.reagents.total_volume && A.reagents)
- user << "\The [A] is empty."
+ to_chat(user, "\The [A] is empty.")
return
if(reagents.total_volume >= reagents.maximum_volume)
- user << "\The [src] is full."
+ to_chat(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]."
+ to_chat(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!"
+ to_chat(user, "\The [src] is empty!")
return
spray(A)
@@ -79,11 +79,11 @@
amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
spray_currentrange = (spray_currentrange == 1 ? spray_maxrange : 1)
- user << "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray."
+ to_chat(user, "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")
/obj/item/weapon/reagent_containers/spray/examine(mob/user)
if(..(user, 0) && user==src.loc)
- user << "[round(src.reagents.total_volume)] units left."
+ to_chat(user, "[round(src.reagents.total_volume)] units left.")
/obj/item/weapon/reagent_containers/spray/verb/empty()
@@ -95,7 +95,7 @@
if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
return
if(isturf(usr.loc) && src.loc == usr)
- usr << "You empty \the [src] onto the floor."
+ to_chat(usr, "You empty \the [src] onto the floor.")
reagents.reaction(usr.loc)
src.reagents.clear_reagents()
@@ -207,7 +207,7 @@
/obj/item/weapon/reagent_containers/spray/chemsprayer/attack_self(var/mob/user)
amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
- user << "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray."
+ to_chat(user, "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray.")
// Plant-B-Gone
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index a7a0f1bba7a..5c7e6d0ca4c 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -62,7 +62,7 @@
return
if(mode == SYRINGE_BROKEN)
- user << "\red This syringe is broken!"
+ to_chat(user, "\red This syringe is broken!")
return
/* if (user.a_intent == I_HARM && ismob(target))
@@ -76,23 +76,23 @@
if(SYRINGE_DRAW)
if(reagents.total_volume >= reagents.maximum_volume)
- user << "\red The syringe is full."
+ to_chat(user, "\red The syringe is full.")
return
if(ismob(target))//Blood!
if(istype(target, /mob/living/carbon/slime))
- user << "\red You are unable to locate any blood."
+ to_chat(user, "\red You are unable to locate any blood.")
return
if(src.reagents.has_reagent("blood"))
- user << "\red There is already a blood sample in this syringe"
+ to_chat(user, "\red There is already a blood sample in this syringe")
return
if(istype(target, /mob/living/carbon))//maybe just add a blood reagent to all mobs. Then you can suck them dry...With hundreds of syringes. Jolly good idea.
var/mob/living/carbon/T = target
if(!T.dna)
- usr << "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)"
+ to_chat(usr, "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)")
return
if(NOCLONE in T.mutations) //target done been et, no more blood in him
- user << "\red You are unable to locate any blood."
+ to_chat(user, "\red You are unable to locate any blood.")
return
@@ -100,7 +100,7 @@
if(istype(target,/mob/living/carbon/human))
var/mob/living/carbon/human/H = T
if(H.species.flags & NO_BLOOD)
- usr << "You are unable to locate any blood."
+ to_chat(usr, "You are unable to locate any blood.")
return
if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
time = 60
@@ -114,14 +114,14 @@
var/amount = src.reagents.maximum_volume - src.reagents.total_volume
if(amount == 0)
- usr << "The syringe is full!"
+ to_chat(usr, "The syringe is full!")
return
var/datum/reagent/B
if(istype(T,/mob/living/carbon/human))
var/mob/living/carbon/human/H = T
- if(H.species && H.species.exotic_blood && H.reagents.total_volume)
- H.reagents.trans_to(src,amount)
+ if(H.species && H.species.exotic_blood && H.vessel.total_volume)
+ H.vessel.trans_to(src,amount)
else
B = T.take_blood(src,amount)
else
@@ -133,53 +133,55 @@
src.on_reagent_change()
src.reagents.handle_reactions()
- user << "\blue You take a blood sample from [target]"
+ to_chat(user, "\blue You take a blood sample from [target]")
for(var/mob/O in viewers(4, user))
O.show_message("\red [user] takes a blood sample from [target].", 1)
+ else
+ user.visible_message("[user] takes a sample from [target].", "You take a sample from [target].")
else //if not mob
if(!target.reagents.total_volume)
- user << "\red [target] is empty."
+ to_chat(user, "\red [target] is empty.")
return
if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers) && !istype(target,/obj/item/slime_extract))
- user << "\red You cannot directly remove reagents from this object."
+ to_chat(user, "\red You cannot directly remove reagents from this object.")
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares?
- user << "\blue You fill the syringe with [trans] units of the solution."
+ to_chat(user, "\blue You fill the syringe with [trans] units of the solution.")
if (reagents.total_volume >= reagents.maximum_volume)
mode=!mode
update_icon()
if(SYRINGE_INJECT)
if(!reagents.total_volume)
- user << "\red The Syringe is empty."
+ to_chat(user, "\red The Syringe is empty.")
return
if(istype(target, /obj/item/weapon/implantcase/chem))
return
if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/cigarette) && !istype(target, /obj/item/weapon/storage/fancy/cigarettes))
- user << "\red You cannot directly fill this object."
+ to_chat(user, "\red You cannot directly fill this object.")
return
if(istype(target, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/C = target
if(istype(C.loc, /obj/item/weapon/storage/fancy/cigarettes))
- user << "\red You cannot inject a cigarette while it's still in the pack."
+ to_chat(user, "\red You cannot inject a cigarette while it's still in the pack.")
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "\red [target] is full."
+ to_chat(user, "\red [target] is full.")
return
var/mob/living/carbon/human/H = target
if(istype(H))
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
- user << "\The [H] is missing that limb!"
+ to_chat(user, "\The [H] is missing that limb!")
return
/* else if(affected.status & ORGAN_ROBOT)
- user << "You cannot inject a robotic limb."
+ to_chat(user, "You cannot inject a robotic limb.")
return */
if(ismob(target) && target != user)
@@ -254,7 +256,7 @@
C.inject_blood(src,5)
else
trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."
+ to_chat(user, "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.")
if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT)
mode = SYRINGE_DRAW
update_icon()
@@ -305,7 +307,7 @@
var/obj/item/organ/external/affecting = target:get_organ(target_zone)
if (!affecting || (affecting.status & ORGAN_DESTROYED) || affecting.is_stump())
- user << "They are missing that limb!"
+ to_chat(user, "They are missing that limb!")
return
var/hit_area = affecting.name
@@ -383,40 +385,40 @@
if(SYRINGE_DRAW)
if(reagents.total_volume >= reagents.maximum_volume)
- user << "\red The syringe is full."
+ to_chat(user, "\red The syringe is full.")
return
if(ismob(target))
if(istype(target, /mob/living/carbon))//I Do not want it to suck 50 units out of people
- usr << "This needle isn't designed for drawing blood."
+ to_chat(usr, "This needle isn't designed for drawing blood.")
return
else //if not mob
if(!target.reagents.total_volume)
- user << "\red [target] is empty."
+ to_chat(user, "\red [target] is empty.")
return
if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers))
- user << "\red You cannot directly remove reagents from this object."
+ to_chat(user, "\red You cannot directly remove reagents from this object.")
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares?
- user << "\blue You fill the syringe with [trans] units of the solution."
+ to_chat(user, "\blue You fill the syringe with [trans] units of the solution.")
if (reagents.total_volume >= reagents.maximum_volume)
mode=!mode
update_icon()
if(SYRINGE_INJECT)
if(!reagents.total_volume)
- user << "\red The Syringe is empty."
+ to_chat(user, "\red The Syringe is empty.")
return
if(istype(target, /obj/item/weapon/implantcase/chem))
return
if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food))
- user << "\red You cannot directly fill this object."
+ to_chat(user, "\red You cannot directly fill this object.")
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "\red [target] is full."
+ to_chat(user, "\red [target] is full.")
return
if(ismob(target) && target != user)
@@ -430,7 +432,7 @@
src.reagents.reaction(target, INGEST)
spawn(5)
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units."
+ to_chat(user, "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.")
if (reagents.total_volume >= reagents.maximum_volume && mode==SYRINGE_INJECT)
mode = SYRINGE_DRAW
update_icon()
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index ed2809896c7..23f09e6c95b 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -26,12 +26,12 @@
/obj/structure/reagent_dispensers/examine(mob/user)
if(!..(user, 2))
return
- user << "\blue It contains:"
+ to_chat(user, "\blue It contains:")
if(reagents && reagents.reagent_list.len)
for(var/datum/reagent/R in reagents.reagent_list)
- user << "\blue [R.volume] units of [R.name]"
+ to_chat(user, "\blue [R.volume] units of [R.name]")
else
- user << "\blue Nothing."
+ to_chat(user, "\blue Nothing.")
/obj/structure/reagent_dispensers/verb/set_APTFT() //set amount_per_transfer_from_this
set name = "Set transfer amount"
@@ -115,7 +115,7 @@
if(!..(user, 2))
return
if(rig)
- usr << "There is some kind of device rigged to the tank."
+ to_chat(usr, "There is some kind of device rigged to the tank.")
/obj/structure/reagent_dispensers/fueltank/attack_hand()
if (rig)
@@ -129,7 +129,7 @@
/obj/structure/reagent_dispensers/fueltank/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W,/obj/item/device/assembly_holder) && accepts_rig)
if (rig)
- user << "\red There is another device in the way."
+ to_chat(user, "\red There is another device in the way.")
return ..()
user.visible_message("[user] begins rigging [W] to \the [src].", "You begin rigging [W] to \the [src]")
if(do_after(user, 20, target = src))
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index c4ba69dc71a..b093048d5e5 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -222,7 +222,7 @@
// attack with hand, switch position
/obj/machinery/conveyor_switch/attack_hand(mob/user)
if(!allowed(user))
- user << "Access denied."
+ to_chat(user, "Access denied.")
return
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 10fb01573d5..948973bc3bc 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -90,7 +90,7 @@
return
if(anchored)
- usr << "You must unfasten the pipe before rotating it."
+ to_chat(usr, "You must unfasten the pipe before rotating it.")
return
dir = turn(dir, -90)
@@ -103,7 +103,7 @@
return
if(anchored)
- usr << "You must unfasten the pipe before flipping it."
+ to_chat(usr, "You must unfasten the pipe before flipping it.")
return
dir = turn(dir, 180)
@@ -164,17 +164,17 @@
var/turf/T = src.loc
if(T.intact)
- user << "You can only attach the [nicetype] if the floor plating is removed."
+ to_chat(user, "You can only attach the [nicetype] if the floor plating is removed.")
return
var/obj/structure/disposalpipe/CP = locate() in T
if(ptype>=6 && ptype <= 8) // Disposal or outlet
if(CP) // There's something there
if(!istype(CP,/obj/structure/disposalpipe/trunk))
- user << "The [nicetype] requires a trunk underneath it in order to work."
+ to_chat(user, "The [nicetype] requires a trunk underneath it in order to work.")
return
else // Nothing under, fuck.
- user << "The [nicetype] requires a trunk underneath it in order to work."
+ to_chat(user, "The [nicetype] requires a trunk underneath it in order to work.")
return
else
if(CP)
@@ -183,7 +183,7 @@
if(istype(CP, /obj/structure/disposalpipe/broken))
pdir = CP.dir
if(pdir & dpdir)
- user << "There is already a [nicetype] at that location."
+ to_chat(user, "There is already a [nicetype] at that location.")
return
@@ -195,7 +195,7 @@
density = 0
else
density = 1
- user << "You detach the [nicetype] from the underfloor."
+ to_chat(user, "You detach the [nicetype] from the underfloor.")
else
anchored = 1
if(ispipe)
@@ -203,7 +203,7 @@
density = 0
else
density = 1 // We don't want disposal bins or outlets to go density 0
- user << "You attach the [nicetype] to the underfloor."
+ to_chat(user, "You attach the [nicetype] to the underfloor.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
update()
@@ -212,10 +212,10 @@
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "Welding the [nicetype] in place."
+ to_chat(user, "Welding the [nicetype] in place.")
if(do_after(user, 20, target = src))
if(!src || !W.isOn()) return
- user << "The [nicetype] has been welded in place!"
+ to_chat(user, "The [nicetype] has been welded in place!")
update() // TODO: Make this neat
if(ispipe) // Pipe
@@ -254,8 +254,8 @@
qdel(src)
return
else
- user << "You need more welding fuel to complete this task."
+ to_chat(user, "You need more welding fuel to complete this task.")
return
else
- user << "You need to attach it to the plating first!"
+ to_chat(user, "You need to attach it to the plating first!")
return
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index ce5ca78ebe0..4301d393391 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -69,30 +69,30 @@
if(mode<=0) // It's off
if(istype(I, /obj/item/weapon/screwdriver))
if(contents.len > 0)
- user << "Eject the items first!"
+ to_chat(user, "Eject the items first!")
return
if(mode==0) // It's off but still not unscrewed
mode=-1 // Set it to doubleoff l0l
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You remove the screws around the power connection."
+ to_chat(user, "You remove the screws around the power connection.")
return
else if(mode==-1)
mode=0
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You attach the screws around the power connection."
+ to_chat(user, "You attach the screws around the power connection.")
return
else if(istype(I,/obj/item/weapon/weldingtool) && mode==-1)
if(contents.len > 0)
- user << "Eject the items first!"
+ to_chat(user, "Eject the items first!")
return
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the floorweld off the disposal unit."
+ to_chat(user, "You start slicing the floorweld off the disposal unit.")
if(do_after(user,20, target = src))
if(!src || !W.isOn()) return
- user << "You sliced the floorweld off the disposal unit."
+ to_chat(user, "You sliced the floorweld off the disposal unit.")
var/obj/structure/disposalconstruct/C = new (src.loc)
src.transfer_fingerprints_to(C)
C.ptype = 6 // 6 = disposal unit
@@ -102,11 +102,11 @@
qdel(src)
return
else
- user << "You need more welding fuel to complete this task."
+ to_chat(user, "You need more welding fuel to complete this task.")
return
if(istype(I, /obj/item/weapon/melee/energy/blade))
- user << "You can't place that item inside the disposal unit."
+ to_chat(user, "You can't place that item inside the disposal unit.")
return
if(istype(I, /obj/item/weapon/storage))
@@ -146,7 +146,7 @@
if(I)
I.loc = src
- user << "You place \the [I] into the [src]."
+ to_chat(user, "You place \the [I] into the [src].")
for(var/mob/M in viewers(src))
if(M == user)
continue
@@ -176,10 +176,10 @@
if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis) // if drop self, then climbed in
// must be awake, not stunned or whatever
msg = "[user.name] climbs into the [src]."
- user << "You climb into the [src]."
+ to_chat(user, "You climb into the [src].")
else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
msg = "[user.name] stuffs [target.name] into the [src]!"
- user << "You stuff [target.name] into the [src]!"
+ to_chat(user, "You stuff [target.name] into the [src]!")
user.attack_log += text("\[[time_stamp()]\] Has placed [key_name(target)] in disposals.")
target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [key_name(user)]")
@@ -239,7 +239,7 @@
return
if(user && user.loc == src)
- usr << "\red You cannot reach the controls from inside."
+ to_chat(usr, "\red You cannot reach the controls from inside.")
return
// Clumsy folks can only flush it.
@@ -279,11 +279,11 @@
/obj/machinery/disposal/Topic(href, href_list)
if(usr.loc == src)
- usr << "\red You cannot reach the controls from inside."
+ to_chat(usr, "\red You cannot reach the controls from inside.")
return
if(mode==-1 && !href_list["eject"]) // only allow ejecting if mode is -1
- usr << "\red The disposal units power is disabled."
+ to_chat(usr, "\red The disposal units power is disabled.")
return
if(..())
@@ -636,7 +636,7 @@
if (src.loc)
for (var/mob/M in hearers(src.loc.loc))
- M << "CLONG, clong!"
+ to_chat(M, "CLONG, clong!")
playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0)
@@ -884,15 +884,15 @@
// check if anything changed over 2 seconds
var/turf/uloc = user.loc
var/atom/wloc = W.loc
- user << "Slicing the disposal pipe."
+ to_chat(user, "Slicing the disposal pipe.")
sleep(30)
if(!W.isOn()) return
if(user.loc == uloc && wloc == W.loc)
welded()
else
- user << "You must stay still while welding the pipe."
+ to_chat(user, "You must stay still while welding the pipe.")
else
- user << "You need more welding fuel to cut the pipe."
+ to_chat(user, "You need more welding fuel to cut the pipe.")
return
// called when pipe is cut with welder
@@ -1032,7 +1032,7 @@
sortType = O.currTag
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
- user << "\blue Changed filter to [tag]"
+ to_chat(user, "\blue Changed filter to [tag]")
updatedesc()
@@ -1200,15 +1200,15 @@
// check if anything changed over 2 seconds
var/turf/uloc = user.loc
var/atom/wloc = W.loc
- user << "Slicing the disposal pipe."
+ to_chat(user, "Slicing the disposal pipe.")
sleep(30)
if(!W.isOn()) return
if(user.loc == uloc && wloc == W.loc)
welded()
else
- user << "You must stay still while welding the pipe."
+ to_chat(user, "You must stay still while welding the pipe.")
else
- user << "You need more welding fuel to cut the pipe."
+ to_chat(user, "You need more welding fuel to cut the pipe.")
return
// would transfer to next pipe segment, but we are in a trunk
@@ -1315,21 +1315,21 @@
if(mode==0)
mode=1
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You remove the screws around the power connection."
+ to_chat(user, "You remove the screws around the power connection.")
return
else if(mode==1)
mode=0
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You attach the screws around the power connection."
+ to_chat(user, "You attach the screws around the power connection.")
return
else if(istype(I,/obj/item/weapon/weldingtool) && mode==1)
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the floorweld off the disposal outlet."
+ to_chat(user, "You start slicing the floorweld off the disposal outlet.")
if(do_after(user,20, target = src))
if(!src || !W.isOn()) return
- user << "You sliced the floorweld off the disposal outlet."
+ to_chat(user, "You sliced the floorweld off the disposal outlet.")
var/obj/structure/disposalconstruct/C = new (src.loc)
src.transfer_fingerprints_to(C)
C.ptype = 7 // 7 = outlet
@@ -1339,7 +1339,7 @@
qdel(src)
return
else
- user << "You need more welding fuel to complete this task."
+ to_chat(user, "You need more welding fuel to complete this task.")
return
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 07c245d889d..f10a50be115 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -31,14 +31,14 @@
if(sortTag != O.currTag)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
- user << "*[tag]*"
+ to_chat(user, "*[tag]*")
sortTag = O.currTag
playsound(loc, 'sound/machines/twobeep.ogg', 100, 1)
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
- user << "Invalid text."
+ to_chat(user, "Invalid text.")
return
user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
@@ -55,7 +55,7 @@
if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/weapon/c_tube( get_turf(user) )
else
- user << "You need more paper."
+ to_chat(user, "You need more paper.")
/obj/item/smallDelivery
@@ -85,14 +85,14 @@
if(sortTag != O.currTag)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
- user << "*[tag]*"
+ to_chat(user, "*[tag]*")
sortTag = O.currTag
playsound(loc, 'sound/machines/twobeep.ogg', 100, 1)
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
- user << "Invalid text."
+ to_chat(user, "Invalid text.")
return
user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
@@ -106,7 +106,7 @@
if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/weapon/c_tube( get_turf(user) )
else
- user << "You need more paper."
+ to_chat(user, "You need more paper.")
@@ -161,7 +161,7 @@
P.wrapped = O
O.loc = P
else
- user << "You need more paper."
+ to_chat(user, "You need more paper.")
return
else if(istype (target, /obj/structure/closet))
var/obj/structure/closet/O = target
@@ -174,10 +174,10 @@
O.welded = 1
O.loc = P
else
- user << "You need more paper."
+ to_chat(user, "You need more paper.")
return
else
- user << "The object you are trying to wrap is unsuitable for the sorting machinery."
+ to_chat(user, "The object you are trying to wrap is unsuitable for the sorting machinery.")
return
user.visible_message("[user] wraps [target].")
@@ -307,21 +307,21 @@
if(c_mode==0)
c_mode=1
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You remove the screws around the power connection."
+ to_chat(user, "You remove the screws around the power connection.")
return
else if(c_mode==1)
c_mode=0
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You attach the screws around the power connection."
+ to_chat(user, "You attach the screws around the power connection.")
return
else if(istype(I,/obj/item/weapon/weldingtool) && c_mode==1)
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the floorweld off the delivery chute."
+ to_chat(user, "You start slicing the floorweld off the delivery chute.")
if(do_after(user,20, target = src))
if(!src || !W.isOn()) return
- user << "You sliced the floorweld off the delivery chute."
+ to_chat(user, "You sliced the floorweld off the delivery chute.")
var/obj/structure/disposalconstruct/C = new (src.loc)
C.ptype = 8 // 8 = Delivery chute
C.update()
@@ -330,5 +330,5 @@
qdel(src)
return
else
- user << "You need more welding fuel to complete this task."
+ to_chat(user, "You need more welding fuel to complete this task.")
return
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index 249b4956953..146f803edfb 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -119,26 +119,26 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
default_deconstruction_crowbar(O)
return
else
- user << "You can't load the [src.name] while it's opened."
+ to_chat(user, "You can't load the [src.name] while it's opened.")
return
if (disabled)
return
if (!linked_console)
- user << "The [name] must be linked to an R&D console first!"
+ to_chat(user, "The [name] must be linked to an R&D console first!")
return 1
if (O.is_open_container())
return
if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond))
- user << "You cannot insert this item into the [name]!"
+ to_chat(user, "You cannot insert this item into the [name]!")
return
if (stat)
return
if (busy)
- user << "The [name] is busy. Please wait for completion of previous operation."
+ to_chat(user, "The [name] is busy. Please wait for completion of previous operation.")
return
var/obj/item/stack/sheet/stack = O
if ((TotalMaterials() + stack.perunit) > max_material_amount)
- user << "The [name] is full. Please remove glass from the protolathe in order to insert more."
+ to_chat(user, "The [name] is full. Please remove glass from the protolathe in order to insert more.")
return
var/amount = round(input("How many sheets do you want to add?") as num)
@@ -149,7 +149,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
busy = 1
use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount/10)))
- user << "You add [amount] sheets to the [src.name]."
+ to_chat(user, "You add [amount] sheets to the [src.name].")
if(istype(stack, /obj/item/stack/sheet/glass))
g_amount += amount * MINERAL_MATERIAL_AMOUNT
else if(istype(stack, /obj/item/stack/sheet/mineral/gold))
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index aa9437d13e5..234b23800e6 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -251,6 +251,14 @@
build_path = /obj/item/device/assembly/voice
category = list("initial", "Miscellaneous")
+/datum/design/videocam
+ name = "Video Camera"
+ id = "videocam"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 120, MAT_GLASS = 60)
+ build_path = /obj/item/device/videocam
+ category = list("initial", "Miscellaneous")
+
/datum/design/canvas
name = "11px by 11px Canvas"
id = "canvas"
@@ -439,6 +447,22 @@
build_path = /obj/item/weapon/bonesetter
category = list("initial", "Medical")
+/datum/design/fixovein
+ name = "FixOVein"
+ id = "fixovein"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 5000, MAT_GLASS = 3000)
+ build_path = /obj/item/weapon/FixOVein
+ category = list("initial", "Medical")
+
+/datum/design/bonegel
+ name = "Bone Gel"
+ id = "bonegel"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 1000, MAT_GLASS = 6000)
+ build_path = /obj/item/weapon/bonegel
+ category = list("initial", "Medical")
+
/datum/design/syringe
name = "Syringe"
id = "syringe"
@@ -614,4 +638,12 @@
build_type = AUTOLATHE
materials = list(MAT_METAL = 150, MAT_GLASS = 125)
build_path = /obj/item/weapon/hand_labeler
+ category = list("initial", "Electronics")
+
+/datum/design/logic_board
+ name = "Logic Circuit"
+ id = "logic_board"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 50, MAT_GLASS = 50)
+ build_path = /obj/item/weapon/circuitboard/logic_gate
category = list("initial", "Electronics")
\ No newline at end of file
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 67d7ca2b2fb..59328d31a5b 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -182,6 +182,16 @@
build_path = /obj/item/weapon/circuitboard/operating
category = list("Computer Boards")
+/datum/design/pandemic
+ name = "Computer Design (PanD.E.M.I.C. 2200)"
+ desc = "Allows for the construction of circuit boards used to build a PanD.E.M.I.C. 2200 console."
+ id = "pandemic"
+ req_tech = list("programming" = 2, "biotech" = 2)
+ build_type = IMPRINTER
+ materials = list(MAT_GLASS = 1000, "sacid" = 20)
+ build_path = /obj/item/weapon/circuitboard/pandemic
+ category = list("Computer Boards")
+
/datum/design/powermonitor
name = "Console Board (Power Monitor)"
desc = "Allows for the construction of circuit boards used to build a new power monitor"
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index 0ffec90b1ec..5a3bba6ae86 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -63,26 +63,26 @@ Note: Must be placed within 3 tiles of the R&D Console
if (disabled)
return
if (!linked_console)
- user << "The [src.name] must be linked to an R&D console first!"
+ to_chat(user, "The [src.name] must be linked to an R&D console first!")
return
if (busy)
- user << "The [src.name] is busy right now."
+ to_chat(user, "The [src.name] is busy right now.")
return
if (istype(O, /obj/item) && !loaded_item)
if(!O.origin_tech)
- user << "This doesn't seem to have a tech origin!"
+ to_chat(user, "This doesn't seem to have a tech origin!")
return
var/list/temp_tech = ConvertReqString2List(O.origin_tech)
if (temp_tech.len == 0)
- user << "You cannot deconstruct this item!"
+ to_chat(user, "You cannot deconstruct this item!")
return
if(!user.drop_item())
- user << "\The [O] is stuck to your hand, you cannot put it in the [src.name]!"
+ to_chat(user, "\The [O] is stuck to your hand, you cannot put it in the [src.name]!")
return
busy = 1
loaded_item = O
O.loc = src
- user << "You add the [O.name] to the [src.name]!"
+ to_chat(user, "You add the [O.name] to the [src.name]!")
flick("d_analyzer_la", src)
spawn(10)
icon_state = "d_analyzer_l"
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 62784d8c8ca..f0e3c089cfd 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -129,33 +129,33 @@
return
if(!checkCircumstances(O))
- user << "The [O] is not yet valid for the [src] and must be completed!"
+ to_chat(user, "The [O] is not yet valid for the [src] and must be completed!")
return
if (disabled)
return
if (!linked_console)
- user << "The [src] must be linked to an R&D console first!"
+ to_chat(user, "The [src] must be linked to an R&D console first!")
return
if (loaded_item)
- user << "The [src] is already loaded."
+ to_chat(user, "The [src] is already loaded.")
return
if (istype(O, /obj/item))
if(!O.origin_tech)
- user << "This doesn't seem to have a tech origin!"
+ to_chat(user, "This doesn't seem to have a tech origin!")
return
var/list/temp_tech = ConvertReqString2List(O.origin_tech)
if (temp_tech.len == 0)
- user << "You cannot experiment on this item!"
+ to_chat(user, "You cannot experiment on this item!")
return
if(O.reliability < 90 && O.crit_fail == 0)
- usr << "Item is neither reliable enough or broken enough to learn from."
+ to_chat(usr, "Item is neither reliable enough or broken enough to learn from.")
return
if(!user.drop_item())
return
loaded_item = O
O.loc = src
- user << "You add the [O.name] to the machine."
+ to_chat(user, "You add the [O.name] to the machine.")
flick("h_lathe_load", src)
return
@@ -326,7 +326,7 @@
ejectItem(TRUE)
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src]'s chemical chamber has sprung a leak!")
- chosenchem = pick("mutationtoxin","itching_powder","sacid")
+ chosenchem = pick("mutationtoxin","nanomachines","sacid")
var/datum/reagents/R = new/datum/reagents(15)
R.my_atom = src
R.add_reagent(chosenchem , 15)
@@ -510,7 +510,7 @@
if(globalMalf > 36 && globalMalf < 50)
visible_message("[src] improves [exp_on], drawing the life essence of those nearby!")
for(var/mob/living/m in view(4,src))
- m << "You feel your flesh being torn from you, mists of blood drifting to [src]!"
+ to_chat(m, "You feel your flesh being torn from you, mists of blood drifting to [src]!")
m.take_overall_damage(50)
investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", "experimentor")
var/list/reqs = ConvertReqString2List(exp_on.origin_tech)
@@ -559,15 +559,15 @@
src.updateUsrDialog()
else
if(recentlyExperimented)
- usr << "[src] has been used too recently!"
+ to_chat(usr, "[src] has been used too recently!")
return
else if(!loaded_item)
updateUsrDialog() //Set the interface to unloaded mode
- usr << "[src] is not currently loaded!"
+ to_chat(usr, "[src] is not currently loaded!")
return
else if(!process || process != loaded_item) //Interface exploit protection (such as hrefs or swapping items with interface set to old item)
updateUsrDialog() //Refresh interface to update interface hrefs
- usr << "Interface failure detected in [src]. Please try again."
+ to_chat(usr, "Interface failure detected in [src]. Please try again.")
return
var/dotype
if(text2num(scantype) == SCANTYPE_DISCOVER)
@@ -639,7 +639,7 @@
/obj/item/weapon/relic/attack_self(mob/user)
if(revealed)
if(cooldown)
- user << "[src] does not react!"
+ to_chat(user, "[src] does not react!")
return
else if(src.loc == user)
cooldown = TRUE
@@ -647,7 +647,7 @@
spawn(cooldownMax)
cooldown = FALSE
else
- user << "You aren't quite sure what to do with this, yet."
+ to_chat(user, "You aren't quite sure what to do with this, yet.")
//////////////// RELIC PROCS /////////////////////////////
@@ -678,7 +678,7 @@
/obj/item/weapon/relic/proc/petSpray(mob/user)
var/message = "[src] begans to shake, and in the distance the sound of rampaging animals arises!"
visible_message(message)
- user << message
+ to_chat(user, message)
var/animals = rand(1,25)
var/counter
var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp)
@@ -687,7 +687,7 @@
new mobType(get_turf(src))
warn_admins(user, "Mass Mob Spawn")
if(prob(60))
- user << "[src] falls apart!"
+ to_chat(user, "[src] falls apart!")
qdel(src)
/obj/item/weapon/relic/proc/rapidDupe(mob/user)
@@ -713,7 +713,7 @@
warn_admins(user, "Rapid duplicator", 0)
/obj/item/weapon/relic/proc/explode(mob/user)
- user << "[src] begins to heat up!"
+ to_chat(user, "[src] begins to heat up!")
spawn(rand(35,100))
if(src.loc == user)
visible_message("The [src]'s top opens, releasing a powerful blast!")
@@ -722,7 +722,7 @@
qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!!
/obj/item/weapon/relic/proc/teleport(mob/user)
- user << "The [src] begins to vibrate!"
+ to_chat(user, "The [src] begins to vibrate!")
spawn(rand(10,30))
var/turf/userturf = get_turf(user)
if(src.loc == user && userturf.z != ZLEVEL_CENTCOMM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 9744e726cdc..a528c643809 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -113,8 +113,8 @@ var/global/list/obj/machinery/message_server/message_servers = list()
Console.set_light(2)
/obj/machinery/message_server/attack_hand(user as mob)
-// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays."
- user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]"
+// to_chat(user, "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays.")
+ to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]")
active = !active
update_icon()
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index ae0bfd6ce7d..16748fbb46b 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -112,15 +112,15 @@ Note: Must be placed west/left of and R&D console to function.
default_deconstruction_crowbar(O)
return 1
else
- user << "You can't load the [src.name] while it's opened."
+ to_chat(user, "You can't load the [src.name] while it's opened.")
return 1
if (disabled)
return
if (!linked_console)
- user << " The [src.name] must be linked to an R&D console first!"
+ to_chat(user, " The [src.name] must be linked to an R&D console first!")
return 1
if (busy)
- user << "The [src.name] is busy. Please wait for completion of previous operation."
+ to_chat(user, "The [src.name] is busy. Please wait for completion of previous operation.")
return 1
if (O.is_open_container())
return
@@ -130,7 +130,7 @@ Note: Must be placed west/left of and R&D console to function.
return 1
if(!materials.has_space( materials.get_item_material_amount(O) ))
- user << "The [src.name]'s material bin is full! Please remove material before adding more."
+ to_chat(user, "The [src.name]'s material bin is full! Please remove material before adding more.")
return 1
var/obj/item/stack/sheet/stack = O
@@ -143,7 +143,7 @@ Note: Must be placed west/left of and R&D console to function.
else
busy = 1
use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount_inserted/10)))
- user << "You add [amount_inserted] sheets to the [src.name]."
+ to_chat(user, "You add [amount_inserted] sheets to the [src.name].")
var/stackname = stack.name
src.overlays += "protolathe_[stackname]"
sleep(10)
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index fc56a079ba1..c294ad8cff1 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -159,18 +159,18 @@ proc/CallMaterialName(ID)
//Loading a disk into it.
if(istype(D, /obj/item/weapon/disk))
if(t_disk || d_disk)
- user << "A disk is already loaded into the machine."
+ to_chat(user, "A disk is already loaded into the machine.")
return
if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D
else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D
else
- user << "Machine cannot accept disks in that format."
+ to_chat(user, "Machine cannot accept disks in that format.")
return
if(!user.drop_item())
return
D.loc = src
- user << "You add the disk to the machine!"
+ to_chat(user, "You add the disk to the machine!")
else
..()
src.updateUsrDialog()
@@ -181,7 +181,7 @@ proc/CallMaterialName(ID)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
req_access = list()
emagged = 1
- user << "You disable the security protocols"
+ to_chat(user, "You disable the security protocols")
/obj/machinery/computer/rdconsole/Topic(href, href_list)
if(..())
@@ -246,6 +246,17 @@ proc/CallMaterialName(ID)
else if(href_list["copy_design"]) //Copy design data from the research holder to the design disk.
for(var/datum/design/D in files.known_designs)
if(href_list["copy_design_ID"] == D.id)
+ var/autolathe_friendly = 1
+ for(var/x in D.materials)
+ if( !(x in list(MAT_METAL, MAT_GLASS)))
+ autolathe_friendly = 0
+ D.category -= "Imported"
+ if(D.locked)
+ autolathe_friendly = 0
+ D.category -= "Imported"
+ if(D.build_type & (AUTOLATHE|PROTOLATHE|CRAFTLATHE)) // Specifically excludes circuit imprinter and mechfab
+ D.build_type = autolathe_friendly ? (D.build_type | AUTOLATHE) : D.build_type
+ D.category |= "Imported"
d_disk.blueprint = D
break
screen = 1.4
@@ -253,7 +264,7 @@ proc/CallMaterialName(ID)
else if(href_list["eject_item"]) //Eject the item inside the destructive analyzer.
if(linked_destroy)
if(linked_destroy.busy)
- usr << " The destructive analyzer is busy at the moment."
+ to_chat(usr, " The destructive analyzer is busy at the moment.")
else if(linked_destroy.loaded_item)
linked_destroy.loaded_item.loc = linked_destroy.loc
@@ -278,7 +289,7 @@ proc/CallMaterialName(ID)
else if(href_list["deconstruct"]) //Deconstruct the item in the destructive analyzer and update the research holder.
if(linked_destroy)
if(linked_destroy.busy)
- usr << "The destructive analyzer is busy at the moment."
+ to_chat(usr, "The destructive analyzer is busy at the moment.")
else
var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel")
if(choice == "Cancel" || !linked_destroy) return
@@ -291,7 +302,7 @@ proc/CallMaterialName(ID)
linked_destroy.busy = 0
if(!linked_destroy.hacked)
if(!linked_destroy.loaded_item)
- usr <<"The destructive analyzer appears to be empty."
+ to_chat(usr, "The destructive analyzer appears to be empty.")
screen = 1.0
return
if((linked_destroy.loaded_item.reliability >= 99 - (linked_destroy.decon_mod * 3)) || linked_destroy.loaded_item.crit_fail)
@@ -330,7 +341,7 @@ proc/CallMaterialName(ID)
else if(href_list["sync"]) //Sync the research holder with all the R&D consoles in the game that aren't sync protected.
screen = 0.0
if(!sync)
- usr << "You must connect to the network first!"
+ to_chat(usr, "You must connect to the network first!")
else
griefProtection() //Putting this here because I dont trust the sync process
spawn(30)
@@ -627,7 +638,7 @@ proc/CallMaterialName(ID)
if(..())
return 1
if(!allowed(user) && !isobserver(user))
- user << "Access denied."
+ to_chat(user, "Access denied.")
return 1
interact(user)
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 4f0b81e5315..79eca347423 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -59,10 +59,10 @@
if(href_list["pulse"])
var/temp_wire = href_list["wire"]
if (!istype(usr.get_active_hand(), /obj/item/device/multitool))
- usr << "You need a multitool!"
+ to_chat(usr, "You need a multitool!")
else
if(src.wires[temp_wire])
- usr << "You can't pulse a cut wire."
+ to_chat(usr, "You can't pulse a cut wire.")
else
if(src.hack_wire == href_list["wire"])
src.hacked = !src.hacked
@@ -77,7 +77,7 @@
spawn(100) src.shocked = !src.shocked
if(href_list["cut"])
if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters))
- usr << "You need wirecutters!"
+ to_chat(usr, "You need wirecutters!")
else
var/temp_wire = href_list["wire"]
wires[temp_wire] = !wires[temp_wire]
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 1bb531051d0..3bd5bad2f57 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -49,12 +49,12 @@
var/list/temp_list
if(!id_with_upload.len)
temp_list = list()
- temp_list = text2list(id_with_upload_string, ";")
+ temp_list = splittext(id_with_upload_string, ";")
for(var/N in temp_list)
id_with_upload += text2num(N)
if(!id_with_download.len)
temp_list = list()
- temp_list = text2list(id_with_download_string, ";")
+ temp_list = splittext(id_with_download_string, ";")
for(var/N in temp_list)
id_with_download += text2num(N)
@@ -209,7 +209,7 @@
add_fingerprint(usr)
usr.set_machine(src)
if(!src.allowed(usr) && !emagged)
- usr << "\red You do not have the required access level"
+ to_chat(usr, "\red You do not have the required access level")
return
if(href_list["main"])
@@ -337,7 +337,7 @@
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
- user << "\blue You you disable the security protocols"
+ to_chat(user, "\blue You you disable the security protocols")
src.updateUsrDialog()
/obj/machinery/r_n_d/server/core
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm
index 817baf70e16..3087ad35a72 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm
@@ -81,18 +81,18 @@
var/obj/item/device/measuring_tape/P = W
user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].")
if(do_after(user,40, target = src))
- user << "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm."
+ to_chat(user, "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm.")
return
if (istype(W, /obj/item/weapon/pickaxe))
var/obj/item/weapon/pickaxe/P = W
- user << "\red You start [P.drill_verb] [src]."
+ to_chat(user, "\red You start [P.drill_verb] [src].")
if(!do_after(user,P.digspeed, target = src))
return
- user << "\blue You finish [P.drill_verb] [src]."
+ to_chat(user, "\blue You finish [P.drill_verb] [src].")
excavation_level += P.excavation_amount
if(excavation_level > 100)
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
index 9d52c9c2dc0..d93b8f3573f 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
@@ -14,11 +14,11 @@
if(active)
active = 0
icon_state = "gigadrill"
- user << "\blue You press a button and [src] slowly spins down."
+ to_chat(user, "\blue You press a button and [src] slowly spins down.")
else
active = 1
icon_state = "gigadrill_mov"
- user << "\blue You press a button and [src] shudders to life."
+ to_chat(user, "\blue You press a button and [src] shudders to life.")
/obj/machinery/giga_drill/Bump(atom/A)
if(active && !drilling_turf)
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
index 23f9f73afde..d9041733d57 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
@@ -221,19 +221,19 @@ var/list/valid_secondary_effect_types = list(\
/obj/machinery/artifact/attack_hand(var/mob/user as mob)
if (get_dist(user, src) > 1)
- user << "\red You can't reach [src] from here."
+ to_chat(user, "\red You can't reach [src] from here.")
return
if(ishuman(user) && user:gloves)
- user << "You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]."
+ to_chat(user, "You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].")
return
src.add_fingerprint(user)
if(my_effect.trigger == TRIGGER_TOUCH)
- user << "You touch [src]."
+ to_chat(user, "You touch [src].")
my_effect.ToggleActivate()
else
- user << "You touch [src], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]."
+ to_chat(user, "You touch [src], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].")
if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH)
secondary_effect.ToggleActivate(0)
@@ -317,7 +317,7 @@ var/list/valid_secondary_effect_types = list(\
warn = 1
if(warn)
- M << "You accidentally touch [src]."
+ to_chat(M, "You accidentally touch [src].")
..()
/obj/machinery/artifact/bullet_act(var/obj/item/projectile/P)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm
index f8dad2c4d36..89c74776f55 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm
@@ -12,7 +12,7 @@
/datum/artifact_effect/cold/DoEffectTouch(var/mob/user)
if(holder)
- user << "\blue A chill passes up your spine!"
+ to_chat(user, "\blue A chill passes up your spine!")
var/datum/gas_mixture/env = holder.loc.return_air()
if(env)
env.temperature = max(env.temperature - rand(5,50), 0)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
index 1244f802cc6..93a025336a0 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm
@@ -32,9 +32,9 @@
var/mob/living/carbon/human/H = user
if(prob(50))
if(prob(75))
- H << "[pick(drastic_messages)]"
+ to_chat(H, "[pick(drastic_messages)]")
else
- H << "[pick(messages)]"
+ to_chat(H, "[pick(messages)]")
if(prob(50))
H.dizziness += rand(3,5)
@@ -45,9 +45,9 @@
for (var/mob/living/carbon/human/H in range(src.effectrange,T))
if(prob(5))
if(prob(75))
- H << "[pick(messages)]"
+ to_chat(H, "[pick(messages)]")
else
- H << "[pick(drastic_messages)]"
+ to_chat(H, "[pick(drastic_messages)]")
if(prob(10))
H.dizziness += rand(3,5)
@@ -59,9 +59,9 @@
for (var/mob/living/carbon/human/H in range(src.effectrange,T))
if(prob(50))
if(prob(95))
- H << "[pick(drastic_messages)]"
+ to_chat(H, "[pick(drastic_messages)]")
else
- H << "[pick(messages)]"
+ to_chat(H, "[pick(messages)]")
if(prob(50))
H.dizziness += rand(3,5)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
index da7f1a012ee..ab66d1d0c6c 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
@@ -10,7 +10,7 @@
var/mob/living/silicon/robot/R = user
for (var/obj/item/weapon/stock_parts/cell/D in R.contents)
D.charge += rand() * 100 + 50
- R << "\blue SYSTEM ALERT: Large energy boost detected!"
+ to_chat(R, "\blue SYSTEM ALERT: Large energy boost detected!")
return 1
/datum/artifact_effect/cellcharge/DoEffectAura()
@@ -24,7 +24,7 @@
for (var/mob/living/silicon/robot/M in mob_list)
for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge += 25
- M << "\blue SYSTEM ALERT: Energy boost detected!"
+ to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
return 1
/datum/artifact_effect/cellcharge/DoEffectPulse()
@@ -38,5 +38,5 @@
for (var/mob/living/silicon/robot/M in mob_list)
for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge += rand() * 100
- M << "\blue SYSTEM ALERT: Energy boost detected!"
+ to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
index 025cdec5ee0..97c113b2fef 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
@@ -10,7 +10,7 @@
var/mob/living/silicon/robot/R = user
for (var/obj/item/weapon/stock_parts/cell/D in R.contents)
D.charge = max(D.charge - rand() * 100, 0)
- R << "\blue SYSTEM ALERT: Energy drain detected!"
+ to_chat(R, "\blue SYSTEM ALERT: Energy drain detected!")
return 1
return 1
@@ -26,7 +26,7 @@
for (var/mob/living/silicon/robot/M in mob_list)
for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge = max(D.charge - 50,0)
- M << "\red SYSTEM ALERT: Energy drain detected!"
+ to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
return 1
/datum/artifact_effect/celldrain/DoEffectPulse()
@@ -40,5 +40,5 @@
for (var/mob/living/silicon/robot/M in mob_list)
for (var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge = max(D.charge - rand() * 150,0)
- M << "\red SYSTEM ALERT: Energy drain detected!"
+ to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm
index b74ab88a9a1..d005fb9e64c 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm
@@ -15,13 +15,13 @@
/datum/artifact_effect/dnaswitch/DoEffectTouch(var/mob/toucher)
var/weakness = GetAnomalySusceptibility(toucher)
if(ishuman(toucher) && prob(weakness * 100))
- toucher << pick("\green You feel a little different.",\
- "\green You feel very strange.",\
- "\green Your stomach churns.",\
- "\green Your skin feels loose.",\
- "\green You feel a stabbing pain in your head.",\
- "\green You feel a tingling sensation in your chest.",\
- "\green Your entire body vibrates.")
+ to_chat(toucher, pick("\green You feel a little different.",
+ "\green You feel very strange.",
+ "\green Your stomach churns.",
+ "\green Your skin feels loose.",
+ "\green You feel a stabbing pain in your head.",
+ "\green You feel a tingling sensation in your chest.",
+ "\green Your entire body vibrates."))
if(prob(75))
scramble(1, toucher, weakness * severity)
else
@@ -35,13 +35,13 @@
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
if(prob(30))
- H << pick("\green You feel a little different.",\
- "\green You feel very strange.",\
- "\green Your stomach churns.",\
- "\green Your skin feels loose.",\
- "\green You feel a stabbing pain in your head.",\
- "\green You feel a tingling sensation in your chest.",\
- "\green Your entire body vibrates.")
+ to_chat(H, pick("\green You feel a little different.",
+ "\green You feel very strange.",
+ "\green Your stomach churns.",
+ "\green Your skin feels loose.",
+ "\green You feel a stabbing pain in your head.",
+ "\green You feel a tingling sensation in your chest.",
+ "\green Your entire body vibrates."))
if(prob(50))
scramble(1, H, weakness * severity)
else
@@ -54,13 +54,13 @@
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
if(prob(75))
- H << pick("\green You feel a little different.",\
- "\green You feel very strange.",\
- "\green Your stomach churns.",\
- "\green Your skin feels loose.",\
- "\green You feel a stabbing pain in your head.",\
- "\green You feel a tingling sensation in your chest.",\
- "\green Your entire body vibrates.")
+ to_chat(H, pick("\green You feel a little different.",
+ "\green You feel very strange.",
+ "\green Your stomach churns.",
+ "\green Your skin feels loose.",
+ "\green You feel a stabbing pain in your head.",
+ "\green You feel a tingling sensation in your chest.",
+ "\green Your entire body vibrates."))
if(prob(25))
if(prob(75))
scramble(1, H, weakness * severity)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
index bc45260b2cc..f52e8125e3f 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm
@@ -30,9 +30,9 @@
var/mob/living/carbon/human/H = user
if(prob(50))
if(prob(75))
- H << "[pick(drastic_messages)]"
+ to_chat(H, "[pick(drastic_messages)]")
else
- H << "[pick(messages)]"
+ to_chat(H, "[pick(messages)]")
if(prob(50))
H.dizziness += rand(3,5)
@@ -43,9 +43,9 @@
for (var/mob/living/carbon/human/H in range(src.effectrange,T))
if(prob(5))
if(prob(75))
- H << "[pick(messages)]"
+ to_chat(H, "[pick(messages)]")
else
- H << "[pick(drastic_messages)]"
+ to_chat(H, "[pick(drastic_messages)]")
if(prob(5))
H.dizziness += rand(3,5)
@@ -57,9 +57,9 @@
for (var/mob/living/carbon/human/H in range(src.effectrange,T))
if(prob(50))
if(prob(95))
- H << "[pick(drastic_messages)]"
+ to_chat(H, "[pick(drastic_messages)]")
else
- H << "[pick(messages)]"
+ to_chat(H, "[pick(messages)]")
if(prob(50))
H.dizziness += rand(3,5)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
index 003250399e9..c46549d0d50 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
@@ -9,7 +9,7 @@
var/weakness = GetAnomalySusceptibility(toucher)
if(prob(weakness * 100))
var/mob/living/carbon/C = toucher
- C << "\blue You feel a soothing energy invigorate you."
+ to_chat(C, "\blue You feel a soothing energy invigorate you.")
if(ishuman(toucher))
var/mob/living/carbon/human/H = toucher
@@ -42,7 +42,7 @@
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
if(prob(10))
- C << "\blue You feel a soothing energy radiating from something nearby."
+ to_chat(C, "\blue You feel a soothing energy radiating from something nearby.")
C.adjustBruteLoss(-1 * weakness)
C.adjustFireLoss(-1 * weakness)
C.adjustToxLoss(-1 * weakness)
@@ -57,7 +57,7 @@
for (var/mob/living/carbon/C in range(src.effectrange,T))
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
- C << "\blue A wave of energy invigorates you."
+ to_chat(C, "\blue A wave of energy invigorates you.")
C.adjustBruteLoss(-5 * weakness)
C.adjustFireLoss(-5 * weakness)
C.adjustToxLoss(-5 * weakness)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm
index 21304df4082..86828f7ef39 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm
@@ -15,7 +15,7 @@
/datum/artifact_effect/heat/DoEffectTouch(var/mob/user)
if(holder)
- user << "\red You feel a wave of heat travel up your spine!"
+ to_chat(user, "\red You feel a wave of heat travel up your spine!")
var/datum/gas_mixture/env = holder.loc.return_air()
if(env)
env.temperature += rand(5,50)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
index 5a4f402269f..fd221b470fb 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
@@ -8,7 +8,7 @@
var/weakness = GetAnomalySusceptibility(toucher)
if(iscarbon(toucher) && prob(weakness * 100))
var/mob/living/carbon/C = toucher
- C << "\red A painful discharge of energy strikes you!"
+ to_chat(C, "\red A painful discharge of energy strikes you!")
C.adjustOxyLoss(rand(5,25) * weakness)
C.adjustToxLoss(rand(5,25) * weakness)
C.adjustBruteLoss(rand(5,25) * weakness)
@@ -26,7 +26,7 @@
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
if(prob(10))
- C << "\red You feel a painful force radiating from something nearby."
+ to_chat(C, "\red You feel a painful force radiating from something nearby.")
C.adjustBruteLoss(1 * weakness)
C.adjustFireLoss(1 * weakness)
C.adjustToxLoss(1 * weakness)
@@ -40,7 +40,7 @@
for (var/mob/living/carbon/C in range(effectrange, T))
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
- C << "\red A wave of painful energy strikes you!"
+ to_chat(C, "\red A wave of painful energy strikes you!")
C.adjustBruteLoss(3 * weakness)
C.adjustFireLoss(3 * weakness)
C.adjustToxLoss(3 * weakness)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
index a1a89e42cf2..6f698bb8ee3 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
@@ -10,7 +10,7 @@
if(user)
if (istype(user, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = user
- R << "\blue Your systems report damaged components mending by themselves!"
+ to_chat(R, "\blue Your systems report damaged components mending by themselves!")
R.adjustBruteLoss(rand(-10,-30))
R.adjustFireLoss(rand(-10,-30))
return 1
@@ -20,7 +20,7 @@
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
if(prob(10))
- M << "\blue SYSTEM ALERT: Beneficial energy field detected!"
+ to_chat(M, "\blue SYSTEM ALERT: Beneficial energy field detected!")
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
M.updatehealth()
@@ -30,7 +30,7 @@
if(holder)
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
- M << "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!"
+ to_chat(M, "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!")
M.adjustBruteLoss(-10)
M.adjustFireLoss(-10)
M.updatehealth()
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
index bc55a76cef7..c7f4d7f9775 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
@@ -10,7 +10,7 @@
if(user)
if (istype(user, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = user
- R << "\red Your systems report severe damage has been inflicted!"
+ to_chat(R, "\red Your systems report severe damage has been inflicted!")
R.adjustBruteLoss(rand(10,50))
R.adjustFireLoss(rand(10,50))
return 1
@@ -19,7 +19,8 @@
if(holder)
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
- if(prob(10)) M << "\red SYSTEM ALERT: Harmful energy field detected!"
+ if(prob(10))
+ to_chat(M, "\red SYSTEM ALERT: Harmful energy field detected!")
M.adjustBruteLoss(1)
M.adjustFireLoss(1)
M.updatehealth()
@@ -29,7 +30,7 @@
if(holder)
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
- M << "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!"
+ to_chat(M, "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!")
M.adjustBruteLoss(10)
M.adjustFireLoss(10)
M.updatehealth()
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
index 61979c5f69d..7ff0af5bab1 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
@@ -12,12 +12,12 @@
var/weakness = GetAnomalySusceptibility(toucher)
if(ishuman(toucher) && prob(weakness * 100))
var/mob/living/carbon/human/H = toucher
- H << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")
+ to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
H.drowsyness = min(H.drowsyness + rand(5,25) * weakness, 50 * weakness)
H.eye_blurry = min(H.eye_blurry + rand(1,3) * weakness, 50 * weakness)
return 1
else if(isrobot(toucher))
- toucher << "\red SYSTEM ALERT: CPU cycles slowing down."
+ to_chat(toucher, "\red SYSTEM ALERT: CPU cycles slowing down.")
return 1
/datum/artifact_effect/sleepy/DoEffectAura()
@@ -27,11 +27,11 @@
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
if(prob(10))
- H << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")
+ to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
H.drowsyness = min(H.drowsyness + 1 * weakness, 25 * weakness)
H.eye_blurry = min(H.eye_blurry + 1 * weakness, 25 * weakness)
for (var/mob/living/silicon/robot/R in range(src.effectrange,holder))
- R << "\red SYSTEM ALERT: CPU cycles slowing down."
+ to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
return 1
/datum/artifact_effect/sleepy/DoEffectPulse()
@@ -40,9 +40,9 @@
for(var/mob/living/carbon/human/H in range(src.effectrange, T))
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
- H << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")
+ to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
H.drowsyness = min(H.drowsyness + rand(5,15) * weakness, 50 * weakness)
H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness)
for (var/mob/living/silicon/robot/R in range(src.effectrange,holder))
- R << "\red SYSTEM ALERT: CPU cycles slowing down."
+ to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
index b7b2864de41..5c924d2bb6e 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
@@ -11,7 +11,7 @@
var/mob/living/carbon/C = toucher
var/susceptibility = GetAnomalySusceptibility(C)
if(prob(susceptibility * 100))
- C << "\red A powerful force overwhelms your consciousness."
+ to_chat(C, "\red A powerful force overwhelms your consciousness.")
C.Weaken(rand(1,10) * susceptibility)
C.stuttering += 30 * susceptibility
C.Stun(rand(1,10) * susceptibility)
@@ -22,13 +22,13 @@
for (var/mob/living/carbon/C in range(src.effectrange,T))
var/susceptibility = GetAnomalySusceptibility(C)
if(prob(10 * susceptibility))
- C << "\red Your body goes numb for a moment."
+ to_chat(C, "\red Your body goes numb for a moment.")
C.Weaken(2)
C.stuttering += 2
if(prob(10))
C.Stun(1)
else if(prob(10))
- C << "\red You feel numb."
+ to_chat(C, "\red You feel numb.")
/datum/artifact_effect/stun/DoEffectPulse()
if(holder)
@@ -36,7 +36,7 @@
for (var/mob/living/carbon/C in range(src.effectrange,T))
var/susceptibility = GetAnomalySusceptibility(C)
if(prob(100 * susceptibility))
- C << "\red A wave of energy overwhelms your senses!"
+ to_chat(C, "\red A wave of energy overwhelms your senses!")
C.SetWeakened(4 * susceptibility)
C.stuttering = 4 * susceptibility
if(prob(10))
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm
index a0e2e44830e..2c22bb9810e 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm
@@ -6,7 +6,7 @@
/datum/artifact_effect/teleport/DoEffectTouch(var/mob/user)
var/weakness = GetAnomalySusceptibility(user)
if(prob(100 * weakness))
- user << "\red You are suddenly zapped away elsewhere!"
+ to_chat(user, "\red You are suddenly zapped away elsewhere!")
if (user.buckled)
user.buckled.unbuckle_mob()
@@ -25,7 +25,7 @@
for (var/mob/living/M in range(src.effectrange,T))
var/weakness = GetAnomalySusceptibility(M)
if(prob(100 * weakness))
- M << "\red You are displaced by a strange force!"
+ to_chat(M, "\red You are displaced by a strange force!")
if(M.buckled)
M.buckled.unbuckle_mob()
@@ -44,7 +44,7 @@
for (var/mob/living/M in range(src.effectrange, T))
var/weakness = GetAnomalySusceptibility(M)
if(prob(100 * weakness))
- M << "\red You are displaced by a strange force!"
+ to_chat(M, "\red You are displaced by a strange force!")
if(M.buckled)
M.buckled.unbuckle_mob()
diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm
index a91ed35ca55..f417fc49792 100644
--- a/code/modules/research/xenoarchaeology/chemistry.dm
+++ b/code/modules/research/xenoarchaeology/chemistry.dm
@@ -93,7 +93,7 @@ obj/item/weapon/reagent_containers/glass/solution_tray/attackby(obj/item/weapon/
var/new_label = input("What should the new label be?","Label solution tray")
if(new_label)
name = "solution tray ([new_label])"
- user << "\blue You write on the label of the solution tray."
+ to_chat(user, "\blue You write on the label of the solution tray.")
else
..(W, user)
diff --git a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm
index a619325d941..206280770e9 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm
@@ -75,7 +75,7 @@
src.desc = "A creature made of [src.contents.len-1] assorted bones and a skull. The plaque reads \'[plaque_contents]\'."
else
src.desc = "Incomplete skeleton, looks like it could use [src.breq-src.bnum] more bones."
- user << "Looks like it could use [src.breq-src.bnum] more bones."
+ to_chat(user, "Looks like it could use [src.breq-src.bnum] more bones.")
else
..()
else if(istype(W,/obj/item/weapon/pen))
diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm
index fb3fce5d26b..68293501b77 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm
@@ -36,7 +36,7 @@
if(G.amount>=G.max_amount)
continue
G.attackby(NG, user, params)
- usr << "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets."
+ to_chat(usr, "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets.")
//SN src = null
qdel(src)
return
diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm
index 10a89d3f4d6..dc315b80640 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_special.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm
@@ -129,7 +129,7 @@
var/target = pick("chest","groin","head","l_arm","r_arm","r_leg","l_leg","l_hand","r_hand","l_foot","r_foot")
M.apply_damage(rand(5, 10), BRUTE, target)
- M << "\red The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out."
+ to_chat(M, "\red The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out.")
var/obj/effect/decal/cleanable/blood/splatter/animated/B = new(M.loc)
B.target_turf = pick(range(1, src))
B.blood_DNA = list()
@@ -200,4 +200,4 @@
processing_objects.Remove(src)
/obj/effect/shadow_wight/Bump(var/atom/obstacle)
- obstacle << "\red You feel a chill run down your spine!"
+ to_chat(obstacle, "\red You feel a chill run down your spine!")
diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
index 65a2e24ca08..9cea4d29494 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
@@ -40,7 +40,7 @@
/*var/l = lentext(msg)
if(findtext(msg," ",l,l+1)==0)
msg+=" "*/
- seperate = text2list(msg, " ")
+ seperate = splittext(msg, " ")
for(var/Xa = 1,Xa[holder_atom] reverberates, \blue\"[msg]\""
+ to_chat(M, "\icon[holder_atom] [holder_atom] reverberates, \blue\"[msg]\"")
last_talk_time = world.time
diff --git a/code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm b/code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm
index 6fc2c277519..654b1a9ccde 100644
--- a/code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm
+++ b/code/modules/research/xenoarchaeology/genetics/prehistoric_animals.dm
@@ -17,6 +17,7 @@
speak = list("Hruuugh!","Hrunnph")
emote_see = list("paws the ground","shakes its mane","stomps")
emote_hear = list("snuffles")
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/diyaab
name = "diyaab"
@@ -37,6 +38,7 @@
speak = list("Awrr?","Aowrl!","Worrl")
emote_see = list("sniffs the air cautiously","looks around")
emote_hear = list("snuffles")
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/hostile/shantak
name = "shantak"
@@ -56,6 +58,7 @@
speak_chance = 5
speak = list("Shuhn","Shrunnph?","Shunpf")
emote_see = list("scratches the ground","shakes out it's mane","tinkles gently")
+ gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
/mob/living/simple_animal/yithian
name = "yithian"
@@ -63,6 +66,7 @@
icon_state = "yithian"
icon_living = "yithian"
icon_dead = "yithian_dead"
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
/mob/living/simple_animal/tindalos
name = "tindalos"
@@ -70,3 +74,4 @@
icon_state = "tindalos"
icon_living = "tindalos"
icon_dead = "tindalos_dead"
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
diff --git a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
index fdc99e353ab..1e491f1ac48 100644
--- a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
+++ b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
@@ -196,13 +196,13 @@ datum/genesequence
//pod1.occupant.name = "[pod1.occupant.name] ([rand(0,999)])"
pod1.biomass -= CLONE_BIOMASS
else
- usr << "\red \icon[src] Unable to locate cloning pod!"
+ to_chat(usr, "\red \icon[src] Unable to locate cloning pod!")
else
..()
/obj/machinery/computer/reconstitutor/Topic(href, href_list)
if(href_list["insertpos"])
- //world << "inserting gene for genesequence [href_list["insertgenome"]] at pos [text2num(href_list["insertpos"])]"
+// to_chat(world, "inserting gene for genesequence [href_list["insertgenome"]] at pos [text2num(href_list["insertpos"])]")
var/sequence_num = text2num(href_list["sequence_num"])
var/insertpos = text2num(href_list["insertpos"])
diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
index ee22edf2fbd..017dcb7157d 100644
--- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
+++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
@@ -24,13 +24,13 @@
/obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob, params)
if(istype(I,/obj/item/weapon/anobattery))
if(!inserted_battery)
- user << "\blue You insert [I] into [src]."
+ to_chat(user, "\blue You insert [I] into [src].")
user.drop_item()
I.loc = src
src.inserted_battery = I
updateDialog()
else
- user << "\red There is already a battery in [src]."
+ to_chat(user, "\red There is already a battery in [src].")
else
return..()
diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
index 61915c91e2d..22d644b5aa5 100644
--- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
+++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
@@ -62,7 +62,7 @@
/obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob, params)
if(scanning)
- user << "You can't do that while [src] is scanning!"
+ to_chat(user, "You can't do that while [src] is scanning!")
else
if(istype(I, /obj/item/stack/nanopaste))
var/choice = alert("What do you want to do with the nanopaste?","Radiometric Scanner","Scan nanopaste","Fix seal integrity")
@@ -78,14 +78,14 @@
var/obj/item/weapon/reagent_containers/glass/G = I
var/amount_transferred = min(src.reagents.maximum_volume - src.reagents.total_volume, G.reagents.total_volume)
G.reagents.trans_to(src, amount_transferred)
- user << "You empty [amount_transferred]u of coolant into [src]."
+ to_chat(user, "You empty [amount_transferred]u of coolant into [src].")
update_coolant()
return
else if(choice == "Empty coolant")
var/obj/item/weapon/reagent_containers/glass/G = I
var/amount_transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, src.reagents.total_volume)
src.reagents.trans_to(G, amount_transferred)
- user << "You remove [amount_transferred]u of coolant from [src]."
+ to_chat(user, "You remove [amount_transferred]u of coolant from [src].")
update_coolant()
return
user.drop_item()
@@ -331,11 +331,11 @@
scanner_progress = 0
scanning = 1
t_left_radspike = pick(5,10,15)
- usr << "Scan initiated."
+ to_chat(usr, "Scan initiated.")
else
- usr << "Could not initiate scan, seal requires replacing."
+ to_chat(usr, "Could not initiate scan, seal requires replacing.")
else
- usr << "Insert an item to scan."
+ to_chat(usr, "Insert an item to scan.")
if(href_list["maserWavelength"])
maser_wavelength = max(min(maser_wavelength + 1000 * text2num(href_list["maserWavelength"]), 10000), 1)
diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
index 6df826f3792..9d6cf4fa460 100644
--- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
@@ -40,7 +40,7 @@
/obj/item/weapon/anodevice/attackby(var/obj/I as obj, var/mob/user as mob, params)
if(istype(I, /obj/item/weapon/anobattery))
if(!inserted_battery)
- user << "\blue You insert the battery."
+ to_chat(user, "\blue You insert the battery.")
user.drop_item()
I.loc = src
inserted_battery = I
@@ -103,7 +103,7 @@
if(interval > 0)
//apply the touch effect to the holder
if(holder)
- holder << "the \icon[src] [src] held by [holder] shudders in your grasp."
+ to_chat(holder, "the \icon[src] [src] held by [holder] shudders in your grasp.")
else
src.loc.visible_message("the \icon[src] [src] shudders.")
inserted_battery.battery_effect.DoEffectTouch(holder)
diff --git a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
index a90105585ee..c05eb88c8bb 100644
--- a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
+++ b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
@@ -12,29 +12,29 @@
/obj/machinery/bunsen_burner/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/reagent_containers))
if(held_container)
- user << "\red You must remove the [held_container] first."
+ to_chat(user, "\red You must remove the [held_container] first.")
else
user.drop_item(src)
held_container = W
held_container.loc = src
- user << "\blue You put the [held_container] onto the [src]."
+ to_chat(user, "\blue You put the [held_container] onto the [src].")
var/image/I = image("icon"=W, "layer"=FLOAT_LAYER)
underlays += I
if(heating)
spawn(heat_time)
try_heating()
else
- user << "\red You can't put the [W] onto the [src]."
+ to_chat(user, "\red You can't put the [W] onto the [src].")
/obj/machinery/bunsen_burner/attack_hand(mob/user as mob)
if(held_container)
underlays = null
- user << "\blue You remove the [held_container] from the [src]."
+ to_chat(user, "\blue You remove the [held_container] from the [src].")
held_container.loc = src.loc
held_container.attack_hand(user)
held_container = null
else
- user << "\red There is nothing on the [src]."
+ to_chat(user, "\red There is nothing on the [src].")
/obj/machinery/bunsen_burner/proc/try_heating()
src.visible_message("\blue \icon[src] [src] hisses.")
diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
index f377d7322c8..0a26c42a821 100644
--- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
@@ -31,14 +31,14 @@
M.Weaken(3)
cell.charge -= power_use
if(prob(5))
- M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]"
+ to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
if(field_type == "iron")
for(var/mob/living/silicon/M in T)
M.Weaken(3)
cell.charge -= power_use
if(prob(5))
- M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]"
+ to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
for(var/obj/item/I in T)
if(!suspension_field.contents.len)
@@ -50,7 +50,7 @@
M.Weaken(3)
cell.charge -= power_use
if(prob(5))
- M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]"
+ to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
if(cell.charge <= 0)
deactivate()
@@ -120,7 +120,7 @@
if(anchored)
activate()
else
- usr << "You are unable to activate [src] until it is properly secured on the ground."
+ to_chat(usr, "You are unable to activate [src] until it is properly secured on the ground.")
else
deactivate()
if(href_list["select_field"])
@@ -135,9 +135,9 @@
I.loc = src
auth_card = I
if(attempt_unlock(I))
- usr << "You insert [I], the console flashes \'Access granted.\'"
+ to_chat(usr, "You insert [I], the console flashes \'Access granted.\'")
else
- usr << "You insert [I], the console flashes \'Access denied.\'"
+ to_chat(usr, "You insert [I], the console flashes \'Access denied.\'")
else if(href_list["ejectcard"])
if(auth_card)
if(ishuman(usr))
@@ -166,7 +166,7 @@
icon_state = "suspension0"
cell = null
- user << "You remove the power cell"
+ to_chat(user, "You remove the power cell")
/obj/machinery/suspension_gen/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/screwdriver))
@@ -175,7 +175,7 @@
screwed = 0
else
screwed = 1
- user << "You [screwed ? "screw" : "unscrew"] the battery panel."
+ to_chat(user, "You [screwed ? "screw" : "unscrew"] the battery panel.")
else if (istype(W, /obj/item/weapon/crowbar))
if(!locked)
if(!screwed)
@@ -184,46 +184,46 @@
open = 0
else
open = 1
- user << "You crowbar the battery panel [open ? "open" : "in place"]."
+ to_chat(user, "You crowbar the battery panel [open ? "open" : "in place"].")
icon_state = "suspension[open ? (cell ? "1" : "0") : "2"]"
else
- user << "[src]'s safety locks are engaged, shut it down first."
+ to_chat(user, "[src]'s safety locks are engaged, shut it down first.")
else
- user << "Unscrew [src]'s battery panel first."
+ to_chat(user, "Unscrew [src]'s battery panel first.")
else
- user << "[src]'s security locks are engaged."
+ to_chat(user, "[src]'s security locks are engaged.")
else if (istype(W, /obj/item/weapon/wrench))
if(!suspension_field)
if(anchored)
anchored = 0
else
anchored = 1
- user << "You wrench the stabilising legs [anchored ? "into place" : "up against the body"]."
+ to_chat(user, "You wrench the stabilising legs [anchored ? "into place" : "up against the body"].")
if(anchored)
desc = "It is resting securely on four stubby legs."
else
desc = "It has stubby legs bolted up against it's body for stabilising."
else
- user << "You are unable to secure [src] while it is active!"
+ to_chat(user, "You are unable to secure [src] while it is active!")
else if (istype(W, /obj/item/weapon/stock_parts/cell))
if(open)
if(cell)
- user << "There is a power cell already installed."
+ to_chat(user, "There is a power cell already installed.")
else
user.drop_item()
W.loc = src
cell = W
- user << "You insert the power cell."
+ to_chat(user, "You insert the power cell.")
icon_state = "suspension1"
else if(istype(W, /obj/item/weapon/card))
var/obj/item/weapon/card/I = W
if(!auth_card)
if(attempt_unlock(I))
- user << "You swipe [I], the console flashes \'Access granted.\'"
+ to_chat(user, "You swipe [I], the console flashes \'Access granted.\'")
else
- user << "You swipe [I], console flashes \'Access denied.\'"
+ to_chat(user, "You swipe [I], console flashes \'Access denied.\'")
else
- user << "Remove [auth_card] first."
+ to_chat(user, "Remove [auth_card] first.")
/obj/machinery/suspension_gen/proc/attempt_unlock(var/obj/item/weapon/card/C)
if(!open)
@@ -305,7 +305,7 @@
var/turf/T = get_turf(suspension_field)
for(var/mob/M in T)
- M << "You no longer feel like floating."
+ to_chat(M, "You no longer feel like floating.")
M.SetWeakened(min(M.weakened, 3))
src.visible_message("\blue \icon[src] [src] deactivates with a gentle shudder.")
@@ -323,7 +323,7 @@
set category = "Object"
if(anchored)
- usr << "\red You cannot rotate [src], it has been firmly fixed to the floor."
+ to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.")
else
dir = turn(dir, 90)
@@ -333,7 +333,7 @@
set category = "Object"
if(anchored)
- usr << "\red You cannot rotate [src], it has been firmly fixed to the floor."
+ to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.")
else
dir = turn(dir, -90)
diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
index 6f7e29917a8..3ae1c15f660 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
@@ -26,7 +26,7 @@
else
message = "Scanning array is recharging."
- user << "[message]"
+ to_chat(user, "[message]")
/obj/item/device/ano_scanner/proc/scan()
last_scan_time = world.time
diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
index 47b0f7e9e2f..c1d8bda97ee 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
@@ -27,16 +27,16 @@
/obj/item/device/core_sampler/examine(mob/user)
if(..(user, 2))
- user << "\blue Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining."
+ to_chat(user, "\blue Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining.")
/obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/evidencebag))
if(num_stored_bags < 10)
qdel(W)
num_stored_bags += 1
- user << "\blue You insert the [W] into the core sampler."
+ to_chat(user, "\blue You insert the [W] into the core sampler.")
else
- user << "\red The core sampler can not fit any more bags!"
+ to_chat(user, "\red The core sampler can not fit any more bags!")
else
return ..()
@@ -52,9 +52,9 @@
if(geo_data)
if(filled_bag)
- user << "\red The core sampler is full!"
+ to_chat(user, "\red The core sampler is full!")
else if(num_stored_bags < 1)
- user << "\red The core sampler is out of sample bags!"
+ to_chat(user, "\red The core sampler is out of sample bags!")
else
//create a new sample bag which we'll fill with rock samples
filled_bag = new /obj/item/weapon/evidencebag(src)
@@ -75,13 +75,13 @@
filled_bag.underlays += I
filled_bag.w_class = 1
- user << "\blue You take a core sample of the [item_to_sample]."
+ to_chat(user, "\blue You take a core sample of the [item_to_sample].")
else
- user << "\red You are unable to take a sample of [item_to_sample]."
+ to_chat(user, "\red You are unable to take a sample of [item_to_sample].")
/obj/item/device/core_sampler/attack_self()
if(filled_bag)
- usr << "\blue You eject the full sample bag."
+ to_chat(usr, "\blue You eject the full sample bag.")
var/success = 0
if(istype(src.loc, /mob))
var/mob/M = src.loc
@@ -91,4 +91,4 @@
filled_bag = null
icon_state = "sampler0"
else
- usr << "\red The core sampler is empty."
+ to_chat(usr, "\red The core sampler is empty.")
diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
index 487aa897d8f..6bf829ba220 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
@@ -46,7 +46,7 @@
positive_locations.Add(D)
for(var/mob/L in range(src, 1))
- L << "\blue \icon[src] [src] pings."
+ to_chat(L, "\blue \icon[src] [src] pings.")
else if(istype(A,/obj/structure/boulder))
var/obj/structure/boulder/B = A
@@ -65,7 +65,7 @@
positive_locations.Add(D)
for(var/mob/L in range(src, 1))
- L << "\blue \icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!."
+ to_chat(L, "\blue \icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!.")
/obj/item/device/depth_scanner/attack_self(var/mob/user as mob)
return src.interact(user)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
new file mode 100644
index 00000000000..96746f780d8
--- /dev/null
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -0,0 +1,171 @@
+//Xenobio control console
+/mob/camera/aiEye/remote/xenobio
+ visible_icon = 1
+ icon = 'icons/obj/abductor.dmi'
+ icon_state = "camera_target"
+
+
+/mob/camera/aiEye/remote/xenobio/setLoc(var/t)
+ var/area/new_area = get_area(t)
+ if(new_area && new_area.name == "Xenobiology Lab" || istype(new_area, /area/toxins/xenobiology ))
+ return ..()
+ else
+ return
+
+/obj/machinery/computer/camera_advanced/xenobio
+ name = "Slime management console"
+ desc = "A computer used for remotely handling slimes."
+ networks = list("SS13")
+ off_action = new/datum/action/camera_off/xenobio
+ var/datum/action/slime_place/slime_place_action = new
+ var/datum/action/slime_pick_up/slime_up_action = new
+ var/datum/action/feed_slime/feed_slime_action = new
+ var/datum/action/monkey_recycle/monkey_recycle_action = new
+
+ var/list/stored_slimes = list()
+ var/max_slimes = 5
+ var/monkeys = 0
+
+ icon_screen = "slime_comp"
+ icon_keyboard = "rd_key"
+
+/obj/machinery/computer/camera_advanced/xenobio/CreateEye()
+ eyeobj = new /mob/camera/aiEye/remote/xenobio()
+ eyeobj.loc = get_turf(src)
+ eyeobj.origin = src
+ eyeobj.visible_icon = 1
+ eyeobj.icon = 'icons/obj/abductor.dmi'
+ eyeobj.icon_state = "camera_target"
+
+/obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/carbon/user)
+ off_action.target = user
+ off_action.Grant(user)
+
+ jump_action.target = user
+ jump_action.Grant(user)
+
+ slime_up_action.target = src
+ slime_up_action.Grant(user)
+
+ slime_place_action.target = src
+ slime_place_action.Grant(user)
+
+ feed_slime_action.target = src
+ feed_slime_action.Grant(user)
+
+ monkey_recycle_action.target = src
+ monkey_recycle_action.Grant(user)
+
+
+/obj/machinery/computer/camera_advanced/xenobio/attack_hand(mob/user)
+ if(!ishuman(user)) //AIs using it might be weird
+ return
+ return ..()
+
+/datum/action/camera_off/xenobio/Activate()
+ if(!target || !ishuman(target))
+ return
+ var/mob/living/carbon/C = target
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/origin = remote_eye.origin
+ C.remote_view = 0
+ origin.current_user = null
+ origin.jump_action.Remove(C)
+ origin.slime_place_action.Remove(C)
+ origin.slime_up_action.Remove(C)
+ origin.feed_slime_action.Remove(C)
+ origin.monkey_recycle_action.Remove(C)
+ //All of this stuff below could probably be a proc for all advanced cameras, only the action removal needs to be camera specific
+ remote_eye.user = null
+ if(C.client)
+ C.client.perspective = MOB_PERSPECTIVE
+ C.client.eye = src
+ C.client.images -= remote_eye.user_image
+ for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
+ C.client.images -= chunk.obscured
+ C.remote_control = null
+ C.unset_machine()
+ src.Remove(C)
+
+
+/datum/action/slime_place
+ name = "Place Slimes"
+ action_type = AB_INNATE
+ button_icon_state = "slime_down"
+
+/datum/action/slime_place/Activate()
+ if(!target || !ishuman(owner))
+ return
+ var/mob/living/carbon/human/C = owner
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = target
+
+ if(cameranet.checkTurfVis(remote_eye.loc))
+ for(var/mob/living/carbon/slime/S in X.stored_slimes)
+ S.forceMove(remote_eye.loc)
+ S.visible_message("[S] warps in!")
+ X.stored_slimes -= S
+
+/datum/action/slime_pick_up
+ name = "Pick up Slime"
+ action_type = AB_INNATE
+ button_icon_state = "slime_up"
+
+/datum/action/slime_pick_up/Activate()
+ if(!target || !ishuman(owner))
+ return
+ var/mob/living/carbon/human/C = owner
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = target
+
+ if(cameranet.checkTurfVis(remote_eye.loc))
+ for(var/mob/living/carbon/slime/S in remote_eye.loc)
+ if(X.stored_slimes.len >= X.max_slimes)
+ break
+ if(!S.ckey)
+ if(S.buckled)
+ S.buckled.unbuckle_mob()
+ S.Feedstop()
+ S.visible_message("[S] vanishes in a flash of light!")
+ S.forceMove(X)
+ X.stored_slimes += S
+
+
+/datum/action/feed_slime
+ name = "Feed Slimes"
+ action_type = AB_INNATE
+ button_icon_state = "monkey_down"
+
+/datum/action/feed_slime/Activate()
+ if(!target || !ishuman(owner))
+ return
+ var/mob/living/carbon/human/C = owner
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = target
+
+ if(cameranet.checkTurfVis(remote_eye.loc))
+ if(X.monkeys >= 1)
+ var/mob/living/carbon/human/monkey/food = new /mob/living/carbon/human/monkey(remote_eye.loc)
+ food.LAssailant = C
+ X.monkeys --
+ to_chat(owner, "[X] now has [X.monkeys] monkeys left.")
+
+
+/datum/action/monkey_recycle
+ name = "Recycle Monkeys"
+ action_type = AB_INNATE
+ button_icon_state = "monkey_up"
+
+/datum/action/monkey_recycle/Activate()
+ if(!target || !ishuman(owner))
+ return
+ var/mob/living/carbon/human/C = owner
+ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/X = target
+
+ if(cameranet.checkTurfVis(remote_eye.loc))
+ for(var/mob/living/carbon/human/M in remote_eye.loc)
+ if(issmall(M) && M.stat)
+ M.visible_message("[M] vanishes as they are reclaimed for recycling!")
+ X.monkeys += 0.2
+ qdel(M)
\ No newline at end of file
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 3aaaa74a5f1..44384db8187 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -6,120 +6,95 @@
desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
icon = 'icons/mob/slimes.dmi'
icon_state = "grey slime extract"
- force = 1.0
- w_class = 1.0
+ force = 1
+ w_class = 1
throwforce = 0
throw_speed = 3
throw_range = 6
- origin_tech = "biotech=4"
- item_color = "grey"
+ origin_tech = "biotech=3"
var/Uses = 1 // uses before it goes inert
- var/enhanced = 0 //has it been enhanced before?
- attackby(obj/item/O as obj, mob/user as mob, params)
- if(istype(O, /obj/item/weapon/slimesteroid2))
- if(enhanced == 1)
- user << " This extract has already been enhanced!"
- return ..()
- if(Uses == 0)
- user << " You can't enhance a used extract!"
- return ..()
- user <<"You apply the enhancer. It now has triple the amount of uses."
- Uses = 3
- enhanced = 1
- qdel(O)
- if(istype(O,/obj/item/weapon/storage/bag))
- ..()
+/obj/item/slime_extract/attackby(obj/item/O, mob/user)
+ if(istype(O, /obj/item/slimepotion/enhancer))
+ if(Uses >= 5)
+ to_chat(user, "You cannot enhance this extract further!")
+ return ..()
+ to_chat(user, "You apply the enhancer to the slime extract. It may now be reused one more time.")
+ Uses++
+ qdel(O)
+ ..()
/obj/item/slime_extract/New()
..()
create_reagents(100)
-
/obj/item/slime_extract/grey
name = "grey slime extract"
icon_state = "grey slime extract"
- item_color = "grey"
/obj/item/slime_extract/gold
name = "gold slime extract"
icon_state = "gold slime extract"
- item_color = "gold"
/obj/item/slime_extract/silver
name = "silver slime extract"
icon_state = "silver slime extract"
- item_color = "silver"
/obj/item/slime_extract/metal
name = "metal slime extract"
icon_state = "metal slime extract"
- item_color = "metal"
/obj/item/slime_extract/purple
name = "purple slime extract"
icon_state = "purple slime extract"
- item_color = "purple"
/obj/item/slime_extract/darkpurple
name = "dark purple slime extract"
icon_state = "dark purple slime extract"
- item_color = "darkpurple"
/obj/item/slime_extract/orange
name = "orange slime extract"
icon_state = "orange slime extract"
- item_color = "orange"
/obj/item/slime_extract/yellow
name = "yellow slime extract"
icon_state = "yellow slime extract"
- item_color = "yellow"
/obj/item/slime_extract/red
name = "red slime extract"
icon_state = "red slime extract"
- item_color = "red"
/obj/item/slime_extract/blue
name = "blue slime extract"
icon_state = "blue slime extract"
- item_color = "blue"
/obj/item/slime_extract/darkblue
name = "dark blue slime extract"
icon_state = "dark blue slime extract"
- item_color = "darkblue"
/obj/item/slime_extract/pink
name = "pink slime extract"
icon_state = "pink slime extract"
- item_color = "pink"
/obj/item/slime_extract/green
name = "green slime extract"
icon_state = "green slime extract"
- item_color = "green"
/obj/item/slime_extract/lightpink
name = "light pink slime extract"
icon_state = "light pink slime extract"
- item_color = "lightpink"
/obj/item/slime_extract/black
name = "black slime extract"
icon_state = "black slime extract"
- item_color = "black"
/obj/item/slime_extract/oil
name = "oil slime extract"
icon_state = "oil slime extract"
- item_color = "oil"
/obj/item/slime_extract/adamantine
name = "adamantine slime extract"
icon_state = "adamantine slime extract"
- item_color = "adamantine"
/obj/item/slime_extract/bluespace
name = "bluespace slime extract"
@@ -141,57 +116,66 @@
name = "rainbow slime extract"
icon_state = "rainbow slime extract"
-////Pet Slime Creation///
+////Slime-derived potions///
-/obj/item/weapon/slimepotion
- name = "docility potion"
- desc = "A potent chemical mix that will nullify a slime's powers, causing it to become docile and tame."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle19"
+/obj/item/slimepotion
+ name = "slime potion"
+ desc = "A hard yet gelatinous capsule excreted by a slime, containing mysterious substances."
w_class = 1
origin_tech = "biotech=4"
- attack(mob/living/carbon/slime/M as mob, mob/user as mob)
- if(!istype(M, /mob/living/carbon/slime))//If target is not a slime.
- user << " The potion only works on slimes!"
- return ..()
- if(M.stat)
- user << " The slime is dead!"
- return..()
- if(M.mind)
- user << " The slime resists!"
- return ..()
- if(M.is_adult)
- var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc)
- pet.icon_state = "[M.colour] adult slime"
- pet.icon_living = "[M.colour] adult slime"
- pet.icon_dead = "[M.colour] baby slime dead"
- pet.colour = "[M.colour]"
- qdel(M)
- var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
+/obj/item/slimepotion/afterattack(obj/item/weapon/reagent_containers/target, mob/user , proximity)
+ if (istype(target))
+ to_chat(user, "You cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb.") // le fluff faec
+ return
- if (!newname)
- newname = "pet slime"
- pet.name = newname
- pet.real_name = newname
- qdel(src)
- else
- var/mob/living/simple_animal/slime/pet = new /mob/living/simple_animal/slime(M.loc)
- pet.icon_state = "[M.colour] baby slime"
- pet.icon_living = "[M.colour] baby slime"
- pet.icon_dead = "[M.colour] baby slime dead"
- pet.colour = "[M.colour]"
- qdel(M)
- var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
+/obj/item/slimepotion/docility
+ name = "docility potion"
+ desc = "A potent chemical mix that nullifies a slime's hunger, causing it to become docile and tame."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bottle19"
- if (!newname)
- newname = "pet slime"
- pet.name = newname
- pet.real_name = newname
- qdel(src)
- user <<"You feed the slime the potion, removing it's powers and calming it."
+/obj/item/slimepotion/docility/attack(mob/living/carbon/slime/M, mob/user)
+ if(!isslime(M))
+ to_chat(user, " The potion only works on slimes!")
+ return ..()
+ if(M.stat)
+ to_chat(user, " The slime is dead!")
+ return..()
+ if(M.mind)
+ to_chat(user, " The slime resists!")
+ return ..()
+ if(M.is_adult)
+ var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc)
+ pet.icon_state = "[M.colour] adult slime"
+ pet.icon_living = "[M.colour] adult slime"
+ pet.icon_dead = "[M.colour] baby slime dead"
+ pet.colour = "[M.colour]"
+ qdel(M)
+ var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
-/obj/item/weapon/sentience_potion
+ if (!newname)
+ newname = "pet slime"
+ pet.name = newname
+ pet.real_name = newname
+ qdel(src)
+ else
+ var/mob/living/simple_animal/slime/pet = new /mob/living/simple_animal/slime(M.loc)
+ pet.icon_state = "[M.colour] baby slime"
+ pet.icon_living = "[M.colour] baby slime"
+ pet.icon_dead = "[M.colour] baby slime dead"
+ pet.colour = "[M.colour]"
+ qdel(M)
+ var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
+
+ if (!newname)
+ newname = "pet slime"
+ pet.name = newname
+ pet.real_name = newname
+ qdel(src)
+ to_chat(user, "You feed the slime the potion, removing it's powers and calming it.")
+
+/obj/item/slimepotion/sentience
name = "sentience potion"
desc = "A miraculous chemical mix that can raise the intelligence of creatures to human levels. Unlike normal slime potions, it can be absorbed by any nonsentient being."
icon = 'icons/obj/chemical.dmi'
@@ -199,124 +183,161 @@
origin_tech = "biotech=5"
var/list/not_interested = list()
var/being_used = 0
- w_class = 1
+ var/sentience_type = SENTIENCE_ORGANIC
-
-/obj/item/weapon/sentience_potion/afterattack(mob/living/M, mob/user)
+/obj/item/slimepotion/sentience/afterattack(mob/living/M, mob/user)
if(being_used || !ismob(M))
return
if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled
- user << "[M] is already too intelligent for this to work!"
+ to_chat(user, "[M] is already too intelligent for this to work!")
return ..()
if(M.stat)
- user << "[M] is dead!"
- return..()
+ to_chat(user, "[M] is dead!")
+ return ..()
+ var/mob/living/simple_animal/SM = M
+ if(SM.sentience_type != sentience_type)
+ to_chat(user, "The potion won't work on [SM].")
+ return ..()
- user << "You offer the sentience potion to [M]..."
+ to_chat(user, "You offer the sentience potion to [SM]...")
being_used = 1
- var/list/candidates = pollCandidates("Do you want to play as [M.name]?", ROLE_SENTIENT, 0, 100)
+ var/list/candidates = pollCandidates("Do you want to play as [SM.name]?", ROLE_SENTIENT, 0, 100)
if(!src)
return
if(candidates.len)
var/mob/C = pick(candidates)
- M.key = C.key
- M.universal_speak = 1
- M.faction |= "sentient"
- M << "All at once it makes sense: you know what you are and who you are! Self awareness is yours!"
- M << "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost."
- user << "[M] accepts the potion and suddenly becomes attentive and aware. It worked!"
- if(isanimal(M))
- var/mob/living/simple_animal/S = M
- S.master_commander = user
+ SM.key = C.key
+ SM.universal_speak = 1
+ SM.faction = user.faction
+ SM.master_commander = user
+ SM.sentience_act()
+ to_chat(SM, "All at once it makes sense: you know what you are and who you are! Self awareness is yours!")
+ to_chat(SM, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost.")
+ to_chat(user, "[M] accepts the potion and suddenly becomes attentive and aware. It worked!")
qdel(src)
else
- user << "[M] looks interested for a moment, but then looks back down. Maybe you should try again later."
+ to_chat(user, "[M] looks interested for a moment, but then looks back down. Maybe you should try again later.")
being_used = 0
..()
-/obj/item/weapon/slimesteroid
+/obj/item/slimepotion/steroid
name = "slime steroid"
- desc = "A potent chemical mix that will cause a slime to generate more extract."
+ desc = "A potent chemical mix that will cause a baby slime to generate more extract."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
- w_class = 1
- origin_tech = "biotech=4"
+/obj/item/slimepotion/steroid/attack(mob/living/carbon/slime/M, mob/user)
+ if(!isslime(M))//If target is not a slime.
+ to_chat(user, "The steroid only works on baby slimes!")
+ return ..()
+ if(M.is_adult) //Can't steroidify adults
+ to_chat(user, "Only baby slimes can use the steroid!")
+ return ..()
+ if(M.stat)
+ to_chat(user, "The slime is dead!")
+ return ..()
+ if(M.cores >= 5)
+ to_chat(user, "The slime already has the maximum amount of extract!")
+ return ..()
- attack(mob/living/carbon/slime/M as mob, mob/user as mob)
- if(!istype(M, /mob/living/carbon/slime))//If target is not a slime.
- user << " The steroid only works on baby slimes!"
- return ..()
- if(M.is_adult) //Can't tame adults
- user << " Only baby slimes can use the steroid!"
- return..()
- if(M.stat)
- user << " The slime is dead!"
- return..()
- if(M.cores == 3)
- user <<" The slime already has the maximum amount of extract!"
- return..()
+ to_chat(user, "You feed the slime the steroid. It will now produce one more extract.")
+ M.cores++
+ qdel(src)
- user <<"You feed the slime the steroid. It now has triple the amount of extract."
- M.cores = 3
- qdel(src)
-
-/obj/item/weapon/slimesteroid2
+/obj/item/slimepotion/enhancer
name = "extract enhancer"
- desc = "A potent chemical mix that will give a slime extract three uses."
+ desc = "A potent chemical mix that will give a slime extract an additional use."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
- w_class = 1
- origin_tech = "biotech=4"
+/obj/item/slimepotion/stabilizer
+ name = "slime stabilizer"
+ desc = "A potent chemical mix that will reduce the chance of a slime mutating."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bottle15"
-/obj/item/weapon/slimespeed
+/obj/item/slimepotion/stabilizer/attack(mob/living/carbon/slime/M, mob/user)
+ if(!isslime(M))
+ to_chat(user, "The stabilizer only works on slimes!")
+ return ..()
+ if(M.stat)
+ to_chat(user, "The slime is dead!")
+ return ..()
+ if(M.mutation_chance == 0)
+ to_chat(user, "The slime already has no chance of mutating!")
+ return ..()
+
+ to_chat(user, "You feed the slime the stabilizer. It is now less likely to mutate.")
+ M.mutation_chance = Clamp(M.mutation_chance-15,0,100)
+ qdel(src)
+
+/obj/item/slimepotion/mutator
+ name = "slime mutator"
+ desc = "A potent chemical mix that will increase the chance of a slime mutating."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bottle3"
+
+/obj/item/slimepotion/mutator/attack(mob/living/carbon/slime/M, mob/user)
+ if(!isslime(M))
+ to_chat(user, "The mutator only works on slimes!")
+ return ..()
+ if(M.stat)
+ to_chat(user, "The slime is dead!")
+ return ..()
+ if(M.mutator_used)
+ to_chat(user, "This slime has already consumed a mutator, any more would be far too unstable!")
+ return ..()
+ if(M.mutation_chance == 100)
+ to_chat(user, "The slime is already guaranteed to mutate!")
+ return ..()
+
+ to_chat(user, "You feed the slime the mutator. It is now more likely to mutate.")
+ M.mutation_chance = Clamp(M.mutation_chance+12,0,100)
+ M.mutator_used = TRUE
+ qdel(src)
+
+/obj/item/slimepotion/speed
name = "slime speed potion"
desc = "A potent chemical mix that will remove the slowdown from any item."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
- w_class = 1
- origin_tech = "biotech=4"
-/obj/item/weapon/slimespeed/afterattack(obj/item/C, mob/user)
+/obj/item/slimepotion/speed/afterattack(obj/item/C, mob/user)
..()
if(!istype(C))
- user << "The potion can only be used on items!"
+ to_chat(user, "The potion can only be used on items!")
return
if(C.slowdown <= 0)
- user << "The [C] can't be made any faster!"
+ to_chat(user, "The [C] can't be made any faster!")
return..()
- user <<"You slather the red gunk over the [C], making it faster."
+ to_chat(user, "You slather the red gunk over the [C], making it faster.")
C.color = "#FF0000"
C.slowdown = 0
qdel(src)
-/obj/item/weapon/slimefireproof
+/obj/item/slimepotion/fireproof
name = "slime chill potion"
desc = "A potent chemical mix that will fireproof any article of clothing. Has three uses."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
var/uses = 3
- w_class = 1
- origin_tech = "biotech=4"
-
-/obj/item/weapon/slimefireproof/afterattack(obj/item/clothing/C, mob/user)
+/obj/item/slimepotion/fireproof/afterattack(obj/item/clothing/C, mob/user)
..()
if(!uses)
qdel(src)
return
if(!istype(C))
- user << "The potion can only be used on clothing!"
+ to_chat(user, "The potion can only be used on clothing!")
return
if(C.max_heat_protection_temperature == FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
- user << "The [C] is already fireproof!"
- return..()
- user <<"You slather the blue gunk over the [C], fireproofing it."
+ to_chat(user, "The [C] is already fireproof!")
+ return ..()
+ to_chat(user, "You slather the blue gunk over the [C], fireproofing it.")
C.name = "fireproofed [C.name]"
C.color = "#000080"
C.max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
@@ -325,6 +346,78 @@
if(!uses)
qdel(src)
+////////Adamantine Golem stuff I dunno where else to put it
+
+/obj/effect/golemrune
+ anchored = 1
+ desc = "a strange rune used to create golems. It glows when spirits are nearby."
+ name = "rune"
+ icon = 'icons/obj/rune.dmi'
+ icon_state = "golem"
+ unacidable = 1
+ layer = TURF_LAYER
+ var/list/mob/dead/observer/ghosts[0]
+
+/obj/effect/golemrune/New()
+ ..()
+ processing_objects.Add(src)
+
+/obj/effect/golemrune/process()
+ if(ghosts.len>0)
+ icon_state = "golem2"
+ else
+ icon_state = "golem"
+
+/obj/effect/golemrune/attack_hand(mob/living/user as mob)
+ var/mob/dead/observer/ghost
+ for(var/mob/dead/observer/O in src.loc)
+ if(!check_observer(O))
+ to_chat(O, "\red You are not eligible to become a golem.")
+ continue
+ ghost = O
+ break
+ if(!ghost)
+ to_chat(user, "The rune fizzles uselessly. There is no spirit nearby.")
+ return
+ var/mob/living/carbon/human/golem/G = new /mob/living/carbon/human/golem
+ G.change_gender(pick(MALE,FEMALE))
+ G.loc = src.loc
+ G.key = ghost.key
+ to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost.")
+ qdel(src)
+
+/obj/effect/golemrune/Topic(href,href_list)
+ if("signup" in href_list)
+ var/mob/dead/observer/O = locate(href_list["signup"])
+ volunteer(O)
+
+/obj/effect/golemrune/attack_ghost(var/mob/dead/observer/O)
+ if(!O) return
+ volunteer(O)
+
+/obj/effect/golemrune/proc/check_observer(var/mob/dead/observer/O)
+ if(!O)
+ return 0
+ if(!O.client)
+ return 0
+ if(O.mind && O.mind.current && O.mind.current.stat != DEAD)
+ return 0
+ if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ return 0
+ return 1
+
+/obj/effect/golemrune/proc/volunteer(var/mob/dead/observer/O)
+ if(O in ghosts)
+ ghosts.Remove(O)
+ to_chat(O, "\red You are no longer signed up to be a golem.")
+ else
+ if(!check_observer(O))
+ to_chat(O, "\red You are not eligible to become a golem.")
+ return
+ ghosts.Add(O)
+ to_chat(O, "\blue You are signed up to be a golem.")
+
+
/obj/effect/timestop
@@ -359,8 +452,7 @@
var/mob/living/M = A
if(M in immune)
continue
- M.stunned += 10
- M.canmove = 0
+ M.notransform = 1
M.anchored = 1
if(istype(M, /mob/living/simple_animal/hostile))
var/mob/living/simple_animal/hostile/H = M
@@ -388,7 +480,7 @@
return
/obj/effect/timestop/proc/unfreeze_mob(mob/living/M)
- M.AdjustStunned(-10)
+ M.notransform = 0
M.anchored = 0
if(istype(M, /mob/living/simple_animal/hostile))
var/mob/living/simple_animal/hostile/H = M
@@ -439,86 +531,21 @@
max_amount = 60
turf_type = /turf/simulated/floor/sepia
+/obj/item/areaeditor/blueprints/slime
+ name = "cerulean prints"
+ desc = "A one use set of blueprints made of jelly like organic material. Renaming an area to 'Xenobiology Lab' will extend the reach of the management console."
+ color = "#2956B2"
+
+/obj/item/areaeditor/blueprints/slime/edit_area()
+ . = ..()
+ var/area/A = get_area(src)
+ if(.)
+ for(var/turf/T in A)
+ T.color = "#2956B2"
+ qdel(src)
/turf/simulated/floor/sepia
slowdown = 2
icon_state = "sepia"
desc = "Time seems to flow very slowly around these tiles."
floor_tile = /obj/item/stack/tile/sepia
-
-/obj/effect/goleRUNe
- anchored = 1
- desc = "a strange rune used to create golems. It glows when spirits are nearby."
- name = "rune"
- icon = 'icons/obj/rune.dmi'
- icon_state = "golem"
- unacidable = 1
- layer = TURF_LAYER
- var/list/mob/dead/observer/ghosts[0]
-
- New()
- ..()
- processing_objects.Add(src)
-
- process()
- if(ghosts.len>0)
- icon_state = "golem2"
- else
- icon_state = "golem"
-
- attack_hand(mob/living/user as mob)
- var/mob/dead/observer/ghost
- for(var/mob/dead/observer/O in src.loc)
- if(!check_observer(O))
- O << "\red You are not eligible to become a golem."
- continue
- ghost = O
- break
- if(!ghost)
- user << "The rune fizzles uselessly. There is no spirit nearby."
- return
- var/mob/living/carbon/human/golem/G = new /mob/living/carbon/human/golem
- G.change_gender(pick(MALE,FEMALE))
- G.loc = src.loc
- G.key = ghost.key
- G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
- qdel(src)
-
-
- proc/announce_to_ghosts()
- for(var/mob/dead/observer/O in player_list)
- if(O.client)
- var/area/A = get_area(src)
- if(A)
- O << "\blue Golem rune created in [A.name]. (Teleport | Sign Up)"
-
- Topic(href,href_list)
- if("signup" in href_list)
- var/mob/dead/observer/O = locate(href_list["signup"])
- volunteer(O)
-
- attack_ghost(var/mob/dead/observer/O)
- if(!O) return
- volunteer(O)
-
- proc/check_observer(var/mob/dead/observer/O)
- if(!O)
- return 0
- if(!O.client)
- return 0
- if(O.mind && O.mind.current && O.mind.current.stat != DEAD)
- return 0
- if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
- return 0
- return 1
-
- proc/volunteer(var/mob/dead/observer/O)
- if(O in ghosts)
- ghosts.Remove(O)
- O << "\red You are no longer signed up to be a golem."
- else
- if(!check_observer(O))
- O << "\red You are not eligible to become a golem."
- return
- ghosts.Add(O)
- O << "\blue You are signed up to be a golem."
\ No newline at end of file
diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm
index eadc1d398c4..e06a5f9a18d 100644
--- a/code/modules/scripting/Implementations/Telecomms.dm
+++ b/code/modules/scripting/Implementations/Telecomms.dm
@@ -138,7 +138,7 @@
@param replacestring: the string to replace the substring with
*/
- interpreter.SetProc("replace", /proc/replacetext)
+ interpreter.SetProc("replace", /proc/n_replacetext)
/*
-> Locates an element/substring inside of a list or string
@@ -180,21 +180,20 @@
interpreter.SetProc("shuffle", /proc/shuffle)
interpreter.SetProc("uniquevector", /proc/uniquelist)
- interpreter.SetProc("text2vector", /proc/text2list)
- interpreter.SetProc("text2vectorEx",/proc/text2listEx)
- interpreter.SetProc("vector2text", /proc/list2text)
+ interpreter.SetProc("text2vector", /proc/n_splittext)
+ interpreter.SetProc("vector2text", /proc/n_jointext)
// Donkie~
// Strings
interpreter.SetProc("lower", /proc/n_lower)
interpreter.SetProc("upper", /proc/n_upper)
interpreter.SetProc("explode", /proc/string_explode)
- interpreter.SetProc("implode", /proc/list2text)
+ interpreter.SetProc("implode", /proc/n_jointext)
interpreter.SetProc("repeat", /proc/n_repeat)
interpreter.SetProc("reverse", /proc/reverse_text)
interpreter.SetProc("tonum", /proc/n_str2num)
interpreter.SetProc("capitalize", /proc/capitalize)
- interpreter.SetProc("replacetextEx",/proc/replacetextEx)
+ interpreter.SetProc("replacetextEx",/proc/n_replacetextEx)
// Numbers
interpreter.SetProc("tostring", /proc/n_num2str)
diff --git a/code/modules/scripting/Implementations/_Logic.dm b/code/modules/scripting/Implementations/_Logic.dm
index c71839eaad9..a97fc320e0e 100644
--- a/code/modules/scripting/Implementations/_Logic.dm
+++ b/code/modules/scripting/Implementations/_Logic.dm
@@ -167,12 +167,12 @@
proc/string_explode(var/string, var/separator = "")
//writepanic("[__FILE__].[__LINE__] \\/proc/string_explode() called tick#: [world.time]")
if(istext(string) && (istext(separator) || isnull(separator)))
- return text2list(string, separator)
+ return splittext(string, separator)
//Converts a list to a string
/proc/list_implode(var/list/li, var/separator)
if(istype(li) && (istext(separator) || isnull(separator)))
- return list2text(li, separator)
+ return jointext(li, separator)
proc/n_repeat(var/string, var/amount)
//writepanic("[__FILE__].[__LINE__] \\/proc/n_repeat() called tick#: [world.time]")
@@ -260,4 +260,16 @@ proc/n_round(var/num)
/proc/n_log(var/num)
if(isnum(num) && 0 < num)
- return log(num)
\ No newline at end of file
+ return log(num)
+
+/proc/n_replacetext(text, r, with)
+ return replacetext(text, r, with)
+
+/proc/n_replacetextEx(text, r, with)
+ return replacetextEx(text, r, with)
+
+/proc/n_jointext(list, glue)
+ return jointext(list, glue)
+
+/proc/n_splittext(text, delim)
+ return splittext(text, delim)
\ No newline at end of file
diff --git a/code/modules/scripting/Parser/Keywords.dm b/code/modules/scripting/Parser/Keywords.dm
index a4470242f5e..4c186160838 100644
--- a/code/modules/scripting/Parser/Keywords.dm
+++ b/code/modules/scripting/Parser/Keywords.dm
@@ -81,7 +81,8 @@ var/const/Represents a special statement in the code triggered by a keyword.
ifstmt = L[L.len] //Get the last statement in the current block
if(!ifstmt || !istype(ifstmt) || ifstmt.else_if)
- usr << "NTSL: ELSE IF FAILED: [!ifstmt], [!istype(ifstmt)], [!istype(ifstmt) || ifstmt.else_if]" // Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache...
+ to_chat(usr, "NTSL: ELSE IF FAILED: [!ifstmt], [!istype(ifstmt)], [!istype(ifstmt) || ifstmt.else_if]")// Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache...
+
parser.errors += new/datum/scriptError/ExpectedToken("if statement", parser.curToken)
return KW_FAIL
@@ -108,7 +109,8 @@ var/const/Represents a special statement in the code triggered by a keyword.
stmt = L[L.len] //Get the last statement in the current block
if(!stmt || !istype(stmt) || stmt.else_block) //Ensure that it is an if statement
- usr << "NTSL: ELSE IF FAILED: [!stmt], [!istype(stmt)], [!istype(stmt) || stmt.else_block]" // Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache...
+ to_chat(usr, "NTSL: ELSE IF FAILED: [!stmt], [!istype(stmt)], [!istype(stmt) || stmt.else_block]")// Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache...
+
parser.errors += new/datum/scriptError/ExpectedToken("if statement", parser.curToken)
return KW_FAIL
diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm
index 0fbff9cd68a..d27820ac033 100644
--- a/code/modules/security_levels/keycard authentication.dm
+++ b/code/modules/security_levels/keycard authentication.dm
@@ -23,12 +23,12 @@
power_channel = ENVIRON
/obj/machinery/keycard_auth/attack_ai(mob/user as mob)
- user << "The station AI is not to interact with these devices."
+ to_chat(user, "The station AI is not to interact with these devices.")
return
/obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(stat & (NOPOWER|BROKEN))
- user << "This device is not powered."
+ to_chat(user, "This device is not powered.")
return
if(istype(W,/obj/item/weapon/card/id))
var/obj/item/weapon/card/id/ID = W
@@ -40,7 +40,7 @@
event_source.event_confirmed_by = usr
else if(screen == 2)
if(event == "Emergency Response Team" && ert_reason == "Reason for ERT")
- user << "Supply a reason for calling the ERT first!"
+ to_chat(user, "Supply a reason for calling the ERT first!")
return
event_triggered_by = usr
broadcast_request() //This is the device making the initial event request. It needs to broadcast to other devices
@@ -59,10 +59,10 @@
/obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(user.stat || stat & (NOPOWER|BROKEN))
- user << "This device is not powered."
+ to_chat(user, "This device is not powered.")
return
if(busy)
- user << "This device is busy."
+ to_chat(user, "This device is busy.")
return
user.set_machine(src)
@@ -82,10 +82,10 @@
if(..())
return
if(busy)
- usr << "This device is busy."
+ to_chat(usr, "This device is busy.")
return
if(usr.stat || stat & (BROKEN|NOPOWER))
- usr << "This device is without power."
+ to_chat(usr, "This device is without power.")
return
if(href_list["triggerevent"])
event = href_list["triggerevent"]
@@ -153,10 +153,10 @@
feedback_inc("alert_keycard_auth_maintRevoke",1)
if("Emergency Response Team")
if(is_ert_blocked())
- usr << "\red All Emergency Response Teams are dispatched and can not be called at this time."
+ to_chat(usr, "\red All Emergency Response Teams are dispatched and can not be called at this time.")
return
- usr << "ERT request transmitted."
+ to_chat(usr, "ERT request transmitted.")
if(admins.len)
ERT_Announce(ert_reason , event_triggered_by)
ert_reason = "Reason for ERT"
diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm
new file mode 100644
index 00000000000..fe3d059a08a
--- /dev/null
+++ b/code/modules/shuttle/assault_pod.dm
@@ -0,0 +1,59 @@
+/obj/docking_port/mobile/assault_pod
+ name = "assault pod"
+ id = "steel_rain"
+ dwidth = 3
+ width = 7
+ height = 7
+
+/obj/docking_port/mobile/assault_pod/request()
+ if(z == initial(src.z)) //No launching pods that have already launched
+ return ..()
+
+
+/obj/docking_port/mobile/assault_pod/dock(obj/docking_port/stationary/S1)
+ ..()
+ if(!istype(S1, /obj/docking_port/stationary/transit))
+ playsound(get_turf(src.loc), 'sound/effects/Explosion1.ogg',50,1)
+
+
+
+/obj/item/device/assault_pod
+ name = "Assault Pod Targetting Device"
+ icon_state = "gangtool-red"
+ item_state = "walkietalkie"
+ desc = "Used to select a landing zone for assault pods."
+ var/shuttle_id = "steel_rain"
+ var/dwidth = 3
+ var/dheight = 0
+ var/width = 7
+ var/height = 7
+ var/lz_dir = 1
+
+
+/obj/item/device/assault_pod/attack_self(mob/living/user)
+ var/target_area
+ target_area = input("Area to land", "Select a Landing Zone", target_area) in teleportlocs
+ var/area/picked_area = teleportlocs[target_area]
+ if(!src || qdeleted(src))
+ return
+
+ var/turf/T = safepick(get_area_turfs(picked_area))
+ if(!T)
+ return
+ var/obj/docking_port/stationary/landing_zone = new /obj/docking_port/stationary(T)
+ landing_zone.id = "assault_pod(\ref[src])"
+ landing_zone.name = "Landing Zone"
+ landing_zone.dwidth = dwidth
+ landing_zone.dheight = dheight
+ landing_zone.width = width
+ landing_zone.height = height
+ landing_zone.dir = lz_dir
+ landing_zone.register() //new docking ports must be registered
+
+ for(var/obj/machinery/computer/shuttle/S in machines)
+ if(S.shuttleId == shuttle_id)
+ S.possible_destinations = "[landing_zone.id]"
+
+ to_chat(user, "Landing zone set.")
+
+ qdel(src)
diff --git a/code/controllers/Processes/shuttles/emergency.dm b/code/modules/shuttle/emergency.dm
similarity index 64%
rename from code/controllers/Processes/shuttles/emergency.dm
rename to code/modules/shuttle/emergency.dm
index 46ad051f3bd..31a4fa84280 100644
--- a/code/controllers/Processes/shuttles/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -1,3 +1,80 @@
+/obj/machinery/computer/emergency_shuttle
+ name = "emergency shuttle console"
+ desc = "For shuttle control."
+ icon_screen = "shuttle"
+ icon_keyboard = "tech_key"
+ var/auth_need = 3
+ var/list/authorized = list()
+
+/obj/machinery/computer/emergency_shuttle/attackby(obj/item/weapon/card/W, mob/user, params)
+ if(stat & (BROKEN|NOPOWER))
+ return
+ if(!istype(W, /obj/item/weapon/card))
+ return
+ if(shuttle_master.emergency.mode != SHUTTLE_DOCKED)
+ return
+ if(!user)
+ return
+ if(shuttle_master.emergency.timeLeft() < 11)
+ return
+ if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
+ if (istype(W, /obj/item/device/pda))
+ var/obj/item/device/pda/pda = W
+ W = pda.id
+ if (!W:access) //no access
+ to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
+ return
+
+ var/list/cardaccess = W:access
+ if(!istype(cardaccess, /list) || !cardaccess.len) //no access
+ to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
+ return
+
+ if(!(access_heads in W:access)) //doesn't have this access
+ to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ")
+ return 0
+
+ var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort")
+ if(shuttle_master.emergency.mode != SHUTTLE_DOCKED || user.get_active_hand() != W)
+ return 0
+
+ var/seconds = shuttle_master.emergency.timeLeft()
+ if(seconds <= 10)
+ return 0
+
+ switch(choice)
+ if("Authorize")
+ if(!authorized.Find(W:registered_name))
+ authorized += W:registered_name
+ if(auth_need - authorized.len > 0)
+ message_admins("[key_name_admin(user)] has authorized early shuttle launch.")
+ log_game("[key_name(user)] has authorized early shuttle launch in ([x], [y], [z]).")
+ minor_announcement.Announce("[auth_need - authorized.len] more authorization(s) needed until shuttle is launched early")
+ else
+ message_admins("[key_name_admin(user)] has launched the emergency shuttle [seconds] seconds before launch.")
+ log_game("[key_name(user)] has launched the emergency shuttle in ([x], [y], [z]) [seconds] seconds before launch.")
+ minor_announcement.Announce("The emergency shuttle will launch in 10 seconds")
+ shuttle_master.emergency.setTimer(100)
+
+ if("Repeal")
+ if(authorized.Remove(W:registered_name))
+ minor_announcement.Announce("[auth_need - authorized.len] authorizations needed until shuttle is launched early")
+
+ if("Abort")
+ if(authorized.len)
+ minor_announcement.Announce("All authorizations to launch the shuttle early have been revoked.")
+ authorized.Cut()
+
+/obj/machinery/computer/emergency_shuttle/emag_act(mob/user)
+ if(!emagged && shuttle_master.emergency.mode == SHUTTLE_DOCKED)
+ var/time = shuttle_master.emergency.timeLeft()
+ message_admins("[key_name_admin(user)] has emagged the emergency shuttle: [time] seconds before launch.")
+ log_game("[key_name(user)] has emagged the emergency shuttle in ([x], [y], [z]): [time] seconds before launch.")
+ minor_announcement.Announce("The emergency shuttle will launch in 10 seconds", "SYSTEM ERROR:")
+ shuttle_master.emergency.setTimer(100)
+ emagged = 1
+
+
/obj/docking_port/mobile/emergency
name = "emergency shuttle"
id = "emergency"
@@ -111,14 +188,17 @@
G.dom_attempts = min(1,G.dom_attempts)
*/
if(SHUTTLE_DOCKED)
+
if(time_left <= 0 && shuttle_master.emergencyNoEscape)
priority_announcement.Announce("Hostile environment detected. Departure has been postponed indefinitely pending conflict resolution.")
sound_played = 0
mode = SHUTTLE_STRANDED
+
if(time_left <= 50 && !sound_played) //4 seconds left - should sync up with the launch
sound_played = 1
for(var/area/shuttle/escape/E in world)
E << 'sound/effects/hyperspace_begin.ogg'
+
if(time_left <= 0 && !shuttle_master.emergencyNoEscape)
//move each escape pod to its corresponding transit dock
for(var/obj/docking_port/mobile/pod/M in shuttle_master.mobile)
@@ -189,13 +269,20 @@
return
/obj/machinery/computer/shuttle/pod/emag_act(mob/user as mob)
- user << " Access requirements overridden. The pod may now be launched manually at any time."
+ to_chat(user, " Access requirements overridden. The pod may now be launched manually at any time.")
admin_controlled = 0
icon_state = "dorm_emag"
+/obj/docking_port/stationary/random
+ name = "escape pod"
+ id = "pod"
+ dwidth = 1
+ width = 3
+ height = 4
+ var/target_area = /area/mine/unexplored
+
/obj/docking_port/stationary/random/initialize()
..()
- var/target_area = /area/mine/unexplored
- var/turfs = get_area_turfs(target_area)
- var/T=pick(turfs)
+ var/list/turfs = get_area_turfs(target_area)
+ var/turf/T = pick(turfs)
src.loc = T
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 98f92d16f6e..2f7c0c06496 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -396,7 +396,7 @@
var/obj/O = AM
if(istype(O, /obj/docking_port/stationary))
continue
- O.loc = T1
+ O.forceMove(T1)
//close open doors
if(istype(O, /obj/machinery/door))
@@ -415,7 +415,7 @@
var/mob/M = AM
if(!M.move_on_shuttle)
continue
- M.loc = T1
+ M.forceMove(T1)
//docking turbulence
if(M.client)
@@ -433,15 +433,12 @@
T1.shuttleRotate(rotation)
//lighting stuff
- T1.reconsider_lights()
- T1.lighting_build_overlays()
air_master.remove_from_active(T1)
T1.CalculateAdjacentTurfs()
air_master.add_to_active(T1,1)
T0.ChangeTurf(turf_type)
- T0.reconsider_lights()
air_master.remove_from_active(T0)
T0.CalculateAdjacentTurfs()
air_master.add_to_active(T0,1)
@@ -515,7 +512,8 @@
if(!AM.anchored)
step(AM, dir)
else
- qdel(AM)
+ if(AM.simulated) //lighting overlays are static
+ qdel(AM)
/*
//used to check if atom/A is within the shuttle's bounding box
/obj/docking_port/mobile/proc/onShuttleCheck(atom/A)
@@ -565,6 +563,32 @@
return round(callTime/divisor, 1)
return max( round((timer+callTime-world.time)/divisor,1), 0 )
+// returns 3-letter mode string, used by status screens and mob status panel
+/obj/docking_port/mobile/proc/getModeStr()
+ switch(mode)
+ if(SHUTTLE_RECALL)
+ return "RCL"
+ if(SHUTTLE_CALL)
+ return "ETA"
+ if(SHUTTLE_DOCKED)
+ return "ETD"
+ if(SHUTTLE_ESCAPE)
+ return "ESC"
+ if(SHUTTLE_STRANDED)
+ return "ERR"
+ return ""
+
+// returns 5-letter timer string, used by status screens and mob status panel
+/obj/docking_port/mobile/proc/getTimerStr()
+ if(mode == SHUTTLE_STRANDED)
+ return "--:--"
+
+ var/timeleft = timeLeft()
+ if(timeleft > 0)
+ return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]"
+ else
+ return "00:00"
+
/obj/docking_port/mobile/proc/getStatusText()
var/obj/docking_port/stationary/dockedAt = get_docked()
. = (dockedAt && dockedAt.name) ? dockedAt.name : "unknown"
@@ -604,7 +628,7 @@
M = D
shuttleId = M.id
break
- else if(!possible_destinations)
+ else if(!possible_destinations && shuttle_master) //possible destinations should **not** always exist; so, if it's specifically set to null, don't make it exist
M = shuttle_master.getShuttle(shuttleId)
if(M && !possible_destinations)
@@ -651,21 +675,24 @@
usr.set_machine(src)
src.add_fingerprint(usr)
if(!allowed(usr))
- usr << "Access denied."
+ to_chat(usr, "Access denied.")
return
if(href_list["move"])
switch(shuttle_master.moveShuttle(shuttleId, href_list["move"], 1))
- if(0) usr << "Shuttle received message and will be sent shortly."
- if(1) usr << "Invalid shuttle requested."
- else usr << "Unable to comply."
+ if(0)
+ to_chat(usr, "Shuttle received message and will be sent shortly.")
+ if(1)
+ to_chat(usr, "Invalid shuttle requested.")
+ else
+ to_chat(usr, "Unable to comply.")
updateUsrDialog()
/obj/machinery/computer/shuttle/emag_act(mob/user)
if(!emagged)
src.req_access = list()
emagged = 1
- user << "You fried the consoles ID checking system."
+ to_chat(user, "You fried the consoles ID checking system.")
/obj/machinery/computer/shuttle/ferry
name = "transport ferry console"
@@ -687,8 +714,8 @@
if(cooldown)
return
cooldown = 1
- usr << "Your request has been recieved by Centcom."
- admins << "FERRY: [key_name_admin(usr)] (?) (FLW) (Move Ferry) is requesting to move the transport ferry to Centcom."
+ to_chat(usr, "Your request has been recieved by Centcom.")
+ to_chat(admins, "FERRY: [key_name_admin(usr)] (?) (FLW) (Move Ferry) is requesting to move the transport ferry to Centcom.")
spawn(600) //One minute cooldown
cooldown = 0
@@ -707,30 +734,6 @@
shuttleId = "whiteship"
possible_destinations = "whiteship_away;whiteship_home;whiteship_z4"
-#define SYNDICATE_CHALLENGE_TIMER 12000 //20 minutes
-
-/obj/machinery/computer/shuttle/syndicate
- name = "syndicate shuttle terminal"
- icon_screen = "syndishuttle"
- icon_keyboard = "syndie_key"
- req_access = list(access_syndicate)
- shuttleId = "syndicate"
- possible_destinations = "syndicate_away;syndicate_z5;syndicate_z3;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s"
- var/challenge = FALSE
-
-/obj/machinery/computer/shuttle/syndicate/recall
- name = "syndicate shuttle recall terminal"
- possible_destinations = "syndicate_away"
-
-/obj/machinery/computer/shuttle/syndicate/Topic(href, href_list)
- if(href_list["move"])
- if(challenge && world.time < SYNDICATE_CHALLENGE_TIMER)
- usr << "You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare."
- return 0
- ..()
-
-#undef SYNDICATE_CHALLENGE_TIMER
-
/obj/machinery/computer/shuttle/vox
name = "skipjack control console"
req_access = list(access_vox)
@@ -764,7 +767,7 @@
if(underlays.len) //we have underlays, which implies some sort of transparency, so we want to a snapshot of the previous turf as an underlay
O = new()
O.underlays.Add(T)
- T = new type(T)
+ T.ChangeTurf(type)
if(underlays.len)
T.underlays = O.underlays
if(T.icon_state != icon_state)
diff --git a/code/controllers/Processes/shuttles/supply.dm b/code/modules/shuttle/supply.dm
similarity index 97%
rename from code/controllers/Processes/shuttles/supply.dm
rename to code/modules/shuttle/supply.dm
index ce990a7226b..3245f6872dc 100644
--- a/code/controllers/Processes/shuttles/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -384,6 +384,7 @@
var/obj/structure/closet/crate/CR = Crate
CR.manifest = slip
CR.update_icon()
+ CR.announce_beacons = object.announce_beacons.Copy()
if(istype(Crate, /obj/structure/largecrate))
var/obj/structure/largecrate/LC = Crate
LC.manifest = slip
@@ -557,7 +558,7 @@
/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob)
if(!allowed(user) && !isobserver(user))
- user << "Access denied."
+ to_chat(user, "Access denied.")
return 1
post_signal("supply")
@@ -566,7 +567,7 @@
/obj/machinery/computer/supplycomp/emag_act(user as mob)
if(!hacked)
- user << "Special supplies unlocked."
+ to_chat(user, "Special supplies unlocked.")
hacked = 1
return
@@ -650,7 +651,7 @@
if(href_list["send"])
if(shuttle_master.supply.canMove())
- usr << "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons."
+ to_chat(usr, "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.")
else if(shuttle_master.supply.getDockedId() == "supply_home")
shuttle_master.toggleShuttle("supply", "supply_home", "supply_away", 1)
investigate_log("[key_name(usr)] has sent the supply shuttle away. Remaining points: [shuttle_master.points]. Shuttle contents: [shuttle_master.sold_atoms]", "cargo")
@@ -717,7 +718,7 @@
shuttle_master.shoppinglist += O
investigate_log("[key_name(usr)] has authorized an order for [P.name]. Remaining points: [shuttle_master.points].", "cargo")
else
- usr << "There are insufficient supply points for this request."
+ to_chat(usr, "There are insufficient supply points for this request.")
break
else if (href_list["rreq"])
@@ -780,7 +781,8 @@
var/list/mobs_can_pass = list(
/mob/living/carbon/slime,
/mob/living/simple_animal/mouse,
- /mob/living/silicon/robot/drone
+ /mob/living/silicon/robot/drone,
+ /mob/living/simple_animal/bot/mulebot
)
/obj/structure/plasticflaps/CanPass(atom/A, turf/T)
@@ -814,6 +816,18 @@
return ..()
+
+/obj/structure/plasticflaps/CanAStarPass(ID, to_dir, caller)
+ if(istype(caller, /mob/living))
+ for(var/mob_type in mobs_can_pass)
+ if(istype(caller, mob_type))
+ return 1
+
+ var/mob/living/M = caller
+ if(!M.ventcrawler && !M.small)
+ return 0
+ return 1
+
/obj/structure/plasticflaps/ex_act(severity)
switch(severity)
if (1)
diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm
new file mode 100644
index 00000000000..b1afd14bcf5
--- /dev/null
+++ b/code/modules/shuttle/syndicate.dm
@@ -0,0 +1,38 @@
+#define SYNDICATE_CHALLENGE_TIMER 12000 //20 minutes
+
+/obj/machinery/computer/shuttle/syndicate
+ name = "syndicate shuttle terminal"
+ icon_screen = "syndishuttle"
+ icon_keyboard = "syndie_key"
+ req_access = list(access_syndicate)
+ shuttleId = "syndicate"
+ possible_destinations = "syndicate_away;syndicate_z5;syndicate_z3;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s"
+ var/challenge = FALSE
+
+/obj/machinery/computer/shuttle/syndicate/recall
+ name = "syndicate shuttle recall terminal"
+ possible_destinations = "syndicate_away"
+
+/obj/machinery/computer/shuttle/syndicate/Topic(href, href_list)
+ if(href_list["move"])
+ if(challenge && world.time < SYNDICATE_CHALLENGE_TIMER)
+ to_chat(usr, "You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.")
+ return 0
+ ..()
+
+/obj/machinery/computer/shuttle/syndicate/drop_pod
+ name = "syndicate assault pod control"
+ icon = 'icons/obj/terminals.dmi'
+ icon_state = "dorm_available"
+ req_access = list(access_syndicate)
+ shuttleId = "steel_rain"
+ possible_destinations = null
+
+/obj/machinery/computer/shuttle/syndicate/drop_pod/Topic(href, href_list)
+ if(href_list["move"])
+ if(z != ZLEVEL_CENTCOMM)
+ to_chat(usr, "Pods are one way!")
+ return 0
+ ..()
+
+#undef SYNDICATE_CHALLENGE_TIMER
\ No newline at end of file
diff --git a/code/modules/space_transition/space_transition.dm b/code/modules/space_transition/space_transition.dm
index 81be4604193..fe63154b017 100644
--- a/code/modules/space_transition/space_transition.dm
+++ b/code/modules/space_transition/space_transition.dm
@@ -87,7 +87,7 @@ var/list/z_levels_list = list()
var/datum/space_level/D
var/list/config_settings[SLS.len][]
for(var/A in SLS)
- config_settings[SLS.Find(A)] = text2list(A, ";")
+ config_settings[SLS.Find(A)] = splittext(A, ";")
var/conf_set_len = SLS.len
SLS.Cut()
for(var/A in config_settings)
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
new file mode 100644
index 00000000000..2810617bd12
--- /dev/null
+++ b/code/modules/surgery/dental_implant.dm
@@ -0,0 +1,59 @@
+/datum/surgery/dental_implant
+ name = "dental implant"
+ steps = list(/datum/surgery_step/generic/drill, /datum/surgery_step/insert_pill)
+ possible_locs = list("mouth")
+
+/datum/surgery/dental_implant/can_start(mob/user, mob/living/carbon/target)
+ if(istype(target,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = target
+ if(!H.check_has_mouth())
+ return 0
+ return 1
+
+/datum/surgery_step/insert_pill
+ name = "insert pill"
+ allowed_tools = list(/obj/item/weapon/reagent_containers/food/pill = 100)
+ time = 16
+
+/datum/surgery_step/insert_pill/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to wedge \the [tool] in [target]'s [parse_zone(target_zone)].", "You begin to wedge [tool] in [target]'s [parse_zone(target_zone)]...")
+ ..()
+
+/datum/surgery_step/insert_pill/end_step(mob/living/user, mob/living/carbon/target, target_zone, var/obj/item/weapon/reagent_containers/food/pill/tool, datum/surgery/surgery)
+ if(!istype(tool))
+ return 0
+
+ var/dental_implants = 0
+ for(var/obj/item/weapon/reagent_containers/food/pill in target.internal_organs) // Can't give them more than 4 dental implants.
+ dental_implants++
+ if(dental_implants >= 4)
+ user.visible_message("[user] pulls \the [tool] back out of [target]'s [parse_zone(target_zone)]!", "You pull \the [tool] back out of [target]'s [parse_zone(target_zone)], there wans't enough room...")
+ return 0
+
+ user.drop_item()
+ target.internal_organs += tool
+ tool.forceMove(target)
+
+ var/datum/action/item_action/hands_free/activate_pill/P = new
+ P.button_icon_state = tool.icon_state
+ P.target = tool
+ P.name = "Activate Pill ([tool.name])"
+ P.Grant(target)
+
+ user.visible_message("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "You wedge [tool] into [target]'s [parse_zone(target_zone)].")
+ return 1
+
+/datum/action/item_action/hands_free/activate_pill
+ name = "Activate Pill"
+
+/datum/action/item_action/hands_free/activate_pill/Trigger()
+ if(!Checks())
+ return
+ to_chat(owner, "You grit your teeth and burst the implanted [target]!")
+ add_logs(owner, null, "swallowed an implanted pill", target)
+ if(target.reagents.total_volume)
+ target.reagents.reaction(owner, INGEST)
+ target.reagents.trans_to(owner, target.reagents.total_volume)
+ Remove(owner)
+ qdel(target)
+ return 1
\ No newline at end of file
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index eaacc784c6f..842eaf84af5 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -211,6 +211,20 @@
target.apply_damage(3, BURN, affected)
return 0
+//drill bone
+/datum/surgery_step/generic/drill
+ name = "drill bone"
+ allowed_tools = list(/obj/item/weapon/surgicaldrill = 100, /obj/item/weapon/pickaxe/drill = 60, /obj/item/mecha_parts/mecha_equipment/tool/drill = 60, /obj/item/weapon/screwdriver = 20)
+ time = 30
+
+/datum/surgery_step/generic/drill/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to drill into the bone in [target]'s [parse_zone(target_zone)].", "You begin to drill into the bone in [target]'s [parse_zone(target_zone)]...")
+ ..()
+
+/datum/surgery_step/generic/drill/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] drills into [target]'s [parse_zone(target_zone)]!", "You drill into [target]'s [parse_zone(target_zone)].")
+ return 1
+
/datum/surgery_step/generic/amputate
name = "amputate limb"
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index be1cb2264a9..a21a7422696 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -57,7 +57,7 @@
else if(!current_surgery.step_in_progress)
if(current_surgery.status == 1 )
M.surgeries -= current_surgery
- user << "You stop the surgery."
+ to_chat(user, "You stop the surgery.")
qdel(current_surgery)
else if(istype(user.get_inactive_hand(), /obj/item/weapon/cautery) && current_surgery.can_cancel)
M.surgeries -= current_surgery
@@ -69,7 +69,7 @@
affecting.status &= ~ORGAN_BLEEDING
qdel(current_surgery)
else if(current_surgery.can_cancel)
- user << "You need to hold a cautery in inactive hand to stop [M]'s surgery!"
+ to_chat(user, "You need to hold a cautery in inactive hand to stop [M]'s surgery!")
return 1
diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm
index 25197913c0f..45da3bce5b6 100644
--- a/code/modules/surgery/implant.dm
+++ b/code/modules/surgery/implant.dm
@@ -156,7 +156,7 @@
IC = I
break
if(istype(tool,/obj/item/weapon/cautery))
- user << "you prepare to close the cavity wall."
+ to_chat(user, "you prepare to close the cavity wall.")
else if(tool)
user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \
"You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." )
@@ -172,28 +172,28 @@
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
if(istype(tool, /obj/item/weapon/disk/nuclear))
- user << "Central command would kill you if you implanted the disk into someone."
+ to_chat(user, "Central command would kill you if you implanted the disk into someone.")
return 0//fail
if(istype(tool,/obj/item/organ))
- user << "This isn't the type of surgery for organ transplants!"
+ to_chat(user, "This isn't the type of surgery for organ transplants!")
return 0//fail
if(!user.canUnEquip(tool, 0))
- user << "[tool] is stuck to your hand, you can't put it in [target]!"
+ to_chat(user, "[tool] is stuck to your hand, you can't put it in [target]!")
return 0
if(istype(tool,/obj/item/weapon/cautery))
return 1//god this is ugly....
else if(tool)
if(IC)
- user << "There seems to be something in there already!"
+ to_chat(user, "There seems to be something in there already!")
return 1
else
user.visible_message(" [user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \
" You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." )
if((tool.w_class > get_max_wclass(affected)/2 && prob(50) && !(affected.status & ORGAN_ROBOT)))
- user << " You tear some vessels trying to fit the object in the cavity."
+ to_chat(user, " You tear some vessels trying to fit the object in the cavity.")
var/datum/wound/internal_bleeding/I = new ()
affected.wounds += I
affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1)
@@ -209,7 +209,7 @@
target.internal_organs -= IC
return 1
else
- user << "You don't find anything in [target]'s [target_zone]."
+ to_chat(user, "You don't find anything in [target]'s [target_zone].")
return 0
@@ -307,7 +307,12 @@
/datum/surgery/embedded_removal
name = "removal of embedded objects"
- steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin,/datum/surgery_step/remove_object)
+ steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/remove_object, /datum/surgery_step/generic/cauterize)
+ possible_locs = list("r_arm","l_arm","r_leg","l_leg","r_hand","r_foot","l_hand","l_foot","groin","chest","head")
+
+/datum/surgery/embedded_removal/synth
+ name = "removal of embedded objects"
+ steps = list(/datum/surgery_step/robotics/external/unscrew_hatch,/datum/surgery_step/robotics/external/open_hatch, /datum/surgery_step/remove_object, /datum/surgery_step/robotics/external/close_hatch)
possible_locs = list("r_arm","l_arm","r_leg","l_leg","r_hand","r_foot","l_hand","l_foot","groin","chest","head")
@@ -316,6 +321,11 @@
return 0
return 1
+/datum/surgery/embedded_removal/synth/can_start(mob/user, mob/living/carbon/target)
+ if(target.get_species() == "Machine")
+ return 1
+ return 0
+
/datum/surgery_step/remove_object
name = "remove embedded objects"
time = 32
@@ -354,8 +364,8 @@
if(objects > 0)
user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.limb_name]!", "You sucessfully remove [objects] objects from [H]'s [L.limb_name].")
else
- user << "You find no objects embedded in [H]'s [L.limb_name]!"
+ to_chat(user, "You find no objects embedded in [H]'s [L.limb_name]!")
else
- user << "You can't find [target]'s [target_zone], let alone any objects embedded in it!"
+ to_chat(user, "You can't find [target]'s [target_zone], let alone any objects embedded in it!")
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index 002eeb9e024..e9464fab9a1 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -151,7 +151,7 @@
return 1
/datum/surgery_step/limb/connect/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- var/obj/item/organ/external/E = tool
+ var/obj/item/organ/external/E = target.get_organ(target_zone)
user.visible_message("[user]'s hand slips, damaging [target]'s [E.amputation_point]!", \
"Your hand slips, damaging [target]'s [E.amputation_point]!")
target.apply_damage(10, BRUTE, null, sharp=1)
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index 622891a4b70..679a98c98f4 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -36,7 +36,7 @@
HMN.b_eyes = eye_colour[3]
HMN.update_eyes()
if(aug_message && !special)
- owner << "[aug_message]"
+ to_chat(owner, "[aug_message]")
M.sight |= vision_flags
/obj/item/organ/internal/cyberimp/eyes/remove(var/mob/living/carbon/M, var/special = 0)
@@ -59,8 +59,8 @@
if(severity > 1)
if(prob(10 * severity))
return
- owner << "Static obfuscates your vision!"
- flick("e_flash", owner.flash)
+ to_chat(owner, "Static obfuscates your vision!")
+ owner.flash_eyes(visual = 1)
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index a135a60df2f..a5af2caca3d 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -34,7 +34,7 @@
return
var/stun_amount = 5 + (severity-1 ? 0 : 5)
owner.Stun(stun_amount)
- owner << "Your body seizes up!"
+ to_chat(owner, "Your body seizes up!")
return stun_amount
@@ -71,7 +71,7 @@
r_hand_ignore = 0
if(!l_hand_obj && !r_hand_obj)
- owner << "You are not holding any items, your hands relax..."
+ to_chat(owner, "You are not holding any items, your hands relax...")
active = 0
else
var/msg = 0
@@ -79,14 +79,14 @@
msg += !r_hand_ignore && r_hand_obj ? 2 : 0
switch(msg)
if(1)
- owner << "Your left hand's grip tightens."
+ to_chat(owner, "Your left hand's grip tightens.")
if(2)
- owner << "Your right hand's grip tightens."
+ to_chat(owner, "Your right hand's grip tightens.")
if(3)
- owner << "Both of your hand's grips tighten."
+ to_chat(owner, "Both of your hand's grips tighten.")
else
release_items()
- owner << "Your hands relax..."
+ to_chat(owner, "Your hands relax...")
l_hand_obj = null
r_hand_obj = null
@@ -103,11 +103,11 @@
if(L_item)
A = pick(oview(range))
L_item.throw_at(A, range, 2)
- owner << "Your left arm spasms and throws the [L_item.name]!"
+ to_chat(owner, "Your left arm spasms and throws the [L_item.name]!")
if(R_item)
A = pick(oview(range))
R_item.throw_at(A, range, 2)
- owner << "Your right arm spasms and throws the [R_item.name]!"
+ to_chat(owner, "Your right arm spasms and throws the [R_item.name]!")
/obj/item/organ/internal/cyberimp/brain/anti_drop/proc/release_items()
if(!l_hand_ignore && l_hand_obj in owner.contents)
@@ -172,7 +172,7 @@
return
if(owner.nutrition <= hunger_threshold)
synthesizing = 1
- owner << "You feel less hungry..."
+ to_chat(owner, "You feel less hungry...")
owner.nutrition += 50
spawn(50)
synthesizing = 0
@@ -181,7 +181,7 @@
if(!owner)
return
owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning
- owner << "You feel like your insides are burning."
+ to_chat(owner, "You feel like your insides are burning.")
/obj/item/organ/internal/cyberimp/chest/nutriment/plus
name = "Nutriment pump implant PLUS"
@@ -246,7 +246,7 @@
spawn(600 / severity)
H.heart_attack = 0
if(H.stat == CONSCIOUS)
- H << "You feel your heart beating again!"
+ to_chat(H, "You feel your heart beating again!")
//ARM...THAT GO IN THE CHEST
/obj/item/organ/internal/cyberimp/chest/arm_mod//dummy parent item for making arm-mod implants. works best with nodrop items that are sent to nullspace upon being dropped.
@@ -264,7 +264,7 @@
/obj/item/organ/internal/cyberimp/chest/arm_mod/ui_action_click()
if(overloaded)//ensure the implant isn't broken
- owner << "The implant doesn't respond. It seems to be broken..."
+ to_chat(owner, "The implant doesn't respond. It seems to be broken...")
return
if(out)//check if the owner has the item out already
owner.unEquip(holder, 1)//if he does, take it away. then,
@@ -280,7 +280,7 @@
playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
else//if this fails to put the item in his hands,
holder.loc = null//keep it in nullspace
- owner << "You can't extend [holder] if you can't use your hands!"
+ to_chat(owner, "You can't extend [holder] if you can't use your hands!")
/obj/item/organ/internal/cyberimp/chest/arm_mod/emp_act(severity)//if the implant gets EMPed...
if(!owner || overloaded)//ensure that it's in an owner and that it's not already EMPed, then...
@@ -292,7 +292,7 @@
owner.visible_message("[holder] forcibly retracts into [owner]'s arm.")
owner.visible_message("A loud bang comes from [owner]...")
playsound(get_turf(owner), 'sound/effects/bang.ogg', 100, 1)
- owner << "You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?"
+ to_chat(owner, "You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?")
owner.adjust_fire_stacks(20)
owner.IgniteMob()//ignite the owner, as well as
owner.say("AUUUUUUUUUUUUUUUUUUGH!!")
diff --git a/code/modules/surgery/organs/autoimplanter.dm b/code/modules/surgery/organs/autoimplanter.dm
index 98d7867c8c8..5c2aa1193d9 100644
--- a/code/modules/surgery/organs/autoimplanter.dm
+++ b/code/modules/surgery/organs/autoimplanter.dm
@@ -8,7 +8,7 @@
/obj/item/device/autoimplanter/attack_self(mob/user)//when the object it used...
if(!storedorgan)
- user << "[src] currently has no implant stored."
+ to_chat(user, "[src] currently has no implant stored.")
return
storedorgan.insert(user)//insert stored organ into the user
user.visible_message("[user] presses a button on [src], and you hear a short mechanical noise.", "You feel a sharp sting as [src] plunges into your body.")
@@ -18,18 +18,18 @@
/obj/item/device/autoimplanter/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/organ/internal/cyberimp))
if(storedorgan)
- user << "[src] already has an implant stored."
+ to_chat(user, "[src] already has an implant stored.")
return
if(!user.drop_item())
return
I.forceMove(src)
storedorgan = I
- user << "You insert the [I] into [src]."
+ to_chat(user, "You insert the [I] into [src].")
else if(istype(I, /obj/item/weapon/screwdriver))
if(!storedorgan)
- user << "There's no implant in [src] for you to remove."
+ to_chat(user, "There's no implant in [src] for you to remove.")
else
storedorgan.forceMove(get_turf(user))
storedorgan = null
- user << "You remove the [storedorgan] from [src]."
+ to_chat(user, "You remove the [storedorgan] from [src].")
playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1)
diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm
index 29c8308c5d8..f2dd4c3c778 100644
--- a/code/modules/surgery/organs/blood.dm
+++ b/code/modules/surgery/organs/blood.dm
@@ -23,6 +23,16 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
vessel.add_reagent(species.exotic_blood, max_blood)
else
vessel.add_reagent("blood", max_blood)
+ for(var/datum/reagent/blood/B in vessel.reagent_list)
+ if(B.id == "blood")
+ B.data = list(
+ "donor" = src,
+ "viruses" = null,
+ "blood_DNA" = dna.unique_enzymes,
+ "blood_colour" = species.blood_color,
+ "blood_type" = b_type,
+ "resistances" = null,
+ "trace_chem" = null)
spawn(1)
fixblood()
@@ -30,9 +40,14 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
/mob/living/carbon/human/proc/fixblood()
for(var/datum/reagent/blood/B in vessel.reagent_list)
if(B.id == "blood")
- B.data = list( "donor"=src,"viruses"=null,"blood_DNA"=dna.unique_enzymes,"blood_colour"= species.blood_color,"blood_type"=dna.b_type, \
- "resistances"=null,"trace_chem"=null, "virus2" = null, "antibodies" = null)
- B.color = B.data["blood_colour"]
+ B.data = list(
+ "donor" = src,
+ "viruses" = null,
+ "blood_DNA" = dna.unique_enzymes,
+ "blood_colour" = species.blood_color,
+ "blood_type" = b_type,
+ "resistances" = null,
+ "trace_chem" = null)
// Takes care blood loss and regeneration
/mob/living/carbon/human/proc/handle_blood()
@@ -111,10 +126,10 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
pale = 1
update_body()
var/word = pick("dizzy","woosey","faint")
- src << "\red You feel [word]"
+ to_chat(src, "\red You feel [word]")
if(prob(1))
var/word = pick("dizzy","woosey","faint")
- src << "\red You feel [word]"
+ to_chat(src, "\red You feel [word]")
if(oxyloss < 20)
oxyloss += 3
if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
@@ -128,7 +143,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
if(prob(15))
Paralyse(rand(1,3))
var/word = pick("dizzy","woosey","faint")
- src << "\red You feel very [word]"
+ to_chat(src, "\red You feel very [word]")
if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
if(!pale)
pale = 1
@@ -139,7 +154,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
if(prob(15))
Paralyse(rand(1,3))
var/word = pick("dizzy","woosey","faint")
- src << "\red You feel extremely [word]"
+ to_chat(src, "\red You feel extremely [word]")
if(0 to BLOOD_VOLUME_SURVIVE)
death()
@@ -196,10 +211,13 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
//set reagent data
B.data["donor"] = src
- if (!B.data["virus2"])
- B.data["virus2"] = list()
- B.data["virus2"] |= virus_copylist(src.virus2)
- B.data["antibodies"] = src.antibodies
+ B.data["viruses"] = list()
+
+ for(var/datum/disease/D in viruses)
+ B.data["viruses"] += D.Copy()
+ if(resistances && resistances.len)
+ B.data["resistances"] = resistances.Copy()
+
B.data["blood_DNA"] = copytext(src.dna.unique_enzymes,1,0)
B.data["blood_type"] = copytext(src.dna.b_type,1,0)
@@ -242,14 +260,10 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
//Transfers blood from container ot vessels
/mob/living/carbon/proc/inject_blood(obj/item/weapon/reagent_containers/container, var/amount)
var/datum/reagent/blood/injected = get_blood(container.reagents)
+
if (!istype(injected))
return
- var/list/sniffles = virus_copylist(injected.data["virus2"])
- for(var/ID in sniffles)
- var/datum/disease2/disease/sniffle = sniffles[ID]
- infect_virus2(src,sniffle,1)
- if (injected.data["antibodies"] && prob(5))
- antibodies |= injected.data["antibodies"]
+
var/list/chems = list()
chems = params2list(injected.data["trace_chem"])
for(var/C in chems)
@@ -388,8 +402,4 @@ Large: Whether the splat should be big or not
else
B.blood_DNA[bld.data["blood_DNA"]] = "O+"
- // Update virus information.
- if(bld.data["virus2"])
- B.virus2 = virus_copylist(bld.data["virus2"])
-
- return B
\ No newline at end of file
+ return B
diff --git a/code/modules/surgery/organs/body_egg.dm b/code/modules/surgery/organs/body_egg.dm
index 7cd53c4319a..3653e3df327 100644
--- a/code/modules/surgery/organs/body_egg.dm
+++ b/code/modules/surgery/organs/body_egg.dm
@@ -8,7 +8,7 @@
/obj/item/organ/internal/body_egg/on_find(mob/living/finder)
..()
- finder << "You found an unknown alien organism in [owner]'s [parent_organ]!"
+ to_chat(finder, "You found an unknown alien organism in [owner]'s [parent_organ]!")
/obj/item/organ/internal/body_egg/insert(var/mob/living/carbon/M, special = 0)
..()
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index e3b7f49abc4..3bce602694a 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -57,7 +57,10 @@ var/list/organ_cache = list()
/obj/item/organ/proc/set_dna(var/datum/dna/new_dna)
if(new_dna)
dna = new_dna.Clone()
- blood_DNA.Cut()
+ if(blood_DNA)
+ blood_DNA.Cut()
+ else
+ blood_DNA = list()
blood_DNA[dna.unique_enzymes] = dna.b_type
/obj/item/organ/proc/die()
@@ -81,7 +84,7 @@ var/list/organ_cache = list()
return
//Process infections
- if ((status & ORGAN_ROBOT) || (sterile) ||(owner && owner.species && (owner.species.flags & IS_PLANT)))
+ if ((status & ORGAN_ROBOT) || sterile ||(owner && owner.species && (owner.species.flags & IS_PLANT)))
germ_level = 0
return
@@ -140,7 +143,7 @@ var/list/organ_cache = list()
/obj/item/organ/examine(mob/user)
..(user)
if(status & ORGAN_DEAD)
- user << "The decay has set in."
+ to_chat(user, "The decay has set in.")
/obj/item/organ/proc/handle_germ_effects()
//** Handle the effects of infections
@@ -173,6 +176,9 @@ var/list/organ_cache = list()
/obj/item/organ/proc/rejuvenate()
damage = 0
germ_level = 0
+ status &= ~ORGAN_DEAD
+ if(!owner)
+ processing_objects |= src
/obj/item/organ/proc/is_damaged()
return damage > 0
@@ -256,6 +262,27 @@ var/list/organ_cache = list()
if(3.0)
take_damage(0,3)
+/obj/item/organ/internal/emp_act(severity)
+ if(!robotic)
+ return
+ if(robotic == 2)
+ switch (severity)
+ if (1.0)
+ take_damage(20,1)
+ if (2.0)
+ take_damage(7,1)
+ if(3.0)
+ take_damage(3,1)
+ else if(robotic == 1)
+ take_damage(11,1)
+
+/obj/item/organ/internal/heart/emp_act(intensity)
+ if(owner && robotic == 2)
+ owner.heart_attack = 1
+ owner.visible_message("[owner] clutches their chest and gasps!","You clutch your chest in pain!")
+ else if(owner && robotic == 1)
+ take_damage(11,1)
+
/obj/item/organ/proc/remove(var/mob/living/user,special = 0)
if(!istype(owner))
return
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index c020b873354..ac96bd0f775 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -30,8 +30,9 @@
var/cannot_amputate
var/cannot_break
var/s_tone
- var/list/s_col = list()
+ var/list/s_col = null // If this is instantiated, it should be a list of length 3
var/list/wounds = list()
+ var/list/child_icons = list()
var/number_wounds = 0 // cache the number of wounds, which is NOT wounds.len!
var/perma_injury = 0
// 0: Don't fail when at full damage
@@ -64,6 +65,7 @@
var/amputation_point // Descriptive string used in amputation.
var/can_grasp
var/can_stand
+ var/wound_cleanup_timer
/obj/item/organ/external/Destroy()
if(parent && parent.children)
@@ -78,6 +80,10 @@
for(var/obj/item/organ/external/C in children)
qdel(C)
+ if(wound_cleanup_timer)
+ deltimer(wound_cleanup_timer)
+ wound_cleanup_timer = null
+
return ..()
/obj/item/organ/external/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -105,7 +111,7 @@
O.status |= ORGAN_CUT_AWAY
if(!O.sterile)
spread_germs_to_organ(O,user) // This wouldn't be any cleaner than the actual surgery
- O.forceMove(src)
+ O.forceMove(get_turf(src))
if(!(user.l_hand && user.r_hand))
user.put_in_hands(removing)
user.visible_message("[user] extracts [removing] from [src] with [W]!")
@@ -287,7 +293,7 @@
if((brute || burn) && children && children.len && (owner.species.flags & REGENERATES_LIMBS))
var/obj/item/organ/external/stump/S = locate() in children
if(S)
- //world << "Extra healing to go around ([brute+burn]) and [owner] needs a replacement limb."
+// to_chat(world, "Extra healing to go around ([brute+burn]) and [owner] needs a replacement limb.")
*/
//Sync the organ's damage with its wounds
@@ -306,6 +312,7 @@ This function completely restores a damaged organ to perfect condition.
status = 128
else
status = 0
+ germ_level = 0
perma_injury = 0
brute_dam = 0
burn_dam = 0
@@ -314,6 +321,8 @@ This function completely restores a damaged organ to perfect condition.
for(var/obj/item/organ/internal/current_organ in internal_organs)
current_organ.rejuvenate()
+ for(var/obj/item/organ/external/EO in contents)
+ EO.rejuvenate()
// remove embedded objects and drop them on the floor
for(var/obj/implanted_object in implants)
@@ -323,6 +332,8 @@ This function completely restores a damaged organ to perfect condition.
owner.updatehealth()
update_icon()
+ if(!owner)
+ processing_objects |= src
/obj/item/organ/external/proc/createwound(var/type = CUT, var/damage)
@@ -392,6 +403,11 @@ This function completely restores a damaged organ to perfect condition.
last_dam = brute_dam + burn_dam
if(germ_level)
return 1
+ if(!wound_cleanup_timer)
+ wound_cleanup_timer = addtimer(src, "cleanup_wounds", SecondsToTicks(600), 1, wounds)
+
+ if (update_icon())
+ owner.UpdateDamageIcon(1)
return 0
/obj/item/organ/external/process()
@@ -512,7 +528,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(germ_level >= INFECTION_LEVEL_THREE && antibiotics < 30) //overdosing is necessary to stop severe infections
if (!(status & ORGAN_DEAD))
status |= ORGAN_DEAD
- owner << "You can't feel your [name] anymore..."
+ to_chat(owner, "You can't feel your [name] anymore...")
owner.update_body(1)
germ_level++
@@ -525,11 +541,6 @@ Note that amputating the affected organ does in fact remove the infection from t
return
for(var/datum/wound/W in wounds)
- // wounds can disappear after 10 minutes at the earliest
- if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time)
- wounds -= W
- continue
- // let the GC handle the deletion of the wound
// Internal wounds get worse over time. Low temperatures (cryo) stop them.
if(W.internal && !W.can_autoheal() && owner.bodytemperature >= 170)
@@ -892,13 +903,13 @@ Note that amputating the affected organ does in fact remove the infection from t
// Attached organs also fly off.
if(!ignore_children)
for(var/obj/item/organ/external/O in children)
- O.remove()
+ O.remove(victim)
if(O)
O.forceMove(src)
// Grab all the internal giblets too.
for(var/obj/item/organ/internal/organ in internal_organs)
- organ.remove()
+ organ.remove(victim)
organ.forceMove(src)
release_restraints(victim)
@@ -941,3 +952,14 @@ Note that amputating the affected organ does in fact remove the infection from t
if (!istype(O)) // You're not the primary organ of ANYTHING, bucko
return 0
return src == O.organs_by_name[limb_name]
+
+// The callback we use to remove wounds from an un-processed limb
+/obj/item/organ/external/proc/cleanup_wounds(var/list/slated_wounds)
+ wound_cleanup_timer = null
+ for(var/datum/wound/W in slated_wounds)
+ if(!W)
+ continue
+ if(W.damage > 0)
+ continue
+ wounds -= W
+ qdel(W)
diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm
index 2b591e6a302..fbc26625e00 100644
--- a/code/modules/surgery/organs/organ_icon.dm
+++ b/code/modules/surgery/organs/organ_icon.dm
@@ -1,34 +1,42 @@
var/global/list/limb_icon_cache = list()
/obj/item/organ/external/proc/compile_icon()
- overlays.Cut()
+ // I do this so the head's overlays don't get obliterated
+ for(var/child_i in child_icons)
+ overlays -= child_i
+ child_icons.Cut()
// This is a kludge, only one icon has more than one generation of children though.
for(var/obj/item/organ/external/organ in contents)
if(organ.children && organ.children.len)
for(var/obj/item/organ/external/child in organ.children)
overlays += child.mob_icon
+ child_icons += child.mob_icon
overlays += organ.mob_icon
+ child_icons += organ.mob_icon
/obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/human)
- s_tone = null
- s_col = null
if(status & ORGAN_ROBOT && !(species && species.name == "Machine")) //machine people get skin color
return
if(species && human.species && species.name != human.species.name)
return
+ if(dna.unique_enzymes != human.dna.unique_enzymes) // This isn't MY arm
+ sync_colour_to_dna()
+ return
if(!isnull(human.s_tone) && (human.species.bodyflags & HAS_SKIN_TONE))
+ s_col = null
s_tone = human.s_tone
if(human.species.bodyflags & HAS_SKIN_COLOR)
+ s_tone = null
s_col = list(human.r_skin, human.g_skin, human.b_skin)
/obj/item/organ/external/proc/sync_colour_to_dna()
- s_tone = null
- s_col = null
if(status & ORGAN_ROBOT)
return
if(!isnull(dna.GetUIValue(DNA_UI_SKIN_TONE)) && (species.flags & HAS_SKIN_TONE))
+ s_col = null
s_tone = dna.GetUIValue(DNA_UI_SKIN_TONE)
if(species.flags & HAS_SKIN_COLOR)
+ s_tone = null
s_col = list(dna.GetUIValue(DNA_UI_SKIN_R), dna.GetUIValue(DNA_UI_SKIN_G), dna.GetUIValue(DNA_UI_SKIN_B))
/obj/item/organ/external/head/sync_colour_to_human(var/mob/living/carbon/human/human)
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index bf0f4926e08..248da9d1154 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -9,19 +9,23 @@
var/slot
vital = 0
var/organ_action_name = null
+ var/non_primary = 0
/obj/item/organ/internal/New(var/mob/living/carbon/holder)
if(istype(holder))
insert(holder)
..()
-/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, var/dont_remove_slot = 0)
if(!iscarbon(M) || owner == M)
return
var/obj/item/organ/internal/replaced = M.get_organ_slot(slot)
if(replaced)
- replaced.remove(M, special = 1)
+ if(dont_remove_slot)
+ non_primary = 1
+ else
+ replaced.remove(M, special = 1)
owner = M
@@ -298,7 +302,7 @@
if (germ_level > INFECTION_LEVEL_ONE)
if(prob(1))
- owner << " Your skin itches."
+ to_chat(owner, " Your skin itches.")
if (germ_level > INFECTION_LEVEL_TWO)
if(prob(1))
spawn owner.vomit()
@@ -348,22 +352,26 @@
organ_tag = "appendix"
parent_organ = "groin"
slot = "appendix"
+ var/inflamed = 0
-
-/*
-/obj/item/organ/internal/appendix/removed()
-
- if(owner)
- var/inflamed = 0
- for(var/datum/disease/appendicitis/appendicitis in owner.viruses)
- inflamed = 1
- appendicitis.cure()
- owner.resistances += appendicitis
- if(inflamed)
- icon_state = "appendixinflamed"
- name = "inflamed appendix"
+/obj/item/organ/internal/appendix/remove(mob/living/carbon/M, special = 0)
+ for(var/datum/disease/appendicitis/A in M.viruses)
+ A.cure()
+ inflamed = 1
+ update_icon()
..()
-*/
+
+/obj/item/organ/internal/appendix/insert(mob/living/carbon/M, special = 0)
+ ..()
+ if(inflamed)
+ M.AddDisease(new /datum/disease/appendicitis)
+
+/obj/item/organ/internal/appendix/prepare_eat()
+ var/obj/S = ..()
+ if(inflamed)
+ S.reagents.add_reagent("????", 5)
+ return S
+
//shadowling tumor
/obj/item/organ/internal/shadowtumor
name = "black tumor"
@@ -450,7 +458,7 @@
if(organhonked < world.time)
organhonked = world.time+900
- owner << "HONK"
+ to_chat(owner, "HONK")
owner.sleeping = 0
owner.stuttering = 20
owner.ear_deaf = 30
diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm
index d1aac66a71c..b2f6945b6f1 100644
--- a/code/modules/surgery/organs/pain.dm
+++ b/code/modules/surgery/organs/pain.dm
@@ -1,6 +1,3 @@
-mob/proc/flash_pain()
- flick("pain",pain)
-
mob/var/list/pain_stored = list()
mob/var/last_pain_message = ""
mob/var/next_pain_time = 0
@@ -30,24 +27,20 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
if(1 to 10)
msg = "\red Your [partname] burns."
if(11 to 90)
- flash_weak_pain()
msg = "\red Your [partname] burns badly!"
if(91 to 10000)
- flash_pain()
msg = "\red OH GOD! Your [partname] is on fire!"
else
switch(amount)
if(1 to 10)
msg = "Your [partname] hurts."
if(11 to 90)
- flash_weak_pain()
msg = "Your [partname] hurts badly."
if(91 to 10000)
- flash_pain()
msg = "OH GOD! Your [partname] is hurting terribly!"
if(msg && (msg != last_pain_message || prob(10)))
last_pain_message = msg
- src << msg
+ to_chat(src, msg)
next_pain_time = world.time + (100 - amount)
@@ -71,7 +64,7 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
// Anti message spam checks
if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time)))
last_pain_message = msg
- src << msg
+ to_chat(src, msg)
next_pain_time = world.time + 100
mob/living/carbon/human/proc/handle_pain()
diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm
index 89f94ba43fc..2d15efdd041 100644
--- a/code/modules/surgery/organs/parasites.dm
+++ b/code/modules/surgery/organs/parasites.dm
@@ -19,7 +19,7 @@
if(prob(12))
owner.reagents.add_reagent("histamine", 5)
if(5)
- owner << "You feel like something is tearing its way out of your skin..."
+ to_chat(owner, "You feel like something is tearing its way out of your skin...")
owner.reagents.add_reagent("histamine", 10)
if(prob(30))
owner.emote("scream")
diff --git a/code/modules/surgery/organs/robolimbs.dm b/code/modules/surgery/organs/robolimbs.dm
index ddb41ee3015..bcebd7e1e64 100644
--- a/code/modules/surgery/organs/robolimbs.dm
+++ b/code/modules/surgery/organs/robolimbs.dm
@@ -8,7 +8,8 @@ var/global/datum/robolimb/basic_robolimb
var/datum/robolimb/R = new limb_type()
all_robolimbs[R.company] = R
if(!R.unavailable_at_chargen)
- chargen_robolimbs[R.company] = R
+ if(R != "head" && R != "chest" && R != "groin" ) //Part of the method that ensures only IPCs can access head, chest and groin prosthetics.
+ chargen_robolimbs[R.company] = R
/datum/robolimb
var/company = "Unbranded" // Shown when selecting the limb.
@@ -26,16 +27,6 @@ var/global/datum/robolimb/basic_robolimb
desc = "This limb has a militaristic black and green casing with gold stripes."
icon = 'icons/mob/human_races/cyberlimbs/hesphaistos.dmi'
-/datum/robolimb/zenghu
- company = "Zeng-Hu Pharmaceuticals"
- desc = "This limb has a rubbery fleshtone covering with visible seams."
- icon = 'icons/mob/human_races/cyberlimbs/zenghu.dmi'
-
-/datum/robolimb/xion
- company = "Xion Manufacturing Group"
- desc = "This limb has a minimalist black and red casing."
- icon = 'icons/mob/human_races/cyberlimbs/xion.dmi'
-
/datum/robolimb/ipc
company = "Morpheus Cyberkinetics"
desc = "This limb is simple and functional; no effort has been made to make it look human."
@@ -45,4 +36,14 @@ var/global/datum/robolimb/basic_robolimb
/datum/robolimb/wardtakahashi
company = "Ward-Takahashi"
desc = "This limb features sleek black and white polymers."
- icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi.dmi'
\ No newline at end of file
+ icon = 'icons/mob/human_races/cyberlimbs/wardtakahashi.dmi'
+
+/datum/robolimb/xion
+ company = "Xion Manufacturing Group"
+ desc = "This limb has a minimalist black and red casing."
+ icon = 'icons/mob/human_races/cyberlimbs/xion.dmi'
+
+/datum/robolimb/zenghu
+ company = "Zeng-Hu Pharmaceuticals"
+ desc = "This limb has a rubbery fleshtone covering with visible seams."
+ icon = 'icons/mob/human_races/cyberlimbs/zenghu.dmi'
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm
index 170f93ecddc..407f2187842 100644
--- a/code/modules/surgery/organs/subtypes/diona.dm
+++ b/code/modules/surgery/organs/subtypes/diona.dm
@@ -194,6 +194,16 @@
parent_organ = "head"
slot = "eyes"
+
+/obj/item/organ/internal/diona_receptor/surgeryize()
+ if(!owner)
+ return
+ owner.disabilities &= ~NEARSIGHTED
+ owner.sdisabilities &= ~BLIND
+ owner.eye_blurry = 0
+ owner.eye_blind = 0
+
+
//TODO:Make absorb rads on insert
/obj/item/organ/internal/liver/diona
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index 6ba6f5055db..5d9bd517d3f 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -129,6 +129,22 @@
robotize()
..()
+
+/obj/item/organ/internal/optical_sensor/remove(var/mob/living/user,special = 0)
+ if(!special)
+ to_chat(owner, "Error 404:Optical Sensors not found.")
+
+ . = ..()
+
+/obj/item/organ/internal/optical_sensor/surgeryize()
+ if(!owner)
+ return
+ owner.disabilities &= ~NEARSIGHTED
+ owner.sdisabilities &= ~BLIND
+ owner.eye_blurry = 0
+ owner.eye_blind = 0
+
+
// Used for an MMI or posibrain being installed into a human.
/obj/item/organ/internal/brain/mmi_holder
name = "brain"
diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm
index a24bb94b5ed..75de3664657 100644
--- a/code/modules/surgery/organs/subtypes/xenos.dm
+++ b/code/modules/surgery/organs/subtypes/xenos.dm
@@ -133,9 +133,13 @@
/obj/item/organ/internal/xenos/hivenode/insert(mob/living/carbon/M, special = 0)
..()
M.faction |= "alien"
+ M.add_language("Hivemind")
+ M.add_language("Xenomorph")
/obj/item/organ/internal/xenos/hivenode/remove(mob/living/carbon/M, special = 0)
M.faction -= "alien"
+ M.remove_language("Hivemind")
+ M.remove_language("Xenomorph")
..()
/obj/item/organ/internal/xenos/neurotoxin
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 091f104707e..83684822a26 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -87,15 +87,15 @@
current_type = "insert"
I = tool
if(target_zone != I.parent_organ || target.get_organ_slot(I.slot))
- user << "There is no room for [I] in [target]'s [parse_zone(target_zone)]!"
+ to_chat(user, "There is no room for [I] in [target]'s [parse_zone(target_zone)]!")
return -1
if(I.damage > (I.max_damage * 0.75))
- user << " \The [I] is in no state to be transplanted."
+ to_chat(user, " \The [I] is in no state to be transplanted.")
return -1
if(target.get_int_organ(I))
- user << " \The [target] already has [I]."
+ to_chat(user, " \The [target] already has [I].")
return -1
if(affected)
user.visible_message("[user] starts transplanting \the [tool] into [target]'s [affected.name].", \
@@ -123,7 +123,7 @@
current_type = "extract"
var/list/organs = target.get_organs_zone(target_zone)
if(!organs.len)
- user << "There are no removeable organs in [target]'s [parse_zone(target_zone)]!"
+ to_chat(user, "There are no removeable organs in [target]'s [parse_zone(target_zone)]!")
return -1
else
for(var/obj/item/organ/internal/O in organs)
@@ -153,7 +153,7 @@
tool_name = "\the [tool]" //what else do you call nanopaste medically?
if(!hasorgans(target))
- user << "They do not have organs to mend!"
+ to_chat(user, "They do not have organs to mend!")
return
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I && I.damage > 0)
@@ -166,11 +166,11 @@
user.visible_message("[user] starts treating damage to [target]'s [I.name] with [tool_name].", \
"You start treating damage to [target]'s [I.name] with [tool_name]." )
- user << "[I] does not appear to be damaged."
+ to_chat(user, "[I] does not appear to be damaged.")
H.custom_pain("The pain in your [affected.name] is living hell!",1)
else if(istype(tool, /obj/item/weapon/reagent_containers/food/snacks/organ))
- user << "[tool] was biten by someone! It's too damaged to use!"
+ to_chat(user, "[tool] was biten by someone! It's too damaged to use!")
return -1
..()
@@ -205,7 +205,7 @@
I.insert(target)
spread_germs_to_organ(I, user)
if(!user.canUnEquip(I, 0))
- user << "[I] is stuck to your hand, you can't put it in [target]!"
+ to_chat(user, "[I] is stuck to your hand, you can't put it in [target]!")
return 0
if(affected)
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 004cea35e59..f8051575b05 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -2,10 +2,16 @@
//////////////////////////////////////////////////////////////////
// INTERNAL WOUND PATCHING //
//////////////////////////////////////////////////////////////////
+
+/datum/surgery/infection
+ name = "external infection treatment/autopsy"
+ steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/cauterize)
+ possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand", "r_foot", "l_foot")
+
/datum/surgery/bleeding
name = "internal bleeding"
steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders,/datum/surgery_step/generic/retract_skin,/datum/surgery_step/fix_vein,/datum/surgery_step/generic/cauterize)
- possible_locs = list("chest","head","groin")
+ possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand", "r_foot", "l_foot")
/datum/surgery/bleeding/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
@@ -14,9 +20,10 @@
if(!affected) return 0
var/internal_bleeding = 0
- for(var/datum/wound/W in affected.wounds) if(W.internal)
- internal_bleeding = 1
- break
+ for(var/datum/wound/W in affected.wounds)
+ if(W.internal)
+ internal_bleeding = 1
+ break
if(internal_bleeding)
return 1
return 0
@@ -37,9 +44,10 @@
if(!affected) return 0
var/internal_bleeding = 0
- for(var/datum/wound/W in affected.wounds) if(W.internal)
- internal_bleeding = 1
- break
+ for(var/datum/wound/W in affected.wounds)
+ if(W.internal)
+ internal_bleeding = 1
+ break
return affected.open == 2 && internal_bleeding
@@ -200,7 +208,7 @@
//////////////////////////////////////////////////////////////////
/datum/surgery/remove_thrall
name = "cleanse contaminations"//RENAME MEH
- steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw,/datum/surgery_step/open_encased/retract, /datum/surgery_step/dethrall,/datum/surgery_step/glue_bone, /datum/surgery_step/set_bone,/datum/surgery_step/finish_bone,/datum/surgery_step/generic/cauterize)
+ steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw,/datum/surgery_step/open_encased/retract, /datum/surgery_step/internal/dethrall, /datum/surgery_step/glue_bone, /datum/surgery_step/set_bone,/datum/surgery_step/finish_bone,/datum/surgery_step/generic/cauterize)
possible_locs = list("head")
/datum/surgery/remove_thrall/synth
@@ -211,13 +219,13 @@
/datum/surgery/remove_thrall/can_start(mob/user, mob/living/carbon/target)
- return is_thrall(target)//would this be too meta?
+ return is_thrall(target) //would this be too meta?
/datum/surgery/remove_thrall/synth/can_start(mob/user, mob/living/carbon/target)
return is_thrall(target) && target.get_species() == "Machine"
-/datum/surgery_step/dethrall
+/datum/surgery_step/internal/dethrall
name = "cleanse contamination"
allowed_tools = list(/obj/item/device/flash = 100, /obj/item/device/flashlight/pen = 80, /obj/item/device/flashlight = 40)
@@ -232,26 +240,31 @@
/datum/surgery_step/internal/dethrall/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
var/braincase = target.named_organ_parent("brain")
user.visible_message("[user] reaches into [target]'s head with [tool].", "You begin aligning [tool]'s light to the tumor on [target]'s brain...")
- target << "A small part of your [braincase] pulses with agony as the light impacts it."
+ to_chat(target, "A small part of your [braincase] pulses with agony as the light impacts it.")
..()
/datum/surgery_step/internal/dethrall/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+ if(target.get_species() == "Lesser Shadowling") //Empowered thralls cannot be deconverted
+ to_chat(target, "NOT LIKE THIS!")
+ user.visible_message("[target] suddenly slams upward and knocks down [user]!", \
+ "[target] suddenly bolts up and slams you with tremendous force!")
+ user.resting = 0 //Remove all stuns
+ user.SetSleeping(0)
+ user.SetStunned(0)
+ user.SetWeakened(0)
+ user.SetParalysis(0)
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ C.Weaken(6)
+ C.apply_damage(20, "brute", "chest")
+ else if(issilicon(user))
+ var/mob/living/silicon/S = user
+ S.Weaken(8)
+ S.apply_damage(20, "brute")
+ playsound(S, 'sound/effects/bang.ogg', 50, 1)
+ return 0
user.visible_message("[user] shines light onto the tumor in [target]'s head!", "You cleanse the contamination from [target]'s brain!")
- ticker.mode.remove_thrall(target.mind,0)
+ ticker.mode.remove_thrall(target.mind, 0)
target.visible_message("A strange black mass falls from [target]'s head!")
new /obj/item/organ/internal/shadowtumor(get_turf(target))
-
return 1
-
-/datum/surgery_step/internal/dethrall/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
- var/braincase = target.named_organ_parent("brain")
- if(prob(50))
- user.visible_message("[user] slips and rips the tumor out from [target]'s [braincase]!", \
- "You fumble and tear out [target]'s tumor!")
- target.adjustBrainLoss(110) // This is so you can't just defib'n go
- ticker.mode.remove_thrall(target.mind,1)
-
- return 0
- else
- user.visible_message("[user]'s hand slips and fumbles! Luckily, they didn't damage anything!")
- return 0
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index c1851ecabc6..da627a57f0d 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -232,7 +232,7 @@
if(limb_can_operate)
if(istype(C))
if(!C.get_amount() >= 3)
- user << "You need three or more cable pieces to repair this damage."
+ to_chat(user, "You need three or more cable pieces to repair this damage.")
return 2
C.use(3)
return 1
@@ -288,18 +288,18 @@
var/obj/item/organ/internal/I = tool
if(I.status != ORGAN_ROBOT || I.robotic != 2)
- user << "You can only implant cybernetic organs."
+ to_chat(user, "You can only implant cybernetic organs.")
if(target_zone != I.parent_organ || target.get_organ_slot(I.slot))
- user << "There is no room for [I] in [target]'s [parse_zone(target_zone)]!"
+ to_chat(user, "There is no room for [I] in [target]'s [parse_zone(target_zone)]!")
return -1
if(I.damage > (I.max_damage * 0.75))
- user << " \The [I] is in no state to be transplanted."
+ to_chat(user, " \The [I] is in no state to be transplanted.")
return -1
if(target.get_int_organ(I))
- user << " \The [target] already has [I]."
+ to_chat(user, " \The [target] already has [I].")
return -1
user.visible_message("[user] begins reattaching [target]'s [tool].", \
@@ -309,7 +309,7 @@
current_type = "install"
if(target_zone != "chest")
- user << " You must target the chest cavity."
+ to_chat(user, " You must target the chest cavity.")
return -1
var/obj/item/device/mmi/M = tool
@@ -322,23 +322,23 @@
return -1
if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD)
- user << "That brain is not usable."
+ to_chat(user, "That brain is not usable.")
return -1
if(!(affected.status & ORGAN_ROBOT))
- user << "You cannot install a computer brain into a meat enclosure."
+ to_chat(user, "You cannot install a computer brain into a meat enclosure.")
return -1
if(!target.species)
- user << "You have no idea what species this person is. Report this on the bug tracker."
+ to_chat(user, "You have no idea what species this person is. Report this on the bug tracker.")
return -1
if(!target.species.has_organ["brain"])
- user << "You're pretty sure [target.species.name_plural] don't normally have a brain."
+ to_chat(user, "You're pretty sure [target.species.name_plural] don't normally have a brain.")
return -1
if(target.get_int_organ(/obj/item/organ/internal/brain/))
- user << "Your subject already has a brain."
+ to_chat(user, "Your subject already has a brain.")
return -1
user.visible_message("[user] starts installing \the [tool] into [target]'s [affected.name].", \
@@ -352,7 +352,7 @@
if(!affected.open_enough_for_surgery())
return -1
if(!organs.len)
- user << "There is no removeable organs in [target]'s [parse_zone(target_zone)]!"
+ to_chat(user, "There is no removeable organs in [target]'s [parse_zone(target_zone)]!")
return -1
else
for(var/obj/item/organ/internal/O in organs)
@@ -408,7 +408,7 @@
var/obj/item/organ/internal/I = tool
if(!user.canUnEquip(I, 0))
- user << "[I] is stuck to your hand, you can't put it in [target]!"
+ to_chat(user, "[I] is stuck to your hand, you can't put it in [target]!")
return 0
user.drop_item()
@@ -515,23 +515,23 @@
return 0
if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD)
- user << "That brain is not usable."
+ to_chat(user, "That brain is not usable.")
return 2
if(!(affected.status & ORGAN_ROBOT))
- user << "You cannot install a computer brain into a meat enclosure."
+ to_chat(user, "You cannot install a computer brain into a meat enclosure.")
return 2
if(!target.species)
- user << "You have no idea what species this person is. Report this on the bug tracker."
+ to_chat(user, "You have no idea what species this person is. Report this on the bug tracker.")
return 2
if(!target.species.has_organ["brain"])
- user << "You're pretty sure [target.species.name_plural] don't normally have a brain."
+ to_chat(user, "You're pretty sure [target.species.name_plural] don't normally have a brain.")
return 2
if(target.get_int_organ(/obj/item/organ/internal/brain/))
- user << "Your subject already has a brain."
+ to_chat(user, "Your subject already has a brain.")
return 2
return 1
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index f413b42ef63..672ae3ac804 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -181,7 +181,7 @@
/proc/spread_germs_to_organ(obj/item/organ/E, mob/living/carbon/human/user)
if(!istype(user) || !istype(E)) return
- //world << "Germ spread: [E] : [E.owner]"
+// to_chat(world, "Germ spread: [E] : [E.owner]")
var/germ_level = user.germ_level
if(user.gloves)
germ_level = user.gloves.germ_level
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 3c588c2f11b..b878034ff4a 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -49,8 +49,8 @@
attack_verb = list("drilled")
suicide_act(mob/user)
- viewers(user) << pick("[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.", \
- "[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.")
+ to_chat(viewers(user), pick("[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.",
+ "[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide."))
return (BRUTELOSS)
@@ -73,9 +73,9 @@
hitsound = 'sound/weapons/bladeslice.ogg'
suicide_act(mob/user)
- viewers(user) << pick("[user] is slitting \his wrists with [src]! It looks like \he's trying to commit suicide.", \
- "[user] is slitting \his throat with [src]! It looks like \he's trying to commit suicide.", \
- "[user] is slitting \his stomach open with [src]! It looks like \he's trying to commit seppuku.")
+ to_chat(viewers(user), pick("[user] is slitting \his wrists with [src]! It looks like \he's trying to commit suicide.",
+ "[user] is slitting \his throat with [src]! It looks like \he's trying to commit suicide.",
+ "[user] is slitting \his stomach open with [src]! It looks like \he's trying to commit seppuku."))
return (BRUTELOSS)
@@ -140,6 +140,7 @@
force = 0
w_class = 2.0
throwforce = 1.0
+ origin_tech = "materials=1;biotech=1"
/obj/item/weapon/FixOVein
name = "FixOVein"
@@ -147,9 +148,8 @@
icon_state = "fixovein"
force = 0
throwforce = 1.0
- origin_tech = "materials=1;biotech=3"
+ origin_tech = "materials=1;biotech=1"
w_class = 2.0
- var/usage_amount = 10
/obj/item/weapon/bonesetter
name = "bone setter"
@@ -161,6 +161,7 @@
throw_range = 5
w_class = 2.0
attack_verb = list("attacked", "hit", "bludgeoned")
+ origin_tech = "materials=1;biotech=1"
/obj/item/weapon/surgical_drapes
name = "surgical drapes"
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index ee4e9a790a6..0f1f7c8f582 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -46,7 +46,7 @@
if(istype(I, /obj/item/device/multitool))
var/obj/item/device/multitool/M = I
M.buffer = src
- user << "You save the data in the [I.name]'s buffer."
+ to_chat(user, "You save the data in the [I.name]'s buffer.")
if(exchange_parts(user, I))
return
@@ -70,22 +70,22 @@
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
if(anchored)
anchored = 0
- user << " The [src] can now be moved."
+ to_chat(user, " The [src] can now be moved.")
else if(!anchored)
anchored = 1
- user << " The [src] is now secured."
+ to_chat(user, " The [src] is now secured.")
if(istype(W, /obj/item/weapon/screwdriver))
if(stage == 0)
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
- user << " You unscrew the telepad's tracking beacon."
+ to_chat(user, " You unscrew the telepad's tracking beacon.")
stage = 1
else if(stage == 1)
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
- user << " You screw in the telepad's tracking beacon."
+ to_chat(user, " You screw in the telepad's tracking beacon.")
stage = 0
if(istype(W, /obj/item/weapon/weldingtool) && stage == 1)
playsound(src, 'sound/items/Welder.ogg', 50, 1)
- user << " You disassemble the telepad."
+ to_chat(user, " You disassemble the telepad.")
new /obj/item/stack/sheet/metal(get_turf(src))
new /obj/item/stack/sheet/glass(get_turf(src))
qdel(src)
@@ -101,7 +101,7 @@
/obj/item/device/telepad_beacon/attack_self(mob/user as mob)
if(user)
- user << " Locked In"
+ to_chat(user, " Locked In")
new /obj/machinery/telepad_cargo(user.loc)
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
qdel(src)
@@ -135,7 +135,7 @@
/obj/item/weapon/rcs/examine(mob/user)
..(user)
- user << "There are [round(rcell.charge/chargecost)] charge\s left."
+ to_chat(user, "There are [round(rcell.charge/chargecost)] charge\s left.")
/obj/item/weapon/rcs/Destroy()
if(rcell)
@@ -148,11 +148,11 @@
if(mode == 0)
mode = 1
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
- user << " The telepad locator has become uncalibrated."
+ to_chat(user, " The telepad locator has become uncalibrated.")
else
mode = 0
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
- user << " You calibrate the telepad locator."
+ to_chat(user, " You calibrate the telepad locator.")
/obj/item/weapon/rcs/emag_act(user as mob)
if(!emagged)
@@ -160,5 +160,5 @@
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
- user << " You emag the RCS. Activate it to toggle between modes."
+ to_chat(user, " You emag the RCS. Activate it to toggle between modes.")
return
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 15edeec20a2..2640b61bd33 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -44,7 +44,7 @@
/obj/machinery/computer/telescience/examine(mob/user)
..(user)
- user << "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots."
+ to_chat(user, "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots.")
/obj/machinery/computer/telescience/initialize()
..()
@@ -54,7 +54,7 @@
/obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/ore/bluespace_crystal))
if(crystals.len >= max_crystals)
- user << "There are not enough crystal slots."
+ to_chat(user, "There are not enough crystal slots.")
return
user.drop_item()
crystals += W
@@ -73,17 +73,17 @@
if(M.buffer && istype(M.buffer, /obj/machinery/telepad))
telepad = M.buffer
M.buffer = null
- user << "You upload the data from the [W.name]'s buffer."
+ to_chat(user, "You upload the data from the [W.name]'s buffer.")
updateUsrDialog()
else
..()
/obj/machinery/computer/telescience/emag_act(user as mob)
if (!emagged)
- user << "\blue You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!"
+ to_chat(user, "\blue You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!")
emagged = 1
else
- user << "\red The machine seems unaffected by the card swipe..."
+ to_chat(user, "\red The machine seems unaffected by the card swipe...")
/obj/machinery/computer/telescience/attack_ai(mob/user)
src.attack_hand(user)
diff --git a/code/modules/vehicle/train/train.dm b/code/modules/vehicle/train/train.dm
index 72b5b2a7ed1..ea84d92c4ed 100644
--- a/code/modules/vehicle/train/train.dm
+++ b/code/modules/vehicle/train/train.dm
@@ -66,7 +66,7 @@
M.apply_damages(22 / move_delay) // and do damage according to how fast the train is going
if(istype(load, /mob/living/carbon/human))
var/mob/living/D = load
- D << "\red You hit [M]!"
+ to_chat(D, "\red You hit [M]!")
msg_admin_attack("[key_name_admin(D)] hit [key_name_admin(M)] with [src].")
@@ -86,7 +86,7 @@
/obj/vehicle/train/relaymove(mob/user, direction)
var/turf/T = get_step_to(src, get_step(src, direction))
if(!T)
- user << "You can't find a clear area to step onto."
+ to_chat(user, "You can't find a clear area to step onto.")
return 0
if(user != load)
@@ -97,7 +97,7 @@
unload(user, direction)
- user << "\blue You climb down from [src]."
+ to_chat(user, "\blue You climb down from [src].")
return 1
@@ -108,7 +108,7 @@
latch(C, user)
else
if(!load(C))
- user << "\red You were unable to load [C] on [src]."
+ to_chat(user, "\red You were unable to load [C] on [src].")
/obj/vehicle/train/attack_hand(mob/user as mob)
if(user.stat || user.restrained() || !Adjacent(user))
@@ -145,22 +145,22 @@
//attempts to attach src as a follower of the train T
/obj/vehicle/train/proc/attach_to(obj/vehicle/train/T, mob/user)
if (get_dist(src, T) > 1)
- user << "\red [src] is too far away from [T] to hitch them together."
+ to_chat(user, "\red [src] is too far away from [T] to hitch them together.")
return
if (lead)
- user << "\red [src] is already hitched to something."
+ to_chat(user, "\red [src] is already hitched to something.")
return
if (T.tow)
- user << "\red [T] is already towing something."
+ to_chat(user, "\red [T] is already towing something.")
return
//check for cycles.
var/obj/vehicle/train/next_car = T
while (next_car)
if (next_car == src)
- user << "\red That seems very silly."
+ to_chat(user, "\red That seems very silly.")
return
next_car = next_car.lead
@@ -170,7 +170,7 @@
dir = lead.dir
if(user)
- user << "\blue You hitch [src] to [T]."
+ to_chat(user, "\blue You hitch [src] to [T].")
update_stats()
@@ -178,7 +178,7 @@
//detaches the train from whatever is towing it
/obj/vehicle/train/proc/unattach(mob/user)
if (!lead)
- user << "\red [src] is not hitched to anything."
+ to_chat(user, "\red [src] is not hitched to anything.")
return
lead.tow = null
diff --git a/code/modules/vehicle/train/trains/ambulance.dm b/code/modules/vehicle/train/trains/ambulance.dm
index f7094f10ad8..6ef9e9822b2 100644
--- a/code/modules/vehicle/train/trains/ambulance.dm
+++ b/code/modules/vehicle/train/trains/ambulance.dm
@@ -142,7 +142,7 @@
if(is_train_head() && istype(load, /mob/living/carbon/human))
var/mob/living/carbon/human/D = load
- D << "\red \b You ran over [H]!"
+ to_chat(D, "\red \b You ran over [H]!")
visible_message("\red \The [src] ran over [H]!")
attack_log += text("\[[time_stamp()]\] ran over [key_name(H)], driven by [key_name(D)]")
msg_admin_attack("[key_name_admin(D)] ran over [key_name_admin(H)]")
@@ -168,7 +168,7 @@
/obj/vehicle/train/ambulance/engine/examine(mob/user)
if(..(user, 1))
- user << "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition."
+ to_chat(user, "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition.")
/obj/vehicle/train/ambulance/engine/verb/check_power()
set name = "Check power level"
@@ -179,10 +179,10 @@
return
if(!cell)
- usr << "There is no power cell installed in [src]."
+ to_chat(usr, "There is no power cell installed in [src].")
return
- usr << "The power meter reads [round(cell.percent(), 0.01)]%"
+ to_chat(usr, "The power meter reads [round(cell.percent(), 0.01)]%")
/obj/vehicle/train/ambulance/engine/verb/start_engine()
set name = "Start engine"
@@ -193,17 +193,17 @@
return
if(on)
- usr << "The engine is already running."
+ to_chat(usr, "The engine is already running.")
return
turn_on()
if (on)
- usr << "You start [src]'s engine."
+ to_chat(usr, "You start [src]'s engine.")
else
if(cell.charge < charge_use)
- usr << "[src] is out of power."
+ to_chat(usr, "[src] is out of power.")
else
- usr << "[src]'s engine won't start."
+ to_chat(usr, "[src]'s engine won't start.")
/obj/vehicle/train/ambulance/engine/verb/stop_engine()
set name = "Stop engine"
@@ -214,12 +214,12 @@
return
if(!on)
- usr << "The engine is already stopped."
+ to_chat(usr, "The engine is already stopped.")
return
turn_off()
if (!on)
- usr << "You stop [src]'s engine."
+ to_chat(usr, "You stop [src]'s engine.")
/obj/vehicle/train/ambulance/engine/verb/remove_key()
set name = "Remove key"
diff --git a/code/modules/vehicle/train/trains/cargo/cargo_train.dm b/code/modules/vehicle/train/trains/cargo/cargo_train.dm
index 5933ada33d5..8df907b1420 100644
--- a/code/modules/vehicle/train/trains/cargo/cargo_train.dm
+++ b/code/modules/vehicle/train/trains/cargo/cargo_train.dm
@@ -138,7 +138,7 @@
if(is_train_head() && istype(load, /mob/living/carbon/human))
var/mob/living/carbon/human/D = load
- D << "\red \b You ran over [H]!"
+ to_chat(D, "\red \b You ran over [H]!")
visible_message("\red \The [src] ran over [H]!")
attack_log += text("\[[time_stamp()]\] ran over [key_name(H)], driven by [key_name(D)]")
msg_admin_attack("[key_name_admin(D)] ran over [key_name_admin(H)]")
@@ -166,8 +166,8 @@
if(!..(user, 1))
return
- user << "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition."
- user << "The charge meter reads [cell? round(cell.percent(), 0.01) : 0]%"
+ to_chat(user, "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition.")
+ to_chat(user, "The charge meter reads [cell? round(cell.percent(), 0.01) : 0]%")
/obj/vehicle/train/cargo/engine/verb/start_engine()
set name = "Start engine"
@@ -178,17 +178,17 @@
return
if(on)
- usr << "The engine is already running."
+ to_chat(usr, "The engine is already running.")
return
turn_on()
if (on)
- usr << "You start [src]'s engine."
+ to_chat(usr, "You start [src]'s engine.")
else
if(cell.charge < charge_use)
- usr << "[src] is out of power."
+ to_chat(usr, "[src] is out of power.")
else
- usr << "[src]'s engine won't start."
+ to_chat(usr, "[src]'s engine won't start.")
/obj/vehicle/train/cargo/engine/verb/stop_engine()
set name = "Stop engine"
@@ -199,12 +199,12 @@
return
if(!on)
- usr << "The engine is already stopped."
+ to_chat(usr, "The engine is already stopped.")
return
turn_off()
if (!on)
- usr << "You stop [src]'s engine."
+ to_chat(usr, "You stop [src]'s engine.")
/obj/vehicle/train/cargo/engine/verb/remove_key()
set name = "Remove key"
diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm
index eb8c4f816b4..105f02148b7 100644
--- a/code/modules/vehicle/vehicle.dm
+++ b/code/modules/vehicle/vehicle.dm
@@ -86,7 +86,7 @@
if(!locked)
open = !open
update_icon()
- user << "Maintenance panel is now [open ? "opened" : "closed"]."
+ to_chat(user, "Maintenance panel is now [open ? "opened" : "closed"].")
else if(istype(W, /obj/item/weapon/crowbar) && cell && open)
remove_cell(user)
@@ -100,11 +100,11 @@
health = min(maxhealth, health+10)
user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!")
else
- user << "Unable to repair with the maintenance panel closed."
+ to_chat(user, "Unable to repair with the maintenance panel closed.")
else
- user << "[src] does not need a repair."
+ to_chat(user, "[src] does not need a repair.")
else
- user << "Unable to repair while [src] is off."
+ to_chat(user, "Unable to repair while [src] is off.")
else if(hasvar(W,"force") && hasvar(W,"damtype"))
switch(W.damtype)
if("fire")
@@ -205,7 +205,7 @@
if(locked)
locked = 0
- user << "You bypass [src]'s controls."
+ to_chat(user, "You bypass [src]'s controls.")
/obj/vehicle/proc/explode()
src.visible_message("\red [src] blows apart!", 1)
@@ -262,13 +262,13 @@
C.forceMove(src)
cell = C
powercheck()
- usr << "You install [C] in [src]."
+ to_chat(usr, "You install [C] in [src].")
/obj/vehicle/proc/remove_cell(var/mob/living/carbon/human/H)
if(!cell)
return
- usr << "You remove [cell] from [src]."
+ to_chat(usr, "You remove [cell] from [src].")
cell.forceMove(get_turf(H))
H.put_in_hands(cell)
cell = null
diff --git a/code/modules/virus2/analyser.dm b/code/modules/virus2/analyser.dm
deleted file mode 100644
index 770587eee70..00000000000
--- a/code/modules/virus2/analyser.dm
+++ /dev/null
@@ -1,68 +0,0 @@
-/obj/machinery/disease2/diseaseanalyser
- name = "Disease Analyser"
- icon = 'icons/obj/virology.dmi'
- icon_state = "analyser"
- anchored = 1
- density = 1
-
- var/scanning = 0
- var/pause = 0
-
- var/obj/item/weapon/virusdish/dish = null
-
-/obj/machinery/disease2/diseaseanalyser/attackby(var/obj/O as obj, var/mob/user as mob, params)
- if(!istype(O,/obj/item/weapon/virusdish)) return
-
- if(dish)
- user << "\The [src] is already loaded."
- return
-
- dish = O
- user.drop_item()
- O.loc = src
-
- user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
-
-/obj/machinery/disease2/diseaseanalyser/process()
- if(stat & (NOPOWER|BROKEN))
- return
-
- if(scanning)
- scanning -= 1
- if(scanning == 0)
- if (dish.virus2.addToDB())
- ping("\The [src] pings, \"New pathogen added to data bank.\"")
-
- playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
- var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src.loc)
- P.name = "paper - [dish.virus2.name()]"
-
- var/r = dish.virus2.get_info()
- P.info = {"
- [virology_letterhead("Post-Analysis Memo")]
- [r]
-
- Additional Notes:
-"}
- dish.info = r
- dish.analysed = 1
- dish.loc = src.loc
- dish = null
-
- icon_state = "analyser"
- src.state("\The [src] prints a sheet of paper.")
-
- else if(dish && !scanning && !pause)
- if(dish.virus2 && dish.growth > 50)
- dish.growth -= 10
- scanning = 5
- icon_state = "analyser_processing"
- else
- pause = 1
- spawn(25)
- dish.loc = src.loc
- dish = null
-
- src.state("\The [src] buzzes, \"Insufficient growth density to complete analysis.\"")
- pause = 0
- return
diff --git a/code/modules/virus2/antibodies.dm b/code/modules/virus2/antibodies.dm
deleted file mode 100644
index 9d4c63ae2c5..00000000000
--- a/code/modules/virus2/antibodies.dm
+++ /dev/null
@@ -1,52 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
-
-// reserving some numbers for later special antigens
-var/global/const/ANTIGEN_A = 1
-var/global/const/ANTIGEN_B = 2
-var/global/const/ANTIGEN_RH = 4
-var/global/const/ANTIGEN_Q = 8
-var/global/const/ANTIGEN_U = 16
-var/global/const/ANTIGEN_V = 32
-var/global/const/ANTIGEN_X = 64
-var/global/const/ANTIGEN_Y = 128
-var/global/const/ANTIGEN_Z = 256
-var/global/const/ANTIGEN_M = 512
-var/global/const/ANTIGEN_N = 1024
-var/global/const/ANTIGEN_P = 2048
-var/global/const/ANTIGEN_O = 4096
-
-var/global/list/ANTIGENS = list(
-"[ANTIGEN_A]" = "A",
-"[ANTIGEN_B]" = "B",
-"[ANTIGEN_RH]" = "RH",
-"[ANTIGEN_Q]" = "Q",
-"[ANTIGEN_U]" = "U",
-"[ANTIGEN_V]" = "V",
-"[ANTIGEN_Z]" = "Z",
-"[ANTIGEN_M]" = "M",
-"[ANTIGEN_N]" = "N",
-"[ANTIGEN_P]" = "P",
-"[ANTIGEN_O]" = "O"
-)
-
-// pure concentrated antibodies
-datum/reagent/antibodies
- data = list("antibodies"=0)
- name = "Antibodies"
- id = "antibodies"
- reagent_state = LIQUID
- color = "#0050F0"
-
- reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
- if(istype(M,/mob/living/carbon))
- if(src.data && method == INGEST)
- if(M:virus2) if(src.data["antibodies"] & M:virus2.antigen)
- M:virus2.dead = 1
- M:antibodies |= src.data["antibodies"]
- return
-
-// iterate over the list of antigens and see what matches
-/proc/antigens2string(var/antigens)
- var/code = ""
- for(var/V in ANTIGENS) if(text2num(V) & antigens) code += ANTIGENS[V]
- return code
\ No newline at end of file
diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm
deleted file mode 100644
index e215e9e6a8c..00000000000
--- a/code/modules/virus2/centrifuge.dm
+++ /dev/null
@@ -1,217 +0,0 @@
-/obj/machinery/computer/centrifuge
- name = "isolation centrifuge"
- desc = "Used to separate things with different weight. Spin 'em round, round, right round."
- icon = 'icons/obj/virology.dmi'
- icon_state = "centrifuge"
- var/curing
- var/isolating
-
- var/obj/item/weapon/reagent_containers/glass/beaker/vial/sample = null
- var/datum/disease2/disease/virus2 = null
-
-/obj/machinery/computer/centrifuge/attackby(var/obj/O as obj, var/mob/user as mob, params)
- if(istype(O, /obj/item/weapon/screwdriver))
- return ..(O,user)
-
- if(istype(O,/obj/item/weapon/reagent_containers/glass/beaker/vial))
- if(sample)
- user << "\The [src] is already loaded."
- return
-
- if(!user.drop_item())
- user << "\The [O] is stuck to you!"
- return
-
- sample = O
- O.forceMove(src)
-
- user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
- nanomanager.update_uis(src)
-
- src.attack_hand(user)
-
-/obj/machinery/computer/centrifuge/update_icon()
- ..()
- if(! (stat & (BROKEN|NOPOWER)) && (isolating || curing))
- icon_state = "centrifuge_moving"
-
-/obj/machinery/computer/centrifuge/attack_hand(var/mob/user as mob)
- if(..()) return
- ui_interact(user)
-
-/obj/machinery/computer/centrifuge/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- user.set_machine(src)
-
- var/data[0]
- data["antibodies"] = null
- data["pathogens"] = null
- data["is_antibody_sample"] = null
-
- if (curing)
- data["busy"] = "Isolating antibodies..."
- else if (isolating)
- data["busy"] = "Isolating pathogens..."
- else
- data["sample_inserted"] = !!sample
-
- if (sample)
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in sample.reagents.reagent_list
- if (B)
- data["antibodies"] = B.data["antibodies"] ? antigens2string(B.data["antibodies"]) : null
-
- var/list/pathogens[0]
- var/list/virus = B.data["virus2"]
- for (var/ID in virus)
- var/datum/disease2/disease/V = virus[ID]
- pathogens.Add(list(list("name" = V.name(), "spread_type" = V.spreadtype, "reference" = "\ref[V]")))
-
- if (pathogens.len > 0)
- data["pathogens"] = pathogens
-
- else
- var/datum/reagent/antibodies/A = locate(/datum/reagent/antibodies) in sample.reagents.reagent_list
- data["antibodies"] = A && A.data["antibodies"] ? antigens2string(A.data["antibodies"]) : null
- data["is_antibody_sample"] = 1
-
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "isolation_centrifuge.tmpl", src.name, 400, 500)
- ui.set_initial_data(data)
- ui.open()
-
-/obj/machinery/computer/centrifuge/process()
- ..()
- if (stat & (NOPOWER|BROKEN)) return
-
- if (curing)
- curing -= 1
- if (curing == 0)
- cure()
-
- if (isolating)
- isolating -= 1
- if(isolating == 0)
- isolate()
-
-/obj/machinery/computer/centrifuge/Topic(href, href_list)
- if (..()) return 0
-
- var/mob/user = usr
- var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")
-
- src.add_fingerprint(user)
-
- if (href_list["close"])
- user.unset_machine()
- ui.close()
- return 0
-
- if (href_list["print"])
- print(user)
- return 1
-
- if(href_list["isolate"])
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in sample.reagents.reagent_list
- if (B)
- var/datum/disease2/disease/virus = locate(href_list["isolate"])
- virus2 = virus.getcopy()
- isolating = 40
- update_icon()
- return 1
-
- switch(href_list["action"])
- if ("antibody")
- var/delay = 20
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in sample.reagents.reagent_list
- if (!B)
- state("\The [src] buzzes, \"No antibody carrier detected.\"", "blue")
- return 1
-
- var/has_toxins = locate(/datum/reagent/toxin) in sample.reagents.reagent_list
- var/has_radium = sample.reagents.has_reagent("radium")
- if (has_toxins || has_radium)
- state("\The [src] beeps, \"Pathogen purging speed above nominal.\"", "blue")
- if (has_toxins)
- delay = delay/2
- if (has_radium)
- delay = delay/2
-
- curing = round(delay)
- playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
- update_icon()
- return 1
-
- if("sample")
- if(sample)
- sample.forceMove(src.loc)
- sample = null
- return 1
-
- return 0
-
-/obj/machinery/computer/centrifuge/proc/cure()
- if (!sample) return
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in sample.reagents.reagent_list
- if (!B) return
-
- var/list/data = list("antibodies" = B.data["antibodies"])
- var/amt= sample.reagents.get_reagent_amount("blood")
- sample.reagents.remove_reagent("blood", amt)
- sample.reagents.add_reagent("antibodies", amt, data)
-
- nanomanager.update_uis(src)
- update_icon()
- ping("\The [src] pings, \"Antibody isolated.\"")
-
-/obj/machinery/computer/centrifuge/proc/isolate()
- if (!sample) return
- var/obj/item/weapon/virusdish/dish = new/obj/item/weapon/virusdish(loc)
- dish.virus2 = virus2
- virus2 = null
-
- nanomanager.update_uis(src)
- update_icon()
- ping("\The [src] pings, \"Pathogen isolated.\"")
-
-/obj/machinery/computer/centrifuge/proc/print(var/mob/user)
- playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
- var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc)
- P.name = "paper - Pathology Report"
- P.info = {"
- [virology_letterhead("Pathology Report")]
- Sample: [sample.name]
-"}
-
- if (user)
- P.info += "Generated By: [user.name]
"
-
- P.info += "
"
-
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in sample.reagents.reagent_list
- if (B)
- P.info += "Antibodies: "
- P.info += B.data["antibodies"] ? antigens2string(B.data["antibodies"]) : "None"
- P.info += "
"
-
- var/list/virus = B.data["virus2"]
- P.info += "Pathogens:
"
- if (virus.len > 0)
- for (var/ID in virus)
- var/datum/disease2/disease/V = virus[ID]
- P.info += "[V.name()]
"
- else
- P.info += "None
"
-
- else
- var/datum/reagent/antibodies/A = locate(/datum/reagent/antibodies) in sample.reagents.reagent_list
- if (A)
- P.info += "The following antibodies have been isolated from the blood sample: "
- P.info += A.data["antibodies"] ? antigens2string(A.data["antibodies"]) : "None"
- P.info += "
"
-
- P.info += {"
-
- Additional Notes:
-"}
-
- state("The nearby computer prints out a pathology report.")
\ No newline at end of file
diff --git a/code/modules/virus2/curer.dm b/code/modules/virus2/curer.dm
deleted file mode 100644
index f298f8a3379..00000000000
--- a/code/modules/virus2/curer.dm
+++ /dev/null
@@ -1,107 +0,0 @@
-/obj/machinery/computer/curer
- name = "cure research machine"
- icon = 'icons/obj/computer.dmi'
- icon_state = "dna"
- circuit = /obj/item/weapon/circuitboard/curefab
- var/curing
- var/virusing
-
- var/obj/item/weapon/reagent_containers/container = null
-
-/obj/machinery/computer/curer/attackby(var/obj/I as obj, var/mob/user as mob, params)
- if(istype(I,/obj/item/weapon/reagent_containers))
- var/mob/living/carbon/C = user
- if(!container && C.drop_item())
- container = I
- I.forceMove(src)
- return
- if(istype(I,/obj/item/weapon/virusdish))
- if(virusing)
- user << "The pathogen materializer is still recharging.."
- return
- var/obj/item/weapon/reagent_containers/glass/beaker/product = new(src.loc)
-
- var/list/data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"virus2"=list(),"antibodies"=0)
- data["virus2"] |= I:virus2
- product.reagents.add_reagent("blood",30,data)
-
- virusing = 1
- spawn(1200) virusing = 0
-
- state("The [src.name] Buzzes", "blue")
- return
- ..()
- return
-
-/obj/machinery/computer/curer/attack_ai(var/mob/user as mob)
- return src.attack_hand(user)
-
-/obj/machinery/computer/curer/attack_hand(var/mob/user as mob)
- if(..())
- return
- user.machine = src
- var/dat
- if(curing)
- dat = "Antibody production in progress"
- else if(virusing)
- dat = "Virus production in progress"
- else if(container)
- // see if there's any blood in the container
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in container.reagents.reagent_list
-
- if(B)
- dat = "Blood sample inserted."
- var/code = ""
- for(var/V in ANTIGENS) if(text2num(V) & B.data["antibodies"]) code += ANTIGENS[V]
- dat += "
Antibodies: [code]"
- dat += "
Begin antibody production"
- else
- dat += "
Please check container contents."
- dat += "
Eject container"
- else
- dat = "Please insert a container."
-
- user << browse(dat, "window=computer;size=400x500")
- onclose(user, "computer")
- return
-
-/obj/machinery/computer/curer/process()
- ..()
-
- if(stat & (NOPOWER|BROKEN))
- return
- use_power(500)
-
- if(curing)
- curing -= 1
- if(curing == 0)
- if(container)
- createcure(container)
- return
-
-/obj/machinery/computer/curer/Topic(href, href_list)
- if(..())
- return
- usr.machine = src
-
- if (href_list["antibody"])
- curing = 10
- else if(href_list["eject"])
- container.forceMove(src.loc)
- container = null
-
- src.add_fingerprint(usr)
- src.updateUsrDialog()
- return
-
-
-/obj/machinery/computer/curer/proc/createcure(var/obj/item/weapon/reagent_containers/container)
- var/obj/item/weapon/reagent_containers/glass/beaker/product = new(src.loc)
-
- var/datum/reagent/blood/B = locate() in container.reagents.reagent_list
-
- var/list/data = list()
- data["antibodies"] = B.data["antibodies"]
- product.reagents.add_reagent("antibodies",30,data)
-
- state("\The [src.name] buzzes", "blue")
\ No newline at end of file
diff --git a/code/modules/virus2/disease2.dm b/code/modules/virus2/disease2.dm
deleted file mode 100644
index d5a17a722af..00000000000
--- a/code/modules/virus2/disease2.dm
+++ /dev/null
@@ -1,268 +0,0 @@
-/datum/disease2/disease
- var/infectionchance = 70
- var/speed = 1
- var/spreadtype = "Contact" // Can also be "Airborne" or "Injection"
- var/stage = 1
- var/stageprob = 10
- var/dead = 0
- var/clicks = 0
- var/uniqueID = 0
- var/list/datum/disease2/effectholder/effects = list()
- var/antigen = 0 // 16 bits describing the antigens, when one bit is set, a cure with that bit can dock here
- var/max_stage = 4
- var/list/affected_species = list("Human","Unathi","Skrell","Tajaran","Vox","Kidan","Slime People","Grey","Diona", "Vulpkanin") //if this is changed, also change modules/nano/modules/virus2_creator.dm
- //as you cannot use initial() with lists
-/datum/disease2/disease/New()
- uniqueID = rand(0,10000)
- ..()
-
-/datum/disease2/disease/proc/makerandom(var/greater=0, var/allow_injection=0)
- for(var/i=1 ; i <= max_stage ; i++ )
- var/datum/disease2/effectholder/holder = new /datum/disease2/effectholder
- holder.stage = i
- if(greater)
- holder.getrandomeffect(2)
- else
- holder.getrandomeffect()
- effects += holder
- uniqueID = rand(0,10000)
- infectionchance = rand(60,90)
- antigen |= text2num(pick(ANTIGENS))
- antigen |= text2num(pick(ANTIGENS))
- spreadtype = prob(70) ? "Airborne" : "Contact"
- if(allow_injection) spreadtype = prob(20) ? spreadtype : "Injection"
-
- if(all_species.len)
- affected_species = get_infectable_species()
-
-/proc/get_infectable_species()
- var/list/meat = list()
- var/list/res = list()
- for (var/specie in all_species)
- var/datum/species/S = all_species[specie]
- if(!(S.virus_immune))
- meat += S.name
- if(meat.len)
- var/num = rand(1,meat.len)
- for(var/i=0,i 50)
-// if(prob(1))
-// majormutateinactivate(mob)
-
- //Space antibiotics stop disease completely
- if(mob.reagents.has_reagent("spaceacillin"))
- if(stage == 1 && prob(20))
- src.cure(mob)
- return
-
- //Virus food speeds up disease progress
- if(mob.reagents.has_reagent("virusfood"))
- mob.reagents.remove_reagent("virusfood",0.1)
- clicks += 10
-
- //Moving to the next stage
- if(clicks > stage*100 && prob(10))
- /*if(stage == max_stage)
- src.cure(mob)
- mob.antibodies |= src.antigen*/ //NO AUTOCURE FOR YOU
- stage++
- clicks = 0
- //Do nasty effects
- for(var/datum/disease2/effectholder/e in effects)
- if(prob(33))
- e.runeffect(mob,stage)
-
- //Short airborne spread
- if(src.spreadtype == "Airborne")
- for(var/mob/living/carbon/M in oview(1,mob))
- if(airborne_can_reach(get_turf(mob), get_turf(M)))
- infect_virus2(M,src)
-
- //fever
- mob.bodytemperature = max(mob.bodytemperature, min(310+5*stage ,mob.bodytemperature+5*stage))
- clicks+=speed
-
-/datum/disease2/disease/proc/cure(var/mob/living/carbon/mob)
- for(var/datum/disease2/effectholder/e in effects)
- e.effect.deactivate(mob)
- mob.virus2.Remove("[uniqueID]")
-
-/datum/disease2/disease/proc/minormutate()
- //uniqueID = rand(0,10000)
- var/datum/disease2/effectholder/holder = pick(effects)
- holder.minormutate()
- infectionchance = min(50,infectionchance + rand(0,10))
-
-/datum/disease2/disease/proc/majormutate()
- uniqueID = rand(0,10000)
- var/datum/disease2/effectholder/holder = pick(effects)
- holder.majormutate()
- if (prob(5))
- antigen = text2num(pick(ANTIGENS))
- antigen |= text2num(pick(ANTIGENS))
- if (prob(5) && all_species.len)
- affected_species = get_infectable_species()
-
-/datum/disease2/disease/proc/majormutateinactivate(var/mob/living/carbon/mob) //Bone White - Duplicate of majormutate() with adminlogs, for use only in activate()
- var/oldID = uniqueID
- uniqueID = rand(0,10000)
- var/datum/disease2/effectholder/holder = pick(effects)
- holder.majormutate()
- if (prob(5))
- var/oldAntigen = antigen
- antigen = text2num(pick(ANTIGENS))
- antigen |= text2num(pick(ANTIGENS))
- log_admin("Stamm #[oldID] ([oldAntigen]) mutated antigens in [mob.name] to Stamm #[uniqueID] ([antigen])")
- message_admins("Stamm #[oldID] ([oldAntigen]) mutated antigens in [mob.name] to Stamm #[uniqueID] ([antigen])")
- else if (prob(10) && all_species.len)
- var/old_species = affected_species
- affected_species = get_infectable_species()
- log_admin("Stamm #[oldID] ([old_species]) mutated affected species in [mob.name] to Stamm #[uniqueID] ([affected_species])")
- message_admins("Stamm #[oldID] ([old_species]) mutated affected species in [mob.name] to Stamm #[uniqueID] ([affected_species])")
- else
- log_admin("Stamm #[oldID] mutated in [mob.name] to Stamm #[uniqueID] ([antigen])")
- message_admins("Stamm #[oldID] mutated in a [mob.name] to Stamm #[uniqueID] ([antigen])")
-
-/datum/disease2/disease/proc/getcopy()
- var/datum/disease2/disease/disease = new /datum/disease2/disease
- disease.infectionchance = infectionchance
- disease.spreadtype = spreadtype
- disease.stageprob = stageprob
- disease.antigen = antigen
- disease.uniqueID = uniqueID
- disease.speed = speed
- disease.clicks = clicks
- disease.affected_species = affected_species.Copy()
- for(var/datum/disease2/effectholder/holder in effects)
- var/datum/disease2/effectholder/newholder = new /datum/disease2/effectholder
- newholder.effect = new holder.effect.type
- newholder.chance = holder.chance
- newholder.cure = holder.cure
- newholder.multiplier = holder.multiplier
- newholder.happensonce = holder.happensonce
- newholder.stage = holder.stage
- disease.effects += newholder
- return disease
-
-/datum/disease2/disease/proc/issame(var/datum/disease2/disease/disease)
- var/list/types = list()
- var/list/types2 = list()
- for(var/datum/disease2/effectholder/d in effects)
- types += d.effect.type
- var/equal = 1
-
- for(var/datum/disease2/effectholder/d in disease.effects)
- types2 += d.effect.type
-
- for(var/type in types)
- if(!(type in types2))
- equal = 0
-
- if (antigen != disease.antigen)
- equal = 0
- return equal
-
-/proc/virus_copylist(var/list/datum/disease2/disease/viruses)
- var/list/res = list()
- for (var/ID in viruses)
- var/datum/disease2/disease/V = viruses[ID]
- if(istype(V))
- res["[V.uniqueID]"] = V.getcopy()
- else
- testing("Got a NULL disease2 in virus_copylist!")
- return res
-
-
-var/global/list/virusDB = list()
-
-/datum/disease2/disease/proc/name()
- .= "stamm #[add_zero("[uniqueID]", 4)]"
- if ("[uniqueID]" in virusDB)
- var/datum/data/record/V = virusDB["[uniqueID]"]
- .= V.fields["name"]
-
-/datum/disease2/disease/proc/get_info()
- var/r = {"
-Analysis determined the existence of a GNAv2-based viral lifeform.
-Designation: [name()]
-Antigen: [antigens2string(antigen)]
-Transmitted By: [spreadtype]
-Rate of Progression: [stageprob * 10]
-Species Affected: [list2text(affected_species, ", ")]
-"}
-
- r += "Symptoms:
"
- for(var/datum/disease2/effectholder/E in effects)
- r += "([E.stage]) [E.effect.name] "
- r += "Strength: [E.multiplier >= 3 ? "Severe" : E.multiplier > 1 ? "Above Average" : "Average"] "
- r += "Verosity: [E.chance * 15]
"
-
- return r
-
-/datum/disease2/disease/proc/addToDB()
- if ("[uniqueID]" in virusDB)
- return 0
- var/datum/data/record/v = new()
- v.fields["id"] = uniqueID
- v.fields["name"] = name()
- v.fields["description"] = get_info()
- v.fields["antigen"] = antigens2string(antigen)
- v.fields["spread type"] = spreadtype
- virusDB["[uniqueID]"] = v
- return 1
-
-proc/virus2_lesser_infection()
- var/list/candidates = list() //list of candidate keys
-
- for(var/mob/living/carbon/human/G in player_list)
- if(G.client && G.stat != DEAD)
- candidates += G
-
- if(!candidates.len) return
-
- candidates = shuffle(candidates)
-
- infect_mob_random_lesser(candidates[1])
-
-proc/virus2_greater_infection()
- var/list/candidates = list() //list of candidate keys
-
- for(var/mob/living/carbon/human/G in player_list)
- if(G.client && G.stat != DEAD)
- candidates += G
- if(!candidates.len) return
-
- candidates = shuffle(candidates)
-
- infect_mob_random_greater(candidates[1])
-
-proc/virology_letterhead(var/report_name)
- return {"
-[report_name]
-[station_name()] Virology Lab
-
-"}
diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm
deleted file mode 100644
index 4129e77ecf6..00000000000
--- a/code/modules/virus2/diseasesplicer.dm
+++ /dev/null
@@ -1,180 +0,0 @@
-/obj/machinery/computer/diseasesplicer
- name = "disease splicer console"
- icon = 'icons/obj/computer.dmi'
- icon_screen = "crew"
- icon_keyboard = "med_key"
-
- var/datum/disease2/effectholder/memorybank = null
- var/list/species_buffer = null
- var/analysed = 0
- var/obj/item/weapon/virusdish/dish = null
- var/burning = 0
- var/splicing = 0
- var/scanning = 0
-
-/obj/machinery/computer/diseasesplicer/attackby(var/obj/I as obj, var/mob/user as mob, params)
- if(istype(I, /obj/item/weapon/screwdriver))
- return ..(I,user)
-
- if(istype(I,/obj/item/weapon/virusdish))
- var/mob/living/carbon/c = user
- if (dish)
- user << "\The [src] is already loaded."
- return
-
- dish = I
- c.drop_item()
- I.loc = src
-
- if(istype(I,/obj/item/weapon/diseasedisk))
- user << "You upload the contents of the disk onto the buffer."
- memorybank = I:effect
- species_buffer = I:species
- analysed = I:analysed
-
- src.attack_hand(user)
-
-/obj/machinery/computer/diseasesplicer/attack_ai(var/mob/user as mob)
- return src.attack_hand(user)
-
-/obj/machinery/computer/diseasesplicer/attack_hand(var/mob/user as mob)
- if(..()) return
- ui_interact(user)
-
-/obj/machinery/computer/diseasesplicer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- user.set_machine(src)
-
- var/data[0]
- data["dish_inserted"] = !!dish
- data["growth"] = 0
- data["affected_species"] = null
-
- if (memorybank)
- data["buffer"] = list("name" = (analysed ? memorybank.effect.name : "Unknown Symptom"), "stage" = memorybank.stage)
- if (species_buffer)
- data["species_buffer"] = analysed ? list2text(species_buffer, ", ") : "Unknown Species"
-
- if (splicing)
- data["busy"] = "Splicing..."
- else if (scanning)
- data["busy"] = "Scanning..."
- else if (burning)
- data["busy"] = "Copying data to disk..."
- else if (dish)
- data["growth"] = min(dish.growth, 100)
-
- if (dish.virus2)
- if (dish.virus2.affected_species)
- data["affected_species"] = dish.analysed ? list2text(dish.virus2.affected_species, ", ") : "Unknown"
-
- if (dish.growth >= 50)
- var/list/effects[0]
- for (var/datum/disease2/effectholder/e in dish.virus2.effects)
- effects.Add(list(list("name" = (dish.analysed ? e.effect.name : "Unknown"), "stage" = (e.stage), "reference" = "\ref[e]")))
- data["effects"] = effects
- else
- data["info"] = "Insufficient cell growth for gene splicing."
- else
- data["info"] = "No virus detected."
- else
- data["info"] = "No dish loaded."
-
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "disease_splicer.tmpl", src.name, 400, 600)
- ui.set_initial_data(data)
- ui.open()
-
-/obj/machinery/computer/diseasesplicer/process()
- if(stat & (NOPOWER|BROKEN))
- return
-
- if(scanning)
- scanning -= 1
- if(!scanning)
- ping("\The [src] pings, \"Analysis complete.\"")
- nanomanager.update_uis(src)
- if(splicing)
- splicing -= 1
- if(!splicing)
- ping("\The [src] pings, \"Splicing operation complete.\"")
- nanomanager.update_uis(src)
- if(burning)
- burning -= 1
- if(!burning)
- var/obj/item/weapon/diseasedisk/d = new /obj/item/weapon/diseasedisk(src.loc)
- d.analysed = analysed
- if(analysed)
- if (memorybank)
- d.name = "[memorybank.effect.name] GNA disk (Stage: [memorybank.effect.stage])"
- d.effect = memorybank
- else if (species_buffer)
- d.name = "[list2text(species_buffer, ", ")] GNA disk"
- d.species = species_buffer
- else
- if (memorybank)
- d.name = "Unknown GNA disk (Stage: [memorybank.effect.stage])"
- d.effect = memorybank
- else if (species_buffer)
- d.name = "Unknown Species GNA disk"
- d.species = species_buffer
-
- ping("\The [src] pings, \"Backup disk saved.\"")
- nanomanager.update_uis(src)
-
-/obj/machinery/computer/diseasesplicer/Topic(href, href_list)
- if(..()) return 0
-
- var/mob/user = usr
- var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")
-
- src.add_fingerprint(user)
-
- if (href_list["close"])
- user.unset_machine()
- ui.close()
- return 0
-
- if (href_list["grab"])
- if (dish)
- memorybank = locate(href_list["grab"])
- species_buffer = null
- analysed = dish.analysed
- dish = null
- scanning = 10
- return 1
-
- if (href_list["affected_species"])
- if (dish)
- memorybank = null
- species_buffer = dish.virus2.affected_species
- analysed = dish.analysed
- dish = null
- scanning = 10
- return 1
-
- if(href_list["eject"])
- if (dish)
- dish.loc = src.loc
- dish = null
- return 1
-
- if(href_list["splice"])
- if(dish)
- if (memorybank)
- for(var/datum/disease2/effectholder/e in dish.virus2.effects)
- if(e.stage == memorybank.stage)
- e.effect = memorybank.effect
-
- if (species_buffer)
- dish.virus2.affected_species = species_buffer
-
- splicing = 10
- dish.virus2.uniqueID = rand(0,10000)
- return 1
-
- if(href_list["disk"])
- burning = 10
- return 1
-
- return 0
diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm
deleted file mode 100644
index 844528e7ed6..00000000000
--- a/code/modules/virus2/dishincubator.dm
+++ /dev/null
@@ -1,208 +0,0 @@
-/obj/machinery/disease2/incubator/
- name = "Pathogenic incubator"
- density = 1
- anchored = 1
- icon = 'icons/obj/virology.dmi'
- icon_state = "incubator"
- var/obj/item/weapon/virusdish/dish
- var/obj/item/weapon/reagent_containers/glass/beaker = null
- var/radiation = 0
-
- var/on = 0
- var/power = 0
-
- var/foodsupply = 0
- var/toxins = 0
-
-/obj/machinery/disease2/incubator/attackby(var/obj/O as obj, var/mob/user as mob, params)
- if(istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/syringe))
-
- if(beaker)
- user << "\The [src] is already loaded."
- return
-
- if(!user.drop_item())
- user << "\The [O] is stuck to you!"
- return
-
- beaker = O
- O.forceMove(src)
-
- user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
- nanomanager.update_uis(src)
-
- src.attack_hand(user)
- return
-
- if(istype(O, /obj/item/weapon/virusdish))
-
- if(dish)
- user << "The dish tray is aleady full!"
- return
-
- if(!user.drop_item())
- user << "\The [O] is stuck to you!"
- return
- dish = O
- O.forceMove(src)
-
- user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
- nanomanager.update_uis(src)
-
- src.attack_hand(user)
-
-/obj/machinery/disease2/incubator/attack_hand(mob/user as mob)
- if(stat & (NOPOWER|BROKEN)) return
- ui_interact(user)
-
-/obj/machinery/disease2/incubator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- user.set_machine(src)
-
- var/data[0]
- data["chemicals_inserted"] = !!beaker
- data["dish_inserted"] = !!dish
- data["food_supply"] = foodsupply
- data["radiation"] = radiation
- data["toxins"] = min(toxins, 100)
- data["on"] = on
- data["system_in_use"] = foodsupply > 0 || radiation > 0 || toxins > 0
- data["chemical_volume"] = beaker ? beaker.reagents.total_volume : 0
- data["max_chemical_volume"] = beaker ? beaker.volume : 1
- data["virus"] = dish ? dish.virus2 : null
- data["growth"] = dish ? min(dish.growth, 100) : 0
- data["infection_rate"] = dish && dish.virus2 ? dish.virus2.infectionchance * 10 : 0
- data["analysed"] = dish && dish.analysed ? 1 : 0
- data["can_breed_virus"] = null
- data["blood_already_infected"] = null
-
- if (beaker)
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in beaker.reagents.reagent_list
- data["can_breed_virus"] = dish && dish.virus2 && B
-
- if (B)
- if (!B.data["virus2"])
- B.data["virus2"] = list()
-
- var/list/virus = B.data["virus2"]
- for (var/ID in virus)
- data["blood_already_infected"] = virus[ID]
-
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "dish_incubator.tmpl", src.name, 400, 600)
- ui.set_initial_data(data)
- ui.open()
-
-/obj/machinery/disease2/incubator/process()
- if(dish && on && dish.virus2)
- use_power(50,EQUIP)
- if(!powered(EQUIP))
- on = 0
- icon_state = "incubator"
-
- if(foodsupply)
- if(dish.growth + 3 >= 100 && dish.growth < 100)
- ping("\The [src] pings, \"Sufficient viral growth density achieved.\"")
-
- foodsupply -= 1
- dish.growth += 3
- nanomanager.update_uis(src)
-
- if(radiation)
- if(radiation > 50 & prob(5))
- dish.virus2.majormutate()
- if(dish.info)
- dish.info = "OUTDATED : [dish.info]"
- dish.analysed = 0
- ping("\The [src] pings, \"Mutant viral strain detected.\"")
- else if(prob(5))
- dish.virus2.minormutate()
- radiation -= 1
- nanomanager.update_uis(src)
- if(toxins && prob(5))
- dish.virus2.infectionchance -= 1
- nanomanager.update_uis(src)
- if(toxins > 50)
- dish.growth = 0
- dish.virus2 = null
- nanomanager.update_uis(src)
- else if(!dish)
- on = 0
- icon_state = "incubator"
- nanomanager.update_uis(src)
-
- if(beaker)
- if(!beaker.reagents.remove_reagent("virusfood",5))
- foodsupply += 10
- nanomanager.update_uis(src)
-
- if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list)
- for(var/datum/reagent/toxin/T in beaker.reagents.reagent_list)
- //toxins += max(T.toxpwr,1)
- beaker.reagents.remove_reagent(T.id,1)
- nanomanager.update_uis(src)
-
-/obj/machinery/disease2/incubator/Topic(href, href_list)
- if (..()) return 0
-
- var/mob/user = usr
- var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")
-
- src.add_fingerprint(user)
-
- if (href_list["close"])
- user.unset_machine()
- ui.close()
- return 0
-
- if (href_list["ejectchem"])
- if(beaker)
- beaker.forceMove(src.loc)
- beaker = null
- return 1
-
- if (href_list["power"])
- if (dish)
- on = !on
- icon_state = on ? "incubator_on" : "incubator"
- return 1
-
- if (href_list["ejectdish"])
- if(dish)
- dish.forceMove(src.loc)
- dish = null
- return 1
-
- if (href_list["rad"])
- radiation += 10
- return 1
-
- if (href_list["flush"])
- radiation = 0
- toxins = 0
- foodsupply = 0
- return 1
-
- if(href_list["virus"])
- if (!dish)
- return 1
-
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in beaker.reagents.reagent_list
- if (!B)
- return 1
-
- if (!B.data["virus2"])
- B.data["virus2"] = list()
-
- var/list/virus = list("[dish.virus2.uniqueID]" = dish.virus2.getcopy())
- B.data["virus2"] += virus
-
- var/list/virus_effects
- for(var/datum/disease2/effectholder/symptom in dish.virus2.effects)
- virus_effects += "\[" + symptom.effect.name + "\]"
- use_log += text("\[[time_stamp()]\] [user.name] ([user.ckey]) has transferred a virus containing [virus_effects] to a blood sample.")
-
- ping("\The [src] pings, \"Injection complete.\"")
- return 1
-
- return 0
\ No newline at end of file
diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm
deleted file mode 100644
index ffb90dc2c61..00000000000
--- a/code/modules/virus2/effect.dm
+++ /dev/null
@@ -1,982 +0,0 @@
-/datum/disease2/effectholder
- var/name = "Holder"
- var/datum/disease2/effect/effect
- var/chance = 0 //Chance in percentage each tick
- var/cure = "" //Type of cure it requires
- var/happensonce = 0
- var/multiplier = 1 //The chance the effects are WORSE
- var/stage = 0
-
-/datum/disease2/effectholder/proc/runeffect(var/mob/living/carbon/human/mob,var/stage)
- if(happensonce > -1 && effect.stage <= stage && prob(chance))
- effect.activate(mob,multiplier)
- if(happensonce == 1)
- happensonce = -1
-
-/datum/disease2/effectholder/proc/getrandomeffect(var/badness = 1)
- var/list/datum/disease2/effect/list = list()
- for(var/e in subtypesof(/datum/disease2/effect) - /datum/disease2/effect/organs/vampire)
- var/datum/disease2/effect/f = new e
- if (f.badness > badness) //we don't want such strong effects
- continue
- if(f.stage == src.stage)
- list += f
- effect = pick(list)
- chance = rand(0,effect.chance_maxm)
- multiplier = rand(1,effect.maxm)
-
-/datum/disease2/effectholder/proc/minormutate()
- switch(pick(1,2,3,4,5))
- if(1)
- chance = rand(0,effect.chance_maxm)
- if(2)
- multiplier = rand(1,effect.maxm)
-
-/datum/disease2/effectholder/proc/majormutate()
- getrandomeffect(2)
-
-////////////////////////////////////////////////////////////////
-////////////////////////EFFECTS/////////////////////////////////
-////////////////////////////////////////////////////////////////
-
-// Badness : 1 means can be a minor viral outbreak event symptom
-// it can also be a major mutation
-// 2 means can be a major or minor viral outbreak event symptom
-// it can also be a major mutation
-// 3 means it cannot be in a viral outbreak event
-// it cannot be a major mutation
-
-/datum/disease2/effect
- var/chance_maxm = 50
- var/name = "Blanking effect"
- var/stage = 4
- var/maxm = 1
- var/badness = 1
- proc/activate(var/mob/living/carbon/mob,var/multiplier)
- proc/deactivate(var/mob/living/carbon/mob)
-
-////////////////////////SPECIAL/////////////////////////////////
-/datum/disease2/effect/alien
- name = "Unidentified Foreign Body"
- stage = 4
- badness = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << "\red You feel something tearing its way out of your stomach..."
- mob.adjustToxLoss(10)
- mob.updatehealth()
- if(prob(40))
- if(mob.client)
- mob.client.mob = new/mob/living/carbon/alien/larva(mob.loc)
- else
- new/mob/living/carbon/alien/larva(mob.loc)
- var/datum/disease2/disease/D = mob:virus2
- mob:gib()
- qdel(D)
-
-
-/datum/disease2/effect/invisible
- name = "Waiting Syndrome"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- return
-
-// Bone White - Empty sypmtoms. There is a better way of handling this but this is much faster.
-
-/datum/disease2/effect/invisible_stage_two
- name = "Patience Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- return
-
-/datum/disease2/effect/invisible_stage_three
- name = "Delayed Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- return
-
-/datum/disease2/effect/invisible_stage_four
- name = "Anticipation Syndrome"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- return
-
-
-
-////////////////////////STAGE 4/////////////////////////////////
-
-/datum/disease2/effect/borg
- name = "Borgification Disorder"
- stage = 4
- badness = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << "You feel like beeping and booping..."
- mob.adjustBruteLoss(10)
- mob.updatehealth()
- if(prob(40))
- if(mob.client)
- if(!jobban_isbanned(mob, "Cyborg") && !jobban_isbanned(mob,"nonhumandept"))
- var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(mob.loc))
- mob.mind.transfer_to(O)
- else
- new/mob/living/silicon/robot(get_turf(mob.loc))
- var/datum/disease2/disease/D = mob.virus2
- mob.gib()
- qdel(D)
-
-/datum/disease2/effect/omnizine
- name = "Panacea Effect"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("omnizine") < 2)
- mob.reagents.add_reagent("omnizine", 2)
-
-/datum/disease2/effect/viralsputum_major
- name = "Hemoptysis"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (prob(60))
- mob.say("*cough")
- var/obj/effect/decal/cleanable/blood/viralsputum/D= locate(/obj/effect/decal/cleanable/blood/viralsputum) in get_turf(mob)
- if(D==null)
- D = new(get_turf(mob))
- D.virus2 |= virus_copylist(mob.virus2)
- mob.reagents.remove_reagent("blood", 20) // Bone White - Blood loss when coughing up blood, experimental, may need adjusting.
- else
-
-/datum/disease2/effect/gibbingtons
- name = "Gibbingtons Syndrome"
- stage = 4
- badness = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.gib()
-
-/datum/disease2/effect/radian
- name = "Radian's Syndrome"
- stage = 4
- maxm = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.apply_effect(2*multiplier,IRRADIATE,0)
-
-/datum/disease2/effect/deaf
- name = "Dead Ear Syndrome"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.ear_deaf += 20
-
-/datum/disease2/effect/monkey
- name = "Monkism Syndrome"
- stage = 4
- badness = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob,/mob/living/carbon/human))
- var/mob/living/carbon/human/h = mob
- h.monkeyize()
-
-/datum/disease2/effect/suicide
- name = "Suicidal Syndrome"
- stage = 4
- badness = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.suiciding == 0)
- mob.suiciding = 1
- //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while
- viewers(mob) << "\red [mob.name] is holding \his breath. It looks like \he's trying to commit suicide."
- mob.adjustOxyLoss(175 - mob.getToxLoss() - mob.getFireLoss() - mob.getBruteLoss() - mob.getOxyLoss())
- mob.updatehealth()
- spawn(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds
- mob.suiciding = 0
-
-
-// === burn brute toxin clone brain damage symptoms - Bone White ===
-
-/datum/disease2/effect/burn_major
- name = "Blood Plasma Pyroclastia"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.take_overall_damage(0,15)
-
-/datum/disease2/effect/brute_major
- name = "Exploding Cell Phenomenon"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.take_overall_damage(15,0)
-
-/datum/disease2/effect/toxin_major
- name = "Acute Kidney Failure"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.adjustToxLoss(15*multiplier)
-
-/datum/disease2/effect/clone_major
- name = "Reverse Pattern Syndrome"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.bodytemperature = max(mob.bodytemperature, 350)
- scramble(0,mob,10)
- mob.apply_damage(10, CLONE)
-
-/datum/disease2/effect/brain_major
- name = "Cortical Liquification"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- var/obj/item/organ/internal/brain/B = H.get_int_organ(/obj/item/organ/internal/brain)
- if (B.damage < B.min_broken_damage)
- B.take_damage(5, 1)
- else
- mob.setBrainLoss(50)
-
-
-
-/datum/disease2/effect/organs
- name = "Shutdown Syndrome"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- var/organ = pick(list("r_arm","l_arm","r_leg","r_leg"))
- var/obj/item/organ/external/E = H.organs_by_name[organ]
- if (!(E.status & ORGAN_DEAD) && !(E.status & ORGAN_ROBOT))
- E.status |= ORGAN_DEAD
- H << "You can't feel your [E.name] anymore..."
- for (var/obj/item/organ/external/C in E.children)
- C.status |= ORGAN_DEAD
- H.update_body(1)
- if(multiplier < 1) multiplier = 1
- H.adjustToxLoss(10*multiplier)
- vampire
- stage = 3
-
- deactivate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- for (var/obj/item/organ/external/E in H.organs)
- if(!(E.status & ORGAN_ROBOT))
- E.status &= ~ORGAN_DEAD
- for (var/obj/item/organ/external/C in E.children)
- C.status &= ~ORGAN_DEAD
-
-
-/datum/disease2/effect/immortal
- name = "Longevity Syndrome"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- for (var/obj/item/organ/external/E in H.organs)
- if (E.status & ORGAN_BROKEN && prob(30) && !(E.status & ORGAN_ROBOT))
- E.status ^= ORGAN_BROKEN
- var/heal_amt = -5*multiplier
- mob.apply_damages(heal_amt,heal_amt,heal_amt,heal_amt)
-
-/datum/disease2/effect/gmagnitis
- name = "Greater Magnitis"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- for(var/obj/M in orange(6,mob))
- if(!M.anchored && (M.flags & CONDUCT))
- var/i
- var/iter = rand(1,3)
- for(i=0,i Your body burns as your cells break down."
- shake_camera(mob,5*multiplier)
-
-
-/datum/disease2/effect/necrosis
- name = "Necrosis"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- //
- var/mob/living/carbon/human/H = mob
- //
- var/inst = pick(1,2,3)
- switch(inst)
- if(1)
- mob << "A chunk of meat falls off you!"
- var/totalslabs = 1
- var/obj/item/weapon/reagent_containers/food/snacks/meat/allmeat[totalslabs]
- if( istype(mob, /mob/living/carbon/human/) )
- //
- var/sourcename = mob.real_name
- var/sourcejob = mob.job
- var/sourcenutriment = mob.nutrition / 15
- //var/sourcetotalreagents = mob.reagents.total_volume
- for(var/i=1 to totalslabs)
- var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new
- newmeat.name = sourcename + newmeat.name
- newmeat.subjectname = sourcename
- newmeat.subjectjob = sourcejob
- newmeat.reagents.add_reagent("nutriment", sourcenutriment / totalslabs) // Thehehe. Fat guys go first
- //src.occupant.reagents.trans_to(newmeat, round (sourcetotalreagents / totalslabs, 1)) // Transfer all the reagents from the
- allmeat[i] = newmeat
- var/obj/item/meatslab = allmeat[i]
- var/turf/Tx = locate(mob.x, mob.y, mob.z)
- meatslab.loc = mob.loc
- meatslab.throw_at(Tx,i,3)
- if (!Tx.density)
- new /obj/effect/decal/cleanable/blood/gibs(Tx,i)
- if(2)
- if(ishuman(mob))
- for (var/obj/item/organ/external/E in H.organs)
- if(pick(1,0) && !(E.status & ORGAN_ROBOT))
- E.droplimb(0,DROPLIMB_EDGE)
- if(3)
- if(ishuman(mob))
- if(H.species.name != "Skeleton")
- mob << " Your necrotic skin ruptures!"
- for (var/obj/item/organ/external/E in H.organs)
- if(pick(1,0) && !(E.status & ORGAN_ROBOT))
- E.createwound(CUT, pick(2,4))
- if(prob(30))
- if(H.species.name != "Skeleton")
- if(H.set_species("Skeleton"))
- mob << " A massive amount of flesh sloughs off your bones!"
- H.regenerate_icons()
- else
- return
-
-
-/datum/disease2/effect/plasma
- name = "Toxin Sublimation"
- stage = 4
- activate(var/mob/living/carbon/mob,var/multiplier)
- //var/src = mob
- var/hack = mob.loc
- var/turf/simulated/T = get_turf(hack)
- if(!T)
- return
- var/datum/gas_mixture/GM = new
- if(prob(10))
- GM.toxins += 100
- //GM.temperature = 1500+T0C //should be enough to start a fire
- mob << "\red You exhale a large plume of toxic gas!"
- else
- GM.toxins += 10
- GM.temperature = istype(T) ? T.air.temperature : T20C
- mob << " A toxic gas emanates from your pores!"
- T.assume_air(GM)
- return
-
-
-////////////////////////STAGE 3/////////////////////////////////
-
-/datum/disease2/effect/brain_regen
- name = "Regenerative Synapse Effect"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("mannitol") < 10)
- mob.reagents.add_reagent("mannitol", 10)
-
-/datum/disease2/effect/haloperidol
- name = "Psyche Collapse Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("haloperidol") < 10)
- mob.reagents.add_reagent("haloperidol", 1)
-
-/datum/disease2/effect/pain_major
- name = "Phantom Pain Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.staminaloss < 100)
- mob << " You feel like your body is on fire. Make the pain stop!"
- mob.apply_effect(20,STAMINA,0)
-
-// === burn brute toxin clone brain damage symptoms - Bone White ===
-
-/datum/disease2/effect/burn
- name = "Flammable inflammation"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.take_overall_damage(0,5)
-
-/datum/disease2/effect/brute
- name = "Continuous Contusions"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.take_overall_damage(5,0)
-
-/datum/disease2/effect/toxin
- name = "Hyperacidity"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.adjustToxLoss(15*multiplier)
-
-/datum/disease2/effect/clone
- name = "DNA Breakdown Effect"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.bodytemperature = max(mob.bodytemperature, 350)
- scramble(0,mob,5)
- mob.apply_damage(5, CLONE)
-
-/datum/disease2/effect/brain
- name = "Synapse Distancing"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- var/obj/item/organ/internal/brain/B = H.get_int_organ(/obj/item/organ/internal/brain)
- if (B.damage < B.min_broken_damage)
- B.take_damage(1, 1)
- else
- mob.setBrainLoss(10)
-
-
-/datum/disease2/effect/lantern_major
- name = "Lantern Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.set_light(5)
- mob << "You are glowing brightly!"
-
-
-/datum/disease2/effect/cough_major
- name = "Acute Tussis"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*cough")
- for(var/mob/living/carbon/M in oview(3,mob))
- mob.spread_disease_to(M)
-
-
-/datum/disease2/effect/bones
- name = "Fragile Bones Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- for (var/obj/item/organ/external/E in H.organs)
- if(!(E.status & ORGAN_ROBOT))
- E.min_broken_damage = max(5, E.min_broken_damage - 30)
-
- deactivate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- for (var/obj/item/organ/external/E in H.organs)
- if(!(E.status & ORGAN_ROBOT))
- E.min_broken_damage = initial(E.min_broken_damage)
-
-/datum/disease2/effect/shakey
- name = "World Shaking Syndrome"
- stage = 3
- maxm = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- shake_camera(mob,5*multiplier)
-
-/datum/disease2/effect/telepathic
- name = "Telepathy Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.dna.check_integrity()
- mob.dna.SetSEState(REMOTETALKBLOCK,1)
- domutcheck(mob, null)
-
-/datum/disease2/effect/hallucinations
- name = "Hallucinational Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.hallucination += 25
-
-/datum/disease2/effect/deaf
- name = "Hard of Hearing Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.ear_deaf = 5
-
-/datum/disease2/effect/giggle
- name = "Uncontrolled Laughter Effect"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*giggle")
-
-/datum/disease2/effect/confusion
- name = "Topographical Cretinism"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << "You have trouble telling right and left apart all of a sudden."
- mob.confused += 10
-
-/datum/disease2/effect/groan
- name = "Groaning Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*groan")
-
-/datum/disease2/effect/lmagnitis
- name = "Lesser Magnitis"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- for(var/obj/M in orange(4,mob))
- if(!M.anchored && (M.flags & CONDUCT))
- var/i
- var/iter = rand(1,2)
- for(i=0,iYou feel a little horse!"
-
-
-/obj/item/clothing/mask/horsehead/magic
- //flags_inv = null //so you can still see their face... no. How can you recognize someone when their face is completely different?
- voicechange = 1 //NEEEEIIGHH
-
- dropped(mob/user as mob)
- flags &= ~NODROP
- ..()
-
- equipped(var/mob/user, var/slot)
- if (slot == slot_wear_mask)
- flags |= NODROP //curses!
- ..()
-
-////////////////////////STAGE 2/////////////////////////////////
-
-
-/datum/disease2/effect/pain
- name = "Acute Muscle Ache"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.staminaloss < 50)
- mob << "You ache all over!"
- mob.apply_effect(10,STAMINA,0)
-
-// === burn brute toxin clone brain damage symptoms - Bone White ===
-
-/datum/disease2/effect/burn
- name = "Prickly Heat Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.take_overall_damage(0,2)
-
-/datum/disease2/effect/brute
- name = "Continuous Contusions"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.take_overall_damage(2,0)
-
-/datum/disease2/effect/toxin
- name = "White Blood Cell Putrification"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.adjustToxLoss(5*multiplier)
-
-/datum/disease2/effect/clone
- name = "RNA Compound Corruption"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.bodytemperature = max(mob.bodytemperature, 350)
- scramble(0,mob,5)
- mob.apply_damage(5, CLONE)
-
-/datum/disease2/effect/brain
- name = "Synapse Distancing"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- var/obj/item/organ/internal/brain/B = H.get_int_organ(/obj/item/organ/internal/brain)
- if (B.damage < B.min_broken_damage)
- B.take_damage(0.5, 1)
- else
- mob.setBrainLoss(5)
-
-
-/datum/disease2/effect/scream
- name = "Loudness Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*scream")
-
-/datum/disease2/effect/drowsness
- name = "Automated Sleeping Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.drowsyness += 10
-
-/datum/disease2/effect/sleepy
- name = "Resting Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*collapse")
-
-/datum/disease2/effect/blind
- name = "Blackout Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.eye_blind = max(mob.eye_blind, 4)
-
-/datum/disease2/effect/cough
- name = "Anima Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*cough")
- for(var/mob/living/carbon/M in oview(2,mob))
- mob.spread_disease_to(M)
-
-/datum/disease2/effect/hungry
- name = "Appetiser Effect"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.nutrition = max(0, mob.nutrition - 200)
-
-/datum/disease2/effect/fridge
- name = "Refridgerator Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*shiver")
-
-/datum/disease2/effect/hair
- name = "Hair Loss"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- if(H.species.name == "Human" && !(H.h_style == "Bald") && !(H.h_style == "Balding Hair"))
- H << "Your hair starts to fall out in clumps..."
- spawn(50)
- H.h_style = "Balding Hair"
- H.update_hair()
-
-/datum/disease2/effect/stimulant_major
- name = "Adrenal Overload"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("methamphetamine") < 5)
- mob.reagents.add_reagent("methamphetamine", 4)
- if (prob(30))
- mob << "You feel a rush of energy inside you!"
- mob.jitteriness += 10
-
-/datum/disease2/effect/drunk
- name = "Glasgow Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << "You feel like you had one hell of a party!"
- if (mob.reagents.get_reagent_amount("ethanol") < 325)
- mob.reagents.add_reagent("ethanol", 5*multiplier)
-
-/datum/disease2/effect/gaben
- name = "Gaben Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << "Your clothing fits a little tighter!!"
- if (prob(10))
- mob.reagents.add_reagent("nutriment", 1000)
- mob.overeatduration = 1000
-
-
-/datum/disease2/effect/beard
- name = "Bearding"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(istype(mob, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = mob
- if(H.species.name == "Human" && !(H.f_style == "Full Beard"))
- H << "Your chin and neck itch!."
- spawn(50)
- H.f_style = "Full Beard"
- H.update_fhair()
-
-/datum/disease2/effect/bloodynose
- name = "Intranasal Hemorrhage"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (prob(30))
- var/obj/effect/decal/cleanable/blood/D= locate(/obj/effect/decal/cleanable/blood) in get_turf(mob)
- if(D==null)
- D = new(get_turf(mob))
- D.virus2 |= virus_copylist(mob.virus2)
- mob.reagents.remove_reagent("blood", 5) // Bone White - Blood loss when coughing up blood, experimental, may need adjusting.
-
-
-/datum/disease2/effect/lantern
- name = "Lantern Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.set_light(4)
- mob << "You are glowing!"
-
-
-/datum/disease2/effect/optimistic
- name = "Full Glass Syndrome"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << " You feel optimistic!"
- if (mob.reagents.get_reagent_amount("salglu_solution") < 1)
- mob.reagents.add_reagent("salglu_solution", 1)
-
-
-////////////////////////STAGE 1/////////////////////////////////
-
-/datum/disease2/effect/poop
- name = "Uncontrollable Bowel Syndrome"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.fakepoop()
-
-
-/datum/disease2/effect/vomit
- name = "Projectile Vomit Syndrome"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.fakevomit()
-
-/datum/disease2/effect/pain_minor
- name = "Heightened Sensitivity"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.staminaloss < 20)
- mob << "Your body aches."
- mob.apply_effect(5,STAMINA,0)
-
-/datum/disease2/effect/stimulant
- name = "Adrenaline Extra"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("ephedrine") < 10)
- mob.reagents.add_reagent("ephedrine", 4)
- if (prob(30))
- mob << "You feel a rush of energy inside you!"
- mob.jitteriness += 10
-
-/datum/disease2/effect/cough_minor
- name = "Trachea Sensitivity"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*cough")
- for(var/mob/living/carbon/M in oview(1,mob))
- mob.spread_disease_to(M)
-
-/datum/disease2/effect/sneeze
- name = "Coldingtons Effect"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (prob(30))
- mob << "You feel like you are about to sneeze!"
- sleep(5)
- mob.say("*sneeze")
- for(var/mob/living/carbon/M in get_step(mob,mob.dir))
- mob.spread_disease_to(M)
- if (prob(50))
- var/obj/effect/decal/cleanable/mucus/M= locate(/obj/effect/decal/cleanable/mucus) in get_turf(mob)
- if(M==null)
- M = new(get_turf(mob))
- else
- if(M.dry)
- M.dry=0
- M.virus2 |= virus_copylist(mob.virus2)
-
-/datum/disease2/effect/gunck
- name = "Flemmingtons"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << " Mucous runs down the back of your throat."
-
-/datum/disease2/effect/drool
- name = "Saliva Effect"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*drool")
-
-/datum/disease2/effect/twitch
- name = "Twitcher"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.say("*twitch")
-
-/datum/disease2/effect/headache
- name = "Headache"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << " Your head hurts a bit"
-
-/datum/disease2/effect/itching
- name = "Itching"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << "Your skin itches!"
-
-/datum/disease2/effect/drained
- name = "Drained Feeling"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << "You feel drained."
-
-/datum/disease2/effect/eyewater
- name = "Watery Eyes"
- stage = 1
- activate(var/mob/living/carbon/human/mob,var/multiplier)
- var/obj/item/organ/internal/eyes/E = mob.get_int_organ(/obj/item/organ/internal/eyes)
- if(!istype(E) || (E.status & ORGAN_ROBOT)) // No eyes or robotic eyes? No problem!
- return
- mob << "Your eyes sting and water!"
-
-/datum/disease2/effect/wheeze
- name = "Wheezing"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.custom_emote(1,"wheezes.")
-
-
-/datum/disease2/effect/optimistic_minor
- name = "Glass Half Full Syndrome"
- stage = 1
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob << " You feel optimistic!"
-
-/datum/disease2/effect/anxiety
- name = "Severe Anxiety"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(prob(20))
- mob << "You feel anxious."
- if(prob(15))
- mob << "You feel butterflies in your stomach."
- if(prob(11))
- mob.visible_message("[mob] stumbles around in a panic.", \
- "You have a panic attack!")
- mob.confused += (rand(6,8))
- mob.jitteriness += (rand(6,8))
- if(prob(10))
- mob.visible_message("[mob] coughs up butterflies!", \
- "You cough up butterflies!")
- new /mob/living/simple_animal/butterfly(mob.loc)
- new /mob/living/simple_animal/butterfly(mob.loc)
-
-/datum/disease2/effect/lycan
- name = "Lycancoughy"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- if(prob(20))
- mob << "You feel itchy."
- if(prob(15))
- mob << "You have the sudden urge for bacon.."
- if(prob(11))
- mob.say(pick("WOOF!", "BARK!", "Bark.", "Woof?", "AUUUUUUUUUUUUU!!"))
- if(prob(10))
- mob.visible_message("[mob] coughs up a dog!!", \
- "You cough up a DOG!!!")
- //yes i KNOW foxes technically are not normal dogs...hush....
- var/randompup = pick(/mob/living/simple_animal/pet/corgi/puppy,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/pet/fox)
-
- new randompup(mob.loc)
- mob.adjustBruteLoss(rand(1,5))//you just coughed up a CANINIE, you are taking brute loss...
\ No newline at end of file
diff --git a/code/modules/virus2/helpers.dm b/code/modules/virus2/helpers.dm
deleted file mode 100644
index 6efe54663f9..00000000000
--- a/code/modules/virus2/helpers.dm
+++ /dev/null
@@ -1,150 +0,0 @@
-//Returns 1 if mob can be infected, 0 otherwise. Checks his clothing.
-proc/get_infection_chance(var/mob/living/carbon/M, var/vector = "Airborne")
- var/score = 0
- if (!istype(M))
- return 0
-
- var/mob/living/carbon/human/H = M
- if(istype(H) && H.species.virus_immune)
- return 0
-
- if(istype(M, /mob/living/carbon/human))
- if (vector == "Airborne")
- if(M.internal) //not breathing infected air helps greatly
- score = 30
- if(M.wear_mask)
- score += 5
- if(istype(M:wear_mask, /obj/item/clothing/mask/surgical) && !M.internal)
- score += 10
- if(istype(M:wear_suit, /obj/item/clothing/suit/space) && istype(M:head, /obj/item/clothing/head/helmet/space))
- score += 20
- if(istype(M:wear_suit, /obj/item/clothing/suit/bio_suit) && istype(M:head, /obj/item/clothing/head/bio_hood))
- score += 30
-
-
- if (vector == "Contact")
- if(M:gloves) score += 15
- if(istype(M:wear_suit, /obj/item/clothing/suit/space) && istype(M:head, /obj/item/clothing/head/helmet/space))
- score += 15
- if(istype(M:wear_suit, /obj/item/clothing/suit/bio_suit) && istype(M:head, /obj/item/clothing/head/bio_hood))
- score += 15
-
- if (vector == "Injection") score = 30 // Makes sure Injection viruses cannot be caught normally
-
-
-// log_debug("[M]'s resistance to [vector] viruses: [score]")
-
- if(score >= 30)
- return 0
- else if(score == 25 && prob(99))
- return 0
- else if(score == 20 && prob(95))
- return 0
- else if(score == 15 && prob(75))
- return 0
- else if(score == 10 && prob(55))
- return 0
- else if(score == 5 && prob(35))
- return 0
- return 1
-
-//Checks if table-passing table can reach target (5 tile radius)
-proc/airborne_can_reach(turf/source, turf/target, var/radius=5)
- var/obj/dummy = new(source)
- dummy.pass_flags = PASSTABLE
-
- for(var/i=0, i 0)
- for (var/ID in virus2)
- log_debug("Attempting virus [ID]")
- var/datum/disease2/disease/V = virus2[ID]
- if(V.spreadtype != vector) continue
-
- if (vector == "Airborne")
- if(airborne_can_reach(get_turf(src), get_turf(victim)))
-// log_debug("In range, infecting")
- infect_virus2(victim,V)
-// else
-// log_debug("Could not reach target")
-
- if (vector == "Contact")
- if (in_range(src, victim))
-// log_debug("In range, infecting")
- infect_virus2(victim,V)
-
-//contact goes both ways
- if (victim.virus2.len > 0 && vector == "Contact")
-// log_debug("Spreading [vector] diseases from [victim] to [src]")
- var/nudity = 1
-
- if (ishuman(victim))
- var/mob/living/carbon/human/H = victim
- var/obj/item/organ/external/select_area = H.get_organ(src.zone_sel.selecting)
- var/list/clothes = list(H.head, H.wear_mask, H.wear_suit, H.w_uniform, H.gloves, H.shoes)
- for(var/obj/item/clothing/C in clothes )
- if(C && istype(C))
- if(C.body_parts_covered & select_area.body_part)
- nudity = 0
- if (nudity)
- for (var/ID in victim.virus2)
- var/datum/disease2/disease/V = victim.virus2[ID]
- if(V && V.spreadtype != vector) continue
- infect_virus2(src,V)
diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm
deleted file mode 100644
index 479b2c7b4d6..00000000000
--- a/code/modules/virus2/isolator.dm
+++ /dev/null
@@ -1,234 +0,0 @@
-// UI menu navigation
-#define HOME "home"
-#define LIST "list"
-#define ENTRY "entry"
-
-/obj/machinery/disease2/isolator/
- name = "Pathogenic Isolator"
- density = 1
- anchored = 1
- icon = 'icons/obj/virology.dmi'
- icon_state = "isolator"
- var/isolating = 0
- var/state = HOME
- var/datum/disease2/disease/virus2 = null
- var/datum/data/record/entry = null
- var/obj/item/weapon/reagent_containers/syringe/sample = null
-
-/obj/machinery/disease2/isolator/update_icon()
- if (stat & (BROKEN|NOPOWER))
- icon_state = "isolator"
- return
-
- if (isolating)
- icon_state = "isolator_processing"
- else if (sample)
- icon_state = "isolator_in"
- else
- icon_state = "isolator"
-
-/obj/machinery/disease2/isolator/attackby(var/obj/O as obj, var/mob/user, params)
- if(!istype(O,/obj/item/weapon/reagent_containers/syringe)) return
- var/obj/item/weapon/reagent_containers/syringe/S = O
-
- if(sample)
- user << "\The [src] is already loaded."
- return
-
- sample = S
- user.drop_item()
- S.loc = src
-
- user.visible_message("[user] adds \a [O] to \the [src]!", "You add \a [O] to \the [src]!")
- nanomanager.update_uis(src)
- update_icon()
-
- src.attack_hand(user)
-
-/obj/machinery/disease2/isolator/attack_hand(mob/user as mob)
- if(stat & (NOPOWER|BROKEN)) return
- ui_interact(user)
-
-/obj/machinery/disease2/isolator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- user.set_machine(src)
-
- var/data[0]
- data["syringe_inserted"] = !!sample
- data["isolating"] = isolating
- data["pathogen_pool"] = null
- data["state"] = state
- data["entry"] = entry
- data["can_print"] = (state != HOME || sample) && !isolating
-
- switch (state)
- if (HOME)
- if (sample)
- var/list/pathogen_pool[0]
- for(var/datum/reagent/blood/B in sample.reagents.reagent_list)
- var/list/virus = B.data["virus2"]
- for (var/ID in virus)
- var/datum/disease2/disease/V = virus[ID]
- var/datum/data/record/R = null
- if (ID in virusDB)
- R = virusDB[ID]
-
- var/mob/living/carbon/human/D = B.data["donor"]
- pathogen_pool.Add(list(list(\
- "name" = "[D.get_species()] [B.name]", \
- "dna" = B.data["blood_DNA"], \
- "unique_id" = V.uniqueID, \
- "reference" = "\ref[V]", \
- "is_in_database" = !!R, \
- "record" = "\ref[R]")))
-
- if (pathogen_pool.len > 0)
- data["pathogen_pool"] = pathogen_pool
-
- if (LIST)
- var/list/db[0]
- for (var/ID in virusDB)
- var/datum/data/record/r = virusDB[ID]
- db.Add(list(list("name" = r.fields["name"], "record" = "\ref[r]")))
-
- if (db.len > 0)
- data["database"] = db
-
- if (ENTRY)
- if (entry)
- var/desc = entry.fields["description"]
- data["entry"] = list(\
- "name" = entry.fields["name"], \
- "description" = replacetext(desc, "\n", ""))
-
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "pathogenic_isolator.tmpl", src.name, 400, 500)
- ui.set_initial_data(data)
- ui.open()
-
-/obj/machinery/disease2/isolator/process()
- if (isolating > 0)
- isolating -= 1
- if (isolating == 0)
- if (virus2)
- var/obj/item/weapon/virusdish/d = new /obj/item/weapon/virusdish(src.loc)
- d.virus2 = virus2.getcopy()
- virus2 = null
- ping("\The [src] pings, \"Viral strain isolated.\"")
-
- nanomanager.update_uis(src)
- update_icon()
-
-/obj/machinery/disease2/isolator/Topic(href, href_list)
- if (..()) return 0
-
- var/mob/user = usr
- var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")
-
- src.add_fingerprint(user)
-
- if (href_list["close"])
- user.unset_machine()
- ui.close()
- return 0
-
- if (href_list[HOME])
- state = HOME
- return 1
-
- if (href_list[LIST])
- state = LIST
- return 1
-
- if (href_list[ENTRY])
- if (istype(locate(href_list["view"]), /datum/data/record))
- entry = locate(href_list["view"])
-
- state = ENTRY
- return 1
-
- if (href_list["print"])
- print(user)
- return 1
-
- if(!sample) return 1
-
- if (href_list["isolate"])
- var/datum/disease2/disease/V = locate(href_list["isolate"])
- if (V)
- virus2 = V
- isolating = 20
- update_icon()
- return 1
-
- if (href_list["eject"])
- sample.loc = src.loc
- sample = null
- update_icon()
- return 1
-
-/obj/machinery/disease2/isolator/proc/print(var/mob/user)
- playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1)
- var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc)
-
- switch (state)
- if (HOME)
- if (!sample) return
- P.name = "paper - Patient Diagnostic Report"
- P.info = {"
- [virology_letterhead("Patient Diagnostic Report")]
- CONFIDENTIAL MEDICAL REPORT
- Sample: [sample.name]
-"}
-
- if (user)
- P.info += "Generated By: [user.name]
"
-
- P.info += "
"
-
- for(var/datum/reagent/blood/B in sample.reagents.reagent_list)
- var/mob/living/carbon/human/D = B.data["donor"]
- P.info += "[D.get_species()] [B.name]:
[B.data["blood_DNA"]]
"
-
- var/list/virus = B.data["virus2"]
- P.info += "Pathogens:
"
- if (virus.len > 0)
- for (var/ID in virus)
- var/datum/disease2/disease/V = virus[ID]
- P.info += "[V.name()]
"
- else
- P.info += "None
"
-
- P.info += {"
-
- Additional Notes:
-"}
-
- if (LIST)
- P.name = "paper - Virus List"
- P.info = {"
- [virology_letterhead("Virus List")]
-"}
-
- var/i = 0
- for (var/ID in virusDB)
- i++
- var/datum/data/record/r = virusDB[ID]
- P.info += "[i]. " + r.fields["name"]
- P.info += "
"
-
- P.info += {"
-
- Additional Notes:
-"}
-
- if (ENTRY)
- P.name = "paper - Viral Profile"
- P.info = {"
- [virology_letterhead("Viral Profile")]
- [entry.fields["description"]]
-
- Additional Notes:
-"}
-
- state("The nearby computer prints out a report.")
diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm
deleted file mode 100644
index e56a99ea9a5..00000000000
--- a/code/modules/virus2/items_devices.dm
+++ /dev/null
@@ -1,104 +0,0 @@
-///////////////ANTIBODY SCANNER///////////////
-
-/obj/item/device/antibody_scanner
- name = "\improper Antibody Scanner"
- desc = "Scans living beings for antibodies in their blood."
- icon_state = "antibody"
- w_class = 2.0
- item_state = "electronic"
- flags = CONDUCT
-
-/obj/item/device/antibody_scanner/attack(mob/M as mob, mob/user as mob)
- if(!istype(M,/mob/living/carbon/))
- report("Scan aborted: Incompatible target.", user)
- return
-
- var/mob/living/carbon/C = M
- if (istype(C,/mob/living/carbon/human/))
- var/mob/living/carbon/human/H = C
- if(H.species && H.species.flags & NO_BLOOD)
- report("Scan aborted: The target does not have blood.", user)
- return
-
- if(!C.antibodies)
- report("Scan Complete: No antibodies detected.", user)
- return
-
- if (CLUMSY in user.mutations && prob(50))
- // I was tempted to be really evil and rot13 the output.
- report("Antibodies detected: [reverse_text(antigens2string(C.antibodies))]", user)
- else
- report("Antibodies detected: [antigens2string(C.antibodies)]", user)
-
-/obj/item/device/antibody_scanner/proc/report(var/text, mob/user as mob)
- user << "\blue \icon[src] \The [src] beeps, \"[text]\""
-
-///////////////VIRUS DISH///////////////
-
-/obj/item/weapon/virusdish
- name = "virus containment/growth dish"
- icon = 'icons/obj/items.dmi'
- icon_state = "implantcase-b"
- var/datum/disease2/disease/virus2 = null
- var/growth = 0
- var/info = 0
- var/analysed = 0
-
-/obj/item/weapon/virusdish/random
- name = "virus sample"
-
-/obj/item/weapon/virusdish/random/New()
- ..()
- src.virus2 = new /datum/disease2/disease
- src.virus2.makerandom(0, 1) // Virus dishes get minor effects only on creation, and have a chance of being injection type
- growth = rand(5, 50)
-
-/obj/item/weapon/virusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob, params)
- if(istype(W,/obj/item/weapon/hand_labeler) || istype(W,/obj/item/weapon/reagent_containers/syringe))
- return
- ..()
- if(prob(50))
- user << "\The [src] shatters!"
- if(virus2.infectionchance > 0)
- for(var/mob/living/carbon/target in view(1, get_turf(src)))
- if(airborne_can_reach(get_turf(src), get_turf(target)))
- if(get_infection_chance(target))
- infect_virus2(target,src.virus2)
- qdel(src)
-
-/obj/item/weapon/virusdish/examine(mob/user)
- user << "This is a virus containment dish."
- if(src.info)
- user << "It has the following information about its contents:"
- user << src.info
-
-/obj/item/weapon/ruinedvirusdish
- name = "ruined virus sample"
- icon = 'icons/obj/items.dmi'
- icon_state = "implantcase-b"
- desc = "The bacteria in the dish are completely dead."
-
-/obj/item/weapon/ruinedvirusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob, params)
- if(istype(W,/obj/item/weapon/hand_labeler) || istype(W,/obj/item/weapon/reagent_containers/syringe))
- return ..()
-
- if(prob(50))
- user << "\The [src] shatters!"
- qdel(src)
-
-///////////////GNA DISK///////////////
-
-/obj/item/weapon/diseasedisk
- name = "blank GNA disk"
- icon = 'icons/obj/cloning.dmi'
- icon_state = "datadisk0"
- var/datum/disease2/effectholder/effect = null
- var/list/species = null
- var/stage = 1
- var/analysed = 1
-
-/obj/item/weapon/diseasedisk/premade/New()
- name = "blank GNA disk (stage: [stage])"
- effect = new /datum/disease2/effectholder
- effect.effect = new /datum/disease2/effect/invisible
- effect.stage = stage
diff --git a/code/world.dm b/code/world.dm
index 5f60f4aa5cf..4c6451d6860 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -82,14 +82,14 @@ var/global/datum/global_init/init = new ()
return
//world/Topic(href, href_list[])
-// world << "Received a Topic() call!"
-// world << "[href]"
+// to_chat(world, "Received a Topic() call!")
+// to_chat(world, "[href]")
// for(var/a in href_list)
-// world << "[a]"
+// to_chat(world, "[a]")
// if(href_list["hello"])
-// world << "Hello world!"
+// to_chat(world, "Hello world!")
// return "Hello world!"
-// world << "End of Topic() call."
+// to_chat(world, "End of Topic() call.")
// ..()
var/world_topic_spam_protect_ip = "0.0.0.0"
@@ -98,20 +98,23 @@ var/world_topic_spam_protect_time = world.timeofday
/world/Topic(T, addr, master, key)
diary << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]"
- if (T == "ping")
+ var/list/input = params2list(T)
+ var/key_valid = (config.comms_password && input["key"] == config.comms_password) //no password means no comms, not any password
+
+ if ("ping" in input)
var/x = 1
for (var/client/C)
x++
return x
- else if(T == "players")
+ else if("players" in input)
var/n = 0
for(var/mob/M in player_list)
if(M.client)
n++
return n
- else if (T == "status")
+ else if ("status" in input)
var/list/s = list()
s["version"] = game_version
s["mode"] = master_mode
@@ -122,25 +125,35 @@ var/world_topic_spam_protect_time = world.timeofday
s["host"] = host ? host : null
s["players"] = list()
s["stationtime"] = worldtime2text()
- var/n = 0
- var/admins = 0
+ var/player_count = 0
+ var/admin_count = 0
for(var/client/C in clients)
if(C.holder)
if(C.holder.fakekey)
continue //so stealthmins aren't revealed by the hub
- admins++
- s["player[n]"] = C.key
- n++
- s["players"] = n
-
-// if(revdata) s["revision"] = revdata.revision
- s["admins"] = admins
+ admin_count++
+ s["player[player_count]"] = C.key
+ player_count++
+ s["players"] = player_count
+ s["admins"] = admin_count
s["map_name"] = map_name ? map_name : "Unknown"
+ if(key_valid)
+ if(ticker && ticker.mode)
+ s["real_mode"] = ticker.mode.name
+
+ s["security_level"] = get_security_level()
+
+ if(shuttle_master && shuttle_master.emergency)
+ // Shuttle status, see /__DEFINES/stat.dm
+ s["shuttle_mode"] = shuttle_master.emergency.mode
+ // Shuttle timer, in seconds
+ s["shuttle_timer"] = shuttle_master.emergency.timeLeft()
+
return list2params(s)
- else if(copytext(T,1,9) == "adminmsg")
+ else if("adminmsg" in input)
/*
We got an adminmsg from IRC bot lets split the input then validate the input.
expected output:
@@ -149,20 +162,8 @@ var/world_topic_spam_protect_time = world.timeofday
3. validatationkey = the key the bot has, it should match the gameservers commspassword in it's configuration.
4. sender = the ircnick that send the message.
*/
-
-
- var/input[] = params2list(T)
- if(input["key"] != config.comms_password)
- if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50)
-
- spawn(50)
- world_topic_spam_protect_time = world.time
- return "Bad Key (Throttled)"
-
- world_topic_spam_protect_time = world.time
- world_topic_spam_protect_ip = addr
-
- return "Bad Key"
+ if(!key_valid)
+ return keySpamProtect(addr)
var/client/C
@@ -180,44 +181,43 @@ var/world_topic_spam_protect_time = world.timeofday
C.irc_admin = input["sender"]
C << 'sound/effects/adminhelp.ogg'
- C << message
-
+ to_chat(C, message)
for(var/client/A in admins)
if(A != C)
- A << amessage
+ to_chat(A, amessage)
return "Message Successful"
- else if(copytext(T,1,6) == "notes")
+ else if("notes" in input)
/*
We got a request for notes from the IRC Bot
expected output:
1. notes = ckey of person the notes lookup is for
2. validationkey = the key the bot has, it should match the gameservers commspassword in it's configuration.
*/
- var/input[] = params2list(T)
- if(input["key"] != config.comms_password)
- if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50)
-
- spawn(50)
- world_topic_spam_protect_time = world.time
- return "Bad Key (Throttled)"
-
- world_topic_spam_protect_time = world.time
- world_topic_spam_protect_ip = addr
- return "Bad Key"
+ if(!key_valid)
+ return keySpamProtect(addr)
return show_player_info_irc(input["notes"])
- else if (copytext(T,1,9) == "announce")
- var/input[] = params2list(T)
+ else if("announce" in input)
if(config.comms_password)
if(input["key"] != config.comms_password)
return "Bad Key"
else
for(var/client/C in clients)
- C << "PR: [input["announce"]]"
+ to_chat(C, "PR: [input["announce"]]")
+
+/proc/keySpamProtect(var/addr)
+ if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50)
+ spawn(50)
+ world_topic_spam_protect_time = world.time
+ return "Bad Key (Throttled)"
+
+ world_topic_spam_protect_time = world.time
+ world_topic_spam_protect_ip = addr
+ return "Bad Key"
/world/Reboot(var/reason, var/feedback_c, var/feedback_r, var/time)
if (reason == 1) //special reboot, do none of the normal stuff
@@ -225,7 +225,7 @@ var/world_topic_spam_protect_time = world.timeofday
message_admins("[key_name_admin(usr)] has requested an immediate world restart via client side debugging tools")
log_admin("[key_name(usr)] has requested an immediate world restart via client side debugging tools")
spawn(0)
- world << "Rebooting world immediately due to host request"
+ to_chat(world, "Rebooting world immediately due to host request")
return ..(1)
var/delay
if(!isnull(time))
@@ -233,21 +233,22 @@ var/world_topic_spam_protect_time = world.timeofday
else
delay = ticker.restart_timeout
if(ticker.delay_end)
- world << "An admin has delayed the round end."
+ to_chat(world, "An admin has delayed the round end.")
return
- world << "Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]"
+ to_chat(world, "Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]")
sleep(delay)
if(blackbox)
blackbox.save_all_data_to_sql()
if(ticker.delay_end)
- world << "Reboot was cancelled by an admin."
+ to_chat(world, "Reboot was cancelled by an admin.")
return
feedback_set_details("[feedback_c]","[feedback_r]")
log_game("Rebooting world. [reason]")
//kick_clients_in_lobby("The round came to an end with you in the lobby.", 1)
spawn(0)
- world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')) // random end sounds!! - LastyBatsy
+ to_chat(world, sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')))// random end sounds!! - LastyBatsy
+
processScheduler.stop()
@@ -273,7 +274,7 @@ var/world_topic_spam_protect_time = world.timeofday
if(C.is_afk(INACTIVITY_KICK))
if(!istype(C.mob, /mob/dead))
log_access("AFK: [key_name(C)]")
- C << "\red You have been inactive for more than 10 minutes and have been disconnected."
+ to_chat(C, "\red You have been inactive for more than 10 minutes and have been disconnected.")
del(C)
if ( ((world.timeofday - sleep_check) > work_length) || ((world.timeofday - sleep_check) < 0) )
sleep(sleep_length)
@@ -320,7 +321,7 @@ var/world_topic_spam_protect_time = world.timeofday
/world/proc/save_mode(var/the_mode)
var/F = file("data/mode.txt")
fdel(F)
- F << the_mode
+ to_chat(F, the_mode)
/hook/startup/proc/loadMusic()
for(var/obj/machinery/media/jukebox/J in machines)
@@ -399,7 +400,7 @@ var/world_topic_spam_protect_time = world.timeofday
// features += "hosted by [config.hostedby]"
if (features)
- s += ": [list2text(features, ", ")]"
+ s += ": [jointext(features, ", ")]"
/* does this help? I do not know */
if (src.status != s)
diff --git a/config/example/config.txt b/config/example/config.txt
index e7eaed2443a..e2061b48652 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -302,9 +302,6 @@ PLAYER_REROUTE_CAP 0
## Disable the loading of away missions
#DISABLE_AWAY_MISSIONS
-## Uncomment this if you still use the old .sav file based notes system and haven't used the mass conversion proc
-#AUTOCONVERT_NOTES
-
## Uncomment to disable the OOC/LOOC channel by default.
#DISABLE_OOC
diff --git a/html/changelog.html b/html/changelog.html
index 92a2b193366..7c09c14460a 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,282 @@
-->
+
07 April 2016
+
Crazylemon64 updated:
+
+ - Removes an offset from the advanced virus stealth calculation, causing viruses to be more stealthy than the sum of their symptoms.
+ - Mulebots will now send announcements to relevant requests consoles on delivery again.
+
+
FalseIncarnate updated:
+
+ - Adds logic gates, for doing illogical things in a logical manner.
+ - Adds buildable light switches, for all your light toggling needs.
+ - Fixes a resource duplication bug with mass driver buttons.
+
+
Fethas updated:
+
+ - maybe makes them last longer...maybe..and fixes the event end message
+
+
Fox McCloud updated:
+
+ - Maps in the slime management console to Xenobio
+ - Reduces Xenobio monkey box count from 4 to 2
+ - Fixes weakeyes having a negligible impact
+ - Can spawn friendly animals with a new gold core reaction by injection with water
+ - Hostile animal spawn increased from 3 to 5 for hostile gold cores
+ - Swarmers, revenants, and morphs no longer gold core spawnable
+ - Fixes invisible animal spawns from gold core/life reactions
+ - Adds tape to the ArtVend
+ - Can no longer use sentience potions on bots
+ - Added in Plasma Dust reagent, acquired by grinding plasma sheets; it's more toxic than regular plasma and generates plasma gas when spilled onto turfs.
+ - Slimecore reactions now require plasma dust as opposed to dispenser plasma
+ - Added in new Rainbow slime; inject with plasma dust to get a random colored slime. Acquire by having 100 mutation chance on a slime when it splits.
+ - Monkey Recycler can produce different types of monkey cubes; change the cube type by using a multitool on the recycler
+ - Epinephrine/plasma reagents changing mutation rate has been removed
+ - Mutation chance is inherited from slime generation to slime generation as opposed to being purely random.
+ - New reactions added for red and blue extracts: red generates mutator, which increases mutation chance, and blue generates stabilizer, which decreases mutation chance.
+ - Slime glycerol reaction removed
+ - Slime cells are now high capacity cells (more power than before)
+ - extract enhancer increases the slime core usage by 1 as oppose to setting it to three
+ - slime enhancer increases slime cores by 1 as opposed to setting the core amount to 3
+ - Chill reaction lowers body temperature slightly more so it doesn't just wear off instantly
+ - Reduces Xenobio plasma sheets from 8 to 3 and removes that pesky boombox
+ - Processors no longer produce 1 more slime core than intended
+ - Less blank/spriteless/empty foods from the silver core reaction
+ - Virology mix reactions now use plasma dust as opposed to plasma
+ - Statues can no longer move/attack people unless they're in total darkness or all mobs viewing them are blinded
+ - statues are invincible to anything other than full out gibbing.
+ - Statues flicker lights spell range increased
+ - Blind spell no longer impacts silicons
+ - Fixes statues being able to attack/move whenever they feel like it, regardless of client statues
+ - Fixes blind spell impacting the statue
+
+
Tastyfish updated:
+
+ - Beepsky is no longer a pokemon.
+ - pAI-controlled Bots now reliably speak human-understandable languages over the radio.
+ - More floor blood for the blood gods. (Or rather, as much as there was supposed to be.)
+
+
tigercat2000 updated:
+
+ - Items in your off hand will now count towards access.
+
+
+
02 April 2016
+
Crazylemon64 updated:
+
+ - Metal foam walls will now produce flooring on space tiles
+ - Syringes will now draw water from slime people.
+
+
FalseIncarnate updated:
+
+ - Let's you know when your container is full when filling from sinks.
+ - Prevents splashing containers onto beakers and buckets that have a lid on them.
+ - Pill bottles can now be labeled with a simple pen.
+ - Beakers/buckets (and pill bottles) now accept 26 character labels from pens.
+
+
Fethas updated:
+
+ - Various spells have had a tweak to stun/reveal/cast, some other number stuff...
+ - Nightvision
+ - harvest code is now in the abilites file.
+ - New fluff objectives
+ - Hell has recently remapped its blood transit system and you can now once again crawl through blood. We are sorry for the-GIVE US YOUR SOUL!
+
+
FlattestGuitar updated:
+
+ - Alcoholic beverages now have proper levels of ethanol in them. Good luck passing out after a beer.
+
+
Fox McCloud updated:
+
+ - Adds in the Lusty Xenomorph Maid Mob; currently admin only.
+ - Fixes xenomorph brains having the wrong sprite, no origin tech, and incorrect name
+ - removes xenomorph egg from hotel
+ - upgrades are no longer needed to for the available toys in the prize vendor
+ - Implements Advanced Camera Consoles. A type of camera console that function like AI's vision style. Non-buildable/accessible.
+ - Adds in Xenobiology Advance Cameras. A type of camera console that functions like advanced cameras, but only works in Xenobiology areas; can move around slimes and feed them with the console as well. Also non-buildable/accessible (for now).
+ - Adds in cerulean slime reaction that generates a single use blueprint. On use it colors turfs a lavender color
+ - Adds disease1 outbreak event
+ - Adds appendecitis event
+ - Roburgers now properly have nanomachines in them
+ - Re-adds nanomachines
+ - Experimentor properly generates nanomachines instead of itching powder
+ - Fixes big roburgers having a healing reagent in them
+ - Adds nanomachines to poison traitor bottles
+ - Tajarans can now eat mice, chicks, parrots, and tribbles
+ - Vulpkanin and Unathi can now eat mice, chicks, lizards, chickens, crabs, parrtos, and tribbles
+ - fixes spawned changeling headcrab behavior
+
+
KasparoVy updated:
+
+ - Incisions made at the beginning of embedded object removal surgery can now be closed in the same procedure.
+
+
ProperPants updated:
+
+ - Maint drones have magboots.
+ - Removed plastic from maint drones. Literally useless for station maintenance.
+ - Increased starting amounts of some materials for maint drones and engi borgs.
+ - Reduced the number of lines taken by Engineering cyborgs calling on materials stacks.
+ - Operating tables can be deconstructed with a wrench.
+ - Fixed and shortened description of metal sheets.
+
+
Tastyfish updated:
+
+ - Bots can now be controlled by players, by opening them up and inserting a pAI. *beep
+ - MULEbots can now access the engineering destination.
+ - All MULEbot destinations should now have the correct load/unload direction, meaning the crates won't be dumped inside the flaps.
+ - Diagnostic HUD's now give health and status information about bots.
+ - MULEbot rampage blood tracks are now rendered correctly and handle UE traces as appropriate.
+ - Bots should (hopefully) lag the game less now.
+ - Beepsky contains 30% more potato.
+ - Action progress bars are now smooth.
+ - Clicking a filled inventory slot's square with an open hand now clicks the item in the slot.
+ - Status displays now display the time when in Shuttle ETA mode and no shuttle activity is happening.
+ - Shuttle ETA countdowns on status displays are now amber.
+ - pAI's can now use the PDA chatrooms.
+ - Adds treadmills to brig cells, to give the prisoners something productive to do.
+
+
TheDZD updated:
+
+ - A lot of the guns and armor in the station collision, space hotel, academy, and wild west away missions have been removed/replaced.
+ - Removes that fucking facehugger from station collision.
+
+
tigercat2000 updated:
+
+ - Virus2 has been removed.
+ - Virus1 is back. Viva la revolution.
+ - You can now have up to 20 characters.
+
+
+
26 March 2016
+
Fox McCloud updated:
+
+ - Adds in dental implant surgery. Implant pills into people's teeth.
+ - Major rebalance and Shadowling update (https://github.com/ParadiseSS13/Paradise/pull/3986 for details). In general, Shadowlings can no longer enthrall or engage in Shadowling like behavior, pre-hatch. Post-hatch, shadowlings are much more powerful, with a ride array of New abilities such as extending the shuttle or making thralls into lesser shadowlings. Shadowling gameplay should not revolve almost entirely around darkness, as opposed to pre-hatch shenanigans.
+ - Robotics now has a "sterile" surgical area for performing augmentations
+ - Adds the FixOVein and Bone Gel to the autolathe
+ - ensures all surgical tools have origin tech on them; lowers origin tech on FixoVein
+
+
KasparoVy updated:
+
+ - Slime People can now wear underwear.
+ - Slime People can now wear undershirts.
+
+
TheDZD updated:
+
+ - NT has removed trace amounts of a highly-addictive substance from the "100% real" cheese used in cheese-flavored snacks. As a result, incidence rates of crewmembers becoming addicted to Cheesie Honkers should reduce to zero.
+ - After receiving complaints about crewmembers often being unable to physically function without a back-mounted barrel of coffee, NT has replaced station all sources of coffee on the station, including coffee beans themselves with a largely decaffeinated version. It was funny the first time almost every crewmember aboard the NSS Cyberiad was lugging around their own oil barrel filled with coffee, it wasn't so funny, nor good for productivity the eighteenth.
+
+
+
25 March 2016
+
Crazylemon64 updated:
+
+ - You now will actually have the correct `real_name` on your DNA.
+ - No more roundstart runtimes regarding IPC hair.
+ - Mitocholide rejuv will work more usefully now.
+ - Limbs and cyborg modules will no longer appear in your screen.
+ - Cyborg module icons are now persistent throughout logging in and out.
+ - Various cyborg modules, like engineering, now use the proper icon.
+
+
FlattestGuitar updated:
+
+ - Adds confetti grenades.
+
+
Fox McCloud updated:
+
+ - Fixes Sleeping Carp combos not having an attack animation
+ - Fixes several chems not properly healing brute/burn damage, consistently, as intended
+
+
KasparoVy updated:
+
+ - Unbranded heads and groins no longer invisible.
+ - Zeng-hu left leg will now be in line with the body when facing south.
+
+
+
22 March 2016
+
Crazylemon64 updated:
+
+ - Repairs all sorts of eldritch occurences that happen when you put an organic head on an IPC body, as well as some decapitation bugs
+ - Makes heads keep hair on removal
+ - Amputated limbs from a DNA-injected individual now will keep their appearance of the DNA-injected person
+ - Wounds will vanish on their own now
+ - Admins now have an "incarnate" option on the player panel when viewing ghosts for quick player instantiation
+ - Fixes a runtime regarding failing a limb reconnection surgery
+ - Copying a client's preferences now overrides the previous mob's DNA
+ - A DNA injector is now more thorough, and affects the DNA of mobs' limbs and organs
+ - DNA-lacking species can no longer be DNA-injected
+ - Brains are now labeled again
+ - Splashing mitocholide on dead organs will make them live again.
+ - The body scanner now detects necrotic limbs and organs.
+ - pAIs and Drones are now affected by EMPs and explosions while held.
+
+
Fethas updated:
+
+ - Adds a surgery for infection treatmne/autopsys that is simply cut open, retract, cauterize
+ - fixes a dumb error in internal bleeeding surgerys
+ - Chaos types no longer random teleport, but will make the target hallucinate everyone looks like the guardian.
+
+
FlattestGuitar updated:
+
+ - Adds a snow, navy and desert military jacket.
+
+
Fox McCloud updated:
+
+ - Removes random 1% chance to heal fire damage
+ - Removes passive healing from resist heat mutation
+ - Regen mutation heals every cycle (albeit less, on average), but doesn't cost hunger
+ - Fixes not being able to speak over xeno common or hivemind when you receive the Xeno hive node
+ - Adds in the ability to transfer non-locked metal+glass only designs from the protolathe to autolathe
+ - Changes Outpost Mass Driver to prevent accidental spacings
+ - Shadow people no longer dust on death, are rad immune+virus immune, and can be cloned. Slip immunity removed
+ - Shadowlings no longer get hungry or fat and no longer dust on death
+
+
KasparoVy updated:
+
+ - The ability to change your head, torso and groin as an IPC in the character creator. Non-IPCs cannot access the parts.
+ - Head, torso and groin sprites for all mechanical limb/bodypart brands but Morpheus and the unbranded ones (since those already exist) from Polaris.
+ - Faux-eye optics for non-Morpheus heads.
+ - The ability to change optic (eye) colour if you've got a non-Morpheus head.
+ - The ability to choose human hair styles (wigs) and facial hair styles (postiche) with non-Morpheus heads. Non-Morpheus heads cannot choose screens. Conversely, Morpheus heads cannot choose wigs or facial hair.
+ - Two hair styles from Polaris.
+ - The ability for IPCs to wear undergarments (shirts and trousers).
+ - Antennae (colourable) for IPCs.
+ - IPC monitor adjustment verb will now adjust optic colour if the head is non-Morpheus.
+ - Combat/SWAT boots can now be toecut and jacksandals can't.
+ - ASAP fix to what would've broken the ability to configure prostheses in character creation.
+ - Adjusted masks no longer block CPR (including bandanas).
+ - You can no longer run internals from adjusted breath masks (or airtight adjustable masks in general).
+
+
Regens updated:
+
+ - Robotic hearts will now properly give the mob a heart attack instead of just damaging it when EMP'd
+ - Assisted organs will now also take damage from EMP's
+ - Internal robotic and assisted organs will now actually take damage from EMP's
+
+
Tastyfish updated:
+
+ - Adds PDA chatrooms. Post memes! Talk to your fellow collaborators! Get caught!
+ - You can now set the PDA messenger to automatically scroll down to new messages.
+ - Pet collars now act as death alarms and can have ID's attached to them.
+ - All domestic animals can now wear collars.
+ - You can now make video cameras at the autolathe.
+
+
TheDZD updated:
+
+ - Fixes an instance of old code being so incredibly, unbelievably, makes-me-want-to-stab-myself-in-the-eye-edly idiotic.
+
+
TravellingMerchant updated:
+
+ - Kidan have new sprites!
+
+
tigercat2000 updated:
+
+ - Nukeops now have an assault pod, they can use it for 30 TC. Loud and mean.
+ - Lighting overlays can no longer go below 0 lum_r/g/b
+ - Shuttles will work with lighting better.
+ - Wizards can no longer teleport to prohibited areas such as Central Command.
+
+
16 March 2016
Crazylemon64 updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 48633a4ed32..4502e176a49 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -893,3 +893,282 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
targets now, and won't shoot through walls anymore.
taukausanake:
- rscadd: Mice can now be picked up like diona
+2016-03-22:
+ Crazylemon64:
+ - bugfix: Repairs all sorts of eldritch occurences that happen when you put an organic
+ head on an IPC body, as well as some decapitation bugs
+ - bugfix: Makes heads keep hair on removal
+ - bugfix: Amputated limbs from a DNA-injected individual now will keep their appearance
+ of the DNA-injected person
+ - bugfix: Wounds will vanish on their own now
+ - rscadd: Admins now have an "incarnate" option on the player panel when viewing
+ ghosts for quick player instantiation
+ - bugfix: Fixes a runtime regarding failing a limb reconnection surgery
+ - bugfix: Copying a client's preferences now overrides the previous mob's DNA
+ - bugfix: A DNA injector is now more thorough, and affects the DNA of mobs' limbs
+ and organs
+ - bugfix: DNA-lacking species can no longer be DNA-injected
+ - bugfix: Brains are now labeled again
+ - rscadd: Splashing mitocholide on dead organs will make them live again.
+ - rscadd: The body scanner now detects necrotic limbs and organs.
+ - bugfix: pAIs and Drones are now affected by EMPs and explosions while held.
+ Fethas:
+ - rscadd: Adds a surgery for infection treatmne/autopsys that is simply cut open,
+ retract, cauterize
+ - bugfix: fixes a dumb error in internal bleeeding surgerys
+ - rscadd: Chaos types no longer random teleport, but will make the target hallucinate
+ everyone looks like the guardian.
+ FlattestGuitar:
+ - rscadd: Adds a snow, navy and desert military jacket.
+ Fox McCloud:
+ - tweak: Removes random 1% chance to heal fire damage
+ - tweak: Removes passive healing from resist heat mutation
+ - tweak: Regen mutation heals every cycle (albeit less, on average), but doesn't
+ cost hunger
+ - bugfix: Fixes not being able to speak over xeno common or hivemind when you receive
+ the Xeno hive node
+ - rscadd: Adds in the ability to transfer non-locked metal+glass only designs from
+ the protolathe to autolathe
+ - tweak: Changes Outpost Mass Driver to prevent accidental spacings
+ - tweak: Shadow people no longer dust on death, are rad immune+virus immune, and
+ can be cloned. Slip immunity removed
+ - tweak: Shadowlings no longer get hungry or fat and no longer dust on death
+ KasparoVy:
+ - rscadd: The ability to change your head, torso and groin as an IPC in the character
+ creator. Non-IPCs cannot access the parts.
+ - rscadd: Head, torso and groin sprites for all mechanical limb/bodypart brands
+ but Morpheus and the unbranded ones (since those already exist) from Polaris.
+ - rscadd: Faux-eye optics for non-Morpheus heads.
+ - rscadd: The ability to change optic (eye) colour if you've got a non-Morpheus
+ head.
+ - rscadd: The ability to choose human hair styles (wigs) and facial hair styles
+ (postiche) with non-Morpheus heads. Non-Morpheus heads cannot choose screens.
+ Conversely, Morpheus heads cannot choose wigs or facial hair.
+ - rscadd: Two hair styles from Polaris.
+ - rscadd: The ability for IPCs to wear undergarments (shirts and trousers).
+ - rscadd: Antennae (colourable) for IPCs.
+ - tweak: IPC monitor adjustment verb will now adjust optic colour if the head is
+ non-Morpheus.
+ - bugfix: Combat/SWAT boots can now be toecut and jacksandals can't.
+ - bugfix: ASAP fix to what would've broken the ability to configure prostheses in
+ character creation.
+ - bugfix: Adjusted masks no longer block CPR (including bandanas).
+ - bugfix: You can no longer run internals from adjusted breath masks (or airtight
+ adjustable masks in general).
+ Regens:
+ - tweak: Robotic hearts will now properly give the mob a heart attack instead of
+ just damaging it when EMP'd
+ - rscadd: Assisted organs will now also take damage from EMP's
+ - bugfix: Internal robotic and assisted organs will now actually take damage from
+ EMP's
+ Tastyfish:
+ - rscadd: Adds PDA chatrooms. Post memes! Talk to your fellow collaborators! Get
+ caught!
+ - tweak: You can now set the PDA messenger to automatically scroll down to new messages.
+ - rscadd: Pet collars now act as death alarms and can have ID's attached to them.
+ - tweak: All domestic animals can now wear collars.
+ - rscadd: You can now make video cameras at the autolathe.
+ TheDZD:
+ - bugfix: Fixes an instance of old code being so incredibly, unbelievably, makes-me-want-to-stab-myself-in-the-eye-edly
+ idiotic.
+ TravellingMerchant:
+ - imageadd: Kidan have new sprites!
+ tigercat2000:
+ - rscadd: Nukeops now have an assault pod, they can use it for 30 TC. Loud and mean.
+ - bugfix: Lighting overlays can no longer go below 0 lum_r/g/b
+ - bugfix: Shuttles will work with lighting better.
+ - bugfix: Wizards can no longer teleport to prohibited areas such as Central Command.
+2016-03-25:
+ Crazylemon64:
+ - bugfix: You now will actually have the correct `real_name` on your DNA.
+ - bugfix: No more roundstart runtimes regarding IPC hair.
+ - bugfix: Mitocholide rejuv will work more usefully now.
+ - bugfix: Limbs and cyborg modules will no longer appear in your screen.
+ - bugfix: Cyborg module icons are now persistent throughout logging in and out.
+ - bugfix: Various cyborg modules, like engineering, now use the proper icon.
+ FlattestGuitar:
+ - rscadd: Adds confetti grenades.
+ Fox McCloud:
+ - bugfix: Fixes Sleeping Carp combos not having an attack animation
+ - bugfix: Fixes several chems not properly healing brute/burn damage, consistently,
+ as intended
+ KasparoVy:
+ - bugfix: Unbranded heads and groins no longer invisible.
+ - bugfix: Zeng-hu left leg will now be in line with the body when facing south.
+2016-03-26:
+ Fox McCloud:
+ - rscadd: Adds in dental implant surgery. Implant pills into people's teeth.
+ - tweak: Major rebalance and Shadowling update (https://github.com/ParadiseSS13/Paradise/pull/3986
+ for details). In general, Shadowlings can no longer enthrall or engage in Shadowling
+ like behavior, pre-hatch. Post-hatch, shadowlings are much more powerful, with
+ a ride array of New abilities such as extending the shuttle or making thralls
+ into lesser shadowlings. Shadowling gameplay should not revolve almost entirely
+ around darkness, as opposed to pre-hatch shenanigans.
+ - rscadd: Robotics now has a "sterile" surgical area for performing augmentations
+ - rscadd: Adds the FixOVein and Bone Gel to the autolathe
+ - tweak: ensures all surgical tools have origin tech on them; lowers origin tech
+ on FixoVein
+ KasparoVy:
+ - rscadd: Slime People can now wear underwear.
+ - rscadd: Slime People can now wear undershirts.
+ TheDZD:
+ - tweak: NT has removed trace amounts of a highly-addictive substance from the "100%
+ real" cheese used in cheese-flavored snacks. As a result, incidence rates of
+ crewmembers becoming addicted to Cheesie Honkers should reduce to zero.
+ - tweak: After receiving complaints about crewmembers often being unable to physically
+ function without a back-mounted barrel of coffee, NT has replaced station all
+ sources of coffee on the station, including coffee beans themselves with a largely
+ decaffeinated version. It was funny the first time almost every crewmember aboard
+ the NSS Cyberiad was lugging around their own oil barrel filled with coffee,
+ it wasn't so funny, nor good for productivity the eighteenth.
+2016-04-02:
+ Crazylemon64:
+ - rscadd: Metal foam walls will now produce flooring on space tiles
+ - bugfix: Syringes will now draw water from slime people.
+ FalseIncarnate:
+ - tweak: Let's you know when your container is full when filling from sinks.
+ - tweak: Prevents splashing containers onto beakers and buckets that have a lid
+ on them.
+ - rscadd: Pill bottles can now be labeled with a simple pen.
+ - tweak: Beakers/buckets (and pill bottles) now accept 26 character labels from
+ pens.
+ Fethas:
+ - tweak: Various spells have had a tweak to stun/reveal/cast, some other number
+ stuff...
+ - rscadd: Nightvision
+ - tweak: harvest code is now in the abilites file.
+ - rscadd: New fluff objectives
+ - bugfix: Hell has recently remapped its blood transit system and you can now once
+ again crawl through blood. We are sorry for the-GIVE US YOUR SOUL!
+ FlattestGuitar:
+ - tweak: Alcoholic beverages now have proper levels of ethanol in them. Good luck
+ passing out after a beer.
+ Fox McCloud:
+ - rscadd: Adds in the Lusty Xenomorph Maid Mob; currently admin only.
+ - bugfix: Fixes xenomorph brains having the wrong sprite, no origin tech, and incorrect
+ name
+ - tweak: removes xenomorph egg from hotel
+ - tweak: upgrades are no longer needed to for the available toys in the prize vendor
+ - rscadd: Implements Advanced Camera Consoles. A type of camera console that function
+ like AI's vision style. Non-buildable/accessible.
+ - rscadd: Adds in Xenobiology Advance Cameras. A type of camera console that functions
+ like advanced cameras, but only works in Xenobiology areas; can move around
+ slimes and feed them with the console as well. Also non-buildable/accessible
+ (for now).
+ - rscadd: Adds in cerulean slime reaction that generates a single use blueprint.
+ On use it colors turfs a lavender color
+ - rscadd: Adds disease1 outbreak event
+ - rscadd: Adds appendecitis event
+ - rscadd: Roburgers now properly have nanomachines in them
+ - rscadd: Re-adds nanomachines
+ - tweak: Experimentor properly generates nanomachines instead of itching powder
+ - bugfix: Fixes big roburgers having a healing reagent in them
+ - rscadd: Adds nanomachines to poison traitor bottles
+ - rscadd: Tajarans can now eat mice, chicks, parrots, and tribbles
+ - rscadd: Vulpkanin and Unathi can now eat mice, chicks, lizards, chickens, crabs,
+ parrtos, and tribbles
+ - bugfix: fixes spawned changeling headcrab behavior
+ KasparoVy:
+ - bugfix: Incisions made at the beginning of embedded object removal surgery can
+ now be closed in the same procedure.
+ ProperPants:
+ - rscadd: Maint drones have magboots.
+ - rscdel: Removed plastic from maint drones. Literally useless for station maintenance.
+ - tweak: Increased starting amounts of some materials for maint drones and engi
+ borgs.
+ - experiment: Reduced the number of lines taken by Engineering cyborgs calling on
+ materials stacks.
+ - rscadd: Operating tables can be deconstructed with a wrench.
+ - spellcheck: Fixed and shortened description of metal sheets.
+ Tastyfish:
+ - rscadd: Bots can now be controlled by players, by opening them up and inserting
+ a pAI. *beep
+ - bugfix: MULEbots can now access the engineering destination.
+ - bugfix: All MULEbot destinations should now have the correct load/unload direction,
+ meaning the crates won't be dumped inside the flaps.
+ - rscadd: Diagnostic HUD's now give health and status information about bots.
+ - bugfix: MULEbot rampage blood tracks are now rendered correctly and handle UE
+ traces as appropriate.
+ - experiment: Bots should (hopefully) lag the game less now.
+ - tweak: Beepsky contains 30% more potato.
+ - tweak: Action progress bars are now smooth.
+ - tweak: Clicking a filled inventory slot's square with an open hand now clicks
+ the item in the slot.
+ - rscadd: Status displays now display the time when in Shuttle ETA mode and no shuttle
+ activity is happening.
+ - tweak: Shuttle ETA countdowns on status displays are now amber.
+ - rscadd: pAI's can now use the PDA chatrooms.
+ - rscadd: Adds treadmills to brig cells, to give the prisoners something productive
+ to do.
+ TheDZD:
+ - rscdel: A lot of the guns and armor in the station collision, space hotel, academy,
+ and wild west away missions have been removed/replaced.
+ - rscdel: Removes that fucking facehugger from station collision.
+ tigercat2000:
+ - rscdel: Virus2 has been removed.
+ - rscadd: Virus1 is back. Viva la revolution.
+ - rscadd: You can now have up to 20 characters.
+2016-04-07:
+ Crazylemon64:
+ - bugfix: Removes an offset from the advanced virus stealth calculation, causing
+ viruses to be more stealthy than the sum of their symptoms.
+ - bugfix: Mulebots will now send announcements to relevant requests consoles on
+ delivery again.
+ FalseIncarnate:
+ - rscadd: Adds logic gates, for doing illogical things in a logical manner.
+ - rscadd: Adds buildable light switches, for all your light toggling needs.
+ - bugfix: Fixes a resource duplication bug with mass driver buttons.
+ Fethas:
+ - tweak: maybe makes them last longer...maybe..and fixes the event end message
+ Fox McCloud:
+ - rscadd: Maps in the slime management console to Xenobio
+ - tweak: Reduces Xenobio monkey box count from 4 to 2
+ - bugfix: Fixes weakeyes having a negligible impact
+ - rscadd: Can spawn friendly animals with a new gold core reaction by injection
+ with water
+ - tweak: Hostile animal spawn increased from 3 to 5 for hostile gold cores
+ - tweak: Swarmers, revenants, and morphs no longer gold core spawnable
+ - bugfix: Fixes invisible animal spawns from gold core/life reactions
+ - rscadd: Adds tape to the ArtVend
+ - tweak: Can no longer use sentience potions on bots
+ - rscadd: Added in Plasma Dust reagent, acquired by grinding plasma sheets; it's
+ more toxic than regular plasma and generates plasma gas when spilled onto turfs.
+ - tweak: Slimecore reactions now require plasma dust as opposed to dispenser plasma
+ - rscadd: Added in new Rainbow slime; inject with plasma dust to get a random colored
+ slime. Acquire by having 100 mutation chance on a slime when it splits.
+ - rscadd: Monkey Recycler can produce different types of monkey cubes; change the
+ cube type by using a multitool on the recycler
+ - tweak: Epinephrine/plasma reagents changing mutation rate has been removed
+ - tweak: Mutation chance is inherited from slime generation to slime generation
+ as opposed to being purely random.
+ - tweak: 'New reactions added for red and blue extracts: red generates mutator,
+ which increases mutation chance, and blue generates stabilizer, which decreases
+ mutation chance.'
+ - tweak: Slime glycerol reaction removed
+ - tweak: Slime cells are now high capacity cells (more power than before)
+ - tweak: extract enhancer increases the slime core usage by 1 as oppose to setting
+ it to three
+ - tweak: slime enhancer increases slime cores by 1 as opposed to setting the core
+ amount to 3
+ - tweak: Chill reaction lowers body temperature slightly more so it doesn't just
+ wear off instantly
+ - tweak: Reduces Xenobio plasma sheets from 8 to 3 and removes that pesky boombox
+ - bugfix: Processors no longer produce 1 more slime core than intended
+ - bugfix: Less blank/spriteless/empty foods from the silver core reaction
+ - tweak: Virology mix reactions now use plasma dust as opposed to plasma
+ - tweak: Statues can no longer move/attack people unless they're in total darkness
+ or all mobs viewing them are blinded
+ - tweak: statues are invincible to anything other than full out gibbing.
+ - tweak: Statues flicker lights spell range increased
+ - tweak: Blind spell no longer impacts silicons
+ - bugfix: Fixes statues being able to attack/move whenever they feel like it, regardless
+ of client statues
+ - bugfix: Fixes blind spell impacting the statue
+ Tastyfish:
+ - tweak: Beepsky is no longer a pokemon.
+ - tweak: pAI-controlled Bots now reliably speak human-understandable languages over
+ the radio.
+ - rscadd: More floor blood for the blood gods. (Or rather, as much as there was
+ supposed to be.)
+ tigercat2000:
+ - rscadd: Items in your off hand will now count towards access.
diff --git a/icons/effects/doafter_icon.dmi b/icons/effects/doafter_icon.dmi
deleted file mode 100644
index 9fce3af3353..00000000000
Binary files a/icons/effects/doafter_icon.dmi and /dev/null differ
diff --git a/icons/effects/fluidtracks.dmi b/icons/effects/fluidtracks.dmi
index 0675d93d7f9..810ecc7f265 100644
Binary files a/icons/effects/fluidtracks.dmi and b/icons/effects/fluidtracks.dmi differ
diff --git a/icons/effects/poop.dmi b/icons/effects/poop.dmi
deleted file mode 100644
index 3c5b32e6543..00000000000
Binary files a/icons/effects/poop.dmi and /dev/null differ
diff --git a/icons/effects/progessbar.dmi b/icons/effects/progessbar.dmi
new file mode 100644
index 00000000000..99284060aa6
Binary files /dev/null and b/icons/effects/progessbar.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 5e7b65eb543..a2847325875 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/alien.dmi b/icons/mob/alien.dmi
index 0e019014c57..0dd9df5691e 100644
Binary files a/icons/mob/alien.dmi and b/icons/mob/alien.dmi differ
diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi
index 1794a4782a3..16d6b2f03f9 100644
Binary files a/icons/mob/body_accessory.dmi and b/icons/mob/body_accessory.dmi differ
diff --git a/icons/mob/guardian.dmi b/icons/mob/guardian.dmi
index 9db3fbedc68..a84ccec28ad 100644
Binary files a/icons/mob/guardian.dmi and b/icons/mob/guardian.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index de442968c0a..38ce685a266 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 9b2a74768d1..4f7829c3aac 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 83dfb8e81e6..abb390fdffe 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/bishop.dmi b/icons/mob/human_races/cyberlimbs/bishop.dmi
index a3fdb455f89..3bf83ae98cd 100644
Binary files a/icons/mob/human_races/cyberlimbs/bishop.dmi and b/icons/mob/human_races/cyberlimbs/bishop.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/hesphaistos.dmi b/icons/mob/human_races/cyberlimbs/hesphaistos.dmi
index 45423ee1698..683339efc05 100644
Binary files a/icons/mob/human_races/cyberlimbs/hesphaistos.dmi and b/icons/mob/human_races/cyberlimbs/hesphaistos.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/wardtakahashi.dmi b/icons/mob/human_races/cyberlimbs/wardtakahashi.dmi
index 01ded594a2c..7122cafb818 100644
Binary files a/icons/mob/human_races/cyberlimbs/wardtakahashi.dmi and b/icons/mob/human_races/cyberlimbs/wardtakahashi.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/xion.dmi b/icons/mob/human_races/cyberlimbs/xion.dmi
index a4fecb0008b..0ee9a0c4965 100644
Binary files a/icons/mob/human_races/cyberlimbs/xion.dmi and b/icons/mob/human_races/cyberlimbs/xion.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/zenghu.dmi b/icons/mob/human_races/cyberlimbs/zenghu.dmi
index d54316e192e..85f49f50873 100644
Binary files a/icons/mob/human_races/cyberlimbs/zenghu.dmi and b/icons/mob/human_races/cyberlimbs/zenghu.dmi differ
diff --git a/icons/mob/human_races/r_def_kidan.dmi b/icons/mob/human_races/r_def_kidan.dmi
index 13583badd71..9cef8f9597c 100644
Binary files a/icons/mob/human_races/r_def_kidan.dmi and b/icons/mob/human_races/r_def_kidan.dmi differ
diff --git a/icons/mob/human_races/r_kidan.dmi b/icons/mob/human_races/r_kidan.dmi
index 13583badd71..9cef8f9597c 100644
Binary files a/icons/mob/human_races/r_kidan.dmi and b/icons/mob/human_races/r_kidan.dmi differ
diff --git a/icons/mob/human_races/r_lshadowling.dmi b/icons/mob/human_races/r_lshadowling.dmi
new file mode 100644
index 00000000000..0e955e5bd97
Binary files /dev/null and b/icons/mob/human_races/r_lshadowling.dmi differ
diff --git a/icons/mob/human_races/robotic.dmi b/icons/mob/human_races/robotic.dmi
index 203f627f6f1..f3bca757490 100644
Binary files a/icons/mob/human_races/robotic.dmi and b/icons/mob/human_races/robotic.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index b6028a4426e..90ea770294e 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 63837126639..051b6b6b874 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 36642747502..bc74db7c722 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
index 169beacef43..fee5f3ec69f 100644
Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ
diff --git a/icons/mob/screen1_bot.dmi b/icons/mob/screen1_bot.dmi
new file mode 100644
index 00000000000..7522623f327
Binary files /dev/null and b/icons/mob/screen1_bot.dmi differ
diff --git a/icons/mob/screen1_full.dmi b/icons/mob/screen1_full.dmi
deleted file mode 100644
index d660f369ba0..00000000000
Binary files a/icons/mob/screen1_full.dmi and /dev/null differ
diff --git a/icons/mob/screen1_robot.dmi b/icons/mob/screen1_robot.dmi
index 9188e33ff5f..0128584d284 100644
Binary files a/icons/mob/screen1_robot.dmi and b/icons/mob/screen1_robot.dmi differ
diff --git a/icons/mob/screen_full.dmi b/icons/mob/screen_full.dmi
new file mode 100644
index 00000000000..e84b0546950
Binary files /dev/null and b/icons/mob/screen_full.dmi differ
diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi
index 431f1df9ddb..a97f1abc5a0 100644
Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 0b7a5921355..c640d20334f 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi
index 928163c75ec..c212261f9ec 100644
Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ
diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi
new file mode 100644
index 00000000000..0896e9a500a
Binary files /dev/null and b/icons/obj/abductor.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 1f0ca57476f..cd6ae3095a0 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index 958c28dcaa5..09380373db8 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/computer3.dmi b/icons/obj/computer3.dmi
index 7c87ec36102..30705076d62 100644
Binary files a/icons/obj/computer3.dmi and b/icons/obj/computer3.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index ffb0f2097f7..5e7c8e43981 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index 61630efbeea..e0b3b047628 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 328cc04d001..bf752f1ca21 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/meteor.dmi b/icons/obj/meteor.dmi
index b852fbf7cf8..83a0a98a49a 100644
Binary files a/icons/obj/meteor.dmi and b/icons/obj/meteor.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 225f1b19ed3..ea68e3dbdbd 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 42379ff68b6..424cf671e88 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 892dfe2a64e..728bfaba198 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index bcc533187b2..98e1f035e0a 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/nano/templates/adv_med.tmpl b/nano/templates/adv_med.tmpl
index 017abaad0cb..66650e62f86 100644
--- a/nano/templates/adv_med.tmpl
+++ b/nano/templates/adv_med.tmpl
@@ -174,6 +174,7 @@ Used In File(s): \code\game\machinery\adv_med.dm
{{if value.status.splinted}} splinted
{{/if}}
{{if value.status.robotic}} robotic
{{/if}}
+ {{if value.status.dead}} DEAD
@@ -220,6 +221,7 @@ Used In File(s): \code\game\machinery\adv_med.dm
{{if value.robotic == 1}} robotic
{{/if}}
{{if value.robotic == 2}} assisted
{{/if}}
+ {{if value.dead}} DEAD
{{/if}}
{{/for}}
diff --git a/nano/templates/pai_chatroom.tmpl b/nano/templates/pai_chatroom.tmpl
new file mode 100644
index 00000000000..d669a375d86
--- /dev/null
+++ b/nano/templates/pai_chatroom.tmpl
@@ -0,0 +1,76 @@
+
+
+
+
+ Receiver:
+
+
+ {{if data.receiver_off}}
+ {{:helper.link("On", '', {"stopic":"chatroom", "toggler":1})}}
+ {{:helper.link("Off", '', {"stopic":"chatroom", "toggler":2}, 'selected')}}
+ {{else}}
+ {{:helper.link("On", '', {"stopic":"chatroom", "toggler":1}, 'selected')}}
+ {{:helper.link("Off", '', {"stopic":"chatroom", "toggler":2})}}
+ {{/if}}
+
+
+
+ Ringer:
+
+
+ {{if data.ringer_off}}
+ {{:helper.link("On", '', {"stopic":"chatroom", "ringer":1})}}
+ {{:helper.link("Off", '', {"stopic":"chatroom", "ringer":2}, 'selected')}}
+ {{else}}
+ {{:helper.link("On", '', {"stopic":"chatroom", "ringer":1}, 'selected')}}
+ {{:helper.link("Off", '', {"stopic":"chatroom", "ringer":2})}}
+ {{/if}}
+
+
+ {{:helper.link(value.name, '', {"stopic":"chatroom", "select":value.ref})}}
+ {{:helper.link("Quick Message", '', {"stopic":"chatroom", "target":value.ref})}}
+
+{{/for}}
+
+{{if data.disconnected}}
+ Connection Lost
+ {{:helper.link("Reconnect", 'refresh', {"stopic":"chatroom", "reconnect":1})}}
+{{else data.current_room}}
+ #{{:data.current_room_name}}
+
+ Topic:
+ {{:helper.link(data.current_room_topic, '', {"stopic":"chatroom", "topic":1})}}
+
+
+
Users:
+
+ {{var firstUser = true;}}
+ {{for data.users}}
+ {{:firstUser ? "" : ", "}}{{:value}}
+ {{firstUser = false;}}
+ {{/for}}
+
+
+
{{:value.username!=prevName ? value.username : " "}}
+
+ {{:value.message}}
+
+
+ {{if data.no_server}}
+
ERROR: Messaging server is not responding.
+ {{:helper.link('Reconnect', 'refresh', {'choice' : "Reconnect"}, null, 'pdalink fixedLeftWidest')}}
+ {{else data.room}}
+ {{if data.inviting}}
+
Invite whom to #{{:data.room}}?
+ {{for data.people}}
+ {{:helper.link(value.name, 'user-plus', {'choice': "Invite PDA", 'user': value.ref}, null, 'pdalink fixedLeftWidest')}}
+ {{empty}}
+
No other people found.
+ {{/for}}
+ {{else}}
+
#{{:data.room}} – {{:data.topic}}
+
+
+ Room Functions:
+
+
+ {{:helper.link('Invite', 'user-plus', {'choice' : "Invite"}, null, 'pdalink fixedLeftWide')}}
+ {{:helper.link('Change Topic', 'tag', {'choice' : "Topic"}, null, 'pdalink fixedLeftWide')}}
+ {{:helper.link('Leave Channel', 'user-times', {'choice' : "Leave"}, null, 'pdalink fixedLeftWide')}}
+ {{:helper.link(data.auto_scroll ? 'Autoscroll: On' : 'Autoscroll: Off', 'level-down', {'choice' : "Autoscroll"}, null, 'pdalink fixedLeftWide')}}
+
+
+
+
+ {{var prevName = "";}}
+ {{for data.history}}
+
+
{{:value.username!=prevName ? value.username : " "}}
+
+ {{:value.message}}
+
+
+ {{prevName = value.username;}}
+ {{/for}}
+
+
+ {{:helper.link('Post', 'comment', {'choice' : "Post"}, null, 'pdalink fixedLeftWidest')}}
+
+
+
+ {{for data.users}}
+
+ {{/for}}
+
+
+ {{/if}}
+ {{else}}
+
Rooms
+ {{for data.rooms}}
+
+ {{:helper.link(value.name, 'arrow-circle-down', {'choice' : "Join", 'room' : value.ref}, null, 'pdalink fixedLeftWidest')}}
+
+ {{empty}}
+
No rooms located.
+ {{/for}}
+ {{/if}}
+
Owner:
@@ -29,7 +48,16 @@ Used In File(s): \code\game\objects\items\devices\PDA\core_apps.dm
{{for data.apps[cat]}}
- {{:helper.link(value.name, value.icon, {'choice' : "StartProgram", 'program' : value.ref}, null, 'pdalink fixedLeftWide')}}
+ {{if value.ref in data.notifying}}
+
+ {{:helper.link(value.name, value.notify_icon, {'choice' : "StartProgram", 'program' : value.ref}, null, 'pdalink fixedLeftWide')}}
+
+
+ {{else}}
+ {{:helper.link(value.name, value.icon, {'choice' : "StartProgram", 'program' : value.ref}, null, 'pdalink fixedLeftWide')}}
+ {{/if}}
{{/for}}
diff --git a/nano/templates/pda_messenger.tmpl b/nano/templates/pda_messenger.tmpl
index 633ae7d4691..4871934e4e9 100644
--- a/nano/templates/pda_messenger.tmpl
+++ b/nano/templates/pda_messenger.tmpl
@@ -9,6 +9,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\core_apps.dm
{{:helper.link('Delete Conversation', 'trash', {'choice' : "Clear", 'option' : "Convo"}, null, 'pdalink fixedLeftWide')}}
+ {{:helper.link(data.auto_scroll ? 'Autoscroll: On' : 'Autoscroll: Off', 'level-down', {'choice' : "Autoscroll"}, null, 'pdalink fixedLeftWide')}}
@@ -29,7 +30,15 @@ Used In File(s): \code\game\objects\items\devices\PDA\core_apps.dm
- {{:helper.link('Reply', 'comment', {'choice' : "Message", 'target': data.active_conversation}, null, 'pdalink fixedLeft')}}
+ {{:helper.link('Reply', 'comment', {'choice' : "Message", 'target': data.active_conversation}, null, 'pdalink fixedLeftWidest')}}
+
{{else}}
@@ -38,7 +47,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\core_apps.dm
{{:helper.link(data.silent==1 ? 'Ringer: Off' : 'Ringer: On', data.silent==1 ? 'volume-off' : 'volume-up', {'choice' : "Toggle Ringer"}, null, 'pdalink fixedLeftWide')}}
{{:helper.link(data.toff==1 ? 'Messenger: Off' : 'Messenger: On',data.toff==1 ? 'close':'check', {'choice' : "Toggle Messenger"}, null, 'pdalink fixedLeftWide')}}
- {{:helper.link('Set Ringtone', 'comment', {'choice' : "Ringtone"}, null, 'pdalink fixedLeftWide')}}
+ {{:helper.link('Set Ringtone', 'bell-o', {'choice' : "Ringtone"}, null, 'pdalink fixedLeftWide')}}
{{:helper.link('Delete all Conversations', 'trash', {'choice' : "Clear", 'option' : "All"}, null, 'pdalink fixedLeftWider')}}
@@ -51,7 +60,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\core_apps.dm
{{/if}}
- {{if data.pda_count == 0}}
+ {{if !data.convopdas.length && !data.pdas.length}}
No other PDAS located
{{else}}
Current Conversations
diff --git a/nano/templates/pda_mule.tmpl b/nano/templates/pda_mule.tmpl
index cf3c5eff6f6..369d0830aa5 100644
--- a/nano/templates/pda_mule.tmpl
+++ b/nano/templates/pda_mule.tmpl
@@ -110,7 +110,7 @@
{{:helper.link('Stop', 'gear', {'radiomenu' : "1", 'op' : "stop"}, null, 'pdalink fixedLeft')}}
- {{:helper.link('Proceed', 'gear', {'radiomenu' : "1", 'op' : "go"}, null, 'pdalink fixedLeft')}}
+ {{:helper.link('Proceed', 'gear', {'radiomenu' : "1", 'op' : "start"}, null, 'pdalink fixedLeft')}}
{{:helper.link('Return Home', 'gear', {'radiomenu' : "1", 'op' : "home"}, null, 'pdalink fixedLeft')}}
diff --git a/nano/templates/virus2_creator.tmpl b/nano/templates/virus2_creator.tmpl
deleted file mode 100644
index bea02ed786a..00000000000
--- a/nano/templates/virus2_creator.tmpl
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
- Spread to:
-
-
- {{:helper.link(data.virus_target ? data.virus_target : "Random", null, {"setTarget" : 1})}}
-
-
Virus Creation
-
-
- Virus:
-
-
- {{:helper.link(data.curr_virus ? data.curr_virus : "Create", null, {"createVirus" : 1})}}
- {{:helper.link("Delete", null, {"deleteCurrVirus" : 1})}}
-
-
- Stats
-
-
- Antigen:
-
-
- {{:data.virusStats.antigen}}
-
-
-
- Spread:
-
-
- {{:data.virusStats.spreadType}}
-
-
-
- Speed:
-
-
- {{:data.virusStats.speed}}
-
-
-
- Affected Species:
-
-
- {{:data.virusStats.affectedSpecies}}
-
-
- Effects
- {{for data.virus_effects}}
-
-
- {{:helper.link(value.name, null, {"changeEffect" : value.stage})}}
-
-
- {{:helper.link("Stage: " + value.stage, null, null, null, "linkOff")}}
- {{:helper.link("Chance: " + value.chance, null, {"changeStat" : "C", "cSEffect" : value.stage})}}
- {{:helper.link("Multiplier: " + value.multiplier, null, {"changeStat" : "M", "cSEffect" : value.stage})}}
- {{:helper.link("Badness: " + value.badness, null, null, null, "linkOff")}}
-
-