cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1815 from CHOMPStationBot/upstream-merge-10157

Browse Source 
[MIRROR] Adminbus Update
This commit is contained in:
Razgriz
2021-04-21 21:24:09 -07:00
committed by GitHub
parent e9932e3142 f2e7ebc438
commit 33090cc00a
5 changed files with 671 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/portable_turret_vr.dm
View File

@@ -24,7 +24,7 @@
name = "military CIWS turret" name = "military CIWS turret"
desc = "A ship weapons turret designed for anti-fighter defense." desc = "A ship weapons turret designed for anti-fighter defense."
req_one_access = list(access_cent_general) req_one_access = list(access_cent_general)
installation = /obj/item/weapon/gun/energy/lasercannon installation = /obj/item/weapon/gun/energy/pulse_rifle/destroyer
health = 500 health = 500
maxhealth = 500 maxhealth = 500
enabled = TRUE enabled = TRUE

3
code/modules/mining/shelter_atoms_vr.dm
View File

@@ -332,6 +332,9 @@ GLOBAL_LIST_EMPTY(unique_deployable)
light_power = 1 light_power = 1
light_color = "#FFFFFF" light_color = "#FFFFFF"
/obj/structure/fans/hardlight/ex_act()
return
/obj/structure/fans/hardlight/colorable /obj/structure/fans/hardlight/colorable
name = "hardlight shield" name = "hardlight shield"
icon_state = "hardlight_colorable" icon_state = "hardlight_colorable"

2
maps/offmap_vr/om_ships/shelter_6.dm
View File

@@ -48,6 +48,6 @@
[i]Transponder[/i]: Transmitting (MIL), NanoTrasen [i]Transponder[/i]: Transmitting (MIL), NanoTrasen
[b]Notice[/b]: Experimental vessel"} [b]Notice[/b]: Experimental vessel"}
color = "#8800ff" //Indigo color = "#8800ff" //Indigo
vessel_mass = 5000 vessel_mass = 3000
vessel_size = SHIP_SIZE_SMALL vessel_size = SHIP_SIZE_SMALL
shuttle = "NDV Tabiranth" shuttle = "NDV Tabiranth"

1280
maps/offmap_vr/om_ships/shelter_6.dmm
View File

File diff suppressed because it is too large Load Diff

2
maps/southern_cross/loadout/loadout_head.dm
View File

@@ -1,4 +1,4 @@
/datum/gear/head/pilot /datum/gear/head/pilot
display_name = "helmet, pilot (Pilot)" display_name = "helmet, pilot (Pilot)"
path = /obj/item/clothing/head/pilot/alt path = /obj/item/clothing/head/ompilot/alt //VOREStation Edit
allowed_roles = list("Pilot") allowed_roles = list("Pilot")