"
+ o += ""
o += "[pressure]kPa"
user << o
diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index 8fb012f870..ce72c82a12 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -66,6 +66,8 @@
opacity = 0
glass = 1
assembly_type = /obj/structure/door_assembly/multi_tile
+ open_sound_powered = 'sound/machines/WideOpen.ogg'
+ close_sound_powered = 'sound/machines/WideClose.ogg'
/obj/machinery/door/airlock/multi_tile/metal
name = "Airlock"
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index 3da253e682..f8c81d386e 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -167,6 +167,9 @@
* Microwave Menu
********************/
+/obj/machinery/microwave/AltClick()//chomp edit
+ cook()
+
/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu
var/dat = ""
if(src.broken > 0)
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 048c1563b9..b853951537 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -323,11 +323,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
if(6)
dat+="ERROR: Could not submit Feed story to Network.
"
if(channel_name=="")
- dat+="•Invalid receiving channel name.
"
+ dat+="?Invalid receiving channel name.
"
if(scanned_user=="Unknown")
- dat+="•Channel author unverified.
"
+ dat+="?Channel author unverified.
"
if(msg == "" || msg == "\[REDACTED\]")
- dat+="•Invalid message body.
"
+ dat+="?Invalid message body.
"
dat+="
Return
"
if(7)
@@ -339,18 +339,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
else
existing_authors += FC.author
if(scanned_user in existing_authors)
- dat+="•There already exists a Feed channel under your name.
"
+ dat+="?There already exists a Feed channel under your name.
"
if(channel_name=="" || channel_name == "\[REDACTED\]")
- dat+="•Invalid channel name.
"
+ dat+="?Invalid channel name.
"
var/check = 0
for(var/datum/feed_channel/FC in news_network.network_channels)
if(FC.channel_name == channel_name)
check = 1
break
if(check)
- dat+="•Channel name already in use.
"
+ dat+="?Channel name already in use.
"
if(scanned_user=="Unknown")
- dat+="•Channel author unverified.
"
+ dat+="?Channel author unverified.
"
dat+="
Return
"
if(8)
var/total_num=length(news_network.network_channels)
@@ -464,11 +464,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
if(16)
dat+="ERROR: Wanted Issue rejected by Network.
"
if(channel_name=="" || channel_name == "\[REDACTED\]")
- dat+="•Invalid name for person wanted.
"
+ dat+="?Invalid name for person wanted.
"
if(scanned_user=="Unknown")
- dat+="•Issue author unverified.
"
+ dat+="?Issue author unverified.
"
if(msg == "" || msg == "\[REDACTED\]")
- dat+="•Invalid description.
"
+ dat+="?Invalid description.
"
dat+="
Return
"
if(17)
dat+="Wanted Issue successfully deleted from Circulation
"
@@ -814,7 +814,7 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob)
switch(screen)
if(0) //Cover
dat+="The Griffon
"
- dat+="[using_map.company_name]-standard newspaper, for use on [using_map.company_name]© Space Facilities
"
+ dat+="[using_map.company_name]-standard newspaper, for use on [using_map.company_name]? Space Facilities
"
if(isemptylist(news_content))
if(important_message)
dat+="Contents:
**Important Security Announcement** \[page [pages+2]\]
"
@@ -919,7 +919,7 @@ obj/item/weapon/newspaper/Topic(href, href_list)
obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/pen))
if(scribble_page == curr_page)
- user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?"
+ user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?"
else
var/s = sanitize(input(user, "Write something", "Newspaper", ""))
s = sanitize(s)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 2ad81624a3..182f4edb75 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -253,7 +253,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
if(inoperable(MAINT)) return
if(screen == RCS_MESSAUTH)
var/obj/item/weapon/stamp/T = O
- msgStamped = text("Stamped with the [T.name]")
+ msgStamped = text("Stamped with the [T.name]")
updateUsrDialog()
return
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index d55dc0bb3e..7d8afeffa6 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -95,8 +95,8 @@
dat+= "Suit storage unit: Maintenance panel"
dat+= "Maintenance panel controls
"
dat+= "The panel is ridden with controls, button and meters, labeled in strange signs and symbols that
you cannot understand. Probably the manufactoring world's language.
Among other things, a few controls catch your eye.
"
- dat+= text("A small dial with a small lambda symbol on it. It's pointing towards a gauge that reads [].
Turn towards []
",(issuperUV ? "15nm" : "185nm"),src,(issuperUV ? "185nm" : "15nm"))
- dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(safetieson? "GREEN" : "RED"),src)
+ dat+= text("A small dial with a small lambda symbol on it. It's pointing towards a gauge that reads [].
Turn towards []
",(issuperUV ? "15nm" : "185nm"),src,(issuperUV ? "185nm" : "15nm"))
+ dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.
Press button",(safetieson? "GREEN" : "RED"),src)
dat+= text("
Close panel", user)
//user << browse(dat, "window=ssu_m_panel;size=400x500")
//onclose(user, "ssu_m_panel")
@@ -110,7 +110,7 @@
else
if(!isbroken)
dat+= "Suit storage unit"
- dat+= "U-Stor-It Suit Storage Unit, model DS1900
"
+ dat+= "U-Stor-It Suit Storage Unit, model DS1900
"
dat+= "Welcome to the Unit control panel.
"
dat+= text("Helmet storage compartment: []
",(HELMET ? HELMET.name : "No helmet detected."))
if(HELMET && isopen)
@@ -402,9 +402,9 @@
if(OCCUPANT.client)
if(user != OCCUPANT)
- OCCUPANT << "The machine kicks you out!"
+ OCCUPANT << "The machine kicks you out!"
if(user.loc != src.loc)
- OCCUPANT << "You leave the not-so-cozy confines of the SSU."
+ OCCUPANT << "You leave the not-so-cozy confines of the SSU."
OCCUPANT.client.eye = OCCUPANT.client.mob
OCCUPANT.client.perspective = MOB_PERSPECTIVE
@@ -474,7 +474,7 @@
if(istype(I, /obj/item/weapon/screwdriver))
panelopen = !panelopen
playsound(src, I.usesound, 100, 1)
- user << text("You [] the unit's maintenance panel.",(panelopen ? "open up" : "close"))
+ user << text("You [] the unit's maintenance panel.",(panelopen ? "open up" : "close"))
updateUsrDialog()
return
if(istype(I, /obj/item/weapon/grab))
@@ -514,7 +514,7 @@
return
var/obj/item/clothing/suit/space/S = I
if(SUIT)
- user << "The unit already contains a suit."
+ user << "The unit already contains a suit."
return
user << "You load the [S.name] into the storage compartment."
user.drop_item()
@@ -528,7 +528,7 @@
return
var/obj/item/clothing/head/helmet/H = I
if(HELMET)
- user << "The unit already contains a helmet."
+ user << "The unit already contains a helmet."
return
user << "You load the [H.name] into the storage compartment."
user.drop_item()
@@ -542,7 +542,7 @@
return
var/obj/item/clothing/mask/M = I
if(MASK)
- user << "The unit already contains a mask."
+ user << "The unit already contains a mask."
return
user << "You load the [M.name] into the storage compartment."
user.drop_item()
diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index 2d3034573a..ab15be3316 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -44,7 +44,7 @@
defence = !defence
if(defence)
deflect_chance = defence_deflect
- src.occupant_message("You enable [src] defence mode.")
+ src.occupant_message("You enable [src] defence mode.")
else
deflect_chance = initial(deflect_chance)
src.occupant_message("You disable [src] defence mode.")
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index eadc96aadd..10423893fd 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -63,7 +63,7 @@
overload = 0
step_in = initial(step_in)
step_energy_drain = initial(step_energy_drain)
- src.occupant_message("You disable leg actuators overload.")
+ src.occupant_message("You disable leg actuators overload.")
else
overload = 1
step_in = min(1, round(step_in/2))
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index d33570cd9c..dc63664e27 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -64,7 +64,7 @@
*/
set_ready_state(0)
pr_mech_sleeper.start()
- occupant_message("[target] successfully loaded into [src]. Life support functions engaged.")
+ occupant_message("[target] successfully loaded into [src]. Life support functions engaged.")
chassis.visible_message("[chassis] loads [target] into [src].")
log_message("[target] loaded. Life support functions engaged.")
return
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 80b417da22..f60de83174 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -60,7 +60,7 @@
icon_state = "mecha_laser"
energy_drain = 30
projectile = /obj/item/projectile/beam
- fire_sound = 'sound/weapons/Laser.ogg'
+ fire_sound = 'sound/weapons/MediumLaser.ogg'
/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser
equip_cooldown = 30
@@ -69,7 +69,7 @@
icon_state = "mecha_laser"
energy_drain = 80
projectile = /obj/item/projectile/beam
- fire_sound = 'sound/weapons/Laser.ogg'
+ fire_sound = 'sound/weapons/MediumLaser.ogg'
required_type = list(/obj/mecha/combat, /obj/mecha/working)
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
@@ -78,7 +78,7 @@
icon_state = "mecha_laser"
energy_drain = 60
projectile = /obj/item/projectile/beam/heavylaser
- fire_sound = 'sound/weapons/lasercannonfire.ogg'
+ fire_sound = 'sound/weapons/LargeLaser.ogg'
/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
equip_cooldown = 40
@@ -86,7 +86,7 @@
icon_state = "mecha_ion"
energy_drain = 120
projectile = /obj/item/projectile/ion
- fire_sound = 'sound/weapons/Laser.ogg'
+ fire_sound = 'sound/weapons/IonCannon.ogg'
/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
equip_cooldown = 30
@@ -183,7 +183,7 @@
icon_state = "mecha_scatter"
equip_cooldown = 20
projectile = /obj/item/projectile/bullet/pistol/medium
- fire_sound = 'sound/weapons/Gunshot.ogg'
+ fire_sound = 'sound/weapons/LBX10.ogg'
fire_volume = 80
projectiles = 40
projectiles_per_shot = 4
@@ -195,7 +195,7 @@
icon_state = "mecha_uac2"
equip_cooldown = 10
projectile = /obj/item/projectile/bullet/pistol/medium
- fire_sound = 'sound/weapons/machinegun.ogg'
+ fire_sound = 'sound/weapons/UAC2.ogg'
projectiles = 300
projectiles_per_shot = 3
deviation = 0.3
@@ -231,7 +231,7 @@
name = "\improper SRM-8 missile rack"
icon_state = "mecha_missilerack"
projectile = /obj/item/missile
- fire_sound = 'sound/weapons/rpg.ogg'
+ fire_sound = 'sound/weapons/SRM.ogg'
projectiles = 8
projectile_energy_cost = 1000
equip_cooldown = 60
@@ -311,7 +311,7 @@
energy_drain = 30
projectile = /obj/item/projectile/bullet/incendiary/flamethrower/large
- fire_sound = 'sound/weapons/towelwipe.ogg'
+ fire_sound = 'sound/weapons/Flamer.ogg'
origin_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 6, TECH_PHORON = 4, TECH_ILLEGAL = 4)
@@ -356,4 +356,4 @@
if(!action_checks(user) || !active)
return
user.electrocute_act(shock_damage, src)
- return chassis.dynattackby(W,user)
+ return chassis.dynattackby(W,user)
\ No newline at end of file
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 360c9e1bbf..8153f95def 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -463,12 +463,12 @@
internal_damage &= ~int_dam_flag
switch(int_dam_flag)
if(MECHA_INT_TEMP_CONTROL)
- occupant_message("Life support system reactivated.")
+ occupant_message("Life support system reactivated.")
pr_int_temp_processor.start()
if(MECHA_INT_FIRE)
- occupant_message("Internal fire extinquished.")
+ occupant_message("Internal fire extinquished.")
if(MECHA_INT_TANK_BREACH)
- occupant_message("Damaged internal tank has been sealed.")
+ occupant_message("Damaged internal tank has been sealed.")
return
@@ -1668,7 +1668,7 @@
if(do_after(100))
if(T == src.loc)
src.clearInternalDamage(MECHA_INT_CONTROL_LOST)
- src.occupant_message("Recalibration successful.")
+ src.occupant_message("Recalibration successful.")
src.log_message("Recalibration of coordination system finished with 0 errors.")
else
src.occupant_message("Recalibration failed.")
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 0369b91d63..bb2adfeb39 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -74,6 +74,8 @@ var/global/list/image/splatter_cache=list()
return
if(amount < 1)
return
+ if(perp.flying) //Flap flap. Chomp edit. Thanks KasparoVy
+ return
var/obj/item/organ/external/l_foot = perp.get_organ("l_foot")
var/obj/item/organ/external/r_foot = perp.get_organ("r_foot")
diff --git a/code/game/objects/items/contraband_vr.dm b/code/game/objects/items/contraband_vr.dm
index 38276115f5..399be72e30 100644
--- a/code/game/objects/items/contraband_vr.dm
+++ b/code/game/objects/items/contraband_vr.dm
@@ -47,8 +47,7 @@
/obj/item/clothing/accessory/permit/gun,
/obj/item/device/perfect_tele,
/obj/item/device/sleevemate,
-// Chompstation Edit: Removing NIFs temporarily - Jon
-// /obj/item/weapon/disk/nifsoft/compliance,
+ /obj/item/weapon/disk/nifsoft/compliance,
/obj/item/seeds/ambrosiadeusseed,
/obj/item/seeds/ambrosiavulgarisseed,
/obj/item/seeds/libertymycelium,
diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm
index 7342988916..40ede14c67 100644
--- a/code/game/objects/items/devices/communicator/communicator.dm
+++ b/code/game/objects/items/devices/communicator/communicator.dm
@@ -221,6 +221,9 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
if(video_source)
watch_video(user)
+/obj/item/device/communicator/AltClick(mob/user) //Chomp edit.
+ attack_self(user) //wow big skill
+
// Proc: MouseDrop()
//Same thing PDAs do
/obj/item/device/communicator/MouseDrop(obj/over_object as obj)
diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm
index d7139ea535..db0e42ae52 100644
--- a/code/game/objects/items/devices/communicator/phone.dm
+++ b/code/game/objects/items/devices/communicator/phone.dm
@@ -211,14 +211,13 @@
var/list/mobs_to_relay
// Chompstation Edit: Removing NIFs temporarily - Jon
-/*
+
if(istype(comm,/obj/item/device/communicator/commlink))
var/obj/item/device/communicator/commlink/CL = comm
mobs_to_relay = list(CL.nif.human)
else
-*/
- var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display
- mobs_to_relay = in_range["mobs"]
+ var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display
+ mobs_to_relay = in_range["mobs"]
//VOREStation Edit End
for(var/mob/mob in mobs_to_relay) //We can't use visible_message(), or else we will get an infinite loop if two communicators hear each other.
@@ -242,14 +241,13 @@
//VOREStation Edit Start for commlinks
var/list/mobs_to_relay
- // Chompstation Edit: Removing NIFs temporarily - Jon
-/* if(istype(comm,/obj/item/device/communicator/commlink))
+
+ if(istype(comm,/obj/item/device/communicator/commlink))
var/obj/item/device/communicator/commlink/CL = comm
mobs_to_relay = list(CL.nif.human)
else
-*/
- var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display
- mobs_to_relay = in_range["mobs"]
+ var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display
+ mobs_to_relay = in_range["mobs"]
//VOREStation Edit End
for(var/mob/mob in mobs_to_relay)
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 055cff3284..53b2d83564 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -77,8 +77,6 @@
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
var/flashfail = 0
-//Chompstation Edit: Removing NIFs - Jon
-/*
//VOREStation Add - NIF
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -86,7 +84,7 @@
flashfail = 1
H.nif.notify("High intensity light detected, and blocked!",TRUE)
//VOREStation Add End
-*/
+
if(iscarbon(M) && !flashfail) //VOREStation Add - NIF
var/mob/living/carbon/C = M
if(C.stat != DEAD)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index d69c2c9d92..b19a2dd432 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -116,6 +116,9 @@
user.update_action_buttons()
return 1
+/obj/item/device/flashlight/AltClick(mob/user)//chomp edit
+ attack_self(user)
+
/obj/item/device/flashlight/emp_act(severity)
for(var/obj/O in contents)
O.emp_act(severity)
diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm
index dbac918609..7a7a61a234 100644
--- a/code/game/objects/items/devices/geiger.dm
+++ b/code/game/objects/items/devices/geiger.dm
@@ -58,6 +58,9 @@
update_icon()
to_chat(user, "\icon[src] You switch [scanning ? "on" : "off"] \the [src].")
+/obj/item/device/geiger/AltClick(mob/user)//chomp edit
+ attack_self(user)
+
/obj/item/device/geiger/update_icon()
if(!scanning)
icon_state = "geiger_off"
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index 8f2827c7ab..bed23c2357 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -239,7 +239,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
return
var/mob/M = usr
if(!istype(M, /mob/living/carbon))
- usr << "You don't have any DNA, or your DNA is incompatible with this device."
+ usr << "You don't have any DNA, or your DNA is incompatible with this device."
else
var/datum/dna/dna = usr.dna
pai.master = M.real_name
diff --git a/code/game/objects/items/devices/scanners_vr.dm b/code/game/objects/items/devices/scanners_vr.dm
index 89eadcefba..ba8abce75b 100644
--- a/code/game/objects/items/devices/scanners_vr.dm
+++ b/code/game/objects/items/devices/scanners_vr.dm
@@ -97,14 +97,11 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
else
output += "Unable
"
-//Chompstation Edit: Removing NIFs - Jon
-/*
//Soulcatcher transfer
if(stored_mind && H.nif)
var/datum/nifsoft/soulcatcher/SC = H.nif.imp_check(NIF_SOULCATCHER)
if(SC)
output += "Store in Soulcatcher: \[Perform\]
"
-*/
to_chat(user,output)
/obj/item/device/sleevemate/Topic(href, href_list)
@@ -131,17 +128,15 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
to_chat(usr,"Target seems totally braindead.")
return
-//Chompstation Edit: Removing NIFs - Jon
-/* var/nif
+ var/nif
if(ishuman(target))
var/mob/living/carbon/human/H = target
nif = H.nif
- persist_nif_data(H)*/
+ persist_nif_data(H)
usr.visible_message("[usr] begins scanning [target]'s mind.","You begin scanning [target]'s mind.")
if(do_after(usr,8 SECONDS,target))
-// SStranscore.m_backup(target.mind,nif,one_time = TRUE) //Chompstation Edit: Removing NIFs - Jon
- SStranscore.m_backup(target.mind,null,one_time = TRUE)
+ SStranscore.m_backup(target.mind,nif,one_time = TRUE)
to_chat(usr,"Mind backed up!")
else
to_chat(usr,"You must remain close to your target!")
@@ -184,8 +179,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
return
-//Chompstation Edit: Removing NIFs - Jon
-/*
+
if(href_list["mindput"])
if(!stored_mind)
to_chat(usr,"\The [src] no longer has a stored mind.")
@@ -212,7 +206,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
stored_mind = null
to_chat(usr,"Mind transferred into Soulcatcher!")
update_icon()
-*/
+
/obj/item/device/sleevemate/update_icon()
if(stored_mind)
diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index 5610828bfe..cfd7c33e2e 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -25,6 +25,9 @@
/obj/item/device/t_scanner/attack_self(mob/user)
set_active(!on)
+/obj/item/device/t_scanner/AltClick(mob/user)//chomp edit
+ attack_self(user)
+
/obj/item/device/t_scanner/proc/set_active(var/active)
on = active
if(on)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index c938e3f8af..cc3c89a475 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -879,6 +879,11 @@
icon_state = "beepskyplushie"
phrase = "Ping!"
+/obj/structure/plushie/silly_teshari
+ name = "teshari plushie"
+ desc = "It has a tag on the foot that says 'WHY'"
+ icon_state = "taaa_plush"
+
//Small plushies.
/obj/item/toy/plushie
name = "generic small plush"
@@ -986,11 +991,6 @@
desc = "Shiny!"
icon_state = "teshplush_rainbow"
-/obj/item/toy/plushie/silly_teshari
- name = "teshari plushie"
- desc = "It has a tag on the foot that says 'WHY'"
- icon_state = "taaa_plush"
-
//foxes are basically the best
/obj/item/toy/plushie/red_fox
diff --git a/code/game/objects/items/weapons/circuitboards/computer/computer.dm b/code/game/objects/items/weapons/circuitboards/computer/computer.dm
index 71d6e2d867..bf74062b78 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/computer.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/computer.dm
@@ -173,6 +173,11 @@
build_path = /obj/machinery/computer/shuttle_control/research
origin_tech = list(TECH_DATA = 2)
+/obj/item/weapon/circuitboard/medical_shuttle
+ name = T_BOARD("medical shuttle console")
+ build_path = /obj/machinery/computer/shuttle_control/medical
+ origin_tech = list(TECH_DATA = 2)
+
/obj/item/weapon/circuitboard/aifixer
name = T_BOARD("AI integrity restorer")
build_path = /obj/machinery/computer/aifixer
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index 749f1a08b9..7f6f4aa6e5 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -68,7 +68,7 @@
for (var/O in item_quants)
if(item_quants[O] > 0)
var/N = item_quants[O]
- dat += "[capitalize(O)]:"
+ dat += "[capitalize(O)]:"
dat += " [N] "
dat += "Vend"
dat += "
"
diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm
index ba7438a685..8e365a118a 100644
--- a/code/game/objects/items/weapons/material/shards.dm
+++ b/code/game/objects/items/weapons/material/shards.dm
@@ -69,6 +69,9 @@
if(M.buckled) //wheelchairs, office chairs, rollerbeds
return
+ if(M.flying) //Flap flap. Chomp edit. Thanks KasparoVy This is before the sound so you can fly stealthly. Plus why would there be a noise if you didn't touch.
+ return
+
playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
if(ishuman(M))
var/mob/living/carbon/human/H = M
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index ddcb722fc9..9a8937adbc 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -597,7 +597,7 @@
var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
if(!E)
return
-// if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF //Chompstation Edit: Removing NIFs - Jon
+ if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF
switch(safety)
if(1)
to_chat(usr, "Your eyes sting a little.")
diff --git a/code/game/objects/mob_spawner_chomp.dm b/code/game/objects/mob_spawner_chomp.dm
index 64c0532492..b7781518dd 100644
--- a/code/game/objects/mob_spawner_chomp.dm
+++ b/code/game/objects/mob_spawner_chomp.dm
@@ -20,3 +20,17 @@
/mob/living/simple_animal/hostile/goose = 60,
/mob/living/simple_animal/retaliate/bee = 50,
)
+
+/obj/structure/mob_spawner/scanner/mining_animals/do_spawn(var/mob_path)
+ if(!ispath(mob_path))
+ return 0
+ var/mob/living/L = new mob_path(get_turf(src))
+ L/simple_animal.vore_escape_time = 15 SECONDS
+ L.source_spawner = src
+ spawned_mobs.Add(L)
+ last_spawn = world.time
+ if(total_spawns > 0)
+ total_spawns--
+ if(mob_faction)
+ L.faction = mob_faction
+ return L
\ No newline at end of file
diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
index cb300d5278..0b2939fc69 100644
--- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm
@@ -118,3 +118,13 @@
name = "Wolfgirl Crate"
desc = "A sketchy looking crate with airholes that shakes and thuds every now and then. Someone seems to be demanding they be let out."
starts_with = list(/mob/living/simple_animal/retaliate/awoo)
+
+/obj/structure/largecrate/animal/fennec
+ name = "Fennec Crate"
+ desc = "Bounces around a lot. Looks messily packaged, were they in a hurry?"
+ starts_with = list(/mob/living/simple_animal/fennec)
+
+/obj/structure/largecrate/animal/fennec/initialize()
+ starts_with = list(pick(/mob/living/simple_animal/fennec,
+ /mob/living/simple_animal/retaliate/fennix;0.5))
+ return ..()
diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm
index ef58518e48..0680521af6 100644
--- a/code/game/objects/structures/flora/trees.dm
+++ b/code/game/objects/structures/flora/trees.dm
@@ -199,19 +199,151 @@
// Sif trees
-/obj/structure/flora/tree/sif
+/obj/structure/flora/tree/sif //CHOMP edit. The tree gives you tap.
name = "glowing tree"
desc = "It's a tree, except this one seems quite alien. It glows a deep blue."
icon = 'icons/obj/flora/deadtrees.dmi'
- icon_state = "tree_sif"
- base_state = "tree_sif"
product = /obj/item/stack/material/log/sif
+ var/obj/item/weapon/t_t = null
+ var/tap = 0 //Variable used to start production or stop it.
+ var/sap = 1 //The actual liquid. Trees aren't reagents containers so i hacked this quickly.
+ var/sap_amount = 0 //Placeholder. Actually important.
+ var/sap_type = 1//this is a sort of variable used for appearance and reagent selection.
+
+/obj/structure/flora/tree/sif/attackby(var/obj/item/weapon/I, var/mob/user)
+ if(istype(I, /obj/item/weapon/reagent_containers/))
+ if(!tap)
+ user << "There is no tap in \the [src]."
+ return
+ if(!sap && tap)
+ user << "There is no sap in \the [src]."
+ return
+ if(sap && tap)
+ if(sap_type == 1)
+ var/obj/item/weapon/reagent_containers/G = I
+ var/transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, sap)
+ sap -= transferred
+ G.reagents.add_reagent("phoron", transferred)//badly done yeah. Ideally, you would have a list of reagents to pull from then to add.
+ G.reagents.add_reagent("bluesap", transferred)
+ sap_amount = transferred * 2
+ user.visible_message("[user] collects [sap_amount] from \the [src] into \the [G].", "You collect [sap_amount] units of sap from \the [src] into \the [G].")
+ return 1
+ if(sap_type == 2)
+ var/obj/item/weapon/reagent_containers/G = I
+ var/transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, sap)
+ sap -= transferred
+ G.reagents.add_reagent("phoron", transferred)
+ G.reagents.add_reagent("purplesap", transferred)
+ sap_amount = transferred * 2
+ user.visible_message("[user] collects [sap_amount] from \the [src] into \the [G].", "You collect [sap_amount] units of sap from \the [src] into \the [G].")
+ return 1
+ if(sap_type == 3)
+ var/obj/item/weapon/reagent_containers/G = I
+ var/transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, sap)
+ sap -= transferred
+ G.reagents.add_reagent("phoron", transferred)
+ G.reagents.add_reagent("orangesap", transferred)
+ sap_amount = transferred * 2
+ user.visible_message("[user] collects [sap_amount] from \the [src] into \the [G].", "You collect [sap_amount] units of sap from \the [src] into \the [G].")
+ return 1
+
+ if(istype(I, /obj/item/weapon/tree_tap))
+ if(!tap)
+ user.drop_item()
+ I.loc = src
+ t_t = I
+ user << "You install a tap in [src]."
+ tap = 1
+ produce_sap()
+ else
+ user << "[src] already has a tap."
+ return 1
+
+ visible_message("\The [user] hits \the [src] with \the [I]!")
+
+ var/damage_to_do = I.force
+ if(!I.sharp && !I.edge)
+ damage_to_do = round(damage_to_do / 4)
+ if(damage_to_do > 0)
+ if(I.sharp && I.edge)
+ playsound(get_turf(src), 'sound/effects/woodcutting.ogg', 50, 1)
+ else
+ playsound(get_turf(src), I.hitsound, 50, 1)
+ if(damage_to_do > 5)
+ adjust_health(-damage_to_do)
+ else
+ to_chat(user, "\The [I] is ineffective at harming \the [src].")
+
+ hit_animation()
+ user.setClickCooldown(user.get_attack_speed(I))
+ user.do_attack_animation(src)
+
+/obj/structure/flora/tree/sif/attack_hand(mob/user as mob)
+ if(tap == 1)
+ user.put_in_hands(t_t)
+ t_t = null
+ user << "You remove the tap from [src]."
+ tap = 0
+ return
+
+/obj/structure/flora/tree/sif/proc/produce_sap()
+ if(tap)
+ sap = (sap + 0.01)
+ return
+
+/obj/structure/flora/tree/sif/process()
+ produce_sap()
+
+/obj/structure/flora/tree/sif/examine(mob/user)
+ if(!..(user, 1))
+ return
+ if(tap)
+ user <<"[src] has a tap wedged in."
+ if(!tap)
+ user <<"[src] looks health and normal."
+
+/* if(sap_type == 1)//Debug stuff. Don't turn on.
+ user <<"[src] 1"
+ if(sap_type == 2)
+ user <<"[src] 2"
+ if(sap_type == 3)
+ user <<"[src] 3"
+*/
/obj/structure/flora/tree/sif/New()
+ sap_type = rand(1,3)
+// ..()
+// processing_objects |= src
+ if(sap_type == 1)//first sap
+ icon_state = "tree_sif1"
+ desc = "It's a tree, except this one seems quite alien. It glows a deep blue."
+ if(sap_type == 2)//second sap
+ icon_state = "tree_sif2"
+ desc = "It's a tree, except this one seems quite alien. It glows a deep violet."
+ if(sap_type == 3)//third sap
+ icon_state = "tree_sif3"
+ desc = "It's a tree, except this one seems quite alien. It glows a low brownish orange."
+// else
+// icon_state = "tree_sif"
update_icon()
+ processing_objects |= src
/obj/structure/flora/tree/sif/update_icon()
- set_light(5, 1, "#33ccff")
+ if(sap_type == 1)
+ set_light(5, 1, "#33ccff")//first sap
+ if(sap_type == 2)
+ set_light(5, 1, "#7a48a0")//second sap
+ if(sap_type == 3)
+ set_light(5, 1, "#e9955c")//third sap
var/image/glow = image(icon = 'icons/obj/flora/deadtrees.dmi', icon_state = "[icon_state]_glow")
glow.plane = PLANE_LIGHTING_ABOVE
+ //debug_glow = glow
overlays = list(glow)
+
+/obj/item/weapon/tree_tap//I put it here because where else?
+ name = "Tree Tap"
+ desc = "A small metal tap with a crude faucet. Sturdy enough to be rammed in a tree."
+ icon = 'icons/obj/flora/deadtrees.dmi'
+ icon_state = "treetap0"
+ w_class = ITEMSIZE_SMALL
+ force = 3
\ No newline at end of file
diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm
index e87dc1b24f..727dcbb9f4 100644
--- a/code/game/objects/structures/trash_pile.dm
+++ b/code/game/objects/structures/trash_pile.dm
@@ -230,13 +230,13 @@
prob(2);/obj/item/weapon/storage/box/syndie_kit/spy,
prob(2);/obj/item/weapon/grenade/anti_photon,
prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
-// prob(1);/obj/item/device/nif/bad, //Chompstation Edit: Removing NIFs - Jon
+ prob(1);/obj/item/device/nif/bad,
prob(1);/obj/item/device/radio_jammer,
prob(1);/obj/item/device/sleevemate,
prob(1);/obj/item/device/bodysnatcher,
prob(1);/obj/item/weapon/beartrap,
prob(1);/obj/item/weapon/cell/hyper/empty,
-// prob(1);/obj/item/weapon/disk/nifsoft/compliance, //Chompstation Edit: Removing NIFs - Jon
+ prob(1);/obj/item/weapon/disk/nifsoft/compliance,
prob(1);/obj/item/weapon/material/knife/tacknife,
prob(1);/obj/item/weapon/reagent_containers/syringe/steroid)
diff --git a/code/game/objects/stumble_into_vr.dm b/code/game/objects/stumble_into_vr.dm
index f1612be040..5c5f32480e 100644
--- a/code/game/objects/stumble_into_vr.dm
+++ b/code/game/objects/stumble_into_vr.dm
@@ -7,6 +7,8 @@
M.stop_flying()
/obj/structure/table/stumble_into(mob/living/M)
+ if(M.flying && !(M.confused || M.is_blind())) //If you're not flying, or you're flying confused/blind, take the tumble.
+ return
var/obj/occupied = turf_is_crowded()
if(occupied)
return ..()
@@ -45,6 +47,7 @@
M.Weaken(5)
M.stop_flying()
+//Morgue thing.
/obj/structure/m_tray/stumble_into(mob/living/M)
playsound(get_turf(src), 'sound/weapons/tablehit1.ogg', 25, 1, -1)
visible_message("[M] flopped onto \the [src]!")
@@ -69,6 +72,8 @@
M.stop_flying()
/obj/structure/railing/stumble_into(mob/living/M)
+ if(M.flying && !(M.confused || M.is_blind())) //If you're not flying, or you're flying confused/blind, take the tumble.
+ return
var/obj/occupied = turf_is_crowded()
if(occupied)
return ..()
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index e4b762d733..4d6368bdcb 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -97,7 +97,7 @@
return ..()
/mob/living/proc/check_submerged()
- if(buckled)
+ if(buckled || flying) //Chomp edit. Thanks kasparoVy
return 0
var/turf/simulated/floor/water/T = loc
if(istype(T))
diff --git a/code/game/verbs/advanced_who.dm b/code/game/verbs/advanced_who.dm
index 855c70dafa..bd176074b3 100644
--- a/code/game/verbs/advanced_who.dm
+++ b/code/game/verbs/advanced_who.dm
@@ -60,7 +60,7 @@
if(isobserver(O))
entry += " - Observing"
else if(istype(O,/mob/new_player))
- entry += " - In Lobby"
+ entry += " - In Lobby"
else
entry += " - Playing"
Lines += entry
@@ -70,7 +70,7 @@
if(isobserver(O)) //Woo, players can see
entry += " - Observing"
else if(istype(O,/mob/new_player))
- entry += " - In Lobby"
+ entry += " - In Lobby"
else
entry += " - Playing"
Lines += entry
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 330ad9c322..84eb9fe853 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -12,6 +12,11 @@
src << "Guests may not use OOC."
return
+ //Chompstation ADD
+ if((copytext(msg, 1, 2) in list(".",";",":","#")) || (findtext(lowertext(copytext(msg, 1, 5)), "say")))
+ if(alert("Your message \"[msg]\" looks like it was meant for in game communication, say it in OOC?", "Meant for OOC?", "No", "Yes") != "Yes")
+ return
+
msg = sanitize(msg)
if(!msg) return
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 06402a90a4..f98bccf88b 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -22,9 +22,9 @@
if(O.started_as_observer)
entry += " - Observing"
else
- entry += " - DEAD"
+ entry += " - DEAD"
else
- entry += " - DEAD"
+ entry += " - DEAD"
var/age
if(isnum(C.player_age))
diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm
index e4d2298ace..6c053321ad 100644
--- a/code/modules/admin/DB ban/functions.dm
+++ b/code/modules/admin/DB ban/functions.dm
@@ -82,7 +82,7 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
var/sql = "INSERT INTO erro_ban (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], [(rounds)?"[rounds]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', '[ip]', '[a_ckey]', '[a_computerid]', '[a_ip]', '[who]', '[adminwho]', '', null, null, null, null, null)"
var/DBQuery/query_insert = dbcon.NewQuery(sql)
query_insert.Execute()
- usr << "Ban saved to database."
+ usr << "Ban saved to database."
message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.",1)
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index e28c4fd570..d0d82259b9 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -7,13 +7,13 @@ world/IsBanned(key,address,computer_id)
//Guest Checking
if(!config.guests_allowed && IsGuestKey(key))
log_adminwarn("Failed Login: [key] - Guests not allowed")
- message_admins("Failed Login: [key] - Guests not allowed")
+ message_admins("Failed Login: [key] - Guests not allowed")
return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
//check if the IP address is a known TOR node
if(config && config.ToRban && ToRban_isbanned(address))
log_adminwarn("Failed Login: [src] - Banned: ToR")
- message_admins("Failed Login: [src] - Banned: ToR")
+ message_admins("Failed Login: [src] - Banned: ToR")
//ban their computer_id and ckey for posterity
AddBan(ckey(key), computer_id, "Use of ToR", "Automated Ban", 0, 0)
return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [config.banappeals]")
@@ -25,7 +25,7 @@ world/IsBanned(key,address,computer_id)
. = CheckBan( ckey(key), computer_id, address )
if(.)
log_adminwarn("Failed Login: [key] [computer_id] [address] - Banned [.["reason"]]")
- message_admins("Failed Login: [key] id:[computer_id] ip:[address] - Banned [.["reason"]]")
+ message_admins("Failed Login: [key] id:[computer_id] ip:[address] - Banned [.["reason"]]")
return .
return ..() //default pager ban stuff
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 0b3899ad99..953941de99 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -168,7 +168,7 @@ var/savefile/Banlist
/datum/admins/proc/unbanpanel()
var/count = 0
var/dat
- //var/dat = "
Unban Player: (U) = Unban , (E) = Edit Ban (Total
"
+ //var/dat = "
Unban Player: (U) = Unban , (E) = Edit Ban (Total
"
Banlist.cd = "/base"
for (var/A in Banlist.dir)
count++
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 0a2feaf850..d6eae136bf 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -403,21 +403,21 @@ proc/admin_notice(var/message, var/rights)
if(6)
dat+="ERROR: Could not submit Feed story to Network.
"
if(src.admincaster_feed_channel.channel_name=="")
- dat+="•Invalid receiving channel name.
"
+ dat+="??Invalid receiving channel name.
"
if(src.admincaster_feed_message.body == "" || src.admincaster_feed_message.body == "\[REDACTED\]")
- dat+="•Invalid message body.
"
+ dat+="??Invalid message body.
"
dat+="
Return
"
if(7)
dat+="ERROR: Could not submit Feed Channel to Network.
"
if(src.admincaster_feed_channel.channel_name =="" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]")
- dat+="•Invalid channel name.
"
+ dat+="??Invalid channel name.
"
var/check = 0
for(var/datum/feed_channel/FC in news_network.network_channels)
if(FC.channel_name == src.admincaster_feed_channel.channel_name)
check = 1
break
if(check)
- dat+="•Channel name already in use.
"
+ dat+="??Channel name already in use.
"
dat+="
Return
"
if(9)
dat+="[src.admincaster_feed_channel.channel_name]: \[created by: [src.admincaster_feed_channel.author]\]
"
@@ -531,9 +531,9 @@ proc/admin_notice(var/message, var/rights)
if(16)
dat+="ERROR: Wanted Issue rejected by Network.
"
if(src.admincaster_feed_message.author =="" || src.admincaster_feed_message.author == "\[REDACTED\]")
- dat+="•Invalid name for person wanted.
"
+ dat+="??Invalid name for person wanted.
"
if(src.admincaster_feed_message.body == "" || src.admincaster_feed_message.body == "\[REDACTED\]")
- dat+="•Invalid description.
"
+ dat+="??Invalid description.
"
dat+="
Return
"
if(17)
dat+={"
@@ -877,7 +877,7 @@ var/datum/announcement/minor/admin_min_announcer = new
ticker.current_state = GAME_STATE_SETTING_UP
Master.SetRunLevel(RUNLEVEL_SETUP)
log_admin("[usr.key] has started the game.")
- message_admins("[usr.key] has started the game.")
+ message_admins("[usr.key] has started the game.")
feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return 1
else
@@ -894,7 +894,7 @@ var/datum/announcement/minor/admin_min_announcer = new
else
world << "New players may now enter the game."
log_admin("[key_name(usr)] toggled new player game entering.")
- message_admins("[key_name_admin(usr)] toggled new player game entering.", 1)
+ message_admins("[key_name_admin(usr)] toggled new player game entering.", 1)
world.update_status()
feedback_add_details("admin_verb","TE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -920,7 +920,7 @@ var/datum/announcement/minor/admin_min_announcer = new
world << "You may now respawn."
else
world << "You may no longer respawn :("
- message_admins("[key_name_admin(usr)] toggled respawn to [config.abandon_allowed ? "On" : "Off"].", 1)
+ message_admins("[key_name_admin(usr)] toggled respawn to [config.abandon_allowed ? "On" : "Off"].", 1)
log_admin("[key_name(usr)] toggled respawn to [config.abandon_allowed ? "On" : "Off"].")
world.update_status()
feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -952,7 +952,7 @@ var/datum/announcement/minor/admin_min_announcer = new
if (!ticker || ticker.current_state != GAME_STATE_PREGAME)
ticker.delay_end = !ticker.delay_end
log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
- message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
+ message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
return //alert("Round end delayed", null, null, null, null, null)
round_progressing = !round_progressing
if (!round_progressing)
@@ -968,7 +968,7 @@ var/datum/announcement/minor/admin_min_announcer = new
set desc="Toggle admin jumping"
set name="Toggle Jump"
config.allow_admin_jump = !(config.allow_admin_jump)
- message_admins("Toggled admin jumping to [config.allow_admin_jump].")
+ message_admins("Toggled admin jumping to [config.allow_admin_jump].")
feedback_add_details("admin_verb","TJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/adspawn()
@@ -976,7 +976,7 @@ var/datum/announcement/minor/admin_min_announcer = new
set desc="Toggle admin spawning"
set name="Toggle Spawn"
config.allow_admin_spawning = !(config.allow_admin_spawning)
- message_admins("Toggled admin item spawning to [config.allow_admin_spawning].")
+ message_admins("Toggled admin item spawning to [config.allow_admin_spawning].")
feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/adrev()
@@ -984,7 +984,7 @@ var/datum/announcement/minor/admin_min_announcer = new
set desc="Toggle admin revives"
set name="Toggle Revive"
config.allow_admin_rev = !(config.allow_admin_rev)
- message_admins("Toggled reviving to [config.allow_admin_rev].")
+ message_admins("Toggled reviving to [config.allow_admin_rev].")
feedback_add_details("admin_verb","TAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/immreboot()
@@ -994,7 +994,7 @@ var/datum/announcement/minor/admin_min_announcer = new
if(!usr.client.holder) return
if( alert("Reboot server?",,"Yes","No") == "No")
return
- world << "Rebooting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!"
+ world << "Rebooting world! Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key]!"
log_admin("[key_name(usr)] initiated an immediate reboot.")
feedback_set_details("end_error","immediate admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]")
@@ -1258,7 +1258,7 @@ var/datum/announcement/minor/admin_min_announcer = new
else
world << "Guests may now enter the game."
log_admin("[key_name(usr)] toggled guests game entering [config.guests_allowed?"":"dis"]allowed.")
- message_admins("[key_name_admin(usr)] toggled guests game entering [config.guests_allowed?"":"dis"]allowed.", 1)
+ message_admins("[key_name_admin(usr)] toggled guests game entering [config.guests_allowed?"":"dis"]allowed.", 1)
feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/output_ai_laws()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 839da18d4d..59e1e268ca 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -102,7 +102,7 @@ var/list/admin_verbs_admin = list(
/client/proc/toggle_attack_logs,
/datum/admins/proc/paralyze_mob,
/client/proc/fixatmos,
-// /datum/admins/proc/quick_nif, //VOREStation Add, //Chompstation Edit: Removing NIFs - Jon,
+ /datum/admins/proc/quick_nif, //VOREStation Add,
/datum/admins/proc/sendFax,
/client/proc/despawn_player
)
@@ -140,7 +140,7 @@ var/list/admin_verbs_fun = list(
)
var/list/admin_verbs_spawn = list(
-// /datum/admins/proc/quick_nif, //CHOMPStation Add, //Chompstation Edit: Removing NIFs - Jon,
+ /datum/admins/proc/quick_nif, //CHOMPStation Add,
/datum/admins/proc/spawn_fruit,
/datum/admins/proc/spawn_custom_item,
/datum/admins/proc/check_custom_items,
@@ -347,7 +347,7 @@ var/list/admin_verbs_mod = list(
/client/proc/cmd_admin_subtle_message, //send an message to somebody as a 'voice in their head',
/datum/admins/proc/paralyze_mob,
/client/proc/cmd_admin_direct_narrate,
-// /datum/admins/proc/quick_nif, //Chompstation Edit: Removing NIFs - Jon,
+ /datum/admins/proc/quick_nif,
/client/proc/allow_character_respawn, // Allows a ghost to respawn ,
/datum/admins/proc/sendFax,
/client/proc/giveruntimelog, //allows us to give access to runtime logs to somebody,
@@ -376,7 +376,7 @@ var/list/admin_verbs_event_manager = list(
/datum/admins/proc/paralyze_mob,
/client/proc/cmd_admin_direct_narrate,
/client/proc/cmd_admin_world_narrate, //sends text to all players with no padding,
-// /datum/admins/proc/quick_nif, //CHOMPStation Add, //Chompstation Edit: Removing NIFs - Jon,
+ /datum/admins/proc/quick_nif, //CHOMPStation Add,
/client/proc/allow_character_respawn,
/datum/admins/proc/sendFax,
/client/proc/respawn_character,
@@ -535,7 +535,7 @@ var/list/admin_verbs_event_manager = list(
mob.alpha = max(mob.alpha + 100, 255)
else
mob.invisibility = INVISIBILITY_OBSERVER
- mob << "Invisimin on. You are now as invisible as a ghost."
+ mob << "Invisimin on. You are now as invisible as a ghost."
mob.alpha = max(mob.alpha - 100, 0)
@@ -701,7 +701,7 @@ var/list/admin_verbs_event_manager = list(
var/light_impact_range = input("Light impact range (in tiles):") as num
var/flash_range = input("Flash range (in tiles):") as num
explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range)
- message_admins("[ckey] creating an admin explosion at [epicenter.loc].")
+ message_admins("[ckey] creating an admin explosion at [epicenter.loc].")
feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/give_disease2(mob/T as mob in mob_list) // -- Giacom
@@ -733,7 +733,7 @@ var/list/admin_verbs_event_manager = list(
feedback_add_details("admin_verb","GD2") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] gave [key_name(T)] a [greater] disease2 with infection chance [D.infectionchance].")
- message_admins("[key_name_admin(usr)] gave [key_name(T)] a [greater] disease2 with infection chance [D.infectionchance].", 1)
+ message_admins("[key_name_admin(usr)] gave [key_name(T)] a [greater] disease2 with infection chance [D.infectionchance].", 1)
/client/proc/admin_give_modifier(var/mob/living/L)
set category = "Debug"
@@ -770,7 +770,7 @@ var/list/admin_verbs_event_manager = list(
for (var/mob/V in hearers(O))
V.show_message(message, 2)
log_admin("[key_name(usr)] made [O] at [O.x], [O.y], [O.z]. make a sound")
- message_admins("[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. make a sound.", 1)
+ message_admins("[key_name_admin(usr)] made [O] at [O.x], [O.y], [O.z]. make a sound.", 1)
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -804,7 +804,7 @@ var/list/admin_verbs_event_manager = list(
usr << "Disabled air processing."
feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] used 'kill air'.")
- message_admins("[key_name_admin(usr)] used 'kill air'.", 1)
+ message_admins("[key_name_admin(usr)] used 'kill air'.", 1)
/client/proc/readmin_self()
set name = "Re-Admin self"
@@ -1068,7 +1068,7 @@ var/list/admin_verbs_event_manager = list(
T << "Move on."
log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.")
- message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.", 1)
+ message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.", 1)
/client/proc/global_man_up()
set category = "Fun"
@@ -1082,7 +1082,7 @@ var/list/admin_verbs_event_manager = list(
T << 'sound/voice/ManUp1.ogg'
log_admin("[key_name(usr)] told everyone to man up and deal with it.")
- message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.", 1)
+ message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.", 1)
/client/proc/give_spell(mob/T as mob in mob_list) // -- Urist
set category = "Fun"
@@ -1093,4 +1093,4 @@ var/list/admin_verbs_event_manager = list(
T.spell_list += new S
feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].")
- message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1)
+ message_admins("[key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1)
diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index 3af71a74f2..8d2b8072f0 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -15,7 +15,7 @@
var/quick_create_object_html = null
var/pathtext = null
- pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item/weapon","/obj/item/clothing","/obj/machinery","/obj/mecha","/obj/item/weapon/storage/box/fluff") //VOREStation Edit
+ pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item/weapon","/obj/item/clothing","/obj/machinery","/obj/fiftyspawner","/obj/mecha","/obj/item/weapon/storage/box/fluff") //VOREStation Edit
if(!pathtext)
return
var path = text2path(pathtext)
diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm
index 0c3e560f78..310a3c73bc 100644
--- a/code/modules/admin/newbanjob.dm
+++ b/code/modules/admin/newbanjob.dm
@@ -206,7 +206,7 @@ var/savefile/Banlistjob
/datum/admins/proc/unjobbanpanel()
var/count = 0
var/dat
- //var/dat = "
Unban Player: (U) = Unban , (E) = Edit Ban (Total
>"
+ //var/dat = "
Unban Player: (U) = Unban , (E) = Edit Ban (Total
>"
Banlistjob.cd = "/base"
for (var/A in Banlistjob.dir)
count++
@@ -226,7 +226,7 @@ var/savefile/Banlistjob
else
M << "No ban appeals URL has been set."
log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.")
- message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.")
+ message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.")
/datum/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job))
M << "You have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason]."
@@ -236,7 +236,7 @@ var/savefile/Banlistjob
else
M << "No ban appeals URL has been set."
log_admin("[usr.client.ckey] has jobbanned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
- message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")*/
+ message_admins("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")*/
//////////////////////////////////// DEBUG ////////////////////////////////////
/proc/CreateBansjob()
diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm
index d0cc5518c7..505eee2e7e 100644
--- a/code/modules/admin/permissionverbs/permissionedit.dm
+++ b/code/modules/admin/permissionverbs/permissionedit.dm
@@ -85,14 +85,14 @@
insert_query.Execute()
var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added new admin [adm_ckey] to rank [new_rank]');")
log_query.Execute()
- usr << "New admin added."
+ usr << "New admin added."
else
if(!isnull(admin_id) && isnum(admin_id))
var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET rank = '[new_rank]' WHERE id = [admin_id]")
insert_query.Execute()
var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Edited the rank of [adm_ckey] to [new_rank]');")
log_query.Execute()
- usr << "Admin rank changed."
+ usr << "Admin rank changed."
/datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission)
if(config.admin_legacy_system) return
@@ -140,10 +140,10 @@
insert_query.Execute()
var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Removed permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]');")
log_query.Execute()
- usr << "Permission removed."
+ usr << "Permission removed."
else //This admin doesn't have this permission, so we are adding it.
var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET flags = '[admin_rights | new_permission]' WHERE id = [admin_id]")
insert_query.Execute()
var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]')")
log_query.Execute()
- usr << "Permission added."
\ No newline at end of file
+ usr << "Permission added."
\ No newline at end of file
diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm
index dee9a69366..b20d34f329 100644
--- a/code/modules/admin/player_notes.dm
+++ b/code/modules/admin/player_notes.dm
@@ -103,7 +103,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
infos += P
info << infos
- message_admins("[key_name_admin(user)] has edited [key]'s notes.")
+ message_admins("[key_name_admin(user)] has edited [key]'s notes.")
log_admin("[key_name(user)] has edited [key]'s notes.")
del(info) // savefile, so NOT qdel
@@ -128,7 +128,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
infos.Remove(item)
info << infos
- message_admins("[key_name_admin(usr)] deleted one of [key]'s notes.")
+ message_admins("[key_name_admin(usr)] deleted one of [key]'s notes.")
log_admin("[key_name(usr)] deleted one of [key]'s notes.")
qdel(info)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index f92bae98fb..c61ee1bb7f 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -197,7 +197,7 @@
if (emergency_shuttle.can_call())
emergency_shuttle.call_evac()
log_admin("[key_name(usr)] called the Emergency Shuttle")
- message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1)
+ message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1)
if("2")
if (!( ticker ) || !emergency_shuttle.location())
@@ -205,12 +205,12 @@
if (emergency_shuttle.can_call())
emergency_shuttle.call_evac()
log_admin("[key_name(usr)] called the Emergency Shuttle")
- message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1)
+ message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station.", 1)
else if (emergency_shuttle.can_recall())
emergency_shuttle.recall()
log_admin("[key_name(usr)] sent the Emergency Shuttle back")
- message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back.", 1)
+ message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back.", 1)
href_list["secretsadmin"] = "check_antagonist"
@@ -223,14 +223,14 @@
emergency_shuttle.launch_time = world.time + new_time_left*10
log_admin("[key_name(usr)] edited the Emergency Shuttle's launch time to [new_time_left]")
- message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's launch time to [new_time_left*10]", 1)
+ message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's launch time to [new_time_left*10]", 1)
else if (emergency_shuttle.shuttle.has_arrive_time())
var/new_time_left = input("Enter new shuttle arrival time (seconds):","Edit Shuttle Arrival Time", emergency_shuttle.estimate_arrival_time() ) as num
emergency_shuttle.shuttle.arrive_time = world.time + new_time_left*10
log_admin("[key_name(usr)] edited the Emergency Shuttle's arrival time to [new_time_left]")
- message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's arrival time to [new_time_left*10]", 1)
+ message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's arrival time to [new_time_left*10]", 1)
else
alert("The shuttle is neither counting down to launch nor is it in transit. Please try again when it is.")
@@ -241,7 +241,7 @@
ticker.delay_end = !ticker.delay_end
log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
- message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
+ message_admins("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
href_list["secretsadmin"] = "check_antagonist"
else if(href_list["simplemake"])
@@ -259,7 +259,7 @@
if("Yes") delmob = 1
log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]")
- message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]", 1)
+ message_admins("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [href_list["simplemake"]]; deletemob=[delmob]", 1)
switch(href_list["simplemake"])
if("observer") M.change_mob_type( /mob/observer/dead , null, null, delmob )
@@ -339,7 +339,7 @@
log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
- message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1)
+ message_admins("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1)
Banlist.cd = "/base/[banfolder]"
Banlist["reason"] << reason
Banlist["temp"] << temp
@@ -711,7 +711,7 @@
else
msg += ", [job]"
notes_add(M.ckey, "Banned from [msg] - [reason]", usr)
- message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1)
+ message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1)
M << "You have been jobbanned by [usr.client.ckey] from: [msg]."
M << "The reason is: [reason]"
M << "This jobban will be lifted in [mins] minutes."
@@ -732,7 +732,7 @@
if(!msg) msg = job
else msg += ", [job]"
notes_add(M.ckey, "Banned from [msg] - [reason]", usr)
- message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1)
+ message_admins("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1)
M << "You have been jobbanned by [usr.client.ckey] from: [msg]."
M << "The reason is: [reason]"
M << "Jobban can be lifted only upon request."
@@ -765,7 +765,7 @@
else
continue
if(msg)
- message_admins("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1)
+ message_admins("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1)
M << "You have been un-jobbanned by [usr.client.ckey] from [msg]."
href_list["jobban2"] = 1 // lets it fall through and refresh
return 1
@@ -782,7 +782,7 @@
else
M << "You have been kicked from the server: [reason]"
log_admin("[key_name(usr)] booted [key_name(M)].")
- message_admins("[key_name_admin(usr)] booted [key_name_admin(M)].", 1)
+ message_admins("[key_name_admin(usr)] booted [key_name_admin(M)].", 1)
//M.client = null
qdel(M.client)
@@ -793,7 +793,7 @@
if(t)
if((alert("Do you want to unjobban [t]?","Unjobban confirmation", "Yes", "No") == "Yes") && t) //No more misclicks! Unless you do it twice.
log_admin("[key_name(usr)] removed [t]")
- message_admins("[key_name_admin(usr)] removed [t]", 1)
+ message_admins("[key_name_admin(usr)] removed [t]", 1)
jobban_remove(t)
href_list["ban"] = 1 // lets it fall through and refresh
var/t_split = splittext(t, " - ")
@@ -840,7 +840,7 @@
else
M << "No ban appeals URL has been set."
log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
- message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
+ message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
qdel(M.client)
//qdel(M) // See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends.
@@ -864,7 +864,7 @@
ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.")
notes_add(M.ckey,"[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.",usr)
log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
- message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
+ message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
feedback_inc("ban_perma",1)
DB_ban_record(BANTYPE_PERMA, M, -1, reason)
@@ -920,8 +920,8 @@
return alert(usr, "The game has already started.", null, null, null, null)
master_mode = href_list["c_mode2"]
log_admin("[key_name(usr)] set the mode as [config.mode_names[master_mode]].")
- message_admins("[key_name_admin(usr)] set the mode as [config.mode_names[master_mode]].", 1)
- world << "The mode is now: [config.mode_names[master_mode]]"
+ message_admins("[key_name_admin(usr)] set the mode as [config.mode_names[master_mode]].", 1)
+ world << "The mode is now: [config.mode_names[master_mode]]"
Game() // updates the main game menu
world.save_mode(master_mode)
.(href, list("c_mode"=1))
@@ -935,7 +935,7 @@
return alert(usr, "The game mode has to be secret!", null, null, null, null)
secret_force_mode = href_list["f_secret2"]
log_admin("[key_name(usr)] set the forced secret mode as [secret_force_mode].")
- message_admins("[key_name_admin(usr)] set the forced secret mode as [secret_force_mode].", 1)
+ message_admins("[key_name_admin(usr)] set the forced secret mode as [secret_force_mode].", 1)
Game() // updates the main game menu
.(href, list("f_secret"=1))
@@ -948,7 +948,7 @@
return
log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]")
- message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]", 1)
+ message_admins("[key_name_admin(usr)] attempting to monkeyize [key_name_admin(H)]", 1)
H.monkeyize()
else if(href_list["corgione"])
@@ -960,7 +960,7 @@
return
log_admin("[key_name(usr)] attempting to corgize [key_name(H)]")
- message_admins("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)]", 1)
+ message_admins("[key_name_admin(usr)] attempting to corgize [key_name_admin(H)]", 1)
H.corgize()
else if(href_list["forcespeech"])
@@ -975,7 +975,7 @@
M.say(speech)
speech = sanitize(speech) // Nah, we don't trust them
log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]")
- message_admins("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]")
+ message_admins("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]")
else if(href_list["sendtoprison"])
if(!check_rights(R_ADMIN)) return
@@ -1015,7 +1015,7 @@
M << "You have been sent to the prison station!"
log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.")
- message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1)
+ message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1)
else if(href_list["tdome1"])
if(!check_rights(R_FUN)) return
@@ -1038,7 +1038,7 @@
sleep(5)
M.loc = pick(tdome1)
spawn(50)
- M << "You have been sent to the Thunderdome."
+ M << "You have been sent to the Thunderdome."
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1)
@@ -1063,7 +1063,7 @@
sleep(5)
M.loc = pick(tdome2)
spawn(50)
- M << "You have been sent to the Thunderdome."
+ M << "You have been sent to the Thunderdome."
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1)
@@ -1085,7 +1085,7 @@
sleep(5)
M.loc = pick(tdomeadmin)
spawn(50)
- M << "You have been sent to the Thunderdome."
+ M << "You have been sent to the Thunderdome."
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1)
@@ -1114,7 +1114,7 @@
sleep(5)
M.loc = pick(tdomeobserve)
spawn(50)
- M << "You have been sent to the Thunderdome."
+ M << "You have been sent to the Thunderdome."
log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1)
@@ -1323,7 +1323,7 @@
log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]")
message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]")
feedback_inc("admin_cookies_spawned",1)
- H << "Your prayers have been answered!! You received the best cookie!"
+ H << "Your prayers have been answered!! You received the best cookie!"
else if(href_list["adminsmite"])
if(!check_rights(R_ADMIN|R_FUN)) return
diff --git a/code/modules/admin/verbs/SDQL.dm b/code/modules/admin/verbs/SDQL.dm
index 969e5cd47c..d17863fbf5 100644
--- a/code/modules/admin/verbs/SDQL.dm
+++ b/code/modules/admin/verbs/SDQL.dm
@@ -262,7 +262,7 @@
- usr << "SQDL Query: [query_text]"
+ usr << "SQDL Query: [query_text]"
message_admins("[usr] executed SDQL query: \"[query_text]\".")
/*
for(var/t in types)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index c843255f85..42ecca5138 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -77,7 +77,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
mobs_found += found
if(!ai_found && isAI(found))
ai_found = 1
- msg += "[original_word] (?) "
+ msg += "[original_word] (?) "
continue
msg += "[original_word] "
@@ -91,7 +91,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
//Options bar: mob, details ( admin = 2, dev = 3, event manager = 4, character name (0 = just ckey, 1 = ckey and character name), link? (0 no don't make it a link, 1 do so),
// highlight special roles (0 = everyone has same looking name, 1 = antags / special roles get a golden name)
- msg = "Request for Help: [get_options_bar(mob, 2, 1, 1)][ai_cl] [msg]"
+ msg = "Request for Help: [get_options_bar(mob, 2, 1, 1)][ai_cl] [msg]"
var/admin_number_afk = 0
@@ -104,7 +104,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
X << 'sound/effects/adminhelp.ogg'
//show it to the person adminhelping too
- src << "PM to-Staff : [original_msg]"
+ src << "PM to-Staff : [original_msg]"
var/admin_number_present = admins.len - admin_number_afk
log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 1029d1b5d5..e620380a3c 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -84,11 +84,11 @@
var/datum/gas_mixture/env = T.return_air()
- var/t = "Coordinates: [T.x],[T.y],[T.z]\n"
+ var/t = "Coordinates: [T.x],[T.y],[T.z]\n"
t += "Temperature: [env.temperature]\n"
t += "Pressure: [env.return_pressure()]kPa\n"
for(var/g in env.gas)
- t += "[g]: [env.gas[g]] / [env.gas[g] * R_IDEAL_GAS_EQUATION * env.temperature / env.volume]kPa\n"
+ t += "[g]: [env.gas[g]] / [env.gas[g] * R_IDEAL_GAS_EQUATION * env.temperature / env.volume]kPa\n"
usr.show_message(t, 1)
feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -296,7 +296,7 @@
alert("Invalid mob")
feedback_add_details("admin_verb","GFA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(src)] has granted [M.key] full access.")
- message_admins("[key_name_admin(usr)] has granted [M.key] full access.", 1)
+ message_admins("[key_name_admin(usr)] has granted [M.key] full access.", 1)
/client/proc/cmd_assume_direct_control(var/mob/M in mob_list)
set category = "Admin"
@@ -310,7 +310,7 @@
else
var/mob/observer/dead/ghost = new/mob/observer/dead(M,1)
ghost.ckey = M.ckey
- message_admins("[key_name_admin(usr)] assumed direct control of [M].", 1)
+ message_admins("[key_name_admin(usr)] assumed direct control of [M].", 1)
log_admin("[key_name(usr)] assumed direct control of [M].")
var/mob/adminmob = src.mob
M.ckey = src.ckey
@@ -570,7 +570,7 @@
log_admin("[key_name(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant" : ""]")
- message_admins("[key_name_admin(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant": ""]", 1)
+ message_admins("[key_name_admin(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant": ""]", 1)
return
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 5469367beb..24da1c9b57 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -17,7 +17,7 @@
return
var/image/cross = image('icons/obj/storage.dmi',"bible")
- msg = "\icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (SMITE): [msg]"
+ msg = "\icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (SMITE): [msg]"
for(var/client/C in admins)
if(R_ADMIN & C.holder.rights)
@@ -30,14 +30,14 @@
//log_admin("HELP: [key_name(src)]: [msg]")
/proc/CentCom_announce(var/msg, var/mob/Sender, var/iamessage)
- msg = "[uppertext(using_map.boss_short)]M[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]"
+ msg = "[uppertext(using_map.boss_short)]M[iamessage ? " IA" : ""]:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]"
for(var/client/C in admins)
if(R_ADMIN & C.holder.rights)
C << msg
C << 'sound/machines/signal.ogg'
/proc/Syndicate_announce(var/msg, var/mob/Sender)
- msg = "ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]"
+ msg = "ILLEGAL:[key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, src)]) (CA) (BSA) (RPLY): [msg]"
for(var/client/C in admins)
if(R_ADMIN & C.holder.rights)
C << msg
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index e3f2c3db56..4a5c9c9341 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -40,7 +40,7 @@
spawn(50)
M << "You have been sent to the prison station!"
log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.")
- message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1)
+ message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1)
feedback_add_details("admin_verb","PRISON") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
//Allows staff to determine who the newer players are.
@@ -96,7 +96,7 @@
M << "You hear a voice in your head... [msg]"
log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
- message_admins("SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1)
+ message_admins("SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1)
feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_world_narrate() // Allows administrators to fluff events a little easier -- TLE
@@ -113,7 +113,7 @@
return
world << "[msg]"
log_admin("GlobalNarrate: [key_name(usr)] : [msg]")
- message_admins(" GlobalNarrate: [key_name_admin(usr)] : [msg]
", 1)
+ message_admins(" GlobalNarrate: [key_name_admin(usr)] : [msg]
", 1)
feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_direct_narrate(var/mob/M) // Targetted narrate -- TLE
@@ -137,7 +137,7 @@
M << msg
log_admin("DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]")
- message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
", 1)
+ message_admins(" DirectNarrate: [key_name(usr)] to ([M.name]/[M.key]): [msg]
", 1)
feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_godmode(mob/M as mob in mob_list)
@@ -147,7 +147,7 @@
src << "Only administrators may use this command."
return
M.status_flags ^= GODMODE
- usr << " Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]"
+ usr << " Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]"
log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]", 1)
@@ -278,7 +278,7 @@ Ccomp's first proc.
G.has_enabled_antagHUD = 2
G.can_reenter_corpse = 1
- G:show_message(text("You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead."), 1)
+ G:show_message(text("You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead."), 1)
log_admin("[key_name(usr)] allowed [key_name(G)] to bypass the respawn time limit")
message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(G)] to bypass the respawn time limit", 1)
@@ -306,10 +306,10 @@ Ccomp's first proc.
for(var/mob/observer/dead/g in get_ghosts())
if(!g.client.holder) // Add the verb back for all non-admin ghosts
g.verbs += /mob/observer/dead/verb/toggle_antagHUD
- g << "The Administrator has enabled AntagHUD " // Notify all observers they can now use AntagHUD
+ g << "The Administrator has enabled AntagHUD " // Notify all observers they can now use AntagHUD
config.antag_hud_allowed = 1
action = "enabled"
- src << "AntagHUD usage has been enabled"
+ src << "AntagHUD usage has been enabled"
log_admin("[key_name(usr)] has [action] antagHUD usage for observers")
@@ -326,10 +326,10 @@ Ccomp's first proc.
var/action=""
if(config.antag_hud_restricted)
for(var/mob/observer/dead/g in get_ghosts())
- g << "The administrator has lifted restrictions on joining the round if you use AntagHUD"
+ g << "The administrator has lifted restrictions on joining the round if you use AntagHUD"
action = "lifted restrictions"
config.antag_hud_restricted = 0
- src << "AntagHUD restrictions have been lifted"
+ src << "AntagHUD restrictions have been lifted"
else
for(var/mob/observer/dead/g in get_ghosts())
g << "The administrator has placed restrictions on joining the round if you use AntagHUD"
@@ -701,7 +701,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
mob.gib()
log_admin("[key_name(usr)] used gibself.")
- message_admins("[key_name_admin(usr)] used gibself.", 1)
+ message_admins("[key_name_admin(usr)] used gibself.", 1)
feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/*
/client/proc/cmd_manual_ban()
@@ -739,7 +739,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
M << "This is a temporary ban, it will be removed in [mins] minutes."
M << "To try to resolve this matter head to http://ss13.donglabs.com/forum/"
log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
- message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
+ message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=[mins]&server=[replacetext(config.server_name, "#", "")]")
del(M.client)
qdel(M)
@@ -754,7 +754,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
M << "This is a permanent ban."
M << "To try to resolve this matter head to http://ss13.donglabs.com/forum/"
log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
- message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
+ message_admins("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=perma&server=[replacetext(config.server_name, "#", "")]")
del(M.client)
qdel(M)
@@ -817,7 +817,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
view = world.view
log_admin("[key_name(usr)] changed their view range to [view].")
- //message_admins("[key_name_admin(usr)] changed their view range to [view].", 1) //why? removed by order of XSI
+ //message_admins("[key_name_admin(usr)] changed their view range to [view].", 1) //why? removed by order of XSI
feedback_add_details("admin_verb","CVRA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -851,7 +851,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-called the emergency shuttle.")
- message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.", 1)
+ message_admins("[key_name_admin(usr)] admin-called the emergency shuttle.", 1)
return
/client/proc/admin_cancel_shuttle()
@@ -868,7 +868,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
emergency_shuttle.recall()
feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
- message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.", 1)
+ message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.", 1)
return
@@ -922,7 +922,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
message_admins("Admin [key_name_admin(usr)] has forced the players to have random appearances.", 1)
if(notifyplayers == "Yes")
- world << "Admin [usr.key] has forced the players to have completely random identities!"
+ world << "Admin [usr.key] has forced the players to have completely random identities!"
usr << "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet."
diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm
index 8cf88aa127..0b576f6e57 100644
--- a/code/modules/admin/verbs/tripAI.dm
+++ b/code/modules/admin/verbs/tripAI.dm
@@ -14,9 +14,9 @@
if(ticker.triai)
ticker.triai = 0
usr << "Only one AI will be spawned at round start."
- message_admins("[key_name_admin(usr)] has toggled off triple AIs at round start.", 1)
+ message_admins("[key_name_admin(usr)] has toggled off triple AIs at round start.", 1)
else
ticker.triai = 1
usr << "There will be an AI Triumvirate at round start."
- message_admins("[key_name_admin(usr)] has toggled on triple AIs at round start.", 1)
+ message_admins("[key_name_admin(usr)] has toggled on triple AIs at round start.", 1)
return
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 4f92884dfb..660604dc28 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -259,6 +259,6 @@ obj/machinery/gateway/centerstation/process()
return
// VOREStation Add End
else
- user << "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target."
+ user << "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target."
calibrated = 1
return
diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
index 7a17b782ef..768ce9d13e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
@@ -108,7 +108,7 @@
/datum/gear/eyes/sun
display_name = "Sunglasses (Security/Command)"
path = /obj/item/clothing/glasses/sunglasses
- allowed_roles = list("Security Officer","Head of Security","Warden","Colony Director","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
+ allowed_roles = list("Security Officer","Head of Security","Warden","Colony Director","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective","Command Secretary")
/datum/gear/eyes/sun/shades
display_name = "Sunglasses, fat (Security/Command)"
diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_ch.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_ch.dm
new file mode 100644
index 0000000000..9e04dce23c
--- /dev/null
+++ b/code/modules/client/preference_setup/loadout/loadout_eyes_ch.dm
@@ -0,0 +1,9 @@
+/datum/gear/eyes/arglasses/visor
+ display_name = "AR visor"
+ path = /obj/item/clothing/glasses/omnihud/visor
+ cost = 0
+
+
+/datum/gear/eyes/arglasses/visor/New()
+ ..()
+ gear_tweaks = list(gear_tweak_free_color_choice)
\ No newline at end of file
diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm
index b5e035d423..76178dada2 100644
--- a/code/modules/client/preference_setup/loadout/loadout_utility.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm
@@ -21,9 +21,7 @@
/datum/gear/utility/communicator/New()
..()
var/list/communicators = list()
-// Chompstation Edit: Conflict with Removing NIFs - Jon
-// for(var/communicator in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated,/obj/item/device/communicator/commlink)) //VOREStation Edit - Remove Commlink
- for(var/communicator in typesof(/obj/item/device/communicator) - /obj/item/device/communicator/integrated)
+ for(var/communicator in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated,/obj/item/device/communicator/commlink)) //VOREStation Edit - Remove Commlink
var/obj/item/device/communicator_type = communicator
communicators[initial(communicator_type.name)] = communicator_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(communicators))
diff --git a/code/modules/clothing/glasses/hud_ch.dm b/code/modules/clothing/glasses/hud_ch.dm
new file mode 100644
index 0000000000..b628d7f5b5
--- /dev/null
+++ b/code/modules/clothing/glasses/hud_ch.dm
@@ -0,0 +1,7 @@
+/obj/item/clothing/glasses/omnihud/visor
+ name = "AR visor"
+ desc = "The VZR-AR are a product based upon the classic AR Glasses, just more fashionable."
+ icon_override = 'icons/mob/eyes_ch.dmi'
+ icon = 'icons/mob/eyes_ch.dmi'
+ icon_state = "visor_CIV"
+ item_state = "visor_CIV"
\ No newline at end of file
diff --git a/code/modules/clothing/head/misc_ch.dm b/code/modules/clothing/head/misc_ch.dm
new file mode 100644
index 0000000000..a368d50520
--- /dev/null
+++ b/code/modules/clothing/head/misc_ch.dm
@@ -0,0 +1,14 @@
+/obj/item/clothing/head/wiggler
+ icon_override = 'icons/vore/misc_ch.dmi'
+ icon = 'icons/vore/misc_ch.dmi'//lets use our own DMI with blackjack and deers
+ icon_state = "flailing_helmet"
+ item_state = "flailing_helmet_worn"
+ name = "Flailing hat"
+ desc = "It's a hat, it flails."
+ body_parts_covered = 0
+
+/obj/item/clothing/head/wiggler/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer)
+ var/image/so_far = ..()
+ so_far.pixel_y += 16
+ so_far.pixel_x += 0
+ return so_far
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm
index 3e8cb36a6c..bdb087cd5d 100644
--- a/code/modules/clothing/spacesuits/rig/modules/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm
@@ -1,6 +1,7 @@
/*
* Contains
* /obj/item/rig_module/grenade_launcher
+ * /obj/item/rig_module/grenade_launcher/nerfed
* /obj/item/rig_module/mounted
* /obj/item/rig_module/mounted/taser
* /obj/item/rig_module/shield
@@ -34,7 +35,7 @@
list("smoke bomb", "smoke bomb", /obj/item/weapon/grenade/smokebomb, 3),
list("EMP grenade", "EMP grenade", /obj/item/weapon/grenade/empgrenade, 3),
)
-
+
/obj/item/rig_module/grenade_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user)
if(!istype(input_device) || !istype(user))
@@ -88,6 +89,66 @@
H.visible_message("[H] launches \a [new_grenade]!")
new_grenade.activate(H)
new_grenade.throw_at(target,fire_force,fire_distance)
+
+/obj/item/rig_module/grenade_launcher/nerfed
+
+ charges = list(
+ list("flashbang", "flashbang", /obj/item/weapon/grenade/flashbang, 3),
+ )
+
+/obj/item/rig_module/grenade_launcher/nerfed/accepts_item(var/obj/item/input_device, var/mob/living/user)
+
+ if(!istype(input_device) || !istype(user))
+ return 0
+
+ var/datum/rig_charge/accepted_item
+ for(var/charge in charges)
+ var/datum/rig_charge/charge_datum = charges[charge]
+ if(input_device.type == charge_datum.product_type)
+ accepted_item = charge_datum
+ break
+
+ if(!accepted_item)
+ return 0
+
+ if(accepted_item.charges >= 5)
+ user << "Another grenade of that type will not fit into the module."
+ return 0
+
+ user << "You slot \the [input_device] into the suit module."
+ user.drop_from_inventory(input_device)
+ qdel(input_device)
+ accepted_item.charges++
+ return 1
+
+/obj/item/rig_module/grenade_launcher/nerfed/engage(atom/target)
+
+ if(!..())
+ return 0
+
+ if(!target)
+ return 0
+
+ var/mob/living/carbon/human/H = holder.wearer
+
+ if(!charge_selected)
+ H << "You have not selected a grenade type."
+ return 0
+
+ var/datum/rig_charge/charge = charges[charge_selected]
+
+ if(!charge)
+ return 0
+
+ if(charge.charges <= 0)
+ H << "Insufficient grenades!"
+ return 0
+
+ charge.charges--
+ var/obj/item/weapon/grenade/new_grenade = new charge.product_type(get_turf(H))
+ H.visible_message("[H] launches \a [new_grenade]!")
+ new_grenade.activate(H)
+ new_grenade.throw_at(target,fire_force,fire_distance)
/obj/item/rig_module/mounted
diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm
index 9308e44cb0..db809e8f92 100644
--- a/code/modules/clothing/spacesuits/rig/modules/computer.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm
@@ -208,8 +208,8 @@
user.drop_from_inventory(ai)
ai.forceMove(src)
ai_card = ai
- ai_mob << "You have been transferred to \the [holder]'s [src]."
- user << "You load [ai_mob] into \the [holder]'s [src]."
+ ai_mob << "You have been transferred to \the [holder]'s [src]."
+ user << "You load [ai_mob] into \the [holder]'s [src]."
integrated_ai = ai_mob
@@ -261,7 +261,7 @@
var/obj/item/weapon/disk/tech_disk/disk = input_device
if(disk.stored)
if(load_data(disk.stored))
- user << "Download successful; disk erased."
+ user << "Download successful; disk erased."
disk.stored = null
else
user << "The disk is corrupt. It is useless to you."
@@ -287,7 +287,7 @@
else
// Maybe consider a way to drop all your data into a target repo in the future.
if(load_data(incoming_files.known_tech))
- user << "Download successful; local and remote repositories synchronized."
+ user << "Download successful; local and remote repositories synchronized."
else
user << "Scan complete. There is nothing useful stored on this terminal."
return 1
@@ -465,9 +465,9 @@
/obj/item/rig_module/power_sink/proc/drain_complete(var/mob/living/M)
if(!interfaced_with)
- if(M) M << "Total power drained: [round(total_power_drained*CELLRATE)] cell units."
+ if(M) M << "Total power drained: [round(total_power_drained*CELLRATE)] cell units."
else
- if(M) M << "Total power drained from [interfaced_with]: [round(total_power_drained*CELLRATE)] cell units."
+ if(M) M << "Total power drained from [interfaced_with]: [round(total_power_drained*CELLRATE)] cell units."
interfaced_with.drain_power(0,1,0) // Damage the victim.
drain_loc = null
diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
index b5d58c8da6..6af53cac1a 100644
--- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
@@ -37,7 +37,7 @@
var/mob/living/carbon/human/H = holder.wearer
- to_chat(H, "You are now nearly invisible to normal detection.")
+ to_chat(H, "You are now nearly invisible to normal detection.")
H.alpha = 5
anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null)
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index 583f491d5e..b01e9342c8 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -635,6 +635,7 @@
interface_name = "sprint system"
interface_desc = "Increases power to the suit's actuators, allowing faster movement."
+
/obj/item/rig_module/sprinter/activate()
if(!..())
@@ -655,4 +656,37 @@
H << "Your hardsuit returns to normal speed."
- holder.slowdown = initial(holder.slowdown)
\ No newline at end of file
+ holder.slowdown = initial(holder.slowdown)
+
+/obj/item/rig_module/sprinter/pursuit
+ name = "pursuit sprint module"
+ desc = "A faster hardsuit-integrated sprint module."
+ icon_state = "sprinter"
+ interface_name = "pursuit system"
+ interface_desc = "Super energy consumption for super speed."
+ sprint_speed = 3
+ use_power_cost = 100
+ active_power_cost = 5
+
+/obj/item/rig_module/sprinter/pursuit/activate()
+
+ if(!..())
+ return 0
+
+ var/mob/living/carbon/human/H = holder.wearer
+
+ H << "You activate the suit's sprint mode."
+
+ holder.slowdown = initial(holder.slowdown) - sprint_speed
+
+/obj/item/rig_module/sprinter/pursuit/deactivate()
+
+ if(!..())
+ return 0
+
+ var/mob/living/carbon/human/H = holder.wearer
+
+ H << "Your hardsuit returns to normal speed."
+
+ holder.slowdown = initial(holder.slowdown)
+
diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm
index a4092d47ef..67ea6ca0cd 100644
--- a/code/modules/clothing/spacesuits/rig/modules/vision.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm
@@ -179,7 +179,7 @@
// Don't cycle if this engage() is being called by activate().
if(starting_up)
- holder.wearer << "You activate your visual sensors."
+ holder.wearer << "You activate your visual sensors."
return 1
if(vision_modes.len > 1)
@@ -188,9 +188,9 @@
vision_index = 1
vision = vision_modes[vision_index]
- holder.wearer << "You cycle your sensors to [vision.mode] mode."
+ holder.wearer << "You cycle your sensors to [vision.mode] mode."
else
- holder.wearer << "Your sensors only have one mode."
+ holder.wearer << "Your sensors only have one mode."
return 1
/obj/item/rig_module/vision/activate()
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index df610f3407..489f46c4bf 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -245,7 +245,7 @@
if(!failed_to_seal)
if(!instant)
- M.visible_message("[M]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.")
+ M.visible_message("[M]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.")
if(seal_delay && !do_after(M,seal_delay))
if(M) M << "You must remain still while the suit is adjusting the components."
failed_to_seal = 1
@@ -275,16 +275,16 @@
piece.icon_state = "[initial(icon_state)][!seal_target ? "_sealed" : ""]"
switch(msg_type)
if("boots")
- M << "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"]."
+ M << "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"]."
M.update_inv_shoes()
if("gloves")
- M << "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"]."
+ M << "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"]."
M.update_inv_gloves()
if("chest")
- M << "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"]."
+ M << "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"]."
M.update_inv_wear_suit()
if("helmet")
- M << "\The [piece] hisses [!seal_target ? "closed" : "open"]."
+ M << "\The [piece] hisses [!seal_target ? "closed" : "open"]."
M.update_inv_head()
if(helmet)
helmet.update_light(wearer)
@@ -319,7 +319,7 @@
// Success!
canremove = seal_target
- M << "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"]."
+ M << "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"]."
M.client.screen -= booting_L
qdel(booting_L)
booting_R.icon_state = "boot_done"
@@ -692,7 +692,7 @@
..()
if(seal_delay > 0 && istype(M) && M.back == src)
- M.visible_message("[M] starts putting on \the [src]...", "You start putting on \the [src]...")
+ M.visible_message("[M] starts putting on \the [src]...", "You start putting on \the [src]...")
if(!do_after(M,seal_delay))
if(M && M.back == src)
if(!M.unEquip(src))
@@ -701,7 +701,7 @@
return
if(istype(M) && M.back == src)
- M.visible_message("[M] struggles into \the [src].", "You struggle into \the [src].")
+ M.visible_message("[M] struggles into \the [src].", "You struggle into \the [src].")
wearer = M
wearer.wearing_rig = src
update_icon()
@@ -751,7 +751,7 @@
holder = use_obj.loc
if(istype(holder))
if(use_obj && check_slot == use_obj)
- H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly."
+ H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly."
use_obj.canremove = 1
holder.drop_from_inventory(use_obj)
use_obj.forceMove(get_turf(src))
diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm
index 09db9b0325..2dcb437441 100644
--- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm
@@ -218,11 +218,11 @@
if(!istype(module))
selected_module = null
- usr << "Primary system is now: deselected."
+ usr << "Primary system is now: deselected."
return
selected_module = module
- usr << "Primary system is now: [selected_module.interface_name]."
+ usr << "Primary system is now: [selected_module.interface_name]."
/obj/item/weapon/rig/verb/toggle_module()
@@ -256,10 +256,10 @@
return
if(module.active)
- usr << "You attempt to deactivate \the [module.interface_name]."
+ usr << "You attempt to deactivate \the [module.interface_name]."
module.deactivate()
else
- usr << "You attempt to activate \the [module.interface_name]."
+ usr << "You attempt to activate \the [module.interface_name]."
module.activate()
/obj/item/weapon/rig/verb/engage_module()
@@ -293,5 +293,5 @@
if(!istype(module))
return
- usr << "You attempt to engage the [module.interface_name]."
+ usr << "You attempt to engage the [module.interface_name]."
module.engage()
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
index b308e99e2d..c5e860a21a 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -18,6 +18,10 @@
/obj/item/clothing/head/helmet/space/rig/hazard
light_overlay = "helmet_light_dual"
camera_networks = list(NETWORK_SECURITY)
+
+/obj/item/clothing/head/helmet/space/rig/pursuit
+ light_overlay = "helmet_light_dual"
+ camera_networks = list(NETWORK_SECURITY)
//Internal Affairs suit
/obj/item/weapon/rig/internalaffairs
@@ -305,4 +309,40 @@
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/grenade_launcher,
/obj/item/rig_module/mounted/taser
- )
\ No newline at end of file
+ )
+
+//A second security suit. Removes the maneuvering jets and nerfs the grenade launcher, and adds the sprinter and flash modules. I removed the maneuvering jets to discourage lone-wolf style gameplay because other sec officers don't get jetpacks very easily.
+/obj/item/weapon/rig/pursuit
+ name = "pursuit hardsuit control module"
+ suit_type = "pursuit hardsuit"
+ desc = "A Security hardsuit designed for chasing down the grey tide."
+ icon_state = "pursuit_rig"
+ armor = list(melee = 60, bullet = 40, laser = 40, energy = 25, bomb = 50, bio = 100, rad = 30)
+ slowdown = 1
+ offline_slowdown = 3
+ offline_vision_restriction = 1
+ siemens_coefficient= 0.7
+
+ helm_type = /obj/item/clothing/head/helmet/space/rig/pursuit
+
+ allowed = list(
+ /obj/item/weapon/gun,
+ /obj/item/device/flashlight,
+ /obj/item/weapon/tank,
+ /obj/item/device/suit_cooling_unit,
+ /obj/item/weapon/melee/baton,
+ /obj/item/weapon/storage/backpack,
+ )
+
+ req_access = list()
+ req_one_access = list()
+
+
+/obj/item/weapon/rig/pursuit/equipped
+
+ initial_modules = list(
+ /obj/item/rig_module/vision/sechud,
+ /obj/item/rig_module/sprinter/pursuit,
+ /obj/item/rig_module/grenade_launcher/nerfed,
+ /obj/item/rig_module/mounted/taser
+ )
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index b5a9900081..76888e02ba 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -35,7 +35,7 @@
camera = new /obj/machinery/camera(src)
camera.replace_networks(camera_networks)
camera.c_tag = user.name
- user << "User scanned as [camera.c_tag]. Camera activated."
+ user << "User scanned as [camera.c_tag]. Camera activated."
user.update_action_buttons()
return 1
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index eb1a04a2e0..1fa33edd6b 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -196,10 +196,10 @@
/obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob)
active = !( active )
if (active)
- user << "The reactive armor is now active."
+ user << "The reactive armor is now active."
icon_state = "reactive"
else
- user << "The reactive armor is now inactive."
+ user << "The reactive armor is now inactive."
icon_state = "reactiveoff"
add_fingerprint(user)
return
diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm
index 349b0e01e7..c4f57ccdb6 100644
--- a/code/modules/clothing/suits/armor_vr.dm
+++ b/code/modules/clothing/suits/armor_vr.dm
@@ -29,10 +29,10 @@
// HoS armor improved by Vorestation to be slightly better than normal security stuff.
/obj/item/clothing/suit/storage/vest/hoscoat
- armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
+ armor = list(melee = 45, bullet = 35, laser = 35, energy = 30, bomb = 25, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/vest/hos
- armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
+ armor = list(melee = 45, bullet = 40, laser = 40, energy = 30, bomb = 15, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/vest/hoscoat/jensen
name = "armored trenchcoat"
@@ -59,7 +59,7 @@
/obj/item/clothing/suit/armor/combat/USDF
name = "marine body armor"
- desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon–and we had to share the rock!"
+ desc = "When I joined the Corps, we didn't have any fancy-schmanzy armor. We had sticks! Two sticks, and a rock for the whole platoon–and we had to share the rock!"
icon_state = "UNSC_armor"
icon = 'icons/obj/clothing/suits_vr.dmi'
icon_override = 'icons/mob/suit_vr.dmi'
@@ -76,4 +76,4 @@
/obj/item/clothing/suit/armor/combat/imperial/centurion
name = "imperial centurion armor"
desc = "Not all heroes wear capes, but it'd be cooler if they did."
- icon_state = "ge_armorcent"
\ No newline at end of file
+ icon_state = "ge_armorcent"
diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
index ca630dae77..e240b1edcb 100644
--- a/code/modules/clothing/suits/storage.dm
+++ b/code/modules/clothing/suits/storage.dm
@@ -53,6 +53,8 @@
return
update_clothing_icon() //so our overlays update
+/obj/item/clothing/suit/storage/toggle/AltClick()//chomp edit
+ toggle()
/obj/item/clothing/suit/storage/hooded/toggle
flags_inv = HIDEHOLSTER
@@ -79,6 +81,8 @@
return
update_clothing_icon() //so our overlays update
+/obj/item/clothing/suit/storage/hooded/AltClick()//chomp edit
+ ToggleHood()
//New Vest 4 pocket storage and badge toggles, until suit accessories are a thing.
/obj/item/clothing/suit/storage/vest/heavy/New()
diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm
index 94daad930f..4c30c2cef8 100644
--- a/code/modules/clothing/under/accessories/accessory_vr.dm
+++ b/code/modules/clothing/under/accessories/accessory_vr.dm
@@ -165,6 +165,8 @@
overlay_state = "collar_holo_overlay"
matter = list(DEFAULT_WALL_MATERIAL = 50)
+// Chompstation edit - Deprecated, implementing a custom method of renaming collars.
+/*
/obj/item/clothing/accessory/collar/holo/attack_self(mob/user as mob)
to_chat(user,"[name]'s interface is projected onto your hand.")
@@ -178,6 +180,26 @@
to_chat(user,"You set the [name]'s tag to '[str]'.")
name = initial(name) + " ([str])"
desc = initial(desc) + " The tag says \"[str]\"."
+*/
+
+// Chompstation add: Adding in a button to allow anyone to change any tag on their collar.
+/obj/item/clothing/accessory/collar/verb/changeTag()
+ set name = "Change collar tag"
+ set category = "Object"
+ set src in usr
+ if(!istype(usr, /mob/living)) return
+ if(usr.stat) return
+
+ var/str = copytext(reject_bad_text(input(usr,"Tag text?","Set tag","")),1,MAX_NAME_LEN)
+
+ if(!str || !length(str))
+ to_chat(usr,"[name]'s tag set to be blank.")
+ name = initial(name)
+ desc = initial(desc)
+ else
+ to_chat(usr,"You set the [name]'s tag to '[str]'.")
+ name = initial(name) + " ([str])"
+ desc = initial(desc) + " The tag says \"[str]\"."
//Machete Holsters
/obj/item/clothing/accessory/holster/machete
@@ -189,3 +211,4 @@
can_hold = list(/obj/item/weapon/material/knife/machete)
//sound_in = 'sound/effects/holster/sheathin.ogg'
//sound_out = 'sound/effects/holster/sheathout.ogg'
+
diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm
index 0c54df0397..925d614799 100644
--- a/code/modules/detectivework/microscope/dnascanner.dm
+++ b/code/modules/detectivework/microscope/dnascanner.dm
@@ -127,7 +127,7 @@
if(bloodsamp.dna != null)
data = "Spectometric analysis on provided sample has determined the presence of [bloodsamp.dna.len] strings of DNA.
"
for(var/blood in bloodsamp.dna)
- data += "Blood type: [bloodsamp.dna[blood]]
\nDNA: [blood]
"
+ data += "Blood type: [bloodsamp.dna[blood]]
\nDNA: [blood]
"
else
data += "No DNA found.
"
P.info = "[src] analysis report #[report_num]
"
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 68e4c12c86..411802f1db 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -308,7 +308,7 @@ log transactions
T.time = stationtime2text()
authenticated_account.transaction_log.Add(T)
- usr << "\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
+ usr << "\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
previous_account_number = tried_account_num
if("e_withdrawal")
@@ -461,7 +461,7 @@ log transactions
if(I)
authenticated_account = attempt_account_access(I.associated_account_number)
if(authenticated_account)
- human_user << "\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'"
+ human_user << "\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/cash.dm b/code/modules/economy/cash.dm
index 8bf5c63cc7..2bc1d13494 100644
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -156,4 +156,4 @@ proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
/obj/item/weapon/spacecash/ewallet/examine(mob/user)
..(user)
if (!(user in view(2)) && user!=src.loc) return
- user << "Charge card's owner: [src.owner_name]. Thalers remaining: [src.worth]."
+ user << "Charge card's owner: [src.owner_name]. Thalers remaining: [src.worth]."
diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm
index 534c5aa56d..9538dc3489 100644
--- a/code/modules/events/event_manager.dm
+++ b/code/modules/events/event_manager.dm
@@ -1,7 +1,7 @@
/datum/event_manager
var/window_x = 700
var/window_y = 600
- var/report_at_round_end = 0
+ var/report_at_round_end = 1 //Chomp edit
var/table_options = " align='center'"
var/row_options1 = " width='85px'"
var/row_options2 = " width='260px'"
diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm
index 6e2df0b1fa..aedf3891fa 100644
--- a/code/modules/examine/examine.dm
+++ b/code/modules/examine/examine.dm
@@ -66,12 +66,12 @@
stat(null,"[description_holders["icon"]] [description_holders["name"]]") //The name, written in big letters.
stat(null,"[description_holders["desc"]]") //the default examine text.
if(description_holders["info"])
- stat(null,"[description_holders["info"]]") //Blue, informative text.
+ stat(null,"[description_holders["info"]]") //Blue, informative text.
if(description_holders["interactions"])
for(var/line in description_holders["interactions"])
stat(null, "[line]")
if(description_holders["fluff"])
- stat(null,"[description_holders["fluff"]]") //Yellow, fluff-related text.
+ stat(null,"[description_holders["fluff"]]") //Green, fluff-related text.
if(description_holders["antag"])
stat(null,"[description_holders["antag"]]") //Red, malicious antag-related text
diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index 964ea8dbed..4eb572729c 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -23,7 +23,7 @@ mob/living/carbon/proc/dream()
spawn(0)
for(var/i = rand(1,4),i > 0, i--)
- src << "... [pick(dreams)] ..."
+ src << "... [pick(dreams)] ..."
sleep(rand(40,70))
if(paralysis <= 0)
dreaming = 0
diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm
index cc46a8da38..46a5d5e032 100644
--- a/code/modules/hydroponics/beekeeping/beehive.dm
+++ b/code/modules/hydroponics/beekeeping/beehive.dm
@@ -128,7 +128,7 @@
user << "The bees won't let you take the honeycombs out like this, smoke them first."
return
user.visible_message("[user] starts taking the honeycombs out of \the [src].", "You start taking the honeycombs out of \the [src]...")
- while(honeycombs >= 100 && do_after(user, 30))
+ while(honeycombs >= 100 && do_after(user, 20))//Chomp edit. 30 -> 20ticks
new /obj/item/honey_frame/filled(loc)
honeycombs -= 100
--frames
@@ -157,7 +157,7 @@
/obj/machinery/honey_extractor
name = "honey extractor"
- desc = "A machine used to turn honeycombs on the frame into honey and wax."
+ desc = "A machine used to turn honeycombs on the frame into honey and wax. There is a tap used to empty the internal storage." //CHOMP EDIT. Added a snip to make it more evident."
icon = 'icons/obj/virology.dmi'
icon_state = "centrifuge"
@@ -180,6 +180,7 @@
spawn(50)
new /obj/item/honey_frame(loc)
new /obj/item/stack/wax(loc)
+ playsound(src,'sound/effects/weightdrop.ogg',30,1) //CHOMP EDIT. Soft sound so you know it is done.
honey += processing
processing = 0
icon_state = "centrifuge"
@@ -213,7 +214,7 @@
/obj/item/honey_frame/filled
name = "filled beehive frame"
desc = "A frame for the beehive that the bees have filled with honeycombs."
- honey = 20
+ honey = 30 //CHOMP EDIT. 20 -> 30
/obj/item/honey_frame/filled/New()
..()
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index b70a02af4c..f87035b806 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -244,7 +244,7 @@
name = "apple"
seed_name = "apple"
display_name = "apple tree"
- mutants = list("poisonapple","goldapple")
+ mutants = list("poisonapple","goldapple","fallingapple")
chems = list("nutriment" = list(1,10),"applejuice" = list(10,20))
kitchen_tag = "apple"
@@ -266,6 +266,14 @@
mutants = null
chems = list("cyanide" = list(1,5))
+//Chompstation add: Adding self harvesting apples which contain poison and can mutate into poisonapples
+/datum/seed/apple/falling
+ name = "fallingapple"
+ mutants = list("poisonapple")
+ can_self_harvest = 1
+ chems = list("nutriment" = list(1,5),"applejuice" = list(5,10),"cyanide" = list(1,3))
+
+
/datum/seed/apple/gold
name = "goldapple"
seed_name = "golden apple"
@@ -858,10 +866,18 @@
/datum/seed/watermelon
name = "watermelon"
seed_name = "watermelon"
+ mutants = list("waterwatermelon")
display_name = "watermelon vine"
chems = list("nutriment" = list(1,6), "watermelonjuice" = list(10,6))
kitchen_tag = "watermelon"
+//Chompstation add: A watermelon full of water
+/datum/seed/watermelon/waterwatermelon
+ name = "waterwatermelon"
+ seed_name = "waterwatermelon"
+ display_name = "waterwatermelon vine"
+ chems = list("water" = list(15,20))
+
/datum/seed/watermelon/New()
..()
set_trait(TRAIT_HARVEST_REPEAT,1)
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 7dc02dedc7..d6606e23c7 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -156,13 +156,13 @@
if(weedlevel > 0)
nymph.reagents.add_reagent("glucose", weedlevel)
weedlevel = 0
- nymph.visible_message("[nymph] begins rooting through [src], ripping out weeds and eating them noisily.","You begin rooting through [src], ripping out weeds and eating them noisily.")
+ nymph.visible_message("[nymph] begins rooting through [src], ripping out weeds and eating them noisily.","You begin rooting through [src], ripping out weeds and eating them noisily.")
else if(nymph.nutrition > 100 && nutrilevel < 10)
nymph.nutrition -= ((10-nutrilevel)*5)
nutrilevel = 10
- nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].")
+ nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].")
else
- nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.")
+ nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.")
return
/obj/machinery/portable_atmospherics/hydroponics/initialize()
diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm
index 6e75d97a0d..db4ce1132f 100644
--- a/code/modules/materials/material_recipes.dm
+++ b/code/modules/materials/material_recipes.dm
@@ -51,6 +51,7 @@
recipes += new/datum/stack_recipe("rack", /obj/structure/table/rack, 1, time = 5, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = 1, on_floor = 1)
+ recipes += new/datum/stack_recipe("tree tap", /obj/item/weapon/tree_tap, 2, time = 10, one_per_turf = 0, on_floor = 1)
recipes += new/datum/stack_recipe("cannon frame", /obj/item/weapon/cannonframe, 10, time = 15, one_per_turf = 0, on_floor = 0)
recipes += new/datum/stack_recipe("regular floor tile", /obj/item/stack/tile/floor, 1, 4, 20)
recipes += new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60)
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index 8923abac56..851d82b8c1 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -75,7 +75,7 @@
CC.update_icon()
overlays = list()
string_attached = null
- user << "You detach the string from the coin."
+ user << "You detach the string from the coin."
else ..()
/obj/item/weapon/coin/attack_self(mob/user as mob)
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index ca03098f55..ad9534eafa 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -82,7 +82,7 @@
if(PROCESS_SMELT)
dat += "smelting"
if(PROCESS_COMPRESS)
- dat += "compressing"
+ dat += "compressing"
if(PROCESS_ALLOY)
dat += "alloying"
else
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index d208b303ee..bbe0ba427c 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -120,7 +120,7 @@
usr.set_machine(src)
src.add_fingerprint(usr)
if(processing==1)
- usr << "The machine is processing."
+ 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 13ddd4ad57..fccca1f4b5 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -50,14 +50,14 @@
..()
if (istype(W, /obj/item/weapon/coin))
var/obj/item/weapon/coin/C = W
- user << "You add the [C.name] into the bag."
+ user << "You add the [C.name] into the bag."
usr.drop_item()
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."
+ user << "You empty the [C.name] into the bag."
return
/obj/item/weapon/moneybag/Topic(href, href_list)
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index b904a7cfad..46bdde5185 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -90,7 +90,7 @@
for (var/obj/item/weapon/ore/O in contents)
contents -= O
O.loc = src.loc
- usr << "You empty the ore box."
+ 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 71284f53b2..22cca07dcd 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -271,7 +271,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
medHUD = !medHUD
plane_holder.set_vis(VIS_CH_HEALTH, medHUD)
plane_holder.set_vis(VIS_CH_STATUS_OOC, medHUD)
- to_chat(src,"Medical HUD [medHUD ? "Enabled" : "Disabled"]")
+ to_chat(src,"Medical HUD [medHUD ? "Enabled" : "Disabled"]")
/mob/observer/dead/verb/toggle_antagHUD()
set category = "Ghost"
@@ -293,7 +293,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
antagHUD = !antagHUD
plane_holder.set_vis(VIS_CH_SPECIAL, antagHUD)
- to_chat(src,"AntagHUD [antagHUD ? "Enabled" : "Disabled"]")
+ to_chat(src,"AntagHUD [antagHUD ? "Enabled" : "Disabled"]")
/mob/observer/dead/proc/dead_tele(var/area/A in return_sorted_areas())
set category = "Ghost"
@@ -449,16 +449,16 @@ 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 << "Results:"
+ src << "Results:"
if(abs(pressure - ONE_ATMOSPHERE) < 10)
- src << "Pressure: [round(pressure,0.1)] kPa"
+ src << "Pressure: [round(pressure,0.1)] kPa"
else
src << "Pressure: [round(pressure,0.1)] kPa"
if(total_moles)
for(var/g in environment.gas)
- src << "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)"
- src << "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)"
- src << "Heat Capacity: [round(environment.heat_capacity(),0.1)]"
+ src << "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)"
+ src << "Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)"
+ src << "Heat Capacity: [round(environment.heat_capacity(),0.1)]"
/mob/observer/dead/verb/check_radiation()
set name = "Check Radiation"
@@ -622,7 +622,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
is_manifest = TRUE
verbs |= /mob/observer/dead/proc/toggle_visibility
verbs |= /mob/observer/dead/proc/ghost_whisper
- to_chat(src,"As you are now in the realm of the living, you can whisper to the living with the Spectral Whisper verb, inside the IC tab.")
+ to_chat(src,"As you are now in the realm of the living, you can whisper to the living with the Spectral Whisper verb, inside the IC tab.")
if(plane != PLANE_WORLD)
user.visible_message( \
"\The [user] drags ghost, [src], to our plane of reality!", \
@@ -754,7 +754,7 @@ mob/observer/dead/MayRespawn(var/feedback = 0)
var/msg = sanitize(input(src, "Message:", "Spectral Whisper") as text|null)
if(msg)
log_say("(SPECWHISP to [key_name(M)]): [msg]", src)
- M << " You hear a strange, unidentifiable voice in your head... [msg]"
+ M << " You hear a strange, unidentifiable voice in your head... [msg]"
src << " You said: '[msg]' to [M]."
else
return
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 07f65f62b5..a79ca24177 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -238,7 +238,7 @@
/obj/item/device/mmi/digital/attack_self(mob/user as mob)
if(brainmob && !brainmob.key && searching == 0)
//Start the process of searching for a new user.
- user << "You carefully locate the manual activation switch and start the [src]'s boot process."
+ user << "You carefully locate the manual activation switch and start the [src]'s boot process."
request_player()
/obj/item/device/mmi/digital/proc/request_player()
@@ -262,7 +262,7 @@
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
- M.show_message("\The [src] buzzes quietly, and the golden lights fade away. Perhaps you could try again?")
+ M.show_message("\The [src] buzzes quietly, and the golden lights fade away. Perhaps you could try again?")
/obj/item/device/mmi/digital/proc/transfer_personality(var/mob/candidate)
announce_ghost_joinleave(candidate, 0, "They are occupying a synthetic brain now.")
@@ -280,7 +280,7 @@
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
- M.show_message("\The [src] chimes quietly.")
+ M.show_message("\The [src] chimes quietly.")
/obj/item/device/mmi/digital/robot
name = "robotic intelligence circuit"
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
index 22efdc76c6..a54f5dae4a 100644
--- a/code/modules/mob/living/carbon/brain/emote.dm
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -60,7 +60,7 @@
if ("help")
src << "alarm,alert,notice,flash,blink,whistle,beep,boop"
else
- src << "Unusable emote '[act]'. Say *help for a list."
+ src << "Unusable emote '[act]'. Say *help for a list."
if (message)
log_emote(message, src)
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 9f1f778ad2..14c7569319 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -16,7 +16,7 @@
/obj/item/device/mmi/digital/posibrain/attack_self(mob/user as mob)
if(brainmob && !brainmob.key && searching == 0)
//Start the process of searching for a new user.
- user << "You carefully locate the manual activation switch and start the positronic brain's boot process."
+ user << "You carefully locate the manual activation switch and start the positronic brain's boot process."
icon_state = "posibrain-searching"
src.searching = 1
src.request_player()
@@ -68,7 +68,7 @@
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
- M.show_message("The positronic brain beeps as it loads a personality.")
+ M.show_message("The positronic brain beeps as it loads a personality.")
playsound(src, 'sound/misc/boobeebeep.ogg', 50, 1)
icon_state = "posibrain-occupied"
@@ -82,7 +82,7 @@
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
- M.show_message("The positronic brain buzzes and beeps, and the golden lights fade away. Perhaps you could try again?")
+ M.show_message("The positronic brain buzzes and beeps, and the golden lights fade away. Perhaps you could try again?")
playsound(src, 'sound/misc/buzzbeep.ogg', 50, 1)
/obj/item/device/mmi/digital/posibrain/examine(mob/user)
diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm
index 353dfbdcbe..4dbac4b77c 100644
--- a/code/modules/mob/living/carbon/breathe.dm
+++ b/code/modules/mob/living/carbon/breathe.dm
@@ -22,13 +22,13 @@
else
//Okay, we can breathe, now check if we can get air
breath = get_breath_from_internal() //First, check for air from internals
-// Chompstation Edit: Removed Nifs - Jon
-/* //VOREStation Add - Respirocytes as a NIF implant
+
+ //VOREStation Add - Respirocytes as a NIF implant
if(!breath && ishuman(src))
var/mob/living/carbon/human/H = src
if(H.nif && H.nif.flag_check(NIF_H_SPAREBREATH,NIF_FLAGS_HEALTH))
var/datum/nifsoft/spare_breath/SB = H.nif.imp_check(NIF_SPAREBREATH)
- breath = SB.resp_breath()*/
+ breath = SB.resp_breath()
//VOREStation Add End
if(!breath)
breath = get_breath_from_environment() //No breath from internals so let's try to get air from our location
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 01f74ac3b5..1c8a7a48d0 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -143,8 +143,8 @@
var/mob/living/carbon/human/H = src
var/datum/gender/T = gender_datums[H.get_visible_gender()]
src.visible_message( \
- "[src] examines [T.himself].", \
- "You check yourself for injuries." \
+ "[src] examines [T.himself].", \
+ "You check yourself for injuries." \
)
for(var/obj/item/organ/external/org in H.organs)
@@ -361,6 +361,8 @@
/mob/living/carbon/slip(var/slipped_on,stun_duration=8)
if(buckled)
return 0
+ if(flying) //chomp edit. Thanks Kasparo
+ return 0
stop_pulling()
src << "You slipped on [slipped_on]!"
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
index c7009107de..bfdcbf69f7 100644
--- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
+++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
@@ -24,7 +24,7 @@
for(var/R in cures)
if(H.reagents.has_reagent(R))
if (cure_message)
- H <<"[cure_message]"
+ H <<"[cure_message]"
return 1
return 0
diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm
index c7009107de..bfdcbf69f7 100644
--- a/code/modules/mob/living/carbon/human/chem_side_effects.dm
+++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm
@@ -24,7 +24,7 @@
for(var/R in cures)
if(H.reagents.has_reagent(R))
if (cure_message)
- H <<"[cure_message]"
+ H <<"[cure_message]"
return 1
return 0
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 3cef432949..df2d2799bc 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -730,7 +730,7 @@
twitch_v, vomit, whimper, wink, yawn. Synthetics: beep, buzz, yes, no, rcough, rsneeze, ping"
else
- src << "Unusable emote '[act]'. Say *help for a list."
+ src << "Unusable emote '[act]'. Say *help for a list."
if (message)
custom_emote(m_type,message)
diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm
index c9d5a3b0d1..41157dfc7b 100644
--- a/code/modules/mob/living/carbon/human/emote_vr.dm
+++ b/code/modules/mob/living/carbon/human/emote_vr.dm
@@ -19,15 +19,19 @@
if ("awoo")
message = "awoos loudly. AwoooOOOOoooo!"
m_type = 2
-//Chompstation Edit: Removing NIFs - Jon
-/*
if ("nsay")
nsay()
return TRUE
if ("nme")
nme()
return TRUE
-*/
+ if ("airflip")
+ if(!flying)
+ to_chat(src, "You can't *flip when you are on the ground!")
+ else
+ src.SpinAnimation(-7,1)
+ message = "flips backwards in the air!"
+ m_type = 1
if ("flip")
var/danger = 1 //Base 1% chance to break something.
var/list/involved_parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 7f8e9db4d4..d05babc345 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -294,7 +294,7 @@
msg += attempt_vr(src,"examine_bellies",args) //VOREStation Code
msg += attempt_vr(src,"examine_pickup_size",args) //VOREStation Code
msg += attempt_vr(src,"examine_step_size",args) //VOREStation Code
-// msg += attempt_vr(src,"examine_nif",args) //VOREStation Code //removed due to removal of NIFs temporarily - Jon
+ msg += attempt_vr(src,"examine_nif",args) //VOREStation Code
if(mSmallsize in mutations)
msg += "[T.He] [T.is] very short!
"
diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm
index 65097c23a2..4cbb7a3dba 100644
--- a/code/modules/mob/living/carbon/human/examine_vr.dm
+++ b/code/modules/mob/living/carbon/human/examine_vr.dm
@@ -144,7 +144,7 @@
/mob/living/carbon/human/proc/examine_pickup_size(mob/living/H)
var/message = ""
if(istype(H) && (H.get_effective_size() - src.get_effective_size()) >= 0.50)
- message = "They are small enough that you could easily pick them up!\n"
+ message = "They are small enough that you could easily pick them up!\n"
return message
/mob/living/carbon/human/proc/examine_step_size(mob/living/H)
@@ -153,9 +153,8 @@
message = "They are small enough that you could easily trample them!\n"
return message
-//Chompstation Edit: Removing NIFs - Jon
-/*
+
+
/mob/living/carbon/human/proc/examine_nif(mob/living/carbon/human/H)
if(nif && nif.examine_msg) //If you have one set, anyway.
return "[nif.examine_msg]\n"
-*/
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index fc1c35b69a..597fb2b94a 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -57,9 +57,9 @@
human_mob_list -= src
for(var/organ in organs)
qdel(organ)
-// Chompstation Edit: Removing NIFs temporarily - Jon
-// qdel_null(nif) //VOREStation Add
-// qdel_null_list(vore_organs) //VOREStation Add
+
+ qdel_null(nif) //VOREStation Add
+ qdel_null_list(vore_organs) //VOREStation Add
return ..()
/mob/living/carbon/human/Stat()
@@ -755,7 +755,7 @@
/mob/living/carbon/human/proc/play_xylophone()
if(!src.xylophone)
var/datum/gender/T = gender_datums[get_visible_gender()]
- visible_message("\The [src] begins playing [T.his] ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.")
+ visible_message("\The [src] begins playing [T.his] ribcage like a xylophone. It's quite spooky.","You begin to play a spooky refrain on your ribcage.","You hear a spooky xylophone melody.")
var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg')
playsound(loc, song, 50, 1, -1)
xylophone = 1
@@ -846,7 +846,7 @@
regenerate_icons()
check_dna()
var/datum/gender/T = gender_datums[get_visible_gender()]
- visible_message("\The [src] morphs and changes [T.his] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")
+ visible_message("\The [src] morphs and changes [T.his] appearance!", "You change your appearance!", "Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")
/mob/living/carbon/human/proc/remotesay()
set name = "Project mind"
@@ -869,10 +869,10 @@
var/say = sanitize(input("What do you wish to say"))
if(mRemotetalk in target.mutations)
- target.show_message(" You hear [src.real_name]'s voice: [say]")
+ target.show_message(" You hear [src.real_name]'s voice: [say]")
else
- target.show_message(" You hear a voice that seems to echo around the room: [say]")
- usr.show_message(" You project your mind into [target.real_name]: [say]")
+ target.show_message(" You hear a voice that seems to echo around the room: [say]")
+ usr.show_message(" You project your mind into [target.real_name]: [say]")
log_say("(TPATH to [key_name(target)]) [say]",src)
for(var/mob/observer/dead/G in mob_list)
G.show_message("Telepathic message from [src] to [target]: [say]")
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 46ade0ac93..f61ddbfd09 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -1,5 +1,5 @@
/mob/living/carbon/human/proc/get_unarmed_attack(var/mob/living/carbon/human/target, var/hit_zone)
- //Chompstation Edit: Removing NIFs - Jon
+
// VOREStation Edit - Begin
// if(nif && nif.flag_check(NIF_C_HARDCLAWS,NIF_FLAGS_COMBAT)){return unarmed_hardclaws}
if(src.default_attack && src.default_attack.is_usable(src, target, hit_zone))
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index aab6d786dc..394acc565e 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -117,9 +117,8 @@
amount *= M.incoming_damage_percent
if(!isnull(M.incoming_brute_damage_percent))
amount *= M.incoming_brute_damage_percent
- //Chompstation Edit: Removing NIFs - Jon
-// if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage
- take_overall_damage(amount, 0)
+ if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage
+ take_overall_damage(amount, 0)
else
for(var/datum/modifier/M in modifiers)
if(!isnull(M.incoming_healing_percent))
@@ -136,9 +135,8 @@
amount *= M.incoming_damage_percent
if(!isnull(M.incoming_fire_damage_percent))
amount *= M.incoming_fire_damage_percent
- //Chompstation Edit: Removing NIFs - Jon
-// if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage
- take_overall_damage(0, amount)
+ if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage
+ take_overall_damage(0, amount)
else
for(var/datum/modifier/M in modifiers)
if(!isnull(M.incoming_healing_percent))
@@ -157,8 +155,7 @@
amount *= M.incoming_damage_percent
if(!isnull(M.incoming_brute_damage_percent))
amount *= M.incoming_brute_damage_percent
-// Chompstation Edit: Removing NIFs temporarily - Jon
-// if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage
+ if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage
O.take_damage(amount, 0, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source)
else
for(var/datum/modifier/M in modifiers)
@@ -180,9 +177,8 @@
amount *= M.incoming_damage_percent
if(!isnull(M.incoming_fire_damage_percent))
amount *= M.incoming_fire_damage_percent
-//Chompstation Edit: Removing NIFs - Jon
-// if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage
- O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source)
+ if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage
+ O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source)
else
for(var/datum/modifier/M in modifiers)
if(!isnull(M.incoming_healing_percent))
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 8add0cb4b8..35f192e208 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -147,12 +147,12 @@
var/obj/item/clothing/glasses/V = rig.visor.vision.glasses
compiled_vis |= V.enables_planes
-//Chompstation Edit: Removing NIFs - Jon
-/* //VOREStation Add - NIF Support
+
+ //VOREStation Add - NIF Support
if(nif)
compiled_vis |= nif.planes_visible()
//VOREStation Add End
-*/
+
if(!compiled_vis.len && !vis_enabled.len)
return //Nothin' doin'.
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index ebf6facf68..e2e438c9c3 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -210,7 +210,7 @@
if(!has_organ(BP_L_FOOT) && !has_organ(BP_R_FOOT))
return // no feet = no footsteps
- if(buckled || lying || throwing)
+ if(buckled || lying || throwing || flying)
return // people flying, lying down or sitting do not step
if(!has_gravity(src) && prob(75))
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index 41c240b98a..0aee7fb4c8 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -76,7 +76,7 @@
log_say("(COMMUNE to [key_name(M)]) [text]",src)
- M << "Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]"
+ M << "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 == src.species.name)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index dda754484d..65439ec3c1 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -84,8 +84,8 @@
handle_heartbeat()
- //Chompstation Edit: Removing NIFs - Jon
-// handle_nif() //VOREStation Add
+
+ handle_nif() //VOREStation Add
if(!client)
species.handle_npc(src)
@@ -691,9 +691,8 @@
pressure_alert = -1
else
if( !(COLD_RESISTANCE in mutations))
-// Chompstation Edit - Removes NIFs - Jon
-// if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF pressure seals
- if(!isSynthetic())
+
+ if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF pressure seals
take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure")
if(getOxyLoss() < 55) // 11 OxyLoss per 4 ticks when wearing internals; unconsciousness in 16 ticks, roughly half a minute
adjustOxyLoss(4) // 16 OxyLoss per 4 ticks when no internals present; unconsciousness in 13 ticks, roughly twenty seconds
@@ -731,9 +730,9 @@
// FBPs will overheat, prosthetic limbs are fine.
if(robobody_count)
-// Chompstation Edit: Removing NIFs temporarily - Jon
-// if(!nif || !nif.flag_check(NIF_O_HEATSINKS,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF heatsinks
- bodytemperature += round(robobody_count*1.75)
+
+ if(!nif || !nif.flag_check(NIF_O_HEATSINKS,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF heatsinks
+ bodytemperature += round(robobody_count*1.75)
var/body_temperature_difference = species.body_temperature - bodytemperature
@@ -1310,9 +1309,9 @@
var/obj/item/clothing/glasses/G = glasses
if(!G.prescription)
set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1)
-//Chompstation Edit: Removing NIFs - Jon
-// else if (!nif || !nif.flag_check(NIF_V_CORRECTIVE,NIF_FLAGS_VISION)) //VOREStation Edit - NIF
-// set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1)
+
+ else if (!nif || !nif.flag_check(NIF_V_CORRECTIVE,NIF_FLAGS_VISION)) //VOREStation Edit - NIF
+ set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1)
set_fullscreen(eye_blurry, "blurry", /obj/screen/fullscreen/blurry)
set_fullscreen(druggy, "high", /obj/screen/fullscreen/high)
@@ -1326,8 +1325,8 @@
var/obj/item/clothing/glasses/welding/O = glasses
if(!O.up)
found_welder = 1
-//Chompstation Edit: Removing NIFs - Jon
-// if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 //VOREStation Add - NIF
+
+ if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 //VOREStation Add - NIF
if(!found_welder && istype(head, /obj/item/clothing/head/welding))
var/obj/item/clothing/head/welding/O = head
if(!O.up)
diff --git a/code/modules/mob/living/carbon/human/life_vr.dm b/code/modules/mob/living/carbon/human/life_vr.dm
index 2710ca452e..5090bf4b85 100644
--- a/code/modules/mob/living/carbon/human/life_vr.dm
+++ b/code/modules/mob/living/carbon/human/life_vr.dm
@@ -48,16 +48,15 @@
else
vantag.icon_state = "hudblank"
apply_hud(VANTAG_HUD, vantag)
-// Chompstation Edit: Removing NIFs temporarily - Jon
-/*
+
//Our call for the NIF to do whatever
/mob/living/carbon/human/proc/handle_nif()
if(!nif) return
//Process regular life stuff
nif.life()
-*/
+
//Overriding carbon move proc that forces default hunger factor
/mob/living/carbon/Move(NewLoc, direct)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm
index a4afed724d..b1e4bcbb1a 100644
--- a/code/modules/mob/living/carbon/human/species/species_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/species_vr.dm
@@ -28,8 +28,7 @@
for(var/u_type in unarmed_types)
unarmed_attacks += new u_type()
-//Chompstation Edit: Removing NIFs - Jon
-/*
+
/datum/species/create_organs(var/mob/living/carbon/human/H)
if(H.nif)
var/type = H.nif.type
@@ -41,4 +40,4 @@
var/obj/item/device/nif/nif = new type(H,durability,nif_savedata)
nif.nifsofts = nifsofts
else
- ..() */
+ ..()
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
index b3d2af1df7..83dfc68022 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
@@ -112,8 +112,6 @@
for(var/path in powertypes)
abilities += new path()
-//Chompstation Edit: Removing NIFs - Jon
-/*
/datum/species/protean/create_organs(var/mob/living/carbon/human/H)
var/obj/item/device/nif/saved_nif = H.nif
if(saved_nif)
@@ -121,7 +119,7 @@
H.nif.forceMove(null)
..()
if(saved_nif)
- saved_nif.quick_implant(H)*/
+ saved_nif.quick_implant(H)
/datum/species/protean/get_bodytype(var/mob/living/carbon/human/H)
if(H)
@@ -145,15 +143,14 @@
else
H.equip_to_slot_or_del(permit, slot_in_backpack)
H.equip_to_slot_or_del(metal_stack, slot_in_backpack)
-// Chompstation Edit: Removing temporarily - Jon
-/*
+
spawn(0) //Let their real nif load if they have one
if(!H.nif)
var/obj/item/device/nif/bioadap/new_nif = new()
new_nif.quick_implant(H)
else
H.nif.durability = rand(21,25)
-*/
+
/datum/species/protean/hug(var/mob/living/carbon/human/H, var/mob/living/target)
return ..() //Wut
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
index e6b52d47e3..d14d4db279 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
@@ -769,13 +769,17 @@
if(C.nutrition < 25 && !C.flying) //Don't have any food in you?" You can't fly.
to_chat(C, "You lack the nutrition to fly.")
return
- if(C.nutrition > 1000 && !C.flying)
+ if(C.nutrition > 2200 && !C.flying) //Chomp edit. 1000 -> 2200
to_chat(C, "You have eaten too much to fly! You need to lose some nutrition.")
return
-
+ if(C.weight > 325 && !C.flying) //Referencing the 'very fat' range from examine_weight() in examine_vr.dm.
+ to_chat(C, "You are too heavy to fly! You need to shed some weight.")
+ return
C.flying = !C.flying
update_floating()
to_chat(C, "You have [C.flying?"started":"stopped"] flying.")
+ visible_message("[C] [C.flying?"started":"stopped"] flying!")
+ playsound(usr.loc, 'sound/effects/wing2.ogg', 60, 1)
//Proc to stop inertial_drift. Exchange nutrition in order to stop gliding around.
/mob/living/proc/start_wings_hovering()
@@ -802,8 +806,8 @@
if(!C.anchored && !C.pulledby) //Not currently anchored, and not pulled by anyone.
C.anchored = 1 //This is the only way to stop the inertial_drift.
- C.nutrition -= 25
- update_floating()
+ C.nutrition -= 15 //Chomp edit. 25 -> 15
+ start_floating() //You do the floating animation when you toggle flight but don't move. Force it here for hovering as well. Chomp edit.
to_chat(C, "You hover in place.")
spawn(6) //.6 seconds.
C.anchored = 0
@@ -878,7 +882,7 @@ mob/living/carbon/proc/charmed() //TODO
spawn(0)
for(var/i = 1,i > 0, i--)
- src << "... [pick(charmed)] ..."
+ src << "... [pick(charmed)] ..."
charmed = 0
*/
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
index 900ca7b867..d802e8abad 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
@@ -97,7 +97,7 @@
/datum/trait/winged_flight
name = "Winged Flight"
desc = "Allows you to fly by using your wings."
- cost = 2 //Some in game value.
+ cost = 3
/datum/trait/winged_flight/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
diff --git a/code/modules/mob/living/carbon/metroid/emote.dm b/code/modules/mob/living/carbon/metroid/emote.dm
index 6375f23b2a..312cf8b7de 100644
--- a/code/modules/mob/living/carbon/metroid/emote.dm
+++ b/code/modules/mob/living/carbon/metroid/emote.dm
@@ -86,7 +86,7 @@
src << "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate. You can also set your face with: \n\nnomood, pout, sad, angry, frown, smile"
else
- src << "Unusable emote '[act]'. Say *help for a list."
+ src << "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/living.dm b/code/modules/mob/living/living.dm
index 7d2d86ab76..a7aeae21b9 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -218,9 +218,9 @@ default behaviour is:
set hidden = 1
if ((src.health < 0 && src.health > (5-src.getMaxHealth()))) // Health below Zero but above 5-away-from-death, as before, but variable
src.death()
- to_chat(src, "You have given up life and succumbed to death.")
+ to_chat(src, "You have given up life and succumbed to death.")
else
- to_chat(src, "You are not injured enough to succumb to death!")
+ to_chat(src, "You are not injured enough to succumb to death!")
/mob/living/proc/updatehealth()
if(status_flags & GODMODE)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 3d9140dd46..42b4359d11 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -255,7 +255,7 @@
miss_chance = max(15*(distance-2), 0)
if (prob(miss_chance))
- visible_message("\The [O] misses [src] narrowly!")
+ visible_message("\The [O] misses [src] narrowly!")
return
src.visible_message("[src] has been hit by [O].")
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 9357c3eeb4..5044595975 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -516,7 +516,7 @@ var/list/ai_verbs_default = list(
if(network in C.network)
eyeobj.setLoc(get_turf(C))
break
- src << "Switched to [network] camera network."
+ src << "Switched to [network] camera network."
//End of code by Mord_Sith
/mob/living/silicon/ai/proc/ai_statuschange()
@@ -695,20 +695,20 @@ var/list/ai_verbs_default = list(
else if(istype(W, /obj/item/weapon/wrench))
if(anchored)
playsound(src, W.usesound, 50, 1)
- user.visible_message("\The [user] starts to unbolt \the [src] from the plating...")
+ user.visible_message("\The [user] starts to unbolt \the [src] from the plating...")
if(!do_after(user,40 * W.toolspeed))
- user.visible_message("\The [user] decides not to unbolt \the [src].")
+ user.visible_message("\The [user] decides not to unbolt \the [src].")
return
- user.visible_message("\The [user] finishes unfastening \the [src]!")
+ user.visible_message("\The [user] finishes unfastening \the [src]!")
anchored = 0
return
else
playsound(src, W.usesound, 50, 1)
- user.visible_message("\The [user] starts to bolt \the [src] to the plating...")
+ user.visible_message("\The [user] starts to bolt \the [src] to the plating...")
if(!do_after(user,40 * W.toolspeed))
- user.visible_message("\The [user] decides not to bolt \the [src].")
+ user.visible_message("\The [user] decides not to bolt \the [src].")
return
- user.visible_message("\The [user] finishes fastening down \the [src]!")
+ user.visible_message("\The [user] finishes fastening down \the [src]!")
anchored = 1
return
else
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 0ba4487f4b..3358d1855e 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -231,7 +231,7 @@
cameralist[C.network] = C.network
src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist
- src << "Switched to [src.network] camera network."
+ src << "Switched to [src.network] camera network."
//End of code by Mord_Sith
*/
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index bbc8cefd36..5e799b969a 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -24,10 +24,10 @@
user << text("You try to analyze the floor's vitals!")
for(var/mob/O in viewers(M, null))
O.show_message(text("[user] has analyzed the floor's vitals!"), 1)
- user.show_message(text("Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1)
- user.show_message(text("\t Damage Specifics: [0]-[0]-[0]-[0]"), 1)
- user.show_message("Key: Suffocation/Toxin/Burns/Brute", 1)
- user.show_message("Body Temperature: ???", 1)
+ user.show_message(text("Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1)
+ user.show_message(text("\t Damage Specifics: [0]-[0]-[0]-[0]"), 1)
+ user.show_message("Key: Suffocation/Toxin/Burns/Brute", 1)
+ user.show_message("Body Temperature: ???", 1)
return
var/scan_type
@@ -44,17 +44,17 @@
if("robot")
var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss()
var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss()
- user.show_message("Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]")
+ user.show_message("Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]")
user.show_message("\t Key: Electronics/Brute", 1)
user.show_message("\t Damage Specifics: [BU] - [BR]")
if(M.tod && M.stat == DEAD)
- user.show_message("Time of Disable: [M.tod]")
+ user.show_message("Time of Disable: [M.tod]")
var/mob/living/silicon/robot/H = M
var/list/damaged = H.get_damaged_components(1,1,1)
- user.show_message("Localized Damage:",1)
+ user.show_message("Localized Damage:",1)
if(length(damaged)>0)
for(var/datum/robot_component/org in damaged)
- user.show_message(text("\t []: [][] - [] - [] - []", \
+ user.show_message(text("\t []: [][] - [] - [] - []", \
capitalize(org.name), \
(org.installed == -1) ? "DESTROYED " :"",\
(org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \
@@ -62,10 +62,10 @@
(org.toggled) ? "Toggled ON" : "Toggled OFF",\
(org.powered) ? "Power ON" : "Power OFF"),1)
else
- user.show_message("\t Components are OK.",1)
+ user.show_message("\t Components are OK.",1)
if(H.emagged && prob(5))
user.show_message("\t ERROR: INTERNAL SYSTEMS COMPROMISED",1)
- user.show_message("Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1)
+ user.show_message("Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1)
if("prosthetics")
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 7e73eb7e4c..c34b802f4f 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -240,7 +240,7 @@
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, yes, no"
else
- src << "Unusable emote '[act]'. Say *help for a list."
+ src << "Unusable emote '[act]'. Say *help for a list."
if ((message && src.stat == 0))
custom_emote(m_type,message)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 3136fb6cc8..072adae5f9 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -469,7 +469,7 @@
C.brute_damage = WC.brute
C.electronics_damage = WC.burn
- usr << "You install the [W.name]."
+ usr << "You install the [W.name]."
return
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index d52a5da531..aa7358eb43 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -166,7 +166,7 @@
overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer)
addedSomething = 1
if ( addedSomething )
- user.visible_message("[user] load some items onto their service tray.")
+ user.visible_message("[user] load some items onto their service tray.")
return
@@ -206,9 +206,9 @@
sleep(rand(2,4))
if ( droppedSomething )
if ( foundtable )
- user.visible_message("[user] unloads their service tray.")
+ user.visible_message("[user] unloads their service tray.")
else
- user.visible_message("[user] drops all the items on their tray.")
+ user.visible_message("[user] drops all the items on their tray.")
return ..()
@@ -288,7 +288,7 @@
deploy_paper(get_turf(src))
/obj/item/weapon/form_printer/proc/deploy_paper(var/turf/T)
- T.visible_message("\The [src.loc] dispenses a sheet of crisp white paper.")
+ T.visible_message("\The [src.loc] dispenses a sheet of crisp white paper.")
new /obj/item/weapon/paper(T)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
index 3ce0e1d0db..56562af581 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
@@ -129,7 +129,8 @@
sprites = list(
"K9 hound" = "k9",
"K9 Alternative (Static)" = "k92",
- "Secborg model V-2" = "secborg"
+ "Secborg model V-2" = "secborg",
+ "Secborg model V-3" = "SecVale"
)
channels = list("Security" = 1)
networks = list(NETWORK_SECURITY)
diff --git a/code/modules/mob/living/simple_animal/aliens/drone.dm b/code/modules/mob/living/simple_animal/aliens/drone.dm
index e51dfd82a7..c09599d619 100644
--- a/code/modules/mob/living/simple_animal/aliens/drone.dm
+++ b/code/modules/mob/living/simple_animal/aliens/drone.dm
@@ -99,7 +99,7 @@
//sometimes our targetting sensors malfunction, and we attack anyone nearby
if(prob(disabled ? 0 : 1))
if(hostile)
- src.visible_message("\icon[src] [src] retracts several targetting vanes, and dulls it's running lights.")
+ src.visible_message("\icon[src] [src] retracts several targetting vanes, and dulls it's running lights.")
hostile = 0
else
src.visible_message("\icon[src] [src] suddenly lights up, and additional targetting vanes slide into place.")
@@ -123,9 +123,9 @@
exploding = 0
if(!disabled)
if(prob(50))
- src.visible_message("\icon[src] [src] suddenly shuts down!")
+ src.visible_message("\icon[src] [src] suddenly shuts down!")
else
- src.visible_message("\icon[src] [src] suddenly lies still and quiet.")
+ src.visible_message("\icon[src] [src] suddenly lies still and quiet.")
disabled = rand(150, 600)
walk(src,0)
diff --git a/code/modules/mob/living/simple_animal/animals/corgi.dm b/code/modules/mob/living/simple_animal/animals/corgi.dm
index 33bda8b2e0..317866e6c4 100644
--- a/code/modules/mob/living/simple_animal/animals/corgi.dm
+++ b/code/modules/mob/living/simple_animal/animals/corgi.dm
@@ -105,7 +105,7 @@
if(!stat)
for(var/mob/M in viewers(user, null))
if ((M.client && !( M.blinded )))
- M.show_message("[user] baps [name] on the nose with the rolled up [O]")
+ M.show_message("[user] baps [name] on the nose with the rolled up [O]")
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2))
set_dir(i)
diff --git a/code/modules/mob/living/simple_animal/animals/farm_animals.dm b/code/modules/mob/living/simple_animal/animals/farm_animals.dm
index 5f63128596..9cc06b035b 100644
--- a/code/modules/mob/living/simple_animal/animals/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/animals/farm_animals.dm
@@ -255,12 +255,12 @@ var/global/chicken_count = 0
var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O
if(G.seed && G.seed.kitchen_tag == "wheat")
if(!stat && eggsleft < 8)
- user.visible_message("[user] feeds [O] to [name]! It clucks happily.","You feed [O] to [name]! It clucks happily.")
+ user.visible_message("[user] feeds [O] to [name]! It clucks happily.","You feed [O] to [name]! It clucks happily.")
user.drop_item()
qdel(O)
eggsleft += rand(1, 4)
else
- user << "[name] doesn't seem hungry!"
+ user << "[name] doesn't seem hungry!"
else
user << "[name] doesn't seem interested in that."
else
diff --git a/code/modules/mob/living/simple_animal/animals/mouse.dm b/code/modules/mob/living/simple_animal/animals/mouse.dm
index 5df09466e6..7998fb6229 100644
--- a/code/modules/mob/living/simple_animal/animals/mouse.dm
+++ b/code/modules/mob/living/simple_animal/animals/mouse.dm
@@ -96,7 +96,7 @@
if( ishuman(AM) )
if(!stat)
var/mob/M = AM
- M.visible_message("\icon[src] Squeek!")
+ M.visible_message("\icon[src] Squeek!")
M << 'sound/effects/mouse_squeak.ogg'
..()
diff --git a/code/modules/mob/living/simple_animal/animals/parrot.dm b/code/modules/mob/living/simple_animal/animals/parrot.dm
index 63c129dda1..4582c7bc61 100644
--- a/code/modules/mob/living/simple_animal/animals/parrot.dm
+++ b/code/modules/mob/living/simple_animal/animals/parrot.dm
@@ -417,7 +417,7 @@
if(!parrot_perch || parrot_interest.loc != parrot_perch.loc)
held_item = parrot_interest
parrot_interest.forceMove(src)
- visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
+ visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
parrot_interest = null
parrot_state = PARROT_SWOOP | PARROT_RETURN
@@ -590,7 +590,7 @@
held_item = I
I.forceMove(src)
- visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
+ visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
return held_item
to_chat(src, "There is nothing of interest to take.")
@@ -621,7 +621,7 @@
C.remove_from_mob(stolen_item)
held_item = stolen_item
stolen_item.forceMove(src)
- visible_message("[src] grabs the [held_item] out of [C]'s hand!", "You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
+ visible_message("[src] grabs the [held_item] out of [C]'s hand!", "You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
return held_item
to_chat(src, "There is nothing of interest to take.")
diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm
index 2b143a6b18..faf786306d 100644
--- a/code/modules/mob/living/simple_animal/animals/synx.dm
+++ b/code/modules/mob/living/simple_animal/animals/synx.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/retaliate/synx
name = "Synx"
- desc = "to be added"
+ desc = "A cold blooded, genderless, parasitic eel from the more distant and stranger areas of the cosmos. Plain, white, perpetually grinning and possessing a hunger as enthusiastic and endless as humanity's sense of exploration."
tt_desc = "synxus pergulus"
//Synx species belongs to ChimeraSynx , Sprites by: SpitefulCrow
@@ -17,8 +17,8 @@
maxHealth = 150
health = 120
- turns_per_move = 2
- speed = -2
+ //turns_per_move = 2 //to be balanced, default for now
+ //speed = -2 //to be balanced, default for now
see_in_dark = 6
stop_when_pulled = 0
armor = list( // will be determined
@@ -102,7 +102,7 @@ mob/living/simple_animal/synx/PunchTarget()
status_flags &= ~HIDING
reset_plane_and_layer()
to_chat(src,"You have stopped hiding.")
- speed = -3
+ //speed = -3, to be balanced
else
status_flags |= HIDING
layer = HIDING_LAYER //Just above cables with their 2.44
diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm
index e4add4d749..be70dfc211 100644
--- a/code/modules/mob/living/simple_animal/borer/borer.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer.dm
@@ -64,16 +64,16 @@
if(host.reagents.has_reagent("sugar"))
if(!docile)
if(controlling)
- host << "You feel the soporific flow of sugar in your host's blood, lulling you into docility."
+ host << "You feel the soporific flow of sugar in your host's blood, lulling you into docility."
else
- src << "You feel the soporific flow of sugar in your host's blood, lulling you into docility."
+ src << "You feel the soporific flow of sugar in your host's blood, lulling you into docility."
docile = 1
else
if(docile)
if(controlling)
- host << "You shake off your lethargy as the sugar leaves your host's blood."
+ host << "You shake off your lethargy as the sugar leaves your host's blood."
else
- src << "You shake off your lethargy as the sugar leaves your host's blood."
+ src << "You shake off your lethargy as the sugar leaves your host's blood."
docile = 0
if(chemicals < 250)
@@ -81,7 +81,7 @@
if(controlling)
if(docile)
- host << "You are feeling far too docile to continue controlling your host..."
+ host << "You are feeling far too docile to continue controlling your host..."
host.release_control()
return
diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
index b75da20cc4..b83c6dfe42 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
@@ -11,7 +11,7 @@
src << "You cannot leave your host in your current state."
if(docile)
- src << "You are feeling far too docile to do that."
+ src << "You are feeling far too docile to do that."
return
if(!host || !src) return
@@ -143,7 +143,7 @@
src << "You cannot do that in your current state."
if(docile)
- src << "You are feeling far too docile to do that."
+ src << "You are feeling far too docile to do that."
return
@@ -211,7 +211,7 @@
src << "You cannot secrete chemicals in your current state."
if(docile)
- src << "You are feeling far too docile to do that."
+ src << "You are feeling far too docile to do that."
return
if(chemicals < 50)
@@ -280,7 +280,7 @@
return
if(docile)
- src << "You are feeling far too docile to do that."
+ src << "You are feeling far too docile to do that."
return
src << "You begin delicately adjusting your connection to the host brain..."
diff --git a/code/modules/mob/living/simple_animal/simple_animal_vr.dm b/code/modules/mob/living/simple_animal/simple_animal_vr.dm
index 883c43e30f..ee4c462a48 100644
--- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm
@@ -20,6 +20,7 @@
var/vore_digest_chance = 25 // Chance to switch to digest mode if resisted
var/vore_absorb_chance = 0 // Chance to switch to absorb mode if resisted
var/vore_escape_chance = 25 // Chance of resisting out of mob
+ var/vore_escape_time = 60 SECONDS // This didn't exist before. Why? I don't know. Modifies the escape time of a belly. -Erik
var/vore_stomach_name // The name for the first belly if not "stomach"
var/vore_stomach_flavor // The flavortext for the first belly if not the default
@@ -151,6 +152,7 @@
B.mode_flags = vore_default_flags
B.escapable = vore_escape_chance > 0
B.escapechance = vore_escape_chance
+ B.escapetime = vore_escape_time
B.digestchance = vore_digest_chance
B.absorbchance = vore_absorb_chance
B.human_prey_swallow_time = swallowTime
diff --git a/code/modules/mob/living/simple_animal/vore/bee.dm b/code/modules/mob/living/simple_animal/vore/bee.dm
index e5bf7b49ae..79c15059e1 100644
--- a/code/modules/mob/living/simple_animal/vore/bee.dm
+++ b/code/modules/mob/living/simple_animal/vore/bee.dm
@@ -42,4 +42,4 @@
// Activate Noms!
/mob/living/simple_animal/retaliate/bee
vore_active = 1
- vore_icons = SA_ICON_LIVING
+ vore_icons = SA_ICON_LIVING
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm
index 2e7e2f949a..83244887b0 100644
--- a/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm
+++ b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm
@@ -57,9 +57,7 @@
vore_icons = SA_ICON_LIVING | SA_ICON_REST
vore_stomach_name = "fuel processor"
vore_stomach_flavor = "You have ended up in the fuel processor of this corrupted machine. This place was definitely not designed with safety and comfort in mind. The heated and cramped surroundings oozing potent fluids all over your form, eager to do nothing less than breaking you apart to fuel its rampage for the next few days... hours... minutes? Oh dear..."
-//Chompstation Edit: Removing NIFs - Jon
-// loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6, /obj/item/weapon/disk/nifsoft/compliance = 6)
- loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6)
+ loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6, /obj/item/weapon/disk/nifsoft/compliance = 6)
/mob/living/simple_animal/hostile/corrupthound/prettyboi
name = "corrupt corrupt hound"
diff --git a/code/modules/mob/living/simple_animal/vore/shadekin/types.dm b/code/modules/mob/living/simple_animal/vore/shadekin/types.dm
index 363180922f..fa8f4942a5 100644
--- a/code/modules/mob/living/simple_animal/vore/shadekin/types.dm
+++ b/code/modules/mob/living/simple_animal/vore/shadekin/types.dm
@@ -290,9 +290,11 @@
//"All your chickens are belong to me!" - Zylas
/mob/living/simple_animal/shadekin/purple/zylas
- name ="Zylas"
- desc = " placerholder "
- icon_state = "zylas"
- eye_desc = "e_purple"
- vore_stomach_flavor = " placeholder "
- player_msg = " placeholder "
\ No newline at end of file
+ name ="Zylas"
+ desc = "He's a chubby looking creature, black and grey fur accompanied by purple eyes and a large hoody."
+ icon_state = "zylashoody"
+ eye_desc = "e_purple"
+ vore_stomach_flavor = "You are trapped in a cramped tight space. The color purple seems to dominate your vision. \
+ His walls rolled over your form as you lay trapped in his depths. There wasnt a drop of fluid in sight inside that \
+ stomach. Instead, you could feel your energy slowly draining away over time, like... he was leeching off you."
+ player_msg = "You are Zylas. You enjoy scaring the local population and eating every chicken you find."
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 8471dd8307..146c59a790 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -17,10 +17,10 @@
spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!")
if(matches)
if(M.client)
- message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1)
+ message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1)
log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)].")
else
- message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1)
+ message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1)
log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).")
/mob/Login()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 2f3a95059b..265e8ce360 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -331,9 +331,9 @@
if (flavor_text && flavor_text != "")
var/msg = replacetext(flavor_text, "\n", " ")
if(lentext(msg) <= 40)
- return "[msg]"
+ return "[msg]"
else
- return "[copytext_preserve_html(msg, 1, 37)]... More..."
+ return "[copytext_preserve_html(msg, 1, 37)]... More..."
/*
/mob/verb/help()
@@ -360,7 +360,7 @@
if(istype(src,/mob/observer/dead))
var/mob/observer/dead/G = src
if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
- to_chat(usr, "By using the antagHUD you forfeit the ability to join the round.")
+ to_chat(usr, "By using the antagHUD you forfeit the ability to join the round.")
return
var/deathtimeminutes = round(deathtime / 600)
var/pluralcheck = "minute"
@@ -381,7 +381,7 @@
log_game("[usr.name]/[usr.key] used abandon mob.")
- to_chat(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("[usr.key] AM failed due to disconnect.")
@@ -442,7 +442,7 @@
if(client.holder && (client.holder.rights & R_ADMIN))
is_admin = 1
else if(stat != DEAD || istype(src, /mob/new_player))
- usr << "You must be observing to use this!"
+ usr << "You must be observing to use this!"
return
if(is_admin && stat == DEAD)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index c2b0aaf0f1..2c82a53c32 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -73,7 +73,7 @@
set hidden = 1
if(!usr.pulling)
- usr << "You are not pulling anything."
+ usr << "You are not pulling anything."
return
usr.stop_pulling()
@@ -262,13 +262,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 << "You're restrained! You can't move!"
+ src << "You're restrained! You can't move!"
return 0
else
M.stop_pulling()
if(mob.pinned.len)
- src << "You're pinned to a wall by [mob.pinned[1]]!"
+ src << "You're pinned to a wall by [mob.pinned[1]]!"
return 0
move_delay = world.time//set move delay
@@ -477,7 +477,7 @@
//Check to see if we slipped
if(prob(Process_Spaceslipping(5)) && !buckled)
- src << "You slipped!"
+ src << "You slipped!"
src.inertia_dir = src.last_move
step(src, src.inertia_dir)
return 0
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index 0282af9fe9..484a914381 100644
--- a/code/modules/mob/new_player/poll.dm
+++ b/code/modules/mob/new_player/poll.dm
@@ -402,7 +402,7 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_vote (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
insert_query.Execute()
- usr << "Vote successful."
+ usr << "Vote successful."
usr << browse(null,"window=playerpoll")
@@ -460,7 +460,7 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_poll_textreply (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
insert_query.Execute()
- usr << "Feedback logging successful."
+ usr << "Feedback logging successful."
usr << browse(null,"window=playerpoll")
@@ -522,5 +522,5 @@
var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO erro_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 << "Vote successful."
+ usr << "Vote successful."
usr << browse(null,"window=playerpoll")
\ No newline at end of file
diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index 6cbef8586b..5c1d835687 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -62,6 +62,7 @@
H.audible_message("[H] begins to flap \his wings, preparing to move upwards!")
if(do_after(H, fly_time) && H.flying)
to_chat(src, "You fly upwards.")
+ playsound(src, 'sound/effects/wing2.ogg', 30, 1)
else
to_chat(src, "You stopped flying upwards.")
return 0
@@ -188,11 +189,12 @@
var/mob/H = src //VOREStation Edit Start. Flight on mobs.
if(H.flying) //Some other checks are done in the wings_toggle proc
if(H.nutrition > 2)
- H.nutrition -= 2 //You use up 2 nutrition per TILE and tick of flying above open spaces. If people wanna flap their wings in the hallways, shouldn't penalize them for it.
+ H.nutrition -= 1 //You use up 1 nutrition per TILE and tick of flying above open spaces.
+ playsound(H.loc, 'sound/effects/wing1.ogg', 25, 1)
if(H.incapacitated(INCAPACITATION_ALL))
H.stop_flying()
//Just here to see if the person is KO'd, stunned, etc. If so, it'll move onto can_fall.
- else if (H.nutrition > 1000) //Eat too much while flying? Get fat and fall.
+ else if (H.nutrition > 2000) //Eat too much while flying? Get fat and fall.
to_chat(H, "You're too heavy! Your wings give out and you plummit to the ground!")
H.stop_flying() //womp womp.
else if(H.nutrition < 300 && H.nutrition > 289) //290 would be risky, as metabolism could mess it up. Let's do 289.
diff --git a/code/modules/nano/interaction/inventory_vr.dm b/code/modules/nano/interaction/inventory_vr.dm
index b8eb72ade2..21ee1ca590 100644
--- a/code/modules/nano/interaction/inventory_vr.dm
+++ b/code/modules/nano/interaction/inventory_vr.dm
@@ -11,8 +11,6 @@
return STATUS_CLOSE
-//Chompstation Edit: Removing NIFs - Jon
-/*
/var/global/datum/topic_state/nif_state/nif_state = new()
/datum/topic_state/nif_state/can_use_topic(var/src_object, var/mob/user)
@@ -32,4 +30,3 @@
return user.shared_nano_interaction()
return STATUS_CLOSE
-*/
\ No newline at end of file
diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm
index b0006888bd..0f8efcdd88 100644
--- a/code/modules/nifsoft/software/01_vision.dm
+++ b/code/modules/nifsoft/software/01_vision.dm
@@ -119,7 +119,7 @@
list_pos = NIF_MATERIAL
cost = 1000
a_drain = 0.1
- access = access_research
+ access = access_mining
tick_flags = NIF_ACTIVETICK
planes_enabled = list(VIS_FULLBRIGHT)
vision_flags = (NIF_V_MATERIAL)
diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm
index 9c8d6d7f0e..8b168fb203 100644
--- a/code/modules/nifsoft/software/15_misc.dm
+++ b/code/modules/nifsoft/software/15_misc.dm
@@ -122,7 +122,7 @@
name = "Mass Alteration"
desc = "A system that allows one to change their size, through drastic mass rearrangement. Causes significant wear when installed."
list_pos = NIF_SIZECHANGE
- cost = 750
+ cost = 375
wear = 6
activate()
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index b6064b7645..789dce7dfb 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -464,9 +464,7 @@ This function completely restores a damaged organ to perfect condition.
// remove embedded objects and drop them on the floor
for(var/obj/implanted_object in implants)
- // Chompstation Edit: Removing NIFs temporarily - Jon
-// if(!istype(implanted_object,/obj/item/weapon/implant) && !istype(implanted_object,/obj/item/device/nif)) // We don't want to remove REAL implants. Just shrapnel etc. //VOREStation Edit - NIFs pls
- if(!istype(implanted_object,/obj/item/weapon/implant) && !istype(implanted_object))
+ if(!istype(implanted_object,/obj/item/weapon/implant) && !istype(implanted_object,/obj/item/device/nif)) // We don't want to remove REAL implants. Just shrapnel etc. //VOREStation Edit - NIFs pls
implanted_object.loc = get_turf(src)
implants -= implanted_object
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 816b62a099..4231ed9bcb 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -428,7 +428,7 @@
// check for exploits
for(var/bad in paper_blacklist)
if(findtext(t,bad))
- usr << "You think to yourself, \"Hm.. this is only paper...\""
+ usr << "You think to yourself, \"Hm.. this is only paper...\""
log_admin("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
message_admins("PAPER: [usr] ([usr.ckey]) tried to use forbidden word in [src]: [bad].")
return
diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm
index 707b756ede..757563118a 100644
--- a/code/modules/power/antimatter/fuel.dm
+++ b/code/modules/power/antimatter/fuel.dm
@@ -76,7 +76,7 @@
if("Anti-Hydrogen")
M.gib() //Yikes!
if("Hydrogen")
- M << "You feel very light, as if you might just float away..."
+ M << "You feel very light, as if you might just float away..."
qdel(src)
return
diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm
index a286517965..e078dde2f2 100644
--- a/code/modules/power/cable_heavyduty.dm
+++ b/code/modules/power/cable_heavyduty.dm
@@ -18,10 +18,10 @@
return
if(istype(W, /obj/item/weapon/wirecutters))
- usr << "These cables are too tough to be cut with those [W.name]."
+ usr << "These cables are too tough to be cut with those [W.name]."
return
else if(istype(W, /obj/item/stack/cable_coil))
- usr << "You will need heavier cables to connect to these."
+ usr << "You will need heavier cables to connect to these."
return
else
..()
diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm
index b6b904e65a..ac7c1977c4 100644
--- a/code/modules/power/pacman2.dm
+++ b/code/modules/power/pacman2.dm
@@ -52,7 +52,7 @@
examine(mob/user)
..(user)
- user << "The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle."
+ user << "The generator has [P.air_contents.phoron] units of fuel left, producing [power_gen] per cycle."
handleInactive()
heat -= 2
@@ -75,23 +75,23 @@
P = O
user.drop_item()
O.loc = src
- user << "You add the phoron tank to the generator."
+ user << "You add the phoron tank to the generator."
else if(!active)
if(istype(O, /obj/item/weapon/wrench))
anchored = !anchored
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(anchored)
- user << "You secure the generator to the floor."
+ user << "You secure the generator to the floor."
else
- user << "You unsecure the generator from the floor."
+ user << "You unsecure the generator from the floor."
SSmachines.makepowernets()
else if(istype(O, /obj/item/weapon/screwdriver))
open = !open
playsound(loc, O.usesound, 50, 1)
if(open)
- user << "You open the access panel."
+ user << "You open the access panel."
else
- user << "You close the access panel."
+ user << "You close the access panel."
else if(istype(O, /obj/item/weapon/crowbar) && !open)
playsound(loc, O.usesound, 50, 1)
var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc)
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 7354faea9e..bcd06c2843 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -77,7 +77,7 @@ var/global/list/rad_collectors = list()
return 1
else if(istype(W, /obj/item/weapon/wrench))
if(P)
- user << "Remove the phoron tank first."
+ user << "Remove the phoron tank first."
return 1
playsound(src, W.usesound, 75, 1)
src.anchored = !src.anchored
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 7ac9bbcfb0..b1cf66b4f5 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -407,7 +407,7 @@ var/list/solars_list = list()
playsound(src, I.usesound, 50, 1)
if(do_after(user, 20))
if (src.stat & BROKEN)
- user << "The broken glass falls out."
+ user << "The broken glass falls out."
var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc )
new /obj/item/weapon/material/shard( src.loc )
var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A )
@@ -419,7 +419,7 @@ var/list/solars_list = list()
A.anchored = 1
qdel(src)
else
- user << "You disconnect the monitor."
+ user << "You disconnect the monitor."
var/obj/structure/frame/A = new /obj/structure/frame/computer( 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/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index b28c8f2993..fedd2dae68 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -32,7 +32,7 @@
/obj/item/ammo_casing/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/screwdriver))
if(!BB)
- user << "There is no bullet in the casing to inscribe anything into."
+ user << "There is no bullet in the casing to inscribe anything into."
return
var/tmp_label = ""
@@ -40,10 +40,10 @@
if(length(label_text) > 20)
user << "The inscription can be at most 20 characters long."
else if(!label_text)
- user << "You scratch the inscription off of [initial(BB)]."
+ user << "You scratch the inscription off of [initial(BB)]."
BB.name = initial(BB.name)
else
- user << "You inscribe \"[label_text]\" into \the [initial(BB.name)]."
+ user << "You inscribe \"[label_text]\" into \the [initial(BB.name)]."
BB.name = "[initial(BB.name)] (\"[label_text]\")"
/obj/item/ammo_casing/update_icon()
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 2f28086e45..e76989eb79 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -695,7 +695,7 @@
mouthshoot = 1
M.visible_message("[user] sticks their gun in their mouth, ready to pull the trigger...")
if(!do_after(user, 40))
- M.visible_message("[user] decided life was worth living")
+ M.visible_message("[user] decided life was worth living")
mouthshoot = 0
return
var/obj/item/projectile/in_chamber = consume_next_projectile()
diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm
index dae5a5c8ee..3c14144fbc 100644
--- a/code/modules/projectiles/guns/launcher/rocket.dm
+++ b/code/modules/projectiles/guns/launcher/rocket.dm
@@ -20,7 +20,7 @@
/obj/item/weapon/gun/launcher/rocket/examine(mob/user)
if(!..(user, 2))
return
- user << "[rockets.len] / [max_rockets] rockets."
+ user << "[rockets.len] / [max_rockets] rockets."
/obj/item/weapon/gun/launcher/rocket/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/ammo_casing/rocket))
@@ -28,8 +28,8 @@
user.drop_item()
I.loc = src
rockets += I
- user << "You put the rocket in [src]."
- user << "[rockets.len] / [max_rockets] rockets."
+ user << "You put the rocket in [src]."
+ user << "[rockets.len] / [max_rockets] rockets."
else
usr << "[src] cannot hold more rockets."
diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm
index 080c7cc1a6..f65fe7def4 100644
--- a/code/modules/projectiles/guns/projectile/dartgun.dm
+++ b/code/modules/projectiles/guns/projectile/dartgun.dm
@@ -105,25 +105,25 @@
// return
..()
if (beakers.len)
- user << "[src] contains:"
+ 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]"
+ user << "[R.volume] units of [R.name]"
/obj/item/weapon/gun/projectile/dartgun/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/weapon/reagent_containers/glass))
if(!istype(I, container_type))
- user << "[I] doesn't seem to fit into [src]."
+ 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!"
+ 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
user.drop_item()
B.loc = src
beakers += B
- user << "You slot [B] into [src]."
+ user << "You slot [B] into [src]."
src.updateUsrDialog()
return 1
..()
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 2e27d125ef..956e0ba673 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -164,7 +164,7 @@
else if(istype(target, /mob/living/carbon/))
// for (var/mob/V in viewers(src))
// V.show_message("The radiation beam dissipates harmlessly through [M]", 3)
- M.show_message("The radiation beam dissipates harmlessly through your body.")
+ M.show_message("The radiation beam dissipates harmlessly through your body.")
else
return 1
@@ -197,7 +197,7 @@
if((H.species.flags & IS_PLANT) && (M.nutrition < 500))
M.nutrition += 30
else if (istype(target, /mob/living/carbon/))
- M.show_message("The radiation beam dissipates harmlessly through your body.")
+ M.show_message("The radiation beam dissipates harmlessly through your body.")
else
return 1
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm
index e57d7ae582..64f12964e4 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm
@@ -74,3 +74,78 @@
/datum/reagent/vermicetol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien != IS_DIONA)
M.heal_organ_damage(0, 110 * removed) //Not as potent as Kelotane, but lasts LONG.
+
+
+
+///SAP REAGENTS////
+//This is all a direct port from aeiou.
+
+/datum/reagent/hannoa
+ name = "Hannoa"
+ id = "hannoa"
+ description = "A powerful clotting agent that treats brute damage very quickly but takes a long time to be metabolised. Overdoses easily, reacts badly with other chemicals."
+ taste_description = "paint"
+ reagent_state = LIQUID
+ color = "#163851"
+ overdose = 8
+ scannable = 1
+ metabolism = 0.03
+
+/datum/reagent/hannoa/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+ ..()
+ if(ishuman(M))
+ var/wound_heal = 1.5 * removed
+ var/mob/living/carbon/human/H = M
+ for(var/obj/item/organ/external/O in H.bad_external_organs)
+ for(var/datum/wound/W in O.wounds)
+ if(W.bleeding())
+ W.damage = max(W.damage - wound_heal, 0)
+ if(W.damage <= 0)
+ O.wounds -= W
+ M.take_organ_damage(3 * removed, 0)
+ if(M.losebreath < 15)
+ M.AdjustLosebreath(1)
+ H.custom_pain("It feels as if your veins are fusing shut!",60)
+
+/datum/reagent/hannoa/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //Sleepy if not overdosing.
+ ..()
+ var/effective_dose = dose
+ if(effective_dose < 2)
+ if(effective_dose == metabolism * 2 || prob(5))
+ M.emote("yawn")
+ else if(effective_dose < 5)
+ M.eye_blurry = max(M.eye_blurry, 10)
+ else if(effective_dose < 20)
+ if(prob(50))
+ M.Weaken(2)
+ M.drowsyness = max(M.drowsyness, 20)
+ else
+ M.sleeping = max(M.sleeping, 20)
+
+
+/datum/reagent/bullvalene //This is for the third sap. It converts Brute Oxy and burn into slightly less toxins.
+ name = "bullvalene"
+ id = "bullvalene"
+ description = "witty pending description. Converts brute and burn into toxin. Or at least is supposed to."
+ taste_description = "sulfur"
+ reagent_state = LIQUID
+ color = "#163851"
+ overdose = 8 //This many units starts killing you.
+ scannable = 1 // Mechs can scan this ye
+ metabolism = 0.03 //Slow metabolism. This value was plucked out of nowhere. Can be changed.
+
+/datum/reagent/bullvalene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //Credit to Cameron for making my life easier with getFireLoss and such!
+ if(alien == IS_SLIME)
+ return
+ if(alien != IS_DIONA)
+ return
+ else
+ if(M.getOxyLoss()) //OXYGEN | This check if there is oxygen damage
+ M.adjustOxyLoss(-1) //This remove the oxygen damage
+ M.adjustToxLoss(0.8) //This add toxin damage
+ if(M.getFireLoss()) //BURN
+ M.adjustFireLoss(-1)
+ M.adjustToxLoss(0.8)
+ if(M.getBruteLoss()) //BRUTE
+ M.adjustBruteLoss(-1)
+ M.adjustToxLoss(0.8)
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm
index b69eccf402..6457525526 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm
@@ -14,7 +14,7 @@
/datum/reagent/macrocillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(M.size_multiplier < RESIZE_HUGE)
- M.resize(M.size_multiplier+0.01)//Incrrease 1% per tick.
+ M.resize(M.size_multiplier+0.01, FALSE)//Increase 1% per tick. Don't animate for 1% size change.
return
/datum/reagent/microcillin
@@ -28,7 +28,7 @@
/datum/reagent/microcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(M.size_multiplier > RESIZE_TINY)
- M.resize(M.size_multiplier-0.01) //Decrease 1% per tick.
+ M.resize(M.size_multiplier-0.01, FALSE) //Decrease 1% per tick. Don't animate for 1% size change.
return
@@ -43,9 +43,9 @@
/datum/reagent/normalcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(M.size_multiplier > RESIZE_NORMAL)
- M.resize(M.size_multiplier-0.01) //Decrease by 1% size per tick.
+ M.resize(M.size_multiplier-0.01, FALSE) //Decrease by 1% size per tick. Don't animate for 1% size change.
else if(M.size_multiplier < RESIZE_NORMAL)
- M.resize(M.size_multiplier+0.01) //Increase 1% per tick.
+ M.resize(M.size_multiplier+0.01, FALSE) //Increase 1% per tick. Don't animate for 1% size change.
return
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm
index b9099a30d7..ae5c5d2c06 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_chomp.dm
@@ -1,14 +1,14 @@
/// Recipes
/datum/chemical_reaction/aphrodisiac
- name = "aphrodisiac"
+ name = "Aphrodisiac"
id = "aphrodisiac"
result = "aphrodisiac"
required_reagents = list("carbon" = 2, "hydrogen" = 2, "oxygen" = 2, "water" = 1)
result_amount = 6
/datum/reagent/aphrodisiac
- name = "aphrodisiac"
+ name = "Aphrodisiac"
id = "aphrodisiac"
description = "You so horny."
taste_description = "sweetness"
diff --git a/code/modules/reagents/Chemistry-Reagents_vr.dm b/code/modules/reagents/Chemistry-Reagents_vr.dm
index 72274b390a..a91e035294 100644
--- a/code/modules/reagents/Chemistry-Reagents_vr.dm
+++ b/code/modules/reagents/Chemistry-Reagents_vr.dm
@@ -27,8 +27,6 @@
result_amount = 30
required = /obj/item/slime_extract/sapphire
-//Chompstation Edit: Removing NIFs - Jon
-/*
/datum/reagent/nif_repair_nanites
name = "Programmed Nanomachines"
id = "nifrepairnanites"
@@ -46,4 +44,32 @@
if(nif.stat == NIF_TEMPFAIL)
nif.stat = NIF_INSTALLING
nif.durability = min(nif.durability + removed, initial(nif.durability))
-*/
\ No newline at end of file
+
+
+
+//////SAP IN UNREFINED FORM////
+
+/datum/reagent/toxin/bluesap //This is the first sap. Blue one.
+ name = "Blue Sap"
+ id = "bluesap"
+ description = "Glowing blue liquid."
+ reagent_state = LIQUID
+ color = "#91f9ff" // rgb(145, 249, 255)
+ metabolism = 0.01
+ strength = 10//Don't drink it
+ mrate_static = TRUE
+
+/datum/reagent/purplesap
+ name = "Purple sap"
+ id = "purplesap"
+ description = "Purple liquid. It is very sticky and smells of amonia."
+ color = "#7a48a0"
+ taste_description = "Amonia"
+
+/datum/reagent/orangesap
+ name = "Orange sap"
+ id = "orangesap"
+ description = "Orange liquid. It wobbles around a bit like jelly."
+ color = "#e0962f"
+ taste_description = "Amonia"
+
diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm
index 58f49f3fc7..1cc22c48be 100644
--- a/code/modules/reagents/Chemistry-Recipes_vr.dm
+++ b/code/modules/reagents/Chemistry-Recipes_vr.dm
@@ -105,6 +105,31 @@
catalysts = list("phoron" = 5)
result_amount = 3
+///////////////////////////////////////////////////////////////////////////////////
+/// Sap recipes
+
+/datum/chemical_reaction/myelamine //This is the clotting agent used by clotting packs.
+ name = "Myelamine"
+ id = "myelamine"
+ result = "myelamine"
+ required_reagents = list("bicaridine" = 1, "iron" = 2, "kelotane" = 1, "bluesap" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/hannoa
+ name = "Hannoa"
+ id = "hannoa"
+ result = "hannoa"
+ required_reagents = list("purplesap" = 1, "iron" = 2, "kelotane" = 1, "carbon" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/bullvalene
+ name = "Bullvalene"
+ id = "bullvalene"
+ result = "bullvalene"
+ required_reagents = list("dermaline" = 1, "orangesap" = 1, "Copper" = 1)
+ result_amount = 1
+
+
///////////////////////////////////////////////////////////////////////////////////
/// Special drinks
/datum/chemical_reaction/drinks/grubshake
@@ -160,8 +185,6 @@
step(B, pick(NORTH,SOUTH,EAST,WEST))
-
-
/datum/chemical_reaction/materials
name = "Slime materials"
id = "slimematerial"
@@ -244,8 +267,6 @@
M << " You suddenly feel a chill!"
-
-
/datum/chemical_reaction/slimefrost
name = "Slime Frost Oil"
id = "m_frostoil"
@@ -254,8 +275,6 @@
result_amount = 10
-
-
/datum/chemical_reaction/slimefire
name = "Slime fire"
id = "m_fire"
@@ -280,9 +299,6 @@
result_amount = 1
-
-
-
/datum/chemical_reaction/slimeheal //A slime healing mixture. Why not.
name = "Slime Health"
id = "slimeheal"
@@ -299,6 +315,7 @@
C.adjustCloneLoss(-25)
C.updatehealth()
+
/datum/chemical_reaction/slimejelly
name = "Slime Jam"
id = "m_jam"
@@ -307,9 +324,6 @@
result_amount = 5
-
-
-
/datum/chemical_reaction/slimevore
name = "Slime Vore" // Hostile vore mobs only
id = "m_tele"
diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm
index 5662b7d3ff..1e13bddf13 100644
--- a/code/modules/reagents/reagent_containers/food/sandwich.dm
+++ b/code/modules/reagents/reagent_containers/food/sandwich.dm
@@ -23,7 +23,7 @@
sandwich_limit += 4
if(istype(W,/obj/item/weapon/material/shard))
- user << "You hide [W] in \the [src]."
+ user << "You hide [W] in \the [src]."
user.drop_item()
W.loc = src
update()
@@ -32,7 +32,7 @@
if(src.contents.len > sandwich_limit)
user << "If you put anything else on \the [src] it's going to collapse."
return
- user << "You layer [W] over \the [src]."
+ user << "You layer [W] over \the [src]."
var/obj/item/weapon/reagent_containers/F = W
F.reagents.trans_to_obj(src, F.reagents.total_volume)
user.drop_item()
@@ -81,7 +81,7 @@
/obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user)
..(user)
var/obj/item/O = pick(contents)
- user << "You think you can see [O.name] in there."
+ user << "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)
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index ce2dd8e791..cd8c568f71 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -147,11 +147,11 @@
if (bitecount==0)
return
else if (bitecount==1)
- user << "\The [src] was bitten by someone!"
+ user << "\The [src] was bitten by someone!"
else if (bitecount<=3)
- user << "\The [src] was bitten [bitecount] times!"
+ user << "\The [src] was bitten [bitecount] times!"
else
- user << "\The [src] was bitten multiple times!"
+ user << "\The [src] was bitten multiple times!"
/obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/storage))
@@ -171,7 +171,7 @@
user.visible_message( \
"[user] scoops up some [src] with \the [U]!", \
- "You scoop up some [src] with \the [U]!" \
+ "You scoop up some [src] with \the [U]!" \
)
src.bitecount++
@@ -585,10 +585,10 @@
var/clr = C.colourName
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
- usr << "The egg refuses to take on this color!"
+ usr << "The egg refuses to take on this color!"
return
- usr << "You color \the [src] [clr]"
+ usr << "You color \the [src] [clr]"
icon_state = "egg-[clr]"
else
..()
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index a9b0b213ed..1cc6fa3d59 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -99,7 +99,7 @@
if(istype(I, /obj/item/weapon/storage/bag/trash))
var/obj/item/weapon/storage/bag/trash/T = I
- user << "You empty the bag."
+ user << "You empty the bag."
for(var/obj/item/O in T.contents)
T.remove_from_storage(O,src)
T.update_icon()
@@ -1169,7 +1169,7 @@
if(O.currTag)// Tag set
sort_tag = O.currTag
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
- user << "Changed tag to '[sort_tag]'."
+ user << "Changed tag to '[sort_tag]'."
updatename()
updatedesc()
@@ -1237,7 +1237,7 @@
if(O.currTag)// Tag set
sortType = O.currTag
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
- user << "Changed filter to '[sortType]'."
+ user << "Changed filter to '[sortType]'."
updatename()
updatedesc()
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index b2cbcb9b3e..cda6f6a42e 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -232,7 +232,7 @@
if(user in target) //no wrapping closets that you are inside - it's not physically possible
return
- user.attack_log += text("\[[time_stamp()]\] Has used [src.name] on \ref[target]")
+ user.attack_log += text("\[[time_stamp()]\] Has used [src.name] on \ref[target]")
if (istype(target, /obj/item) && !(istype(target, /obj/item/weapon/storage) && !istype(target,/obj/item/weapon/storage/box)))
@@ -293,7 +293,7 @@
else if(src.amount < 3)
user << "You need more paper."
else
- user << "The object you are trying to wrap is unsuitable for the sorting machinery!"
+ user << "The object you are trying to wrap is unsuitable for the sorting machinery!"
if (src.amount <= 0)
new /obj/item/weapon/c_tube( src.loc )
qdel(src)
@@ -302,7 +302,7 @@
examine(mob/user)
if(..(user, 0))
- user << "There are [amount] units of package wrap left!"
+ user << "There are [amount] units of package wrap left!"
return
diff --git a/code/modules/research/designs_vr.dm b/code/modules/research/designs_vr.dm
index 9072bf644a..a78da35191 100644
--- a/code/modules/research/designs_vr.dm
+++ b/code/modules/research/designs_vr.dm
@@ -84,8 +84,6 @@
build_path = /obj/item/device/perfect_tele
sort_string = "HABAF"
-// Chompstation Edit: Removing temporarily - Jon
-/*
/datum/design/item/nif
name = "nanite implant framework"
id = "nif"
@@ -110,7 +108,7 @@
materials = list(DEFAULT_WALL_MATERIAL = 200, "glass" = 3000, "uranium" = 2000, "diamond" = 2000)
build_path = /obj/item/device/nifrepairer
sort_string = "HABBE" //CHOMP Edit, Changed String from HABBD to HABBE
-*/
+
// Resleeving Circuitboards
/datum/design/circuit/transhuman_clonepod
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 19afc0f564..adcc735061 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -136,7 +136,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
/obj/machinery/message_server/attack_hand(user as mob)
-// user << "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 CentCom delays."
+// user << "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 CentCom delays."
user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]"
active = !active
update_icon()
diff --git a/code/modules/resleeving/infocore_records.dm b/code/modules/resleeving/infocore_records.dm
index 662ef0717b..834b067e9d 100644
--- a/code/modules/resleeving/infocore_records.dm
+++ b/code/modules/resleeving/infocore_records.dm
@@ -41,8 +41,7 @@
ckey = ckey(mind.key)
cryo_at = 0
-// Chompstation Edit: Removing NIFs temporarily - Jon
-/*
+
//Mental stuff the game doesn't keep mentally
if(istype(M) || istype(M,/mob/living/carbon/brain/caught_soul))
id_gender = M.identifying_gender
@@ -58,7 +57,7 @@
nifsofts += nifsoft.type
nif_software = nifsofts
nif_savedata = M.nif.save_data.Copy()
-*/
+
last_update = world.time
if(add_to_db)
diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index bd4cbc3be6..8f4cc8e13c 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -528,15 +528,14 @@
var/how_long = round((world.time - MR.last_update)/10/60)
to_chat(occupant,"Your mind backup was a 'one-time' backup. \
You will not be able to remember anything since the backup, [how_long] minutes ago.")
-// Chompstation Edit: Removed Nifs - Jon
-/*
+
//Re-supply a NIF if one was backed up with them.
if(MR.nif_path)
var/obj/item/device/nif/nif = new MR.nif_path(occupant,null,MR.nif_savedata)
for(var/path in MR.nif_software)
new path(nif)
nif.durability = MR.nif_durability //Restore backed up durability after restoring the softs.
-*/
+
// If it was a custom sleeve (not owned by anyone), update namification sequences
if(!occupant.original_player)
occupant.real_name = occupant.mind.name
diff --git a/code/modules/scripting/IDE.dm b/code/modules/scripting/IDE.dm
index 3974e2dee4..7b3b3a84ec 100644
--- a/code/modules/scripting/IDE.dm
+++ b/code/modules/scripting/IDE.dm
@@ -58,12 +58,12 @@ client/verb/tcscompile()
else
- src << output("TCS compilation successful!", "tcserror")
+ src << output("TCS compilation successful!", "tcserror")
src << output("(0 errors)", "tcserror")
for(var/mob/M in Machine.viewingcode)
if(M.client)
- M << output("TCS compilation successful!", "tcserror")
+ M << output("TCS compilation successful!", "tcserror")
M << output("(0 errors)", "tcserror")
else
@@ -109,12 +109,12 @@ client/verb/tcsrun()
else
// Finally, we run the code!
- src << output("TCS compilation successful! Code executed.", "tcserror")
+ src << output("TCS compilation successful! Code executed.", "tcserror")
src << output("(0 errors)", "tcserror")
for(var/mob/M in Machine.viewingcode)
if(M.client)
- M << output("TCS compilation successful!", "tcserror")
+ M << output("TCS compilation successful!", "tcserror")
M << output("(0 errors)", "tcserror")
var/datum/signal/signal = new()
@@ -196,10 +196,10 @@ client/verb/tcsclearmem()
Server.memory = list() // clear the memory
// Show results
src << output(null, "tcserror")
- src << output("Server memory cleared!", "tcserror")
+ src << output("Server memory cleared!", "tcserror")
for(var/mob/M in Machine.viewingcode)
if(M.client)
- M << output("Server memory cleared!", "tcserror")
+ M << output("Server memory cleared!", "tcserror")
else
src << output(null, "tcserror")
src << output("Failed to clear memory: Unable to locate server machine.", "tcserror")
diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm
index b67e6f70a2..efbd40374e 100644
--- a/code/modules/shieldgen/emergency_shield.dm
+++ b/code/modules/shieldgen/emergency_shield.dm
@@ -261,14 +261,14 @@
return
if (src.active)
- user.visible_message("\icon[src] [user] deactivated the shield generator.", \
- "\icon[src] You deactivate the shield generator.", \
+ user.visible_message("\icon[src] [user] deactivated the shield generator.", \
+ "\icon[src] You deactivate the shield generator.", \
"You hear heavy droning fade out.")
src.shields_down()
else
if(anchored)
- user.visible_message("\icon[src] [user] activated the shield generator.", \
- "\icon[src] You activate the shield generator.", \
+ user.visible_message("\icon[src] [user] activated the shield generator.", \
+ "\icon[src] You activate the shield generator.", \
"You hear heavy droning.")
src.shields_up()
else
@@ -285,10 +285,10 @@
if(istype(W, /obj/item/weapon/screwdriver))
playsound(src, W.usesound, 100, 1)
if(is_open)
- user << "You close the panel."
+ user << "You close the panel."
is_open = 0
else
- user << "You open the panel and expose the wiring."
+ user << "You open the panel and expose the wiring."
is_open = 1
else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open)
@@ -308,15 +308,15 @@
return
if(anchored)
playsound(src, W.usesound, 100, 1)
- user << "You unsecure the [src] from the floor!"
+ user << "You unsecure the [src] from the floor!"
if(active)
- user << "The [src] shuts off!"
+ user << "The [src] shuts off!"
src.shields_down()
anchored = 0
else
if(istype(get_turf(src), /turf/space)) return //No wrenching these in space!
playsound(src, W.usesound, 100, 1)
- user << "You secure the [src] to the floor!"
+ user << "You secure the [src] to the floor!"
anchored = 1
diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm
index 1b8f2def84..3f601bcc4e 100644
--- a/code/modules/shieldgen/shield_capacitor.dm
+++ b/code/modules/shieldgen/shield_capacitor.dm
@@ -48,7 +48,7 @@
else if(istype(W, /obj/item/weapon/wrench))
src.anchored = !src.anchored
playsound(src, W.usesound, 75, 1)
- src.visible_message("\icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")
+ src.visible_message("\icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")
if(anchored)
spawn(0)
diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm
index aa504fd7a6..008358a635 100644
--- a/code/modules/shieldgen/shield_gen.dm
+++ b/code/modules/shieldgen/shield_gen.dm
@@ -67,7 +67,7 @@
else if(istype(W, /obj/item/weapon/wrench))
src.anchored = !src.anchored
playsound(src, W.usesound, 75, 1)
- src.visible_message("\icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].")
+ src.visible_message("\icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].")
if(active)
toggle()
diff --git a/code/modules/shuttles/departmental.dm b/code/modules/shuttles/departmental.dm
index 81ad237cc7..6ca626d099 100644
--- a/code/modules/shuttles/departmental.dm
+++ b/code/modules/shuttles/departmental.dm
@@ -15,3 +15,9 @@
shuttle_tag = "Research"
//req_access = list(access_research)
circuit = /obj/item/weapon/circuitboard/research_shuttle
+
+/obj/machinery/computer/shuttle_control/medical
+ name = "medical shuttle control console"
+ shuttle_tag = "Medical"
+ //req_access = list(access_medical)
+ circuit = /obj/item/weapon/circuitboard/medical_shuttle
diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm
index 47c3aca5ab..26adfb23d2 100644
--- a/code/modules/shuttles/shuttle_specops.dm
+++ b/code/modules/shuttles/shuttle_specops.dm
@@ -64,14 +64,14 @@
var/obj/machinery/computer/C = user
if(world.time <= reset_time)
- C.visible_message("[using_map.boss_name] will not allow the Special Operations shuttle to launch yet.")
+ C.visible_message("[using_map.boss_name] will not allow the Special Operations shuttle to launch yet.")
if (((world.time - reset_time)/10) > 60)
- C.visible_message("[-((world.time - reset_time)/10)/60] minutes remain!")
+ C.visible_message("[-((world.time - reset_time)/10)/60] minutes remain!")
else
- C.visible_message("[-(world.time - reset_time)/10] seconds remain!")
+ C.visible_message("[-(world.time - reset_time)/10] seconds remain!")
return
- C.visible_message("The Special Operations shuttle will depart in [(specops_countdown_time/10)] seconds.")
+ C.visible_message("The Special Operations shuttle will depart in [(specops_countdown_time/10)] seconds.")
if (location) //returning
radio_announce("THE SPECIAL OPERATIONS SHUTTLE IS PREPARING TO RETURN")
diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm
index 73e08a719f..a5ea7d1fd2 100644
--- a/code/modules/shuttles/shuttles_multi.dm
+++ b/code/modules/shuttles/shuttles_multi.dm
@@ -179,7 +179,7 @@
return
if (MS.moving_status != SHUTTLE_IDLE)
- to_chat(usr, "[shuttle_tag] vessel is moving.")
+ to_chat(usr, "[shuttle_tag] vessel is moving.")
return
if(href_list["dock_command"])
@@ -246,7 +246,7 @@
var/choice = input("Select a destination.") as null|anything in MS.destinations
if(!choice) return
- to_chat(usr, "[shuttle_tag] main computer received message.")
+ to_chat(usr, "[shuttle_tag] main computer received message.")
if(MS.at_origin)
MS.announce_arrival()
diff --git a/code/modules/shuttles/shuttles_vr.dm b/code/modules/shuttles/shuttles_vr.dm
index 7462fcd188..3ae3829477 100644
--- a/code/modules/shuttles/shuttles_vr.dm
+++ b/code/modules/shuttles/shuttles_vr.dm
@@ -22,3 +22,5 @@
/obj/machinery/computer/shuttle_control/research
name = "research elevator control console"
+/obj/machinery/computer/shuttle_control/medical
+ name = "medical elevator control console"
\ No newline at end of file
diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm
index 90e5141535..92590071ee 100644
--- a/code/modules/shuttles/shuttles_web.dm
+++ b/code/modules/shuttles/shuttles_web.dm
@@ -375,7 +375,7 @@
ui_interact(usr)
if (WS.moving_status != SHUTTLE_IDLE)
- usr << "[WS.visible_name] is busy moving."
+ usr << "[WS.visible_name] is busy moving."
return
if(href_list["rename_command"])
diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm
index 5465e7d03e..45c5818213 100644
--- a/code/modules/surgery/bones.dm
+++ b/code/modules/surgery/bones.dm
@@ -27,15 +27,15 @@
/datum/surgery_step/glue_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if (affected.stage == 0)
- user.visible_message("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." , \
- "You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].")
+ user.visible_message("[user] starts applying medication to the damaged bones in [target]'s [affected.name] with \the [tool]." , \
+ "You start applying medication to the damaged bones in [target]'s [affected.name] with \the [tool].")
target.custom_pain("Something in your [affected.name] is causing you a lot of pain!", 50)
..()
/datum/surgery_step/glue_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] applies some [tool] to [target]'s bone in [affected.name]", \
- "You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].")
+ user.visible_message("[user] applies some [tool] to [target]'s bone in [affected.name]", \
+ "You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].")
affected.stage = 1
/datum/surgery_step/glue_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -64,16 +64,16 @@
/datum/surgery_step/set_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool]." , \
- "You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].")
+ user.visible_message("[user] is beginning to set the bone in [target]'s [affected.name] in place with \the [tool]." , \
+ "You are beginning to set the bone in [target]'s [affected.name] in place with \the [tool].")
target.custom_pain("The pain in your [affected.name] is going to make you pass out!", 50)
..()
/datum/surgery_step/set_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if (affected.status & ORGAN_BROKEN)
- user.visible_message("[user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \
- "You set the bone in [target]'s [affected.name] in place with \the [tool].")
+ user.visible_message("[user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \
+ "You set the bone in [target]'s [affected.name] in place with \the [tool].")
affected.stage = 2
else
user.visible_message("[user] sets the bone in [target]'s [affected.name] in the WRONG place with \the [tool].", \
@@ -106,14 +106,14 @@
return affected && affected.organ_tag == BP_HEAD && (affected.robotic < ORGAN_ROBOT) && affected.open >= 2 && affected.stage == 1
/datum/surgery_step/mend_skull/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] is beginning to piece together [target]'s skull with \the [tool]." , \
- "You are beginning to piece together [target]'s skull with \the [tool].")
+ user.visible_message("[user] is beginning to piece together [target]'s skull with \the [tool]." , \
+ "You are beginning to piece together [target]'s skull with \the [tool].")
..()
/datum/surgery_step/mend_skull/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] sets [target]'s skull with \the [tool]." , \
- "You set [target]'s skull with \the [tool].")
+ user.visible_message("[user] sets [target]'s skull with \the [tool]." , \
+ "You set [target]'s skull with \the [tool].")
affected.stage = 2
/datum/surgery_step/mend_skull/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -147,14 +147,14 @@
/datum/surgery_step/finish_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] starts to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].", \
- "You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].")
+ user.visible_message("[user] starts to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].", \
+ "You start to finish mending the damaged bones in [target]'s [affected.name] with \the [tool].")
..()
/datum/surgery_step/finish_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] has mended the damaged bones in [target]'s [affected.name] with \the [tool]." , \
- "You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." )
+ user.visible_message("[user] has mended the damaged bones in [target]'s [affected.name] with \the [tool]." , \
+ "You have mended the damaged bones in [target]'s [affected.name] with \the [tool]." )
affected.status &= ~ORGAN_BROKEN
affected.stage = 0
@@ -186,15 +186,15 @@
/datum/surgery_step/clamp_bone/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if (affected.stage == 0)
- user.visible_message("[user] starts repairing the damaged bones in [target]'s [affected.name] with \the [tool]." , \
- "You starts repairing the damaged bones in [target]'s [affected.name] with \the [tool].")
+ user.visible_message("[user] starts repairing the damaged bones in [target]'s [affected.name] with \the [tool]." , \
+ "You starts repairing the damaged bones in [target]'s [affected.name] with \the [tool].")
target.custom_pain("Something in your [affected.name] is causing you a lot of pain!", 50)
..()
/datum/surgery_step/clamp_bone/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] sets the bone in [target]'s [affected.name] with \the [tool].", \
- "You sets [target]'s bone in [affected.name] with \the [tool].")
+ user.visible_message("[user] sets the bone in [target]'s [affected.name] with \the [tool].", \
+ "You sets [target]'s bone in [affected.name] with \the [tool].")
affected.status &= ~ORGAN_BROKEN
/datum/surgery_step/clamp_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm
index 7bc33d7500..3a482659dc 100644
--- a/code/modules/surgery/encased.dm
+++ b/code/modules/surgery/encased.dm
@@ -48,8 +48,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] has cut [target]'s [affected.encased] open with \the [tool].", \
- "You have cut [target]'s [affected.encased] open with \the [tool].")
+ user.visible_message("[user] has cut [target]'s [affected.encased] open with \the [tool].", \
+ "You have cut [target]'s [affected.encased] open with \the [tool].")
affected.open = 2.5
/datum/surgery_step/open_encased/saw/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -97,8 +97,8 @@
if (!hasorgans(target))
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "[user] forces open [target]'s [affected.encased] with \the [tool]."
- var/self_msg = "You force open [target]'s [affected.encased] with \the [tool]."
+ var/msg = "[user] forces open [target]'s [affected.encased] with \the [tool]."
+ var/self_msg = "You force open [target]'s [affected.encased] with \the [tool]."
user.visible_message(msg, self_msg)
affected.open = 3
@@ -150,8 +150,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "[user] bends [target]'s [affected.encased] back into place with \the [tool]."
- var/self_msg = "You bend [target]'s [affected.encased] back into place with \the [tool]."
+ var/msg = "[user] bends [target]'s [affected.encased] back into place with \the [tool]."
+ var/self_msg = "You bend [target]'s [affected.encased] back into place with \the [tool]."
user.visible_message(msg, self_msg)
affected.open = 2.5
@@ -207,8 +207,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "[user] applied \the [tool] to [target]'s [affected.encased]."
- var/self_msg = "You applied \the [tool] to [target]'s [affected.encased]."
+ var/msg = "[user] applied \the [tool] to [target]'s [affected.encased]."
+ var/self_msg = "You applied \the [tool] to [target]'s [affected.encased]."
user.visible_message(msg, self_msg)
affected.open = 2
\ No newline at end of file
diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm
index b3fae927bb..29c06158d5 100644
--- a/code/modules/surgery/face.dm
+++ b/code/modules/surgery/face.dm
@@ -39,8 +39,8 @@
..()
/datum/surgery_step/generic/cut_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] has cut open [target]'s face and neck with \the [tool]." , \
- " You have cut open[target]'s face and neck with \the [tool].",)
+ user.visible_message("[user] has cut open [target]'s face and neck with \the [tool]." , \
+ " You have cut open[target]'s face and neck with \the [tool].",)
target.op_stage.face = 1
/datum/surgery_step/generic/cut_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -73,8 +73,8 @@
..()
/datum/surgery_step/face/mend_vocal/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] mends [target]'s vocal cords with \the [tool].", \
- "You mend [target]'s vocal cords with \the [tool].")
+ user.visible_message("[user] mends [target]'s vocal cords with \the [tool].", \
+ "You mend [target]'s vocal cords with \the [tool].")
target.op_stage.face = 2
/datum/surgery_step/face/mend_vocal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -104,8 +104,8 @@
..()
/datum/surgery_step/face/fix_face/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] pulls the skin on [target]'s face back in place with \the [tool].", \
- "You pull the skin on [target]'s face back in place with \the [tool].")
+ user.visible_message("[user] pulls the skin on [target]'s face back in place with \the [tool].", \
+ "You pull the skin on [target]'s face back in place with \the [tool].")
target.op_stage.face = 3
/datum/surgery_step/face/fix_face/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -133,14 +133,14 @@
return ..() && target.op_stage.face > 0
/datum/surgery_step/face/cauterize/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] is beginning to cauterize the incision on [target]'s face and neck with \the [tool]." , \
- "You are beginning to cauterize the incision on [target]'s face and neck with \the [tool].")
+ user.visible_message("[user] is beginning to cauterize the incision on [target]'s face and neck with \the [tool]." , \
+ "You are beginning to cauterize the incision on [target]'s face and neck with \the [tool].")
..()
/datum/surgery_step/face/cauterize/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] cauterizes the incision on [target]'s face and neck with \the [tool].", \
- "You cauterize the incision on [target]'s face and neck with \the [tool].")
+ user.visible_message("[user] cauterizes the incision on [target]'s face and neck with \the [tool].", \
+ "You cauterize the incision on [target]'s face and neck with \the [tool].")
affected.open = 0
affected.status &= ~ORGAN_BLEEDING
if (target.op_stage.face == 3)
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index f74c7dda64..067cc402a2 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -51,8 +51,8 @@
/datum/surgery_step/generic/cut_open/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] has made an incision on [target]'s [affected.name] with \the [tool].", \
- "You have made an incision on [target]'s [affected.name] with \the [tool].",)
+ user.visible_message("[user] has made an incision on [target]'s [affected.name] with \the [tool].", \
+ "You have made an incision on [target]'s [affected.name] with \the [tool].",)
affected.open = 1
if(istype(target) && target.should_have_organ(O_HEART))
@@ -96,8 +96,8 @@
/datum/surgery_step/generic/cut_with_laser/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] has made a bloodless incision on [target]'s [affected.name] with \the [tool].", \
- "You have made a bloodless incision on [target]'s [affected.name] with \the [tool].",)
+ user.visible_message("[user] has made a bloodless incision on [target]'s [affected.name] with \the [tool].", \
+ "You have made a bloodless incision on [target]'s [affected.name] with \the [tool].",)
//Could be cleaner ...
affected.open = 1
@@ -139,8 +139,8 @@
/datum/surgery_step/generic/incision_manager/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] has constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].", \
- "You have constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].",)
+ user.visible_message("[user] has constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].", \
+ "You have constructed a prepared incision on and within [target]'s [affected.name] with \the [tool].",)
affected.open = 1
if(istype(target) && target.should_have_organ(O_HEART))
@@ -185,8 +185,8 @@
/datum/surgery_step/generic/clamp_bleeders/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \
- "You clamp bleeders in [target]'s [affected.name] with \the [tool].")
+ user.visible_message("[user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \
+ "You clamp bleeders in [target]'s [affected.name] with \the [tool].")
affected.clamp()
spread_germs_to_organ(affected, user)
@@ -231,14 +231,14 @@
/datum/surgery_step/generic/retract_skin/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "[user] keeps the incision open on [target]'s [affected.name] with \the [tool]."
- var/self_msg = "You keep the incision open on [target]'s [affected.name] with \the [tool]."
+ var/msg = "[user] keeps the incision open on [target]'s [affected.name] with \the [tool]."
+ var/self_msg = "You keep the incision open on [target]'s [affected.name] with \the [tool]."
if (target_zone == BP_TORSO)
- msg = "[user] keeps the ribcage open on [target]'s torso with \the [tool]."
- self_msg = "You keep the ribcage open on [target]'s torso with \the [tool]."
+ msg = "[user] keeps the ribcage open on [target]'s torso with \the [tool]."
+ self_msg = "You keep the ribcage open on [target]'s torso with \the [tool]."
if (target_zone == BP_GROIN)
- msg = "[user] keeps the incision open on [target]'s lower abdomen with \the [tool]."
- self_msg = "You keep the incision open on [target]'s lower abdomen with \the [tool]."
+ msg = "[user] keeps the incision open on [target]'s lower abdomen with \the [tool]."
+ self_msg = "You keep the incision open on [target]'s lower abdomen with \the [tool]."
user.visible_message(msg, self_msg)
affected.open = 2
@@ -284,8 +284,8 @@
/datum/surgery_step/generic/cauterize/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", \
- "You cauterize the incision on [target]'s [affected.name] with \the [tool].")
+ user.visible_message("[user] cauterizes the incision on [target]'s [affected.name] with \the [tool].", \
+ "You cauterize the incision on [target]'s [affected.name] with \the [tool].")
affected.open = 0
affected.germ_level = 0
affected.status &= ~ORGAN_BLEEDING
@@ -329,8 +329,8 @@
/datum/surgery_step/generic/amputate/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \
- "You amputate [target]'s [affected.name] with \the [tool].")
+ user.visible_message("[user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].", \
+ "You amputate [target]'s [affected.name] with \the [tool].")
affected.droplimb(1,DROPLIMB_EDGE)
/datum/surgery_step/generic/amputate/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm
index d5ea0f9e88..5341151408 100644
--- a/code/modules/surgery/implant.dm
+++ b/code/modules/surgery/implant.dm
@@ -67,8 +67,8 @@
end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
- user.visible_message("[user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \
- "You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." )
+ user.visible_message("[user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \
+ "You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." )
///////////////////////////////////////////////////////////////
// Cavity Closing Surgery
@@ -101,8 +101,8 @@
/datum/surgery_step/cavity/close_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
- user.visible_message("[user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \
- " You mend[target]'s [get_cavity(affected)] cavity walls with \the [tool]." )
+ user.visible_message("[user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \
+ " You mend[target]'s [get_cavity(affected)] cavity walls with \the [tool]." )
///////////////////////////////////////////////////////////////
// Item Implantation Surgery
@@ -130,16 +130,16 @@
/datum/surgery_step/cavity/place_item/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- 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." ) //Nobody will probably ever see this, but I made these two blue. ~CK
+ 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." ) //Nobody will probably ever see this, but I made these two blue. ~CK
target.custom_pain("The pain in your chest is living hell!",1)
..()
/datum/surgery_step/cavity/place_item/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
- 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." )
+ 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.robotic < ORGAN_ROBOT))
user << " You tear some blood vessels trying to fit such a big object in this cavity."
var/datum/wound/internal_bleeding/I = new (10)
@@ -148,8 +148,7 @@
user.drop_item()
affected.implants += tool
tool.loc = affected
-// Chompstation Edit: Removing NIFs temporarily - Jon
-// if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.implant(target)} //VOREStation Add - NIF support
+ if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.implant(target)} //VOREStation Add - NIF support
affected.cavity = 0
//////////////////////////////////////////////////////////////////
@@ -176,8 +175,8 @@
/datum/surgery_step/cavity/implant_removal/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \
- "You start poking around inside [target]'s [affected.name] with \the [tool]." )
+ user.visible_message("[user] starts poking around inside [target]'s [affected.name] with \the [tool].", \
+ "You start poking around inside [target]'s [affected.name] with \the [tool]." )
target.custom_pain("The pain in your [affected.name] is living hell!",1)
..()
@@ -200,8 +199,8 @@
find_prob +=50
if (prob(find_prob))
- user.visible_message("[user] takes something out of incision on [target]'s [affected.name] with \the [tool]!", \
- "You take [obj] out of incision on [target]'s [affected.name]s with \the [tool]!" )
+ user.visible_message("[user] takes something out of incision on [target]'s [affected.name] with \the [tool]!", \
+ "You take [obj] out of incision on [target]'s [affected.name]s with \the [tool]!" )
affected.implants -= obj
BITSET(target.hud_updateflag, IMPLOYAL_HUD)
@@ -221,14 +220,13 @@
var/obj/item/weapon/implant/imp = obj
imp.imp_in = null
imp.implanted = 0
-// Chompstation Edit: Removing NIFs temporarily - Jon
-// else if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.unimplant(target)} //VOREStation Add - NIF support
+ else if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.unimplant(target)} //VOREStation Add - NIF support
else
- user.visible_message("[user] removes \the [tool] from [target]'s [affected.name].", \
- "There's something inside [target]'s [affected.name], but you just missed it this time." )
+ user.visible_message("[user] removes \the [tool] from [target]'s [affected.name].", \
+ "There's something inside [target]'s [affected.name], but you just missed it this time." )
else
- user.visible_message("[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \
- "You could not find anything inside [target]'s [affected.name]." )
+ user.visible_message("[user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \
+ "You could not find anything inside [target]'s [affected.name]." )
/datum/surgery_step/cavity/implant_removal/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
..()
diff --git a/code/modules/surgery/neck.dm b/code/modules/surgery/neck.dm
index 6cd347586b..112c0356b8 100644
--- a/code/modules/surgery/neck.dm
+++ b/code/modules/surgery/neck.dm
@@ -40,8 +40,8 @@
..()
/datum/surgery_step/brainstem/mend_vessels/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] has mended the blood vessels on [target]'s brainstem with \the [tool]." , \
- " You have mended the blood vessels on [target]'s brainstem with \the [tool].",)
+ user.visible_message("[user] has mended the blood vessels on [target]'s brainstem with \the [tool]." , \
+ " You have mended the blood vessels on [target]'s brainstem with \the [tool].",)
target.op_stage.brainstem = 1
/datum/surgery_step/brainstem/mend_vessels/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -76,8 +76,8 @@
/datum/surgery_step/brainstem/drill_vertebrae/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] has drilled around [target]'s brainstem with \the [tool]." , \
- " You have drilled around [target]'s brainstem with \the [tool].",)
+ user.visible_message("[user] has drilled around [target]'s brainstem with \the [tool]." , \
+ " You have drilled around [target]'s brainstem with \the [tool].",)
target.AdjustParalysis(10) //We're getting Invasive here. This only ticks down when the person is alive, so it's a good side-effect for this step. Rattling the braincase with a drill is not optimal.
target.op_stage.brainstem = 2
affected.fracture() //Does not apply damage, simply breaks it if it wasn't already. Doesn't stop a defib on its own.
@@ -115,8 +115,8 @@
..()
/datum/surgery_step/brainstem/clean_chips/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] has cleaned around [target]'s brainstem with \the [tool]." , \
- " You have cleaned around [target]'s brainstem with \the [tool].",)
+ user.visible_message("[user] has cleaned around [target]'s brainstem with \the [tool]." , \
+ " You have cleaned around [target]'s brainstem with \the [tool].",)
target.AdjustParalysis(10) //Still invasive.
target.op_stage.brainstem = 3
@@ -154,8 +154,8 @@
..()
/datum/surgery_step/brainstem/mend_cord/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] has fused [target]'s spinal cord with \the [tool]." , \
- " You have fused [target]'s spinal cord with \the [tool].",)
+ user.visible_message("[user] has fused [target]'s spinal cord with \the [tool]." , \
+ " You have fused [target]'s spinal cord with \the [tool].",)
target.op_stage.brainstem = 4
target.AdjustParalysis(5)
target.add_modifier(/datum/modifier/franken_sickness, 20 MINUTES)
@@ -193,8 +193,8 @@
..()
/datum/surgery_step/brainstem/mend_vertebrae/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] has mended [target]'s vertebrae with \the [tool]." , \
- " You have mended [target]'s vertebrae with \the [tool].",)
+ user.visible_message("[user] has mended [target]'s vertebrae with \the [tool]." , \
+ " You have mended [target]'s vertebrae with \the [tool].",)
target.can_defib = 1
target.op_stage.brainstem = 5
@@ -231,8 +231,8 @@
..()
/datum/surgery_step/brainstem/realign_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
- user.visible_message("[user] has realigned the tissues in [target]'s skull back into place with \the [tool]." , \
- " You have realigned the tissues in [target]'s skull back into place with \the [tool].",)
+ user.visible_message("[user] has realigned the tissues in [target]'s skull back into place with \the [tool]." , \
+ " You have realigned the tissues in [target]'s skull back into place with \the [tool].",)
target.AdjustParalysis(5) //I n v a s i v e
target.op_stage.brainstem = 0 //The cycle begins anew.
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 56c6731b9a..cbd5e743f2 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -41,8 +41,8 @@
/datum/surgery_step/fix_vein/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", \
- "You have patched the damaged vein in [target]'s [affected.name] with \the [tool].")
+ user.visible_message("[user] has patched the damaged vein in [target]'s [affected.name] with \the [tool].", \
+ "You have patched the damaged vein in [target]'s [affected.name] with \the [tool].")
for(var/datum/wound/W in affected.wounds) if(W.internal)
affected.wounds -= W
@@ -92,8 +92,8 @@
/datum/surgery_step/fix_dead_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("[user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", \
- "You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].")
+ user.visible_message("[user] has cut away necrotic tissue in [target]'s [affected.name] with \the [tool].", \
+ "You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].")
affected.open = 3
/datum/surgery_step/fix_dead_tissue/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -158,8 +158,8 @@
affected.status &= ~ORGAN_DEAD
affected.owner.update_icons_body()
- user.visible_message("[user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name].", \
- "You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].")
+ user.visible_message("[user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name].", \
+ "You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].")
/datum/surgery_step/treat_necrosis/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm
index ad4c413c8e..43ed082d9a 100644
--- a/code/modules/surgery/slimes.dm
+++ b/code/modules/surgery/slimes.dm
@@ -29,8 +29,8 @@
"You start cutting through [target]'s flesh with \the [tool].")
/datum/surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
- user.visible_message("[user] cuts through [target]'s flesh with \the [tool].", \
- "You cut through [target]'s flesh with \the [tool], revealing its silky innards.")
+ user.visible_message("[user] cuts through [target]'s flesh with \the [tool].", \
+ "You cut through [target]'s flesh with \the [tool], revealing its silky innards.")
target.core_removal_stage = 1
/datum/surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
@@ -57,8 +57,8 @@
"You start cutting [target]'s silky innards apart with \the [tool].")
/datum/surgery_step/slime/cut_innards/end_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
- user.visible_message("[user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \
- "You cut [target]'s innards apart with \the [tool], exposing the cores.")
+ user.visible_message("[user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \
+ "You cut [target]'s innards apart with \the [tool], exposing the cores.")
target.core_removal_stage = 2
/datum/surgery_step/slime/cut_innards/fail_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
@@ -85,8 +85,8 @@
/datum/surgery_step/slime/saw_core/end_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
target.cores--
- user.visible_message("[user] cuts out one of [target]'s cores with \the [tool].",, \
- "You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.")
+ user.visible_message("[user] cuts out one of [target]'s cores with \the [tool].",, \
+ "You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.")
if(target.cores >= 0)
new target.coretype(target.loc)
diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm
index 19764b2997..925fc5c487 100644
--- a/code/modules/tables/interactions.dm
+++ b/code/modules/tables/interactions.dm
@@ -10,6 +10,10 @@
return 1
if(istype(mover) && mover.checkpass(PASSTABLE))
return 1
+ var/mob/M = mover //Chomp edit
+ if(istype(M) && M.flying)
+ playsound(M, 'sound/effects/wing1.ogg', 20, 1)
+ return 1
if(locate(/obj/structure/table/bench) in get_turf(mover))
return 0
var/obj/structure/table/table = locate(/obj/structure/table) in get_turf(mover)
diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm
index 42f97676ad..8cc1a0d3fb 100644
--- a/code/modules/vehicles/train.dm
+++ b/code/modules/vehicles/train.dm
@@ -86,7 +86,7 @@
unload(user, direction)
- user << "You climb down from [src]."
+ user << "You climb down from [src]."
return 1
@@ -160,7 +160,7 @@
set_dir(lead.dir)
if(user)
- user << "You hitch [src] to [T]."
+ user << "You hitch [src] to [T]."
update_stats()
@@ -174,7 +174,7 @@
lead.tow = null
lead.update_stats()
- user << "You unhitch [src] from [lead]."
+ user << "You unhitch [src] from [lead]."
lead = null
update_stats()
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 0b454f6bc5..c6c9246a3b 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -137,7 +137,7 @@
health = min(maxhealth, health+10)
user.setClickCooldown(user.get_attack_speed(W))
playsound(src, T.usesound, 50, 1)
- user.visible_message("[user] repairs [src]!"," You repair [src]!")
+ user.visible_message("[user] repairs [src]!"," You repair [src]!")
else
user << "Unable to repair with the maintenance panel closed."
else
diff --git a/code/modules/virus2/biohazard destroyer.dm b/code/modules/virus2/biohazard destroyer.dm
index 694251a76e..c3703dca80 100644
--- a/code/modules/virus2/biohazard destroyer.dm
+++ b/code/modules/virus2/biohazard destroyer.dm
@@ -17,4 +17,4 @@
I.loc = src.loc
for(var/mob/O in hearers(src, null))
- O.show_message("\icon[src] The [src.name] beeps.", 2)
\ No newline at end of file
+ O.show_message("\icon[src] The [src.name] beeps.", 2)
\ No newline at end of file
diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm
index ae56c35087..bee6db8783 100644
--- a/code/modules/virus2/items_devices.dm
+++ b/code/modules/virus2/items_devices.dm
@@ -31,7 +31,7 @@
report("Antibodies detected: [antigens2string(C.antibodies)]", user)
/obj/item/device/antibody_scanner/proc/report(var/text, mob/user as mob)
- user << "\icon[src] \The [src] beeps, \"[text]\""
+ user << "\icon[src] \The [src] beeps, \"[text]\""
///////////////VIRUS DISH///////////////
diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm
index 405d44af5f..862387d72d 100644
--- a/code/modules/vore/eating/digest_act_vr.dm
+++ b/code/modules/vore/eating/digest_act_vr.dm
@@ -54,7 +54,7 @@
desc = "A partially digested card that has seen better days. The damage appears to be only cosmetic, but the access codes need to be reprogrammed at the HoP office."
icon = 'icons/obj/card_vr.dmi'
icon_state = "[initial(icon_state)]_digested"
- access = list() // No access
+ // access = list() // No access /Removing this because everyone thinks it's dumb. -Erik
return FALSE
/obj/item/weapon/reagent_containers/food/digest_act(var/atom/movable/item_storage = null)
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index 4e40af36f7..4e845ccc33 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -474,41 +474,41 @@
if(ishuman(C.loc)) //In a /mob/living/carbon/human
var/mob/living/carbon/human/H = C.loc
if(H.shoes == C) //Being worn
- to_chat(src," You start to climb around the larger creature's feet and ankles!")
+ to_chat(src," You start to climb around the larger creature's feet and ankles!")
to_chat(H,"Something is trying to climb out of your [C]!")
var/original_loc = H.loc
for(var/escape_time = 100,escape_time > 0,escape_time--)
if(H.loc != original_loc)
to_chat(src,"You're pinned back underfoot!")
- to_chat(H,"You pin the escapee back underfoot!")
+ to_chat(H,"You pin the escapee back underfoot!")
return
if(src.loc != C)
return
sleep(1)
- to_chat(src,"You manage to escape \the [C]!")
+ to_chat(src,"You manage to escape \the [C]!")
to_chat(H,"Somone has climbed out of your [C]!")
forceMove(H.loc)
else //Being held by a human
- to_chat(src,"You start to climb out of \the [C]!")
+ to_chat(src,"You start to climb out of \the [C]!")
to_chat(H,"Something is trying to climb out of your [C]!")
for(var/escape_time = 60,escape_time > 0,escape_time--)
if(H.shoes == C)
to_chat(src,"You're pinned underfoot!")
- to_chat(H,"You pin the escapee underfoot!")
+ to_chat(H,"You pin the escapee underfoot!")
return
if(src.loc != C)
return
sleep(1)
- to_chat(src,"You manage to escape \the [C]!")
+ to_chat(src,"You manage to escape \the [C]!")
to_chat(H,"Somone has climbed out of your [C]!")
forceMove(H.loc)
- to_chat(src,"You start to climb out of \the [C]!")
+ to_chat(src,"You start to climb out of \the [C]!")
sleep(50)
if(loc == C)
- to_chat(src,"You climb out of \the [C]!")
+ to_chat(src,"You climb out of \the [C]!")
forceMove(C.loc)
return
diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm
index aa49a9eec8..f76cc11c59 100644
--- a/code/modules/vore/eating/vorepanel_vr.dm
+++ b/code/modules/vore/eating/vorepanel_vr.dm
@@ -2,7 +2,7 @@
// Vore management panel for players
//
-#define BELLIES_MAX 20
+#define BELLIES_MAX 30
#define BELLIES_NAME_MIN 2
#define BELLIES_NAME_MAX 12
#define BELLIES_DESC_MAX 1024
diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm
index 3391cd2291..33d656d63f 100644
--- a/code/modules/vore/fluffstuff/custom_guns_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm
@@ -59,7 +59,7 @@
// For general use
/obj/item/weapon/gun/projectile/shotgun/pump/USDF
name = "\improper USDF tactical shotgun"
- desc = "All you greenhorns who wanted to see Xenomorphs up close... this is your lucky day. Uses 12g rounds."
+ desc = "All you greenhorns who wanted to see Xenomorphs up close... this is gunna be your lucky day. Uses 12g rounds."
icon = 'icons/obj/gun_vr.dmi'
icon_state = "haloshotgun"
icon_override = 'icons/obj/gun_vr.dmi'
diff --git a/code/modules/vore/fluffstuff/guns/nsfw.dm b/code/modules/vore/fluffstuff/guns/nsfw.dm
index e8e3febce2..bc570697d6 100644
--- a/code/modules/vore/fluffstuff/guns/nsfw.dm
+++ b/code/modules/vore/fluffstuff/guns/nsfw.dm
@@ -316,13 +316,12 @@
/obj/item/projectile/beam/final_option/on_hit(var/atom/impacted)
if(isliving(impacted))
var/mob/living/L = impacted
-// Chompstation Edit: Removed Nifs - Jon
-/* if(L.mind)
+ if(L.mind)
var/nif
if(ishuman(L))
var/mob/living/carbon/human/H = L
nif = H.nif
- SStranscore.m_backup(L.mind,nif,one_time = TRUE)*/
+ SStranscore.m_backup(L.mind,nif,one_time = TRUE)
L.gib()
..()
diff --git a/code/modules/vore/persist/persist_vr.dm b/code/modules/vore/persist/persist_vr.dm
index 22e7b2da55..7b9f3d497d 100644
--- a/code/modules/vore/persist/persist_vr.dm
+++ b/code/modules/vore/persist/persist_vr.dm
@@ -82,12 +82,11 @@
WARNING("Persist (PID): Skipping [occupant] for persisting, as they have no prefs.")
return
-//Chompstation Edit: Removing NIFs - Jon
-/*
+
//This one doesn't rely on persistence prefs
if(ishuman(occupant) && occupant.stat != DEAD)
persist_nif_data(occupant, prefs)
-*/
+
if(!prefs.persistence_settings)
return // Persistence disabled by preference settings
@@ -220,14 +219,14 @@
var/loss = (MAX_NUTRITION_TO_LOSE - C.nutrition) * weight_per_nutrition * C.weight_loss/100
C.weight = max(MIN_MOB_WEIGHT, C.weight - loss)
-// Chompstation Edit: Removing NIFs temporarily - Jon
+
/**
* Persist any NIF data that needs to be persisted. It's stored in a list to make it more malleable
* towards future shenanigans such as upgradable NIFs or different types or things of that nature,
* without invoking the need for a bunch of different save file variables.
*/
-/*
+
/proc/persist_nif_data(var/mob/living/carbon/human/H,var/datum/preferences/prefs)
if(!istype(H))
crash_with("Persist (NIF): Given a nonhuman: [H]")
@@ -262,4 +261,3 @@
if(!S) WARNING ("Persist (NIF): Couldn't load NIF save savefile? [prefs.real_name]")
S.cd = "/character[prefs.default_slot]"
nif_prefs.save_character(S)
-*/
\ No newline at end of file
diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm
index 27f2d770b8..12adf709b0 100644
--- a/code/modules/vore/resizing/sizegun_vr.dm
+++ b/code/modules/vore/resizing/sizegun_vr.dm
@@ -74,7 +74,7 @@
if(ishuman(target))
var/mob/living/carbon/human/H = M
H.resize(set_size)
- H.show_message(" The beam fires into your body, changing your size!")
+ H.show_message(" The beam fires into your body, changing your size!")
H.updateicon()
else if (istype(target, /mob/living/))
var/mob/living/H = M
diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm
index 89ca5dfdb1..e89940190c 100644
--- a/code/modules/xenoarcheaology/artifacts/replicator.dm
+++ b/code/modules/xenoarcheaology/artifacts/replicator.dm
@@ -74,7 +74,7 @@
viables.Remove(type)
construction[button_desc] = type
- fail_message = "\icon[src] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \
+ fail_message = "\icon[src] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \
[pick("horn","beep","bing","bleep","blat","honk","hrumph","ding")] sounds and a \
[pick("yellow","purple","green","blue","red","orange","white")] \
[pick("light","dial","meter","window","protrusion","knob","antenna","swirly thing")] \
diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm
index 1ce4233c39..fb72700b41 100644
--- a/code/modules/xenoarcheaology/effects/cellcharge.dm
+++ b/code/modules/xenoarcheaology/effects/cellcharge.dm
@@ -10,7 +10,7 @@
var/mob/living/silicon/robot/R = user
for (var/obj/item/weapon/cell/D in R.contents)
D.charge += rand() * 100 + 50
- R << "SYSTEM ALERT: Large energy boost detected!"
+ R << "SYSTEM ALERT: Large energy boost detected!"
return 1
/datum/artifact_effect/cellcharge/DoEffectAura()
@@ -25,7 +25,7 @@
for (var/obj/item/weapon/cell/D in M.contents)
D.charge += 25
if(world.time - last_message > 200)
- M << "SYSTEM ALERT: Energy boost detected!"
+ M << "SYSTEM ALERT: Energy boost detected!"
last_message = world.time
return 1
@@ -41,6 +41,6 @@
for (var/obj/item/weapon/cell/D in M.contents)
D.charge += rand() * 100
if(world.time - last_message > 200)
- M << "SYSTEM ALERT: Energy boost detected!"
+ M << "SYSTEM ALERT: Energy boost detected!"
last_message = world.time
return 1
diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm
index 4c27aaf134..2421c1b14b 100644
--- a/code/modules/xenoarcheaology/effects/celldrain.dm
+++ b/code/modules/xenoarcheaology/effects/celldrain.dm
@@ -10,7 +10,7 @@
var/mob/living/silicon/robot/R = user
for (var/obj/item/weapon/cell/D in R.contents)
D.charge = max(D.charge - rand() * 100, 0)
- R << "SYSTEM ALERT: Energy drain detected!"
+ R << "SYSTEM ALERT: Energy drain detected!"
return 1
return 1
diff --git a/code/modules/xenoarcheaology/effects/cold.dm b/code/modules/xenoarcheaology/effects/cold.dm
index 3c7438f93e..6b4ad2d425 100644
--- a/code/modules/xenoarcheaology/effects/cold.dm
+++ b/code/modules/xenoarcheaology/effects/cold.dm
@@ -11,7 +11,7 @@
/datum/artifact_effect/cold/DoEffectTouch(var/mob/user)
if(holder)
- user << "A chill passes up your spine!"
+ user << "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/xenoarcheaology/effects/goodfeeling.dm b/code/modules/xenoarcheaology/effects/goodfeeling.dm
index 8086d0e673..5a7848bfc0 100644
--- a/code/modules/xenoarcheaology/effects/goodfeeling.dm
+++ b/code/modules/xenoarcheaology/effects/goodfeeling.dm
@@ -31,7 +31,7 @@
if(prob(75))
H << "[pick(drastic_messages)]"
else
- H << "[pick(messages)]"
+ H << "[pick(messages)]"
if(prob(50))
H.dizziness += rand(3,5)
@@ -42,7 +42,7 @@
for (var/mob/living/carbon/human/H in range(src.effectrange,T))
if(prob(5))
if(prob(75))
- H << "[pick(messages)]"
+ H << "[pick(messages)]"
else
H << "[pick(drastic_messages)]"
@@ -58,7 +58,7 @@
if(prob(95))
H << "[pick(drastic_messages)]"
else
- H << "[pick(messages)]"
+ H << "[pick(messages)]"
if(prob(50))
H.dizziness += rand(3,5)
diff --git a/code/modules/xenoarcheaology/effects/heal.dm b/code/modules/xenoarcheaology/effects/heal.dm
index 963a0de295..2957f0cad8 100644
--- a/code/modules/xenoarcheaology/effects/heal.dm
+++ b/code/modules/xenoarcheaology/effects/heal.dm
@@ -8,7 +8,7 @@
var/weakness = GetAnomalySusceptibility(toucher)
if(prob(weakness * 100))
var/mob/living/carbon/C = toucher
- C << "You feel a soothing energy invigorate you."
+ C << "You feel a soothing energy invigorate you."
if(ishuman(toucher))
var/mob/living/carbon/human/H = toucher
@@ -40,7 +40,7 @@
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
if(prob(10))
- C << "You feel a soothing energy radiating from something nearby."
+ C << "You feel a soothing energy radiating from something nearby."
C.adjustBruteLoss(-1 * weakness)
C.adjustFireLoss(-1 * weakness)
C.adjustToxLoss(-1 * weakness)
@@ -55,7 +55,7 @@
for (var/mob/living/carbon/C in range(src.effectrange,T))
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
- C << "A wave of energy invigorates you."
+ C << "A wave of energy invigorates you."
C.adjustBruteLoss(-5 * weakness)
C.adjustFireLoss(-5 * weakness)
C.adjustToxLoss(-5 * weakness)
diff --git a/code/modules/xenoarcheaology/effects/roboheal.dm b/code/modules/xenoarcheaology/effects/roboheal.dm
index 5e714ece47..bab60e93b8 100644
--- a/code/modules/xenoarcheaology/effects/roboheal.dm
+++ b/code/modules/xenoarcheaology/effects/roboheal.dm
@@ -10,7 +10,7 @@
if(user)
if (istype(user, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = user
- R << "Your systems report damaged components mending by themselves!"
+ R << "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(world.time - last_message > 200)
- M << "SYSTEM ALERT: Beneficial energy field detected!"
+ M << "SYSTEM ALERT: Beneficial energy field detected!"
last_message = world.time
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
@@ -32,7 +32,7 @@
var/turf/T = get_turf(holder)
for (var/mob/living/silicon/robot/M in range(src.effectrange,T))
if(world.time - last_message > 200)
- M << "SYSTEM ALERT: Structural damage has been repaired by energy pulse!"
+ M << "SYSTEM ALERT: Structural damage has been repaired by energy pulse!"
last_message = world.time
M.adjustBruteLoss(-10)
M.adjustFireLoss(-10)
diff --git a/code/modules/xenoarcheaology/effects/sleepy.dm b/code/modules/xenoarcheaology/effects/sleepy.dm
index d556c76b60..f31e59e2d1 100644
--- a/code/modules/xenoarcheaology/effects/sleepy.dm
+++ b/code/modules/xenoarcheaology/effects/sleepy.dm
@@ -11,7 +11,7 @@
var/weakness = GetAnomalySusceptibility(toucher)
if(ishuman(toucher) && prob(weakness * 100))
var/mob/living/carbon/human/H = toucher
- H << pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.")
+ H << pick("You feel like taking a nap."," You feel a yawn coming on."," 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
@@ -26,7 +26,7 @@
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
if(prob(10))
- H << pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.")
+ H << pick("You feel like taking a nap."," You feel a yawn coming on."," 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))
@@ -39,7 +39,7 @@
for(var/mob/living/carbon/human/H in range(src.effectrange, T))
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
- H << pick("You feel like taking a nap."," You feel a yawn coming on."," You feel a little tired.")
+ H << pick("You feel like taking a nap."," You feel a yawn coming on."," 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))
diff --git a/code/modules/xenoarcheaology/finds/talking.dm b/code/modules/xenoarcheaology/finds/talking.dm
index 72ff1330de..ec48217b9e 100644
--- a/code/modules/xenoarcheaology/finds/talking.dm
+++ b/code/modules/xenoarcheaology/finds/talking.dm
@@ -54,7 +54,7 @@
var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\
"[holder_atom] seems to be focusing on [source]...",\
"[holder_atom] seems to turn it's attention to [source]...")
- holder_atom.loc.visible_message("\icon[holder_atom] [pick(options)]")
+ holder_atom.loc.visible_message("\icon[holder_atom] [pick(options)]")
if(prob(20))
spawn(2)
@@ -118,5 +118,5 @@
listening|=M
for(var/mob/M in listening)
- M << "\icon[holder_atom] [holder_atom] reverberates, \"[msg]\""
+ M << "\icon[holder_atom] [holder_atom] reverberates, \"[msg]\""
last_talk_time = world.time
diff --git a/code/modules/xenoarcheaology/tools/ano_device_battery.dm b/code/modules/xenoarcheaology/tools/ano_device_battery.dm
index a7fdae7553..5188b22c9b 100644
--- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm
+++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm
@@ -39,7 +39,7 @@
/obj/item/weapon/anodevice/attackby(var/obj/I as obj, var/mob/user as mob)
if(istype(I, /obj/item/weapon/anobattery))
if(!inserted_battery)
- user << "You insert the battery."
+ user << "You insert the battery."
user.drop_item()
I.loc = src
inserted_battery = I
@@ -130,13 +130,13 @@
//work out if we need to shutdown
if(inserted_battery.stored_charge <= 0)
- src.loc.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.")
+ src.loc.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.")
shutdown_emission()
else if(world.time > time_end)
- src.loc.visible_message("\icon[src] [src] chimes.", "\icon[src] You hear something chime.")
+ src.loc.visible_message("\icon[src] [src] chimes.", "\icon[src] You hear something chime.")
shutdown_emission()
else
- src.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.")
+ src.visible_message("\icon[src] [src] buzzes.", "\icon[src] You hear something buzz.")
shutdown_emission()
last_process = world.time
@@ -163,7 +163,7 @@
if(href_list["startup"])
if(inserted_battery && inserted_battery.battery_effect && (inserted_battery.stored_charge > 0) )
activated = 1
- src.visible_message("\icon[src] [src] whirrs.", "\icon[src]You hear something whirr.")
+ src.visible_message("\icon[src] [src] whirrs.", "\icon[src]You hear something whirr.")
if(!inserted_battery.battery_effect.activated)
inserted_battery.battery_effect.ToggleActivate(1)
time_end = world.time + duration
@@ -200,9 +200,9 @@
if(activated && inserted_battery.battery_effect.effect == EFFECT_TOUCH && !isnull(inserted_battery))
inserted_battery.battery_effect.DoEffectTouch(M)
inserted_battery.use_power(energy_consumed_on_touch)
- user.visible_message("[user] taps [M] with [src], and it shudders on contact.")
+ user.visible_message("[user] taps [M] with [src], and it shudders on contact.")
else
- user.visible_message("[user] taps [M] with [src], but nothing happens.")
+ user.visible_message("[user] taps [M] with [src], but nothing happens.")
//admin logging
user.lastattacked = M
diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm
index 253aad11ad..672f1bd2c5 100644
--- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm
+++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm
@@ -23,7 +23,7 @@
/obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob)
if(istype(I,/obj/item/weapon/anobattery))
if(!inserted_battery)
- user << "You insert [I] into [src]."
+ user << "You insert [I] into [src]."
user.drop_item()
I.loc = src
src.inserted_battery = I
diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
index 156a59799e..a6f7f3f69d 100644
--- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm
+++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
@@ -234,16 +234,16 @@
//emergency stop if seal integrity reaches 0
if(scanner_seal_integrity <= 0 || (scanner_temperature >= 1273 && !rad_shield))
stop_scanning()
- src.visible_message("\icon[src] buzzes unhappily. It has failed mid-scan!", 2)
+ src.visible_message("\icon[src] buzzes unhappily. It has failed mid-scan!", 2)
if(prob(5))
- src.visible_message("\icon[src] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", 2)
+ src.visible_message("\icon[src] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", 2)
else
//gradually cool down over time
if(scanner_temperature > 0)
scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0)
if(prob(0.75))
- src.visible_message("\icon[src] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", 2)
+ src.visible_message("\icon[src] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", 2)
last_process_worldtime = world.time
/obj/machinery/radiocarbon_spectrometer/proc/stop_scanning()
@@ -261,7 +261,7 @@
used_coolant = 0
/obj/machinery/radiocarbon_spectrometer/proc/complete_scan()
- src.visible_message("\icon[src] makes an insistent chime.", 2)
+ src.visible_message("\icon[src] makes an insistent chime.", 2)
if(scanned_item)
//create report
diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm
index ac56f7de92..3358dc5fd7 100644
--- a/code/modules/xenoarcheaology/tools/suspension_generator.dm
+++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm
@@ -61,7 +61,7 @@
dat += "
"
dat += "
"
- dat += "Always wear safety gear and consult a field manual before operation.
"
+ dat += "Always wear safety gear and consult a field manual before operation.
"
if(!locked)
dat += "Lock console
"
else
@@ -182,10 +182,10 @@
for(var/mob/living/M in T)
M.weakened += 5
- M.visible_message("\icon[M] [M] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
+ M.visible_message("\icon[M] [M] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
suspension_field = new(T)
- src.visible_message("\icon[src] [src] activates with a low hum.")
+ src.visible_message("\icon[src] [src] activates with a low hum.")
icon_state = "suspension3"
for(var/obj/item/I in T)
@@ -195,7 +195,7 @@
if(collected)
suspension_field.icon_state = "energynet"
suspension_field.overlays += "shield2"
- src.visible_message("\icon[suspension_field] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].")
+ src.visible_message("\icon[suspension_field] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].")
else
if(istype(T,/turf/simulated/mineral) || istype(T,/turf/simulated/wall))
suspension_field.icon_state = "shieldsparkles"
@@ -210,7 +210,7 @@
M << "You no longer feel like floating."
M.weakened = min(M.weakened, 3)
- src.visible_message("\icon[src] [src] deactivates with a gentle shudder.")
+ src.visible_message("\icon[src] [src] deactivates with a gentle shudder.")
qdel(suspension_field)
suspension_field = null
icon_state = "suspension2"
diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index 7c595b923f..8718c03006 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -1,15 +1,15 @@
client/script = {"