cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-18 18:57:15 +01: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
code/game/machinery/portable_turret_vr.dm
+1 -1
View File
@@ -24,7 +24,7 @@
name = "military CIWS turret"
desc = "A ship weapons turret designed for anti-fighter defense."
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
maxhealth = 500
enabled = TRUE
code/modules/mining/shelter_atoms_vr.dm
+3
View File
@@ -332,6 +332,9 @@ GLOBAL_LIST_EMPTY(unique_deployable)
light_power = 1
light_color = "#FFFFFF"
/obj/structure/fans/hardlight/ex_act()
return
/obj/structure/fans/hardlight/colorable
name = "hardlight shield"
icon_state = "hardlight_colorable"