mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-15 20:52:41 +00:00
Exploration Fixes for 09-27-2018 Sync
- Removes redundant station_vr file - Reverts exploration suit cyclers to polaris cyclers - Adds a pilot suit cycler to exploration - Applies a functioning fix for holdout phasers - Slightly buffs up the holdout phaser to be 50% of expedition phaser, to keep size-effectiveness scaling - Removes head access from expedition shuttle control console - Removes Pilot Blue/Old Exploration from polaris cyclers (they are still WIP on polaris end)
This commit is contained in:
Unknown
@@ -1,7 +1,7 @@
|
||||
/datum/supply_pack/munitions/expeditionguns
|
||||
name = "Frontier phaser (station-locked) crate"
|
||||
contains = list(
|
||||
/obj/item/weapon/gun/energy/frontier/locked/basic = 2,
|
||||
/obj/item/weapon/gun/energy/frontier/locked = 2,
|
||||
/obj/item/weapon/gun/energy/frontier/locked/holdout = 1,
|
||||
)
|
||||
cost = 35
|
||||
|
||||
@@ -18,47 +18,12 @@
|
||||
SPECIES_ZORREN_HIGH
|
||||
)
|
||||
|
||||
/obj/machinery/suit_cycler/explorer
|
||||
name = "Explorer suit cycler"
|
||||
model_text = "Exploration"
|
||||
// Old Exploration is too WIP to use right now
|
||||
/obj/machinery/suit_cycler/exploration
|
||||
req_access = list(access_explorer)
|
||||
departments = list("Exploration")
|
||||
|
||||
// Pilot Blue is still missing a few sprites on polaris end
|
||||
/obj/machinery/suit_cycler/pilot
|
||||
req_access = list(access_pilot)
|
||||
departments = list("Exploration","Pilot")
|
||||
|
||||
/obj/machinery/suit_cycler/explorer/initialize()
|
||||
species -= SPECIES_TESHARI
|
||||
return ..()
|
||||
|
||||
/obj/machinery/suit_cycler/apply_paintjob()
|
||||
if(!target_species || !target_department)
|
||||
return
|
||||
|
||||
if(target_species)
|
||||
if(helmet) helmet.refit_for_species(target_species)
|
||||
if(suit) suit.refit_for_species(target_species)
|
||||
|
||||
switch(target_department)
|
||||
if("Exploration")
|
||||
if(helmet)
|
||||
helmet.name = "exploration voidsuit helmet"
|
||||
helmet.icon_state = "helm_explorer"
|
||||
helmet.item_state = "helm_explorer"
|
||||
if(suit)
|
||||
suit.name = "exploration voidsuit"
|
||||
suit.icon_state = "void_explorer"
|
||||
suit.item_state = "void_explorer"
|
||||
suit.item_state_slots[slot_r_hand_str] = "wiz_voidsuit"
|
||||
suit.item_state_slots[slot_l_hand_str] = "wiz_voidsuit"
|
||||
if("Pilot")
|
||||
if(helmet)
|
||||
helmet.name = "pilot voidsuit helmet"
|
||||
helmet.icon_state = "rig0_pilot"
|
||||
helmet.item_state = "pilot_helm"
|
||||
if(suit)
|
||||
suit.name = "pilot voidsuit"
|
||||
suit.icon_state = "rig-pilot"
|
||||
suit.item_state = "rig-pilot"
|
||||
suit.item_state_slots[slot_r_hand_str] = "sec_voidsuitTG"
|
||||
suit.item_state_slots[slot_l_hand_str] = "sec_voidsuitTG"
|
||||
else
|
||||
return ..()
|
||||
|
||||
departments = list("Pilot")
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
//Exploration
|
||||
/obj/item/clothing/head/helmet/space/void/exploration
|
||||
name = "exploration voidsuit helmet"
|
||||
desc = "A radiation-resistant helmet made especially for exploring unknown planetary environments."
|
||||
icon_state = "helm_explorer"
|
||||
item_state = "helm_explorer"
|
||||
armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70)
|
||||
light_overlay = "helmet_light_dual" //explorer_light
|
||||
|
||||
/obj/item/clothing/suit/space/void/exploration
|
||||
name = "exploration voidsuit"
|
||||
desc = "A lightweight, radiation-resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments."
|
||||
icon_state = "void_explorer"
|
||||
armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70)
|
||||
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon,/obj/item/weapon/shovel)
|
||||
|
||||
/obj/item/clothing/suit/space/void/exploration/prepared
|
||||
helmet = /obj/item/clothing/head/helmet/space/void/exploration
|
||||
boots = /obj/item/clothing/shoes/magboots
|
||||
|
||||
//Pilot
|
||||
/obj/item/clothing/head/helmet/space/void/pilot
|
||||
desc = "An atmos resistant helmet for space and planet exploration."
|
||||
name = "pilot voidsuit helmet"
|
||||
icon_state = "rig0_pilot"
|
||||
item_state = "pilot_helm"
|
||||
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 50)
|
||||
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
light_overlay = "helmet_light_dual"
|
||||
|
||||
/obj/item/clothing/suit/space/void/pilot
|
||||
desc = "An atmos resistant voidsuit for space and planet exploration."
|
||||
icon_state = "rig-pilot"
|
||||
item_state = "rig-pilot"
|
||||
name = "pilot voidsuit"
|
||||
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 50)
|
||||
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
|
||||
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/toolbox,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/weapon/rcd)
|
||||
|
||||
/obj/item/clothing/suit/space/void/pilot/prepared
|
||||
helmet = /obj/item/clothing/head/helmet/space/void/pilot
|
||||
boots = /obj/item/clothing/shoes/magboots
|
||||
@@ -743,6 +743,10 @@
|
||||
var/recharging = 0
|
||||
|
||||
projectile_type = /obj/item/projectile/beam
|
||||
firemodes = list(
|
||||
list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 300),
|
||||
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 60),
|
||||
)
|
||||
|
||||
/obj/item/weapon/gun/energy/frontier/unload_ammo(var/mob/user)
|
||||
if(recharging)
|
||||
@@ -774,13 +778,6 @@
|
||||
/obj/item/weapon/gun/energy/frontier/ex_act() //|rugged|
|
||||
return
|
||||
|
||||
//Needed to fix a bug with the holdout phaser
|
||||
/obj/item/weapon/gun/energy/frontier/basic
|
||||
firemodes = list(
|
||||
list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 300),
|
||||
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 60),
|
||||
)
|
||||
|
||||
/obj/item/weapon/gun/energy/frontier/locked
|
||||
desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
|
||||
req_access = list(access_armory) //for toggling safety
|
||||
@@ -811,13 +808,6 @@
|
||||
return 0
|
||||
return ..()
|
||||
|
||||
//Needed to fix a bug with the holdout phaser
|
||||
/obj/item/weapon/gun/energy/frontier/locked/basic
|
||||
firemodes = list(
|
||||
list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 300),
|
||||
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 60),
|
||||
)
|
||||
|
||||
//Expeditionary Holdout Phaser
|
||||
/obj/item/weapon/gun/energy/frontier/locked/holdout
|
||||
name = "holdout frontier phaser"
|
||||
@@ -826,9 +816,10 @@
|
||||
icon_state = "PDW"
|
||||
item_state = "gun"
|
||||
w_class = ITEMSIZE_SMALL
|
||||
charge_cost = 600
|
||||
firemodes = list(
|
||||
list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 1200),
|
||||
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 240),
|
||||
list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 600),
|
||||
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 120),
|
||||
)
|
||||
|
||||
/obj/item/weapon/gun/energy/frontier/locked/holdout/proc/update_mode()
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
icon_opened = "secureexpopen"
|
||||
icon_broken = "secureexpbroken"
|
||||
icon_off = "secureexpoff"
|
||||
req_access = list(access_explorer)
|
||||
req_access = list(access_gateway)
|
||||
|
||||
starts_with = list(
|
||||
/obj/item/clothing/under/explorer,
|
||||
|
||||
@@ -1948,7 +1948,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/machinery/suit_cycler/explorer,
|
||||
/obj/machinery/suit_cycler/exploration,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/station/explorer_prep)
|
||||
"aeC" = (
|
||||
@@ -22129,9 +22129,23 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/station/explorer_meeting)
|
||||
"pTz" = (
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/suit_cycler/pilot,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/station/excursion_dock)
|
||||
"pYE" = (
|
||||
/obj/structure/closet/secure_closet/pathfinder{
|
||||
req_access = list(18,43,67)
|
||||
req_access = list(62)
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/effect/floor_decal/steeldecal/steel_decals9,
|
||||
@@ -22462,7 +22476,7 @@
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/machinery/door/airlock/research{
|
||||
name = "Pathfinder's Office";
|
||||
req_access = list(18,43,67)
|
||||
req_access = list(62)
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
@@ -35486,7 +35500,7 @@ aad
|
||||
aaH
|
||||
aah
|
||||
aah
|
||||
aah
|
||||
pTz
|
||||
abc
|
||||
aad
|
||||
abU
|
||||
|
||||
@@ -174,7 +174,7 @@
|
||||
name = "shuttle control console"
|
||||
shuttle_tag = "Excursion Shuttle"
|
||||
req_access = list()
|
||||
req_one_access = list(access_heads,access_explorer,access_pilot)
|
||||
req_one_access = list(access_explorer,access_pilot)
|
||||
var/wait_time = 45 MINUTES
|
||||
|
||||
/obj/machinery/computer/shuttle_control/web/excursion/ui_interact()
|
||||
|
||||
@@ -395,7 +395,7 @@ var/global/list/latejoin_tram = list()
|
||||
/obj/structure/closet/secure_closet/guncabinet/excursion/New()
|
||||
..()
|
||||
for(var/i = 1 to 4)
|
||||
new /obj/item/weapon/gun/energy/frontier/locked/basic(src)
|
||||
new /obj/item/weapon/gun/energy/frontier/locked(src)
|
||||
for(var/i = 1 to 4)
|
||||
new /obj/item/weapon/gun/energy/frontier/locked/holdout(src)
|
||||
|
||||
|
||||
@@ -1610,7 +1610,6 @@
|
||||
#include "code\modules\clothing\spacesuits\void\merc.dm"
|
||||
#include "code\modules\clothing\spacesuits\void\military_vr.dm"
|
||||
#include "code\modules\clothing\spacesuits\void\station.dm"
|
||||
#include "code\modules\clothing\spacesuits\void\station_vr.dm"
|
||||
#include "code\modules\clothing\spacesuits\void\void.dm"
|
||||
#include "code\modules\clothing\spacesuits\void\void_vr.dm"
|
||||
#include "code\modules\clothing\spacesuits\void\wizard.dm"
|
||||
|
||||
Reference in New Issue
Block a user