mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 12:37:26 +01:00
beep book goonfabs 4 i fucking hate git etc etc.
This commit is contained in:
iamgoofball
+7
-4
@@ -848,10 +848,10 @@
|
||||
#include "code\modules\customitems\item_defines.dm"
|
||||
#include "code\modules\customitems\item_spawning.dm"
|
||||
#include "code\modules\customitems\definitions\base.dm"
|
||||
#include "code\modules\detectivework\detective_work.dm"
|
||||
#include "code\modules\detectivework\evidence.dm"
|
||||
#include "code\modules\detectivework\footprints_and_rag.dm"
|
||||
#include "code\modules\detectivework\scanner.dm"
|
||||
#include "code\modules\DetectiveWork\detective_work.dm"
|
||||
#include "code\modules\DetectiveWork\evidence.dm"
|
||||
#include "code\modules\DetectiveWork\footprints_and_rag.dm"
|
||||
#include "code\modules\DetectiveWork\scanner.dm"
|
||||
#include "code\modules\economy\Accounts.dm"
|
||||
#include "code\modules\economy\Accounts_DB.dm"
|
||||
#include "code\modules\economy\ATM.dm"
|
||||
@@ -947,16 +947,19 @@
|
||||
#include "code\modules\mining\machine_processing.dm"
|
||||
#include "code\modules\mining\machine_stacking.dm"
|
||||
#include "code\modules\mining\machine_unloading.dm"
|
||||
#include "code\modules\mining\manufacturing.dm"
|
||||
#include "code\modules\mining\materials.dm"
|
||||
#include "code\modules\mining\mine_areas.dm"
|
||||
#include "code\modules\mining\mine_items.dm"
|
||||
#include "code\modules\mining\mine_turfs.dm"
|
||||
#include "code\modules\mining\minerals.dm"
|
||||
#include "code\modules\mining\mining_recipes.dm"
|
||||
#include "code\modules\mining\mint.dm"
|
||||
#include "code\modules\mining\money_bag.dm"
|
||||
#include "code\modules\mining\ore.dm"
|
||||
#include "code\modules\mining\ore_datum.dm"
|
||||
#include "code\modules\mining\satchel_ore_boxdm.dm"
|
||||
#include "code\modules\mining\security_recipes.dm"
|
||||
#include "code\modules\mining\surprise.dm"
|
||||
#include "code\modules\mining\drilling\distribution.dm"
|
||||
#include "code\modules\mining\drilling\drill.dm"
|
||||
|
||||
@@ -1095,3 +1095,30 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "mafia supply crate"
|
||||
group = "Operations"
|
||||
|
||||
/datum/supply_packs/fabric
|
||||
name = "Fabric crate"
|
||||
contains = list(/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric,
|
||||
/obj/item/weapon/ore/fabric)
|
||||
cost = 30
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Fabric crate"
|
||||
group = "Operations"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -136,4 +136,12 @@
|
||||
value=1
|
||||
oretype=null
|
||||
sheettype=/obj/item/stack/sheet/mineral/plastic
|
||||
cointype=null
|
||||
|
||||
/datum/material/fabric
|
||||
name="Fabric"
|
||||
id="fabric"
|
||||
value=20
|
||||
oretype=/obj/item/weapon/ore/fabric
|
||||
sheettype=null
|
||||
cointype=null
|
||||
@@ -0,0 +1,252 @@
|
||||
/obj/machinery/manufacturer/mining
|
||||
name = "Mining Fabricator"
|
||||
desc = "A manufacturing unit calibrated to produce mining related equipment."
|
||||
acceptdisk = 1
|
||||
|
||||
New()
|
||||
..()
|
||||
src.available += new /datum/manufacture/pick(src)
|
||||
src.available += new /datum/manufacture/shovel(src)
|
||||
src.available += new /datum/manufacture/oresatchel(src)
|
||||
src.available += new /datum/manufacture/breathmask(src)
|
||||
src.available += new /datum/manufacture/spacesuit(src)
|
||||
src.available += new /datum/manufacture/spacehelm(src)
|
||||
src.available += new /datum/manufacture/eyes_meson(src)
|
||||
src.hidden += new /datum/manufacture/RCD(src)
|
||||
src.hidden += new /datum/manufacture/RCDammo(src)
|
||||
|
||||
|
||||
// Mining Gear
|
||||
/datum/manufacture/pick
|
||||
name = "Pickaxe"
|
||||
item = /obj/item/weapon/pickaxe
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 5
|
||||
time = 5
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/shovel
|
||||
name = "Shovel"
|
||||
item = /obj/item/weapon/shovel
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 3
|
||||
time = 2
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/spick
|
||||
name = "Silver Pickaxe"
|
||||
item = /obj/item/weapon/pickaxe/silver
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 5
|
||||
cost2 = /obj/item/weapon/ore/silver
|
||||
cname2 = "Silver"
|
||||
amount2 = 5
|
||||
time = 10
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/gpick
|
||||
name = "Gold Pickaxe"
|
||||
item = /obj/item/weapon/pickaxe/gold
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 5
|
||||
cost2 = /obj/item/weapon/ore/gold
|
||||
cname2 = "Gold"
|
||||
amount2 = 5
|
||||
time = 15
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/dpick
|
||||
name = "Diamond Pickaxe"
|
||||
item = /obj/item/weapon/pickaxe/diamond
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 5
|
||||
cost2 = /obj/item/weapon/ore/diamond
|
||||
cname2 = "Uranium"
|
||||
amount2 = 5
|
||||
time = 30
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/jackhammer
|
||||
name = "Sonic Jackhammer"
|
||||
item = /obj/item/weapon/pickaxe/jackhammer
|
||||
cost1 = /obj/item/weapon/ore/gold
|
||||
cname1 = "Gold"
|
||||
amount1 = 8
|
||||
cost2 = /obj/item/weapon/ore/silver
|
||||
cname2 = "Silver"
|
||||
amount2 = 12
|
||||
time = 30
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/drill
|
||||
name = "Hand Drill"
|
||||
item = /obj/item/weapon/pickaxe/drill
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 15
|
||||
time = 20
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/diamonddrill
|
||||
name = "Diamond Drill"
|
||||
item = /obj/item/weapon/pickaxe/diamonddrill
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 15
|
||||
cost2 = /obj/item/weapon/ore/diamond
|
||||
cname2 = "Diamond"
|
||||
amount2 = 15
|
||||
cost3 = /obj/item/weapon/ore/silver
|
||||
cname3 = "Silver"
|
||||
amount3 = 15
|
||||
time = 40
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/cutter
|
||||
name = "Plasma Cutter"
|
||||
item = /obj/item/weapon/pickaxe/plasmacutter
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 10
|
||||
cost2 = /obj/item/weapon/ore/gold
|
||||
cname2 = "Gold"
|
||||
amount2 = 10
|
||||
cost3 = /obj/item/weapon/ore/plasma
|
||||
cname3 = "Plasma"
|
||||
amount3 = 15
|
||||
time = 30
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/eyes_meson
|
||||
name = "Optical Meson Scanner"
|
||||
item = /obj/item/clothing/glasses/meson
|
||||
cost1 = /obj/item/weapon/ore/glass
|
||||
cname1 = "Glass"
|
||||
amount1 = 5
|
||||
cost2 = /obj/item/weapon/ore/silver
|
||||
cname2 = "Silver"
|
||||
amount2 = 3
|
||||
time = 10
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/miningsuit
|
||||
name = "Mining Hardsuit"
|
||||
item = /obj/item/clothing/suit/space/rig/mining
|
||||
cost1 = /obj/item/weapon/ore/osmium
|
||||
cname1 = "Platinum"
|
||||
amount1 = 30
|
||||
cost2 = /obj/item/weapon/ore/iron
|
||||
cname2 = "Iron"
|
||||
amount2 = 30
|
||||
time = 30
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/mininghelm
|
||||
name = "Mining Hardsuit Helmet"
|
||||
item = /obj/item/clothing/head/helmet/space/rig/mining
|
||||
cost1 = /obj/item/weapon/ore/osmium
|
||||
cname1 = "Platinum"
|
||||
amount1 = 30
|
||||
cost2 = /obj/item/weapon/ore/iron
|
||||
cname2 = "Iron"
|
||||
amount2 = 30
|
||||
time = 20
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/breathmask
|
||||
name = "Breath Mask"
|
||||
item = /obj/item/clothing/mask/breath
|
||||
cost1 = /obj/item/weapon/ore/fabric
|
||||
cname1 = "Fabric"
|
||||
amount1 = 1
|
||||
time = 5
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/spacesuit
|
||||
name = "Space Suit"
|
||||
item = /obj/item/clothing/suit/space
|
||||
cost1 = /obj/item/weapon/ore/fabric
|
||||
cname1 = "Fabric"
|
||||
amount1 = 5
|
||||
cost2 = /obj/item/weapon/ore/iron
|
||||
cname2 = "Iron"
|
||||
amount2 = 5
|
||||
time = 15
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/spacehelm
|
||||
name = "Space Helmet"
|
||||
item = /obj/item/clothing/head/helmet/space
|
||||
cost1 = /obj/item/weapon/ore/fabric
|
||||
cname1 = "Fabric"
|
||||
amount1 = 5
|
||||
cost2 = /obj/item/weapon/ore/glass
|
||||
cname2 = "Glass"
|
||||
amount2 = 5
|
||||
time = 10
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/oresatchel
|
||||
name = "Ore Satchel"
|
||||
item = /obj/item/weapon/storage/bag/ore
|
||||
cost1 = /obj/item/weapon/ore/fabric
|
||||
cname1 = "Fabric"
|
||||
amount1 = 5
|
||||
time = 5
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/jetpack
|
||||
name = "Jetpack"
|
||||
item = /obj/item/weapon/tank/jetpack
|
||||
cost1 = /obj/item/weapon/ore/gold
|
||||
cname1 = "Gold"
|
||||
amount1 = 15
|
||||
cost2 = /obj/item/weapon/ore/silver
|
||||
cname2 = "Silver"
|
||||
amount2 = 20
|
||||
time = 30
|
||||
create = 1
|
||||
|
||||
//Diskettes!
|
||||
/obj/item/weapon/disk/data/schematic/mining1
|
||||
name = "Mining Schematics Level 1"
|
||||
desc = "Contains the schematics for a new range of Pickaxes."
|
||||
|
||||
New()
|
||||
src.schematics += new /datum/manufacture/spick(src)
|
||||
src.schematics += new /datum/manufacture/gpick(src)
|
||||
src.schematics += new /datum/manufacture/dpick(src)
|
||||
|
||||
/obj/item/weapon/disk/data/schematic/mining2
|
||||
name = "Mining Schematics Level 2"
|
||||
desc = "Contains the schematics for a new line of drills. And a Plasma Cutter. Has the previous level as well."
|
||||
|
||||
New()
|
||||
src.schematics += new /datum/manufacture/spick(src)
|
||||
src.schematics += new /datum/manufacture/gpick(src)
|
||||
src.schematics += new /datum/manufacture/dpick(src)
|
||||
src.schematics += new /datum/manufacture/drill(src)
|
||||
src.schematics += new /datum/manufacture/jackhammer(src)
|
||||
src.schematics += new /datum/manufacture/diamonddrill(src)
|
||||
src.schematics += new /datum/manufacture/cutter(src)
|
||||
|
||||
/obj/item/weapon/disk/data/schematic/mining3
|
||||
name = "Mining Schematics Level 3"
|
||||
desc = "Contains the schematics for a new type of Spacesuit, and schematics for a Jetpack. Has the previous levels as well."
|
||||
|
||||
New()
|
||||
src.schematics += new /datum/manufacture/spick(src)
|
||||
src.schematics += new /datum/manufacture/gpick(src)
|
||||
src.schematics += new /datum/manufacture/dpick(src)
|
||||
src.schematics += new /datum/manufacture/drill(src)
|
||||
src.schematics += new /datum/manufacture/jackhammer(src)
|
||||
src.schematics += new /datum/manufacture/diamonddrill(src)
|
||||
src.schematics += new /datum/manufacture/cutter(src)
|
||||
src.schematics += new /datum/manufacture/miningsuit(src)
|
||||
src.schematics += new /datum/manufacture/mininghelm(src)
|
||||
src.schematics += new /datum/manufacture/jetpack(src)
|
||||
@@ -69,6 +69,12 @@
|
||||
origin_tech = "materials=4"
|
||||
oretag="clown"
|
||||
|
||||
/obj/item/weapon/ore/fabric
|
||||
name = "fabric"
|
||||
icon_state = "fabric"
|
||||
origin_tech = "materials=1"
|
||||
oretag = "fabric"
|
||||
|
||||
/obj/item/weapon/ore/slag
|
||||
name = "Slag"
|
||||
desc = "Completely useless"
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
/obj/machinery/manufacturer/security
|
||||
name = "Security Fabricator"
|
||||
desc = "A manufacturing unit calibrated to produce security and military related equipment."
|
||||
acceptdisk = 1
|
||||
|
||||
New()
|
||||
..()
|
||||
src.available += new /datum/manufacture/beret(src)
|
||||
src.available += new /datum/manufacture/helmet1(src)
|
||||
src.available += new /datum/manufacture/sunglasses(src)
|
||||
src.available += new /datum/manufacture/sechud(src)
|
||||
src.available += new /datum/manufacture/secpants(src)
|
||||
src.available += new /datum/manufacture/secbelt(src)
|
||||
src.available += new /datum/manufacture/armor1(src)
|
||||
src.available += new /datum/manufacture/taser(src)
|
||||
src.available += new /datum/manufacture/baton(src)
|
||||
|
||||
// Security Gear Tier-0. AKA Clothing and basic as shit gear.
|
||||
/datum/manufacture/beret
|
||||
name = "Beret"
|
||||
item = /obj/item/clothing/head/beret/sec
|
||||
cost1 = /obj/item/weapon/ore/fabric
|
||||
cname1 = "Fabric"
|
||||
amount1 = 2
|
||||
time = 3
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/helmet1
|
||||
name = "Helmet"
|
||||
item = /obj/item/clothing/head/helmet
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 10
|
||||
cost2 = /obj/item/weapon/ore/fabric
|
||||
cname2 = "Fabric"
|
||||
amount2 = 10
|
||||
time = 10
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/sunglasses
|
||||
name = "Sunglasses"
|
||||
item = /obj/item/clothing/glasses/sunglasses
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 5
|
||||
cost2 = /obj/item/weapon/ore/glass
|
||||
cname2 = "Glass"
|
||||
amount2 = 10
|
||||
time = 8
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/sechud
|
||||
name = "Security HUD"
|
||||
item = /obj/item/clothing/glasses/hud/security
|
||||
cost1 = /obj/item/weapon/ore/osmium
|
||||
cname1 = "Platinum"
|
||||
amount1 = 10
|
||||
cost2 = /obj/item/weapon/ore/glass
|
||||
cname2 = "Glass"
|
||||
amount2 = 15
|
||||
time = 12
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/secpants
|
||||
name = "Security Uniform"
|
||||
item = /obj/item/clothing/under/rank/security
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 2
|
||||
cost2 = /obj/item/weapon/ore/fabric
|
||||
cname2 = "Fabric"
|
||||
amount2 = 1
|
||||
time = 10
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/secbelt
|
||||
name = "Security Belt"
|
||||
item = /obj/item/weapon/storage/belt/security
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 2
|
||||
cost2 = /obj/item/weapon/ore/fabric
|
||||
cname2 = "Fabric"
|
||||
amount2 = 5
|
||||
time = 15
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/armor1
|
||||
name = "Armored Vest"
|
||||
item = /obj/item/clothing/suit/armor/vest
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 15
|
||||
cost2 = /obj/item/weapon/ore/fabric
|
||||
cname2 = "Fabric"
|
||||
amount2 = 15
|
||||
time = 20
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/taser
|
||||
name = "Taser"
|
||||
item = /obj/item/weapon/gun/energy/taser
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 15
|
||||
cost2 = /obj/item/weapon/ore/glass
|
||||
cname2 = "Glass"
|
||||
amount2 = 10
|
||||
cost3 = /obj/item/weapon/ore/osmium
|
||||
cname3 = "Platinum"
|
||||
amount3 = 20
|
||||
time = 25
|
||||
create = 1
|
||||
|
||||
/datum/manufacture/baton
|
||||
name = "Stun Baton"
|
||||
item = /obj/item/weapon/melee/baton
|
||||
cost1 = /obj/item/weapon/ore/iron
|
||||
cname1 = "Iron"
|
||||
amount1 = 10
|
||||
cost2 = /obj/item/weapon/ore/glass
|
||||
cname2 = "Glass"
|
||||
amount2 = 10
|
||||
cost3 = /obj/item/weapon/ore/osmium
|
||||
cname3 = "Platinum"
|
||||
amount3 = 15
|
||||
time = 20
|
||||
create = 1
|
||||
@@ -591,6 +591,7 @@
|
||||
flesh_color = "#AAAAAA"
|
||||
|
||||
/datum/species/machine/handle_death(var/mob/living/carbon/human/H)
|
||||
H.emote("deathgasp")
|
||||
for(var/organ_name in H.organs_by_name)
|
||||
if (organ_name == "head") // do the head last as that's when the user will be transfered to the posibrain
|
||||
continue
|
||||
|
||||
@@ -64,6 +64,15 @@
|
||||
return 1
|
||||
|
||||
|
||||
/mob/living/carbon/human/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0)
|
||||
if((species.flags & IS_SYNTHETIC) && (effecttype == IRRADIATE))
|
||||
return
|
||||
return ..()
|
||||
|
||||
|
||||
/mob/living/carbon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0)
|
||||
return ..()
|
||||
|
||||
/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/agony = 0, var/blocked = 0)
|
||||
if(blocked >= 2) return 0
|
||||
if(stun) apply_effect(stun, STUN, blocked)
|
||||
|
||||
@@ -1773,6 +1773,33 @@ datum/design/mesons
|
||||
materials = list("$metal" = 50, "$glass" = 50)
|
||||
build_path = "/obj/item/clothing/glasses/meson"
|
||||
|
||||
datum/design/miningblueprint1
|
||||
name = "Mining Schematic Disk Version 1"
|
||||
desc = "Contains the schematics for a new range of Pickaxes."
|
||||
id = "miningblueprint1"
|
||||
req_tech = list("materials" = 3)
|
||||
build_type = PROTOLATHE
|
||||
materials = list("$metal" = 50, "$glass" = 50)
|
||||
build_path = "/obj/item/weapon/disk/data/schematic/mining1"
|
||||
|
||||
datum/design/miningblueprint2
|
||||
name = "Mining Schematic Disk Version 2"
|
||||
desc = "Contains the schematics for a new line of drills. And a Plasma Cutter. Has the previous level as well."
|
||||
id = "miningblueprint2"
|
||||
req_tech = list("materials" = 5)
|
||||
build_type = PROTOLATHE
|
||||
materials = list("$metal" = 50, "$glass" = 50)
|
||||
build_path = "/obj/item/weapon/disk/data/schematic/mining2"
|
||||
|
||||
datum/design/miningblueprint3
|
||||
name = "Mining Schematic Disk Version 3"
|
||||
desc = "Contains the schematics for a new type of Spacesuit, and schematics for a Jetpack. Has the previous levels as well."
|
||||
id = "miningblueprint3"
|
||||
req_tech = list("materials" = 6)
|
||||
build_type = PROTOLATHE
|
||||
materials = list("$metal" = 50, "$glass" = 50)
|
||||
build_path = "/obj/item/weapon/disk/data/schematic/mining3"
|
||||
|
||||
/////////////////////////////////////////
|
||||
//////////////Blue Space/////////////////
|
||||
/////////////////////////////////////////
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 16 KiB |
@@ -345,6 +345,16 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
|
||||
<tr><td><span class="average">{{:value.name}}</span></td><td><span class="average">{{:value.rank}}</span></td><td><span class="average">{{:value.active}}</span></td></tr>
|
||||
{{/if}}
|
||||
{{/for}}
|
||||
{{/if}}
|
||||
{{if data.manifest.supp}}
|
||||
<tr><th colspan="3" class="supp">Support</th></tr>
|
||||
{{for data.manifest["supp"]}}
|
||||
{{if value.rank == "Head of Personnel"}}
|
||||
<tr><td><span class="good">{{:value.name}}</span></td><td><span class="good">{{:value.rank}}</span></td><td><span class="good">{{:value.active}}</span></td></tr>
|
||||
{{else}}
|
||||
<tr><td><span class="average">{{:value.name}}</span></td><td><span class="average">{{:value.rank}}</span></td><td><span class="average">{{:value.active}}</span></td></tr>
|
||||
{{/if}}
|
||||
{{/for}}
|
||||
{{/if}}
|
||||
{{if data.manifest.civ}}
|
||||
<tr><th colspan="3" class="civ">Civilian</th></tr>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
set MAPFILE=tgstation2.dmm
|
||||
set MAPFILE=cyberiad.dmm
|
||||
|
||||
cd ../../maps
|
||||
copy %MAPFILE% %MAPFILE%.backup
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
set MAPFILE=tgstation2.dmm
|
||||
set MAPFILE=cyberiad.dmm
|
||||
|
||||
java -jar MapPatcher.jar -clean ../../maps/%MAPFILE%.backup ../../maps/%MAPFILE% ../../maps/%MAPFILE%
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
MAPFILE='tgstation2.dmm'
|
||||
MAPFILE='cyberiad.dmm'
|
||||
|
||||
git show HEAD:maps/$MAPFILE > tmp.dmm
|
||||
java -jar MapPatcher.jar -clean tmp.dmm '../../maps/'$MAPFILE '../../maps/'$MAPFILE
|
||||
|
||||
Reference in New Issue
Block a user