cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9629 from Novacat/nova-basicfixes

Browse Source 
Shuttle Console ID Stuff
This commit is contained in:
Novacat
2021-01-31 22:24:27 -05:00
committed by Chompstation Bot
parent 710c6b5021
commit 3d5c11d6df
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/computer/guestpass.dm
View File

@@ -168,9 +168,9 @@
if(reas) if(reas)
reason = reas reason = reas
if("duration") if("duration")
var/dur = input("Duration (in minutes) during which pass is valid (up to 120 minutes).", "Duration") as num|null var/dur = input("Duration (in minutes) during which pass is valid (up to 360 minutes).", "Duration") as num|null //VOREStation Edit
if(dur) if(dur)
if(dur > 0 && dur <= 120) if(dur > 0 && dur <= 360) //VOREStation Edit
duration = dur duration = dur
else else
to_chat(usr, "<span class='warning'>Invalid duration.</span>") to_chat(usr, "<span class='warning'>Invalid duration.</span>")

13
code/modules/overmap/ships/computers/ship_vr.dm Normal file
View File

@@ -0,0 +1,13 @@
/*
Ships can now be hijacked!
*/
/obj/machinery/computer/ship
var/hacked = 0 // Has been emagged, no access restrictions.
/obj/machinery/computer/ship/emag_act(var/remaining_charges, var/mob/user)
if (!hacked)
req_access = list()
req_one_access = list()
hacked = 1
to_chat(user, "You short out the console's ID checking system. It's now available to everyone!")
return 1

2
maps/tether/tether_shuttles.dm
View File

@@ -259,7 +259,6 @@
/obj/machinery/computer/shuttle_control/explore/medivac /obj/machinery/computer/shuttle_control/explore/medivac
name = "short jump console" name = "short jump console"
shuttle_tag = "Medivac Shuttle" shuttle_tag = "Medivac Shuttle"
req_one_access = list(access_cmo, access_pilot)
//////////////////////////////////////// ////////////////////////////////////////
//////// Securiship ///////////// //////// Securiship /////////////
@@ -285,4 +284,3 @@
/obj/machinery/computer/shuttle_control/explore/securiship /obj/machinery/computer/shuttle_control/explore/securiship
name = "short jump console" name = "short jump console"
shuttle_tag = "Securiship Shuttle" shuttle_tag = "Securiship Shuttle"
req_one_access = list(access_pilot, access_hos)

1
vorestation.dme
View File

@@ -3332,6 +3332,7 @@
#include "code\modules\overmap\ships\computers\helm.dm" #include "code\modules\overmap\ships\computers\helm.dm"
#include "code\modules\overmap\ships\computers\sensors.dm" #include "code\modules\overmap\ships\computers\sensors.dm"
#include "code\modules\overmap\ships\computers\ship.dm" #include "code\modules\overmap\ships\computers\ship.dm"
#include "code\modules\overmap\ships\computers\ship_vr.dm"
#include "code\modules\overmap\ships\computers\shuttle.dm" #include "code\modules\overmap\ships\computers\shuttle.dm"
#include "code\modules\overmap\ships\engines\engine.dm" #include "code\modules\overmap\ships\engines\engine.dm"
#include "code\modules\overmap\ships\engines\gas_thruster.dm" #include "code\modules\overmap\ships\engines\gas_thruster.dm"