cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-18 10:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Woodrat breaks map stuff

Browse Source 
Added SC map files for further work. Including hopefully all the related files.

New airlock sprite thanks to Virgo, with a alternate non-see through sprite.

Changes to the space and transit tiles (ported from bay).

Changes done to the NC map that should bring it more up to date with changes (shield defuse stuff and minor bug fixes)
This commit is contained in:
Woodratt
2017-07-02 18:53:17 -07:00
parent 7164f8ed23
commit e75c3887b7
37 changed files with 31868 additions and 14177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+9 -7
View File
@@ -29,21 +29,22 @@
lazors++
if (istype(G, /obj/item/weapon/gun/projectile/))
shottas++
if (lazors || shottas)
for (var/i = 0 to 2)
for (var/i = 0 to 2)
if(lazors || shottas) // only make icons if we have one of the two types.
var/image/gun = image(icon(src.icon))
if (lazors > 0 && (shottas <= 0 || prob(50)))
if (lazors > shottas)
lazors--
gun.icon_state = "laser"
else if (shottas > 0)
else if (shottas)
shottas--
gun.icon_state = "projectile"
gun.pixel_x = i*4
overlays += gun
overlays += icon(src.icon,"door")
overlays += icon(src.icon, "door")
if(welded)
overlays += icon(src.icon,"welded")
if(broken)
overlays += icon(src.icon,"broken")
@@ -51,3 +52,4 @@
overlays += icon(src.icon,"locked")
else
overlays += icon(src.icon,"open")
code/game/objects/structures/door_assembly.dm
+6 -6
View File
@@ -71,18 +71,18 @@
glass_type = "/glass_medical"
airlock_type = "/medical"
/obj/structure/door_assembly/door_assembly_ext
base_icon_state = "ext"
base_name = "External airlock"
glass_type = "/glass_external"
airlock_type = "/external"
/obj/structure/door_assembly/door_assembly_mai
base_icon_state = "mai"
base_name = "Maintenance airlock"
airlock_type = "/maintenance"
glass = -1
/obj/structure/door_assembly/door_assembly_ext
base_icon_state = "ext"
base_name = "External airlock"
airlock_type = "/external"
glass = -1
/obj/structure/door_assembly/door_assembly_fre
base_icon_state = "fre"
base_name = "Freezer airlock"
code/game/objects/structures/signs.dm
+52 -1
View File
@@ -274,6 +274,25 @@
desc = "A warning sign which reads 'HYDROPONICS'."
icon_state = "hydro1"
/obj/structure/sign/hydro
name = "\improper HYDROPONICS"
desc = "A sign labelling an area as a place where plants are grown."
icon_state = "hydro1"
/obj/structure/sign/hydrostorage
name = "\improper HYDROPONICS STORAGE"
desc = "A sign labelling an area as a place where plant growing supplies are kept."
icon_state = "hydro3"
/obj/structure/sign/directions
name = "direction sign"
desc = "A direction sign, claiming to know the way."
icon_state = "direction"
/obj/structure/sign/directions/New()
..()
desc = "A direction sign, pointing out which way \the [src] is."
/obj/structure/sign/directions/science
name = "\improper Science department"
desc = "A direction sign, pointing out which way the Science department is."
@@ -295,10 +314,14 @@
icon_state = "direction_med"
/obj/structure/sign/directions/evac
name = "\improper Escape Arm"
name = "\improper Evacuation"
desc = "A direction sign, pointing out which way the Escape Shuttle dock is."
icon_state = "direction_evac"
/obj/structure/sign/directions/bridge
name = "\improper Bridge"
icon_state = "direction_bridge"
/obj/structure/sign/directions/cargo
name = "\improper Cargo department"
desc = "A direction sign, pointing out which way the Cargo department is."
@@ -315,3 +338,31 @@
desc = "Prickly and festive."
icon = 'icons/obj/christmas.dmi'
icon_state = "doorwreath"
/obj/structure/sign/deck/first
name = "\improper First Deck"
icon_state = "deck-1"
/obj/structure/sign/deck/second
name = "\improper Second Deck"
icon_state = "deck-2"
/obj/structure/sign/deck/third
name = "\improper Third Deck"
icon_state = "deck-3"
/obj/structure/sign/deck/fourth
name = "\improper Fourth Deck"
icon_state = "deck-4"
/obj/structure/sign/hangar/one
name = "\improper Hangar One"
icon_state = "hangar-1"
/obj/structure/sign/hangar/two
name = "\improper Hangar Two"
icon_state = "hangar-2"
/obj/structure/sign/hangar/three
name = "\improper Hangar Three"
icon_state = "hangar-3"