cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts.

Browse Source
This commit is contained in:
ComicIronic
2015-01-07 16:38:06 +00:00
parent e93acf366c a6c108fcaa
commit 57cf932a54
451 changed files with 21506 additions and 15735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm
View File

@@ -6,8 +6,9 @@
icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
icon_state = "port2"
w_class = 4
flags = FPRINT | TABLEPASS| CONDUCT
mount_reqs = list("simfloor", "nospace")
flags = FPRINT
siemens_coefficient = 1
/obj/item/mounted/frame/rust_fuel_assembly_port/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/wrench))

3
code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm
View File

@@ -6,8 +6,9 @@
icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
icon_state = "fuel_compressor0"
w_class = 4
flags = FPRINT | TABLEPASS| CONDUCT
mount_reqs = list("simfloor", "nospace")
flags = FPRINT
siemens_coefficient = 1
/obj/item/mounted/frame/rust_fuel_compressor/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/wrench))