mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-23 12:06:22 +01:00
Merge pull request #643 from TheFurryFeline/TFF-QoL_Changes1
QoL Changes - Round 1
This commit is contained in:
@@ -103,7 +103,7 @@ Code:
|
||||
var/obj/item/device/assembly/signaler/signaler2 = W
|
||||
if(secured && signaler2.secured)
|
||||
code = signaler2.code
|
||||
frequency = signaler2.frequency
|
||||
set_frequency(signaler2.frequency) //TFF 18/4/19: Polaris fix - frequency transfer to other signalers
|
||||
to_chat(user, "You transfer the frequency and code of [signaler2] to [src].")
|
||||
else
|
||||
..()
|
||||
|
||||
@@ -213,7 +213,7 @@
|
||||
if(istype(W,/obj/item/clothing/accessory) || istype(W, /obj/item/weapon/hand_labeler))
|
||||
return ..()
|
||||
|
||||
if(istype(src.loc,/mob/living))
|
||||
if(user.get_inventory_slot(src) == slot_wear_suit) //TFF 18/4/19: Port Polaris QoL edit - allow attaching voidsuit parts WHILE holding it!
|
||||
user << "<span class='warning'>You cannot modify \the [src] while it is being worn.</span>"
|
||||
return
|
||||
|
||||
|
||||
@@ -394,8 +394,9 @@
|
||||
|
||||
activate_pin(3)
|
||||
|
||||
for(var/mob/O in hearers(1, get_turf(src)))
|
||||
O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
|
||||
if(loc) //TFF 18/4/19: Polaris fix - signaller circuit no long pings all alive.
|
||||
for(var/mob/O in hearers(1, get_turf(src)))
|
||||
O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
|
||||
|
||||
/obj/item/integrated_circuit/input/EPv2
|
||||
name = "\improper EPv2 circuit"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null)
|
||||
var/param = null
|
||||
|
||||
|
||||
var/datum/gender/T = gender_datums[get_visible_gender()]
|
||||
|
||||
if (findtext(act, "-", 1, null))
|
||||
@@ -29,7 +29,7 @@
|
||||
m_type = 1
|
||||
|
||||
//Machine-only emotes
|
||||
if("ping", "beep", "buzz", "yes", "no", "rcough", "rsneeze")
|
||||
if("ping", "beep", "buzz", "yes", "ye", "no", "rcough", "rsneeze") //TFF 18/4/19: Polaris fix - make synths able to use *yes emote
|
||||
|
||||
if(!isSynthetic())
|
||||
src << "<span class='warning'>You are not a synthetic.</span>"
|
||||
@@ -52,7 +52,7 @@
|
||||
else if(act == "ping")
|
||||
display_msg = "pings"
|
||||
use_sound = 'sound/machines/ping.ogg'
|
||||
else if(act == "yes")
|
||||
else if(act == "yes"||act == "ye") //TFF 18/4/19: Polaris fix - make synths able to use *yes emote
|
||||
display_msg = "emits an affirmative blip"
|
||||
use_sound = 'sound/machines/synth_yes.ogg'
|
||||
else if(act == "no")
|
||||
@@ -557,7 +557,7 @@
|
||||
if ("weh")
|
||||
message = "lets out a weh."
|
||||
m_type = 1
|
||||
|
||||
|
||||
if ("whimper")
|
||||
if (miming)
|
||||
message = "appears hurt."
|
||||
@@ -743,7 +743,7 @@
|
||||
set name = "Set Pose"
|
||||
set desc = "Sets a description which will be shown when someone examines you."
|
||||
set category = "IC"
|
||||
|
||||
|
||||
var/datum/gender/T = gender_datums[get_visible_gender()]
|
||||
|
||||
pose = sanitize(input(usr, "This is [src]. [T.he]...", "Pose", null) as text)
|
||||
|
||||
@@ -113,10 +113,19 @@ var/datum/species/shapeshifter/promethean/prometheans
|
||||
prometheans = src
|
||||
|
||||
/datum/species/shapeshifter/promethean/equip_survival_gear(var/mob/living/carbon/human/H)
|
||||
var/boxtype = pick(typesof(/obj/item/weapon/storage/toolbox/lunchbox))
|
||||
//TFF 18/4/19: Add a proper list of randomly chosen lunchboxes
|
||||
var/boxtype = pick(list(/obj/item/weapon/storage/toolbox/lunchbox,
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/heart,
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/cat,
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/nt,
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/mars,
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/cti,
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/nymph,
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/syndicate)) //Only pick the empty types
|
||||
var/obj/item/weapon/storage/toolbox/lunchbox/L = new boxtype(get_turf(H))
|
||||
var/mob/living/simple_animal/mouse/mouse = new (L)
|
||||
var/obj/item/weapon/holder/holder = new (L)
|
||||
holder.held_mob = mouse //TFF 18/4/19: Make Prommies hold a mouse on spawning.
|
||||
mouse.forceMove(holder)
|
||||
holder.sync(mouse)
|
||||
if(H.backbag == 1)
|
||||
|
||||
@@ -185,7 +185,7 @@
|
||||
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
|
||||
m_type = 1
|
||||
|
||||
if("yes")
|
||||
if("yes", "ye") //TFF 18/4/19: Polaris fix - make synths able to use *yes emote
|
||||
var/M = null
|
||||
if(param)
|
||||
for (var/mob/A in view(null, null))
|
||||
|
||||
@@ -704,6 +704,7 @@
|
||||
if(!istype(req_access, /list)) //something's very wrong
|
||||
return 1
|
||||
|
||||
//TFF 14/4/19: Port VoreStation edit - wallet/micro usage to unlock borgs
|
||||
var/list/L = req_access
|
||||
if(!L.len) //no requirements
|
||||
return 1
|
||||
|
||||
@@ -288,7 +288,8 @@
|
||||
tickcomp = ((1/(world.tick_lag))*1.3) - 1.3
|
||||
move_delay = move_delay + tickcomp
|
||||
|
||||
if(istype(mob.buckled))// VOREStation Removal - , /obj/vehicle))
|
||||
//TFF 18/4/19: Port VOREStation wheelchair speed nerf fix
|
||||
if(istype(mob.buckled, /obj/vehicle) || istype(mob.buckled, /mob)) //VOREStation Edit: taur riding. I think.
|
||||
//manually set move_delay for vehicles so we don't inherit any mob movement penalties
|
||||
//specific vehicle move delays are set in code\modules\vehicles\vehicle.dm
|
||||
move_delay = world.time + tickcomp
|
||||
@@ -567,4 +568,4 @@
|
||||
|
||||
/obj/item/weapon/storage/on_loc_moved(atom/oldloc)
|
||||
for(var/obj/O in contents)
|
||||
O.on_loc_moved(oldloc)
|
||||
O.on_loc_moved(oldloc)
|
||||
|
||||
Reference in New Issue
Block a user