shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update files

Browse Source
This commit is contained in:
SandPoot
2022-04-06 18:41:31 -03:00
parent 4c3fa08cdf
commit 586a035132
881 changed files with 1599 additions and 1599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/abandoned_crates.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/codelen = 4
tamperproof = 90
/obj/structure/closet/crate/secure/loot/Initialize()
/obj/structure/closet/crate/secure/loot/Initialize(mapload)
. = ..()
var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
code = ""
code/modules/mining/aux_base.dm
+1 -1
View File
@@ -27,7 +27,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
var/obj/item/gps/internal/base/locator
circuit = /obj/item/circuitboard/computer/auxiliary_base
/obj/machinery/computer/auxillary_base/Initialize()
/obj/machinery/computer/auxillary_base/Initialize(mapload)
. = ..()
locator = new(src)
code/modules/mining/aux_base_camera.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "construction_drone"
var/area/starting_area
/mob/camera/aiEye/remote/base_construction/Initialize()
/mob/camera/aiEye/remote/base_construction/Initialize(mapload)
. = ..()
starting_area = get_area(loc)
code/modules/mining/equipment/explorer_gear.dm
+5 -5
View File
@@ -35,7 +35,7 @@
/obj/item/clothing/head/hooded/explorer/standard
/obj/item/clothing/suit/hooded/explorer/standard/Initialize()
/obj/item/clothing/suit/hooded/explorer/standard/Initialize(mapload)
. = ..()
AddComponent(/datum/component/armor_plate)
RegisterSignal(src, COMSIG_ARMOR_PLATED, .proc/upgrade_icon)
@@ -54,7 +54,7 @@
if(wearer.wear_suit == src)
wearer.update_inv_wear_suit()
/obj/item/clothing/head/hooded/explorer/standard/Initialize()
/obj/item/clothing/head/hooded/explorer/standard/Initialize(mapload)
. = ..()
AddComponent(/datum/component/armor_plate)
RegisterSignal(src, COMSIG_ARMOR_PLATED, .proc/upgrade_icon)
@@ -91,7 +91,7 @@
..()
w_class = mask_adjusted ? WEIGHT_CLASS_NORMAL : WEIGHT_CLASS_SMALL
/obj/item/clothing/mask/gas/explorer/folded/Initialize()
/obj/item/clothing/mask/gas/explorer/folded/Initialize(mapload)
. = ..()
adjustmask()
@@ -108,7 +108,7 @@
armor = list("melee" = 70, "bullet" = 40, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
/obj/item/clothing/suit/space/hostile_environment/Initialize()
/obj/item/clothing/suit/space/hostile_environment/Initialize(mapload)
. = ..()
AddComponent(/datum/component/spraycan_paintable)
START_PROCESSING(SSobj, src)
@@ -137,7 +137,7 @@
armor = list("melee" = 70, "bullet" = 40, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | LAVA_PROOF
/obj/item/clothing/head/helmet/space/hostile_environment/Initialize()
/obj/item/clothing/head/helmet/space/hostile_environment/Initialize(mapload)
. = ..()
AddComponent(/datum/component/spraycan_paintable)
update_icon()
code/modules/mining/equipment/kinetic_crusher.dm
+1 -1
View File
@@ -34,7 +34,7 @@
detonation_damage = 60
wielded = 1
/obj/item/kinetic_crusher/Initialize()
/obj/item/kinetic_crusher/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
code/modules/mining/equipment/mineral_scanner.dm
+1 -1
View File
@@ -78,6 +78,6 @@
pixel_x = -224
pixel_y = -224
/obj/effect/temp_visual/mining_overlay/Initialize()
/obj/effect/temp_visual/mining_overlay/Initialize(mapload)
. = ..()
animate(src, alpha = 0, time = duration, easing = EASE_IN)
code/modules/mining/equipment/mining_tools.dm
+2 -2
View File
@@ -108,7 +108,7 @@
flags_1 = NONE
toolspeed = 0.5
/obj/item/pickaxe/drill/cyborg/Initialize()
/obj/item/pickaxe/drill/cyborg/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
@@ -155,7 +155,7 @@
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
sharpness = SHARP_EDGED
/obj/item/shovel/Initialize()
/obj/item/shovel/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 150, 40) //it's sharp, so it works, but barely.
code/modules/mining/equipment/regenerative_core.dm
+2 -2
View File
@@ -29,7 +29,7 @@
var/inert
var/preserved
/obj/item/organ/regenerative_core/Initialize()
/obj/item/organ/regenerative_core/Initialize(mapload)
. = ..()
addtimer(CALLBACK(src, .proc/inert_check), 2400)
@@ -116,7 +116,7 @@
desc = "A strange rock that crackles with power. It can be used to heal completely, but it will rapidly decay into uselessness."
icon_state = "legion_soul"
/obj/item/organ/regenerative_core/legion/Initialize()
/obj/item/organ/regenerative_core/legion/Initialize(mapload)
. = ..()
update_icon()
code/modules/mining/equipment/resonator.dm
+1 -1
View File
@@ -111,7 +111,7 @@
layer = ABOVE_ALL_MOB_LAYER
duration = 4
/obj/effect/temp_visual/resonance_crush/Initialize()
/obj/effect/temp_visual/resonance_crush/Initialize(mapload)
. = ..()
transform = matrix()*1.5
animate(src, transform = matrix()*0.1, alpha = 50, time = 4)
code/modules/mining/equipment/survival_pod.dm
+1 -1
View File
@@ -327,7 +327,7 @@
/obj/item/phylactery,
/obj/item/banhammer)
/obj/item/fakeartefact/Initialize()
/obj/item/fakeartefact/Initialize(mapload)
. = ..()
var/obj/item/I = pick(possible)
name = initial(I.name)
code/modules/mining/fulton.dm
+1 -1
View File
@@ -161,7 +161,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
density = FALSE
var/beacon_network = "station"
/obj/structure/extraction_point/Initialize()
/obj/structure/extraction_point/Initialize(mapload)
. = ..()
name += " ([rand(100,999)]) ([get_area_name(src, TRUE)])"
GLOB.total_extraction_beacons += src
code/modules/mining/laborcamp/laborstacker.dm
+1 -1
View File
@@ -15,7 +15,7 @@ GLOBAL_LIST(labor_sheet_values)
/// Needed to send messages to sec radio
var/obj/item/radio/Radio
/obj/machinery/mineral/labor_claim_console/Initialize()
/obj/machinery/mineral/labor_claim_console/Initialize(mapload)
. = ..()
Radio = new/obj/item/radio(src)
Radio.listening = FALSE
code/modules/mining/lavaland/ash_flora.dm
+2 -2
View File
@@ -20,7 +20,7 @@
var/regrowth_time_low = 8 MINUTES
var/regrowth_time_high = 16 MINUTES
/obj/structure/flora/ash/Initialize()
/obj/structure/flora/ash/Initialize(mapload)
. = ..()
base_icon = "[icon_state][rand(1, 4)]"
icon_state = base_icon
@@ -152,7 +152,7 @@
seed = /obj/item/seeds/lavaland/polypore
wine_power = 20
/obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize()
/obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize(mapload)
. = ..()
pixel_x = rand(-4, 4)
pixel_y = rand(-4, 4)
code/modules/mining/lavaland/necropolis_chests.dm
+6 -6
View File
@@ -184,7 +184,7 @@
icon_state = "datadisk1"
var/modkit_design = /datum/design/unique_modkit
/obj/item/disk/design_disk/modkit_disc/Initialize()
/obj/item/disk/design_disk/modkit_disc/Initialize(mapload)
. = ..()
blueprints[1] = new modkit_design
@@ -383,7 +383,7 @@
wisp.forceMove(src)
SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
/obj/item/wisp_lantern/Initialize()
/obj/item/wisp_lantern/Initialize(mapload)
. = ..()
wisp = new(src)
@@ -473,7 +473,7 @@
icon_state = "red_cube"
teleport_color = "#FD3F48"
/obj/item/warp_cube/red/Initialize()
/obj/item/warp_cube/red/Initialize(mapload)
. = ..()
if(!linked)
var/obj/item/warp_cube/blue = new(src.loc)
@@ -553,7 +553,7 @@
actions_types = list(/datum/action/item_action/immortality)
var/cooldown = 0
/obj/item/immortality_talisman/Initialize()
/obj/item/immortality_talisman/Initialize(mapload)
. = ..()
AddComponent(/datum/component/anti_magic, TRUE, TRUE, TRUE)
@@ -637,7 +637,7 @@
name = "paradox bag"
desc = "Somehow, it's in two places at once."
/obj/item/shared_storage/red/Initialize()
/obj/item/shared_storage/red/Initialize(mapload)
. = ..()
var/datum/component/storage/STR = AddComponent(/datum/component/storage/concrete)
STR.max_w_class = WEIGHT_CLASS_NORMAL
@@ -876,7 +876,7 @@
var/summon_cooldown = 0
var/list/mob/dead/observer/spirits
/obj/item/melee/ghost_sword/Initialize()
/obj/item/melee/ghost_sword/Initialize(mapload)
. = ..()
spirits = list()
START_PROCESSING(SSobj, src)
code/modules/mining/machine_processing.dm
+2 -2
View File
@@ -65,7 +65,7 @@
var/obj/machinery/mineral/processing_unit/machine = null
var/machinedir = EAST
/obj/machinery/mineral/processing_unit_console/Initialize()
/obj/machinery/mineral/processing_unit_console/Initialize(mapload)
. = ..()
machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir))
if (machine)
@@ -127,7 +127,7 @@
var/selected_alloy = null
var/datum/techweb/stored_research
/obj/machinery/mineral/processing_unit/Initialize()
/obj/machinery/mineral/processing_unit/Initialize(mapload)
. = ..()
proximity_monitor = new(src, 1)
AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace), INFINITY, TRUE, /obj/item/stack)
code/modules/mining/machine_stacking.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/// Direction for which console looks for stacking machine to connect to
var/machinedir = SOUTHEAST
/obj/machinery/mineral/stacking_unit_console/Initialize()
/obj/machinery/mineral/stacking_unit_console/Initialize(mapload)
. = ..()
machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
if (machine)
code/modules/mining/machine_vending.dm
+2 -2
View File
@@ -88,7 +88,7 @@
src.equipment_path = path
src.cost = cost
/obj/machinery/mineral/equipment_vendor/Initialize()
/obj/machinery/mineral/equipment_vendor/Initialize(mapload)
. = ..()
build_inventory()
@@ -281,7 +281,7 @@
name = "golem ship equipment vendor"
circuit = /obj/item/circuitboard/machine/mining_equipment_vendor/golem
/obj/machinery/mineral/equipment_vendor/golem/Initialize()
/obj/machinery/mineral/equipment_vendor/golem/Initialize(mapload)
. = ..()
desc += "\nIt seems a few selections have been added."
prize_list += list(
code/modules/mining/mine_items.dm
+1 -1
View File
@@ -8,7 +8,7 @@
var/set_luminosity = 8
var/set_cap = 0
/obj/effect/light_emitter/Initialize()
/obj/effect/light_emitter/Initialize(mapload)
. = ..()
set_light(set_luminosity, set_cap)
code/modules/mining/minebot.dm
+1 -1
View File
@@ -39,7 +39,7 @@
var/light_on = 0
var/obj/item/gun/energy/kinetic_accelerator/minebot/stored_gun
/mob/living/simple_animal/hostile/mining_drone/Initialize()
/mob/living/simple_animal/hostile/mining_drone/Initialize(mapload)
. = ..()
stored_gun = new(src)
var/datum/action/innate/minedrone/toggle_light/toggle_light_action = new()
code/modules/mining/mint.dm
+1 -1
View File
@@ -16,7 +16,7 @@
var/chosen = /datum/material/iron //which material will be used to make coins
/obj/machinery/mineral/mint/Initialize()
/obj/machinery/mineral/mint/Initialize(mapload)
. = ..()
AddComponent(/datum/component/material_container, list(
/datum/material/iron,
code/modules/mining/money_bag.dm
+1 -1
View File
@@ -9,7 +9,7 @@
max_integrity = 100
w_class = WEIGHT_CLASS_BULKY
/obj/item/storage/bag/money/Initialize()
/obj/item/storage/bag/money/Initialize(mapload)
. = ..()
if(prob(20))
icon_state = "moneybagalt"
code/modules/mining/ores_coins.dm
+1 -1
View File
@@ -384,7 +384,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
var/coinflip
item_flags = NO_MAT_REDEMPTION //You know, it's kind of a problem that money is worth more extrinsicly than intrinsically in this universe.
/obj/item/coin/Initialize()
/obj/item/coin/Initialize(mapload)
. = ..()
coinflip = pick(sideslist)
icon_state = "coin_[coinflip]"