mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 15:45:25 +01:00
Merge branch 'master' into travis-cleanup
This commit is contained in:
AffectedArc07
@@ -68,7 +68,7 @@
|
||||
on = !on
|
||||
icon_state = "[initial(icon_state)][on ? "-light":""]"
|
||||
item_state = icon_state
|
||||
|
||||
|
||||
var/mob/living/carbon/human/H = user
|
||||
if(istype(H))
|
||||
H.update_inv_head()
|
||||
@@ -185,7 +185,7 @@
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/mining
|
||||
name = "mining plasma envirosuit helmet"
|
||||
desc = "A khaki helmet given to plasmamen miners operating on Lavaland."
|
||||
desc = "A khaki helmet given to plasmaman miners operating on Lavaland."
|
||||
icon_state = "explorer_envirohelm"
|
||||
item_state = "explorer_envirohelm"
|
||||
visor_icon = "explorer_envisor"
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
/obj/item/clothing/under/plasmaman/cargo
|
||||
name = "cargo plasma envirosuit"
|
||||
desc = "A joint envirosuit used by plasmamen quartermasters and cargo techs alike, due to the logistical problems of differenciating the two with the length of their pant legs."
|
||||
desc = "An envirosuit used by plasmaman quartermasters and cargo techs alike, due to the logistical problems of differentiating the two by the length of their pant legs."
|
||||
icon_state = "cargo_envirosuit"
|
||||
item_state = "cargo_envirosuit"
|
||||
item_color = "cargo_envirosuit"
|
||||
|
||||
/obj/item/clothing/under/plasmaman/mining
|
||||
name = "mining plasma envirosuit"
|
||||
desc = "An air-tight khaki suit designed for operations on lavaland by plasmamen."
|
||||
desc = "An airtight khaki suit designed for operations on Lavaland by plasmamen."
|
||||
icon_state = "explorer_envirosuit"
|
||||
item_state = "explorer_envirosuit"
|
||||
item_color = "explorer_envirosuit"
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
/obj/item/clothing/under/plasmaman/chef
|
||||
name = "chef's plasma envirosuit"
|
||||
desc = "A white plasmaman envirosuit designed for cullinary practices. One might question why a member of a species that doesn't need to eat would become a chef."
|
||||
desc = "A white plasmaman envirosuit designed for culinary practices. One might question why a member of a species that doesn't need to eat would become a chef."
|
||||
icon_state = "chef_envirosuit"
|
||||
item_state = "chef_envirosuit"
|
||||
item_color = "chef_envirosuit"
|
||||
|
||||
/obj/item/clothing/under/plasmaman/enviroslacks
|
||||
name = "enviroslacks"
|
||||
desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nano-Trasen for it's detectives, lawyers, and bar-tenders alike."
|
||||
desc = "The pet project of a particularly posh plasmaman, this custom suit was quickly appropriated by Nanotrasen for its detectives, lawyers, and bartenders alike."
|
||||
icon_state = "enviroslacks"
|
||||
item_state = "enviroslacks"
|
||||
item_color = "enviroslacks"
|
||||
@@ -36,14 +36,14 @@
|
||||
|
||||
/obj/item/clothing/under/plasmaman/librarian
|
||||
name = "librarian's plasma envirosuit"
|
||||
desc = "Made out of a modified voidsuit, this suit was Nano-Trasen's first solution to the *logistical problems* that come with employing plasmamen. Due to the modifications, the suit is no longer space-worthy. Despite their limitations, these suits are still in used by historian and old-styled plasmamen alike."
|
||||
desc = "Made out of a modified voidsuit, this suit was Nanotrasen's first solution to the *logistical problems* that come with employing plasmamen. Due to the modifications, the suit is no longer space-worthy. Despite their limitations, these suits are still in used by historian and old-styled plasmamen alike."
|
||||
icon_state = "prototype_envirosuit"
|
||||
item_state = "prototype_envirosuit"
|
||||
item_color = "prototype_envirosuit"
|
||||
|
||||
/obj/item/clothing/under/plasmaman/janitor
|
||||
name = "janitor's plasma envirosuit"
|
||||
desc = "A grey and purple envirosuit designated for plasmamen janitors."
|
||||
desc = "A grey and purple envirosuit designated for plasmaman janitors."
|
||||
icon_state = "janitor_envirosuit"
|
||||
item_state = "janitor_envirosuit"
|
||||
item_color = "janitor_envirosuit"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/obj/item/clothing/under/plasmaman/engineering
|
||||
name = "engineering plasma envirosuit"
|
||||
desc = "An air-tight suit designed to be used by plasmamen exployed as engineers, the usual purple stripes being replaced by engineer's orange. It protects the user from fire and acid damage."
|
||||
desc = "An airtight suit designed to be used by plasmamen employed as engineers, the usual purple stripes being replaced by engineering's orange. It protects the user from fire and acid damage."
|
||||
icon_state = "engineer_envirosuit"
|
||||
item_state = "engineer_envirosuit"
|
||||
item_color = "engineer_envirosuit"
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
/obj/item/clothing/under/plasmaman/engineering/ce
|
||||
name = "chief engineer plasma envirosuit"
|
||||
desc = "An air-tight suit designed to be used by plasmamen exployed as the chief engineer"
|
||||
desc = "An airtight suit designed to be used by plasmamen employed as the chief engineer."
|
||||
icon_state = "ce_envirosuit"
|
||||
item_state = "ce_envirosuit"
|
||||
item_color = "ce_envirosuit"
|
||||
|
||||
/obj/item/clothing/under/plasmaman/atmospherics
|
||||
name = "atmospherics plasma envirosuit"
|
||||
desc = "An air-tight suit designed to be used by plasmamen exployed as atmos technicians, the usual purple stripes being replaced by atmos's blue."
|
||||
desc = "An airtight suit designed to be used by plasmamen employed as atmos technicians, the usual purple stripes being replaced by atmos' blue."
|
||||
icon_state = "atmos_envirosuit"
|
||||
item_state = "atmos_envirosuit"
|
||||
item_color = "atmos_envirosuit"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
item_color = "scientist_envirosuit"
|
||||
|
||||
/obj/item/clothing/under/plasmaman/rd
|
||||
name = "science plasma envirosuit"
|
||||
name = "rd plasma envirosuit"
|
||||
desc = "A plasmaman envirosuit designed for the research director."
|
||||
icon_state = "rd_envirosuit"
|
||||
item_state = "rd_envirosuit"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
/obj/item/clothing/under/plasmaman/security/warden
|
||||
name = "warden plasma envirosuit"
|
||||
desc = "A plasmaman containment suit designed for the warden, white stripes being added to differeciate them from other members of security."
|
||||
desc = "A plasmaman containment suit designed for the warden, white stripes being added to differentiate them from other members of security."
|
||||
icon_state = "warden_envirosuit"
|
||||
item_state = "warden_envirosuit"
|
||||
item_color = "warden_envirosuit"
|
||||
|
||||
@@ -835,16 +835,16 @@ GLOBAL_LIST_INIT(non_fakeattack_weapons, list(/obj/item/gun/projectile, /obj/ite
|
||||
//To make it more realistic, I added two gunshots (enough to kill)
|
||||
playsound_local(null, 'sound/weapons/gunshots/gunshot.ogg', 25, 1)
|
||||
var/timer_pause = rand(10,30)
|
||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, 'sound/weapons/gunshots/gunshot.ogg', 25, 1), timer_pause)
|
||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10))
|
||||
addtimer(CALLBACK(src, /mob/.proc/playsound_local, null, 'sound/weapons/gunshots/gunshot.ogg', 25, 1), timer_pause)
|
||||
addtimer(CALLBACK(src, /mob/.proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10))
|
||||
if(10)
|
||||
playsound_local(null, 'sound/effects/pray_chaplain.ogg', 50)
|
||||
if(11)
|
||||
//Same as above, but with tasers.
|
||||
playsound_local(null, 'sound/weapons/taser.ogg', 25, 1)
|
||||
var/timer_pause = rand(10,30)
|
||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, 'sound/weapons/taser.ogg', 25, 1), timer_pause)
|
||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10))
|
||||
addtimer(CALLBACK(src, /mob/.proc/playsound_local, null, 'sound/weapons/taser.ogg', 25, 1), timer_pause)
|
||||
addtimer(CALLBACK(src, /mob/.proc/playsound_local, null, sound(get_sfx("bodyfall"), 25), 25, 1), timer_pause+rand(5,10))
|
||||
//Rare audio
|
||||
if(12)
|
||||
//These sounds are (mostly) taken from Hidden: Source
|
||||
|
||||
@@ -594,7 +594,7 @@
|
||||
toggle_ai(initial(AIStatus))
|
||||
|
||||
/mob/living/simple_animal/proc/add_collar(obj/item/clothing/accessory/petcollar/P, mob/user)
|
||||
if(QDELETED(P) || pcollar)
|
||||
if(!istype(P) || QDELETED(P) || pcollar)
|
||||
return
|
||||
if(user && !user.unEquip(P))
|
||||
return
|
||||
|
||||
@@ -89,11 +89,13 @@
|
||||
|
||||
/obj/item/modular_computer/laptop/proc/toggle_open(mob/living/user=null)
|
||||
if(screen_on)
|
||||
to_chat(user, "<span class='notice'>You close \the [src].</span>")
|
||||
if(user)
|
||||
to_chat(user, "<span class='notice'>You close \the [src].</span>")
|
||||
slowdown = initial(slowdown)
|
||||
w_class = initial(w_class)
|
||||
else
|
||||
to_chat(user, "<span class='notice'>You open \the [src].</span>")
|
||||
if(user)
|
||||
to_chat(user, "<span class='notice'>You open \the [src].</span>")
|
||||
slowdown = slowdown_open
|
||||
w_class = w_class_open
|
||||
|
||||
|
||||
Reference in New Issue
Block a user