diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 2572e94a42..bd3f075866 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -231,7 +231,7 @@
var/obj/machinery/computer/cryopod/control_computer
var/last_no_computer_message = 0
- var/applies_stasis = 1
+ var/applies_stasis = 0 ///TFF 18/4/19: change var from 1 to 0 so that you're able to get back out if you don't want to cryo out in the first place.
/obj/machinery/cryopod/robot
name = "robotic storage unit"
@@ -506,11 +506,6 @@
//visible_message("\The [initial(name)] hums and hisses as it moves [to_despawn.real_name] into storage.", 3)
visible_message("\The [initial(name)] [on_store_visible_message_1] [to_despawn.real_name] [on_store_visible_message_2].", 3)
-//TFF: Port Vorestation fix for people getting kicked while inside a belly.
- if(to_despawn.client && to_despawn.stat<2)
- var/mob/observer/dead/newghost = to_despawn.ghostize()
- newghost.timeofdeath = world.time
-
//This should guarantee that ghosts don't spawn.
to_despawn.ckey = null
diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm
index fd2ea3e94b..54141ec119 100644
--- a/code/game/objects/items/apc_frame.dm
+++ b/code/game/objects/items/apc_frame.dm
@@ -6,12 +6,7 @@
icon = 'icons/obj/apc_repair.dmi'
icon_state = "apc_frame"
flags = CONDUCT
-
-/obj/item/frame/apc/attackby(obj/item/weapon/W as obj, mob/user as mob)
- ..()
- if (istype(W, /obj/item/weapon/wrench))
- new /obj/item/stack/material/steel( get_turf(src.loc), 2 )
- qdel(src)
+ refund_amt = 2 //TFF 18/4/19: Polaris fix for APC frames giving more steel than used when made.
/obj/item/frame/apc/try_build(turf/on_wall, mob/user as mob)
if (get_dist(on_wall, user)>1)
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 69905f0cb8..2bf0c8e768 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -71,6 +71,8 @@
/obj/item/device/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user)
if(!(user in (viewers(world.view,target))))
return
+ if(!(target in view(user, world.view))) ///TFF 18/4/19: VOREStation port - prevent laser light reaching the other side of a wall.
+ return
if(!(world.time - last_used_time >= cooldown))
return
if (!diode)
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index cd4c253f66..2a709a9cf5 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -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
..()
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index ef78d32f03..8ee276e341 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -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 << "You cannot modify \the [src] while it is being worn."
return
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index ac9a0e13f9..5333ece78d 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -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"
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index dc339c1f3f..2c4eb0780d 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -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 << "You are not a synthetic."
@@ -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)
diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
index a9d8d9d822..699f04e797 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -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)
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index c34b802f4f..3e0ccb470f 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -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))
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index a34d92169d..9731e94155 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -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
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 2cf73080f4..c7e10082d2 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -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)
\ No newline at end of file
+ O.on_loc_moved(oldloc)