mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
TG: Added checks for the player being dead, stunned, unconcious ect... to:
- Timers - Remote Signallers (Fixes issue 325 ) - Proximity Sensors - Infared Sensors (Man.. these really need to be fixed.. or just re-done entierly) Cargo shuttle: - People in the area of the cargo shuttle get gibbed when the shuttle shows up. (Fixes issue 508 ) - Renamed 'Dock' to 'Away' because Station -> Dock is confusing... Committing for Sieve: - The toggle throw hotkey (end) now works with TK (Fixes issue 523 ) - Borg diamond drills now properly dig sand (I still don't understand why they don't just have a shovel...) Updated changelog to reflect some of these changes. Revision: r3747 Author: johnsonmt88
This commit is contained in:
@@ -129,7 +129,7 @@
|
|||||||
disp2 = "STATN"
|
disp2 = "STATN"
|
||||||
else
|
else
|
||||||
disp1 = "SPPLY"
|
disp1 = "SPPLY"
|
||||||
disp2 = "DOCK"
|
disp2 = "AWAY"
|
||||||
|
|
||||||
update_display(disp1, disp2)
|
update_display(disp1, disp2)
|
||||||
|
|
||||||
|
|||||||
@@ -160,6 +160,7 @@ var/list/supply_groups = new()
|
|||||||
/proc/supply_can_move()
|
/proc/supply_can_move()
|
||||||
if(supply_shuttle_moving) return 0
|
if(supply_shuttle_moving) return 0
|
||||||
|
|
||||||
|
//I know this is an absolutly horrendous way to do this, very inefficient, but it's the only reliable way I can think of.
|
||||||
//Check for carbon mobs - Allows simple animals.
|
//Check for carbon mobs - Allows simple animals.
|
||||||
for(var/mob/living/carbon/M in world)
|
for(var/mob/living/carbon/M in world)
|
||||||
var/area/A = get_area(M)
|
var/area/A = get_area(M)
|
||||||
@@ -445,10 +446,10 @@ This method wont take into account storage items developed in the future and doe
|
|||||||
dat = src.temp
|
dat = src.temp
|
||||||
else
|
else
|
||||||
dat += {"<BR><B>Supply shuttle</B><HR>
|
dat += {"<BR><B>Supply shuttle</B><HR>
|
||||||
\nLocation: [supply_shuttle_moving ? "Moving to station ([supply_shuttle_timeleft] Mins.)":supply_shuttle_at_station ? "Station":"Dock"]<BR>
|
\nLocation: [supply_shuttle_moving ? "Moving to station ([supply_shuttle_timeleft] Mins.)":supply_shuttle_at_station ? "Station":"Away"]<BR>
|
||||||
<HR>\nSupply points: [supply_shuttle_points]<BR>\n<BR>
|
<HR>\nSupply points: [supply_shuttle_points]<BR>\n<BR>
|
||||||
[supply_shuttle_moving ? "\n*Must be at dock to order items*<BR>\n<BR>":supply_shuttle_at_station ? "\n*Must be at dock to order items*<BR>\n<BR>":"\n<A href='?src=\ref[src];order=1'>Order items</A><BR>\n<BR>"]
|
[supply_shuttle_moving ? "\n*Must be away to order items*<BR>\n<BR>":supply_shuttle_at_station ? "\n*Must be away to order items*<BR>\n<BR>":"\n<A href='?src=\ref[src];order=1'>Order items</A><BR>\n<BR>"]
|
||||||
[supply_shuttle_moving ? "\n*Shuttle already called*<BR>\n<BR>":supply_shuttle_at_station ? "\n<A href='?src=\ref[src];sendtodock=1'>Send to Dock</A><BR>\n<BR>":"\n<A href='?src=\ref[src];sendtostation=1'>Send to station</A><BR>\n<BR>"]
|
[supply_shuttle_moving ? "\n*Shuttle already called*<BR>\n<BR>":supply_shuttle_at_station ? "\n<A href='?src=\ref[src];sendtodock=1'>Send away</A><BR>\n<BR>":"\n<A href='?src=\ref[src];sendtostation=1'>Send to station</A><BR>\n<BR>"]
|
||||||
\n<A href='?src=\ref[src];viewrequests=1'>View requests</A><BR>\n<BR>
|
\n<A href='?src=\ref[src];viewrequests=1'>View requests</A><BR>\n<BR>
|
||||||
\n<A href='?src=\ref[src];vieworders=1'>View orders</A><BR>\n<BR>
|
\n<A href='?src=\ref[src];vieworders=1'>View orders</A><BR>\n<BR>
|
||||||
\n<A href='?src=\ref[user];mach_close=computer'>Close</A>"}
|
\n<A href='?src=\ref[user];mach_close=computer'>Close</A>"}
|
||||||
@@ -506,6 +507,7 @@ This method wont take into account storage items developed in the future and doe
|
|||||||
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
|
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
|
||||||
usr.machine = src
|
usr.machine = src
|
||||||
|
|
||||||
|
//From Station to Centcomm
|
||||||
if (href_list["sendtodock"])
|
if (href_list["sendtodock"])
|
||||||
if(!supply_shuttle_at_station || supply_shuttle_moving) return
|
if(!supply_shuttle_at_station || supply_shuttle_moving) return
|
||||||
|
|
||||||
@@ -531,6 +533,7 @@ This method wont take into account storage items developed in the future and doe
|
|||||||
|
|
||||||
send_supply_shuttle()
|
send_supply_shuttle()
|
||||||
|
|
||||||
|
//From Centcomm to Station
|
||||||
else if (href_list["sendtostation"])
|
else if (href_list["sendtostation"])
|
||||||
if(supply_shuttle_at_station || supply_shuttle_moving) return
|
if(supply_shuttle_at_station || supply_shuttle_moving) return
|
||||||
|
|
||||||
@@ -669,9 +672,11 @@ This method wont take into account storage items developed in the future and doe
|
|||||||
|
|
||||||
if (supply_shuttle_moving) return
|
if (supply_shuttle_moving) return
|
||||||
|
|
||||||
if (!supply_can_move())
|
var/area/the_shuttles_way = locate(SUPPLY_STATION_AREATYPE)
|
||||||
usr << "\red The supply shuttle can not transport station employees, exosuits, classified nuclear codes, or homing beacons."
|
|
||||||
return
|
//Do I really need to explain this loop?
|
||||||
|
for(var/mob/living/unlucky_person in the_shuttles_way)
|
||||||
|
unlucky_person.gib()
|
||||||
|
|
||||||
var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE
|
var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE
|
||||||
var/shuttleto = !supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE
|
var/shuttleto = !supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
|
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
|
||||||
|
|
||||||
/obj/item/device/assembly/infra
|
/obj/item/device/assembly/infra
|
||||||
name = "Infrared Beam"
|
name = "Infrared Beam"
|
||||||
@@ -129,7 +129,7 @@
|
|||||||
|
|
||||||
Topic(href, href_list)
|
Topic(href, href_list)
|
||||||
..()
|
..()
|
||||||
if(get_dist(src, usr) > 1)
|
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
|
||||||
usr << browse(null, "window=infra")
|
usr << browse(null, "window=infra")
|
||||||
onclose(usr, "infra")
|
onclose(usr, "infra")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
|
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
|
||||||
|
|
||||||
/obj/item/device/assembly/prox_sensor
|
/obj/item/device/assembly/prox_sensor
|
||||||
name = "proximity sensor"
|
name = "proximity sensor"
|
||||||
@@ -100,7 +100,6 @@
|
|||||||
M.c_state(0)
|
M.c_state(0)
|
||||||
if(holder)
|
if(holder)
|
||||||
holder.update_icon()
|
holder.update_icon()
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
@@ -127,7 +126,7 @@
|
|||||||
|
|
||||||
Topic(href, href_list)
|
Topic(href, href_list)
|
||||||
..()
|
..()
|
||||||
if(get_dist(src, usr) > 1)
|
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
|
||||||
usr << browse(null, "window=prox")
|
usr << browse(null, "window=prox")
|
||||||
onclose(usr, "prox")
|
onclose(usr, "prox")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
|
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
|
||||||
|
|
||||||
/obj/item/device/assembly/signaler
|
/obj/item/device/assembly/signaler
|
||||||
name = "Remote Signaling Device"
|
name = "Remote Signaling Device"
|
||||||
@@ -77,9 +77,9 @@
|
|||||||
Topic(href, href_list)
|
Topic(href, href_list)
|
||||||
..()
|
..()
|
||||||
|
|
||||||
if(get_dist(src, usr) > 1)
|
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
|
||||||
usr << browse(null, "window=signal")
|
usr << browse(null, "window=radio")
|
||||||
onclose(usr, "signal")
|
onclose(usr, "radio")
|
||||||
return
|
return
|
||||||
|
|
||||||
if (href_list["freq"])
|
if (href_list["freq"])
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
|
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
|
||||||
|
|
||||||
/obj/item/device/assembly/timer
|
/obj/item/device/assembly/timer
|
||||||
name = "timer"
|
name = "timer"
|
||||||
@@ -93,7 +93,7 @@
|
|||||||
|
|
||||||
Topic(href, href_list)
|
Topic(href, href_list)
|
||||||
..()
|
..()
|
||||||
if(get_dist(src, usr) > 1)
|
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
|
||||||
usr << browse(null, "window=timer")
|
usr << browse(null, "window=timer")
|
||||||
onclose(usr, "timer")
|
onclose(usr, "timer")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -345,7 +345,7 @@
|
|||||||
else
|
else
|
||||||
..(W,user)
|
..(W,user)
|
||||||
|
|
||||||
if ((istype(W,/obj/item/weapon/pickaxe/diamonddrill)))
|
if ((istype(W,/obj/item/weapon/pickaxe/diamonddrill)) || (istype(W,/obj/item/weapon/pickaxe/borgdrill)))
|
||||||
var/turf/T = user.loc
|
var/turf/T = user.loc
|
||||||
if (!( istype(T, /turf) ))
|
if (!( istype(T, /turf) ))
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -40,10 +40,7 @@
|
|||||||
/client/Southwest()
|
/client/Southwest()
|
||||||
if(iscarbon(usr))
|
if(iscarbon(usr))
|
||||||
var/mob/living/carbon/C = usr
|
var/mob/living/carbon/C = usr
|
||||||
if(!C.get_active_hand())
|
C.toggle_throw_mode()
|
||||||
usr << "\red You have nothing in your hand to throw."
|
|
||||||
return
|
|
||||||
toggle_throw_mode()
|
|
||||||
else
|
else
|
||||||
usr << "\red This mob type cannot throw items."
|
usr << "\red This mob type cannot throw items."
|
||||||
return
|
return
|
||||||
@@ -132,10 +129,12 @@
|
|||||||
|
|
||||||
/client/verb/toggle_throw_mode()
|
/client/verb/toggle_throw_mode()
|
||||||
set hidden = 1
|
set hidden = 1
|
||||||
if(!istype(mob, /mob/living/carbon)) return
|
if(!istype(mob, /mob/living/carbon))
|
||||||
if((mob.stat || mob.restrained()) || !(isturf(mob.loc))) return
|
return
|
||||||
mob:toggle_throw_mode()
|
if (!mob.stat && isturf(mob.loc) && !mob.restrained())
|
||||||
return
|
mob:toggle_throw_mode()
|
||||||
|
else
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
/client/verb/drop_item()
|
/client/verb/drop_item()
|
||||||
|
|||||||
Reference in New Issue
Block a user