cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

then-we-shall-reforge-the-armor-from-what-remains

Browse Source
This commit is contained in:
Fox McCloud
2019-09-10 07:03:05 -04:00
parent 177ac43f23
commit f998cb74ad
147 changed files with 390 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/displaycase.dm
+2 -1
View File
@@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(captain_display_cases, list())
name = "display case frame"
icon = 'icons/obj/stock_parts.dmi'
icon_state = "box_glass"
armor = list(melee = 30, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
armor = list("melee" = 30, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
var/obj/item/airlock_electronics/circuit = null
var/obj/item/assembly/prox_sensor/sensor = null
var/state = DISPLAYCASE_FRAME_CIRCUIT
@@ -96,6 +96,7 @@ GLOBAL_LIST_INIT(captain_display_cases, list())
density = TRUE
anchored = TRUE
unacidable = TRUE //Dissolving the case would also delete the contents.
armor = list("melee" = 30, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
var/health = 30
var/obj/item/occupant = null
var/destroyed = FALSE