Update files

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
+1 -1
View File
@@ -79,7 +79,7 @@ other types of metals and chemistry for reagents).
var/list/blueprints = list()
var/max_blueprints = 1
/obj/item/disk/design_disk/Initialize()
/obj/item/disk/design_disk/Initialize(mapload)
. = ..()
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
+2 -2
View File
@@ -66,7 +66,7 @@
if(initial(tempCheck.icon_state) != null)
critical_items += I
/obj/machinery/rnd/experimentor/Initialize()
/obj/machinery/rnd/experimentor/Initialize(mapload)
. = ..()
trackedIan = locate(/mob/living/simple_animal/pet/dog/corgi/Ian) in GLOB.mob_living_list
@@ -537,7 +537,7 @@
var/cooldownMax = 60
var/cooldown
/obj/item/relic/Initialize()
/obj/item/relic/Initialize(mapload)
. = ..()
icon_state = pick("shock_kit","armor-igniter-analyzer","infra-igniter0","infra-igniter1","radio-multitool","prox-radio1","radio-radio","timer-multitool0","radio-igniter-tank")
realName = "[pick("broken","twisted","spun","improved","silly","regular","badly made")] [pick("device","object","toy","illegal tech","weapon")]"
@@ -20,7 +20,7 @@
var/busy_message
var/message_cooldown = 0
/obj/machinery/nanite_chamber/Initialize()
/obj/machinery/nanite_chamber/Initialize(mapload)
. = ..()
occupant_typecache = GLOB.typecache_living
@@ -6,7 +6,7 @@
icon_screen = "nanite_chamber_control"
circuit = /obj/item/circuitboard/computer/nanite_chamber_control
/obj/machinery/computer/nanite_chamber_control/Initialize()
/obj/machinery/computer/nanite_chamber_control/Initialize(mapload)
. = ..()
find_chamber()
@@ -22,7 +22,7 @@
list(name = "Protocols"),
)
/obj/machinery/nanite_program_hub/Initialize()
/obj/machinery/nanite_program_hub/Initialize(mapload)
. = ..()
linked_techweb = SSresearch.science_tech
@@ -148,6 +148,6 @@
disk.name = initial(disk.name)
. = TRUE
/obj/machinery/nanite_program_hub/admin/Initialize()
/obj/machinery/nanite_program_hub/admin/Initialize(mapload)
. = ..()
linked_techweb = SSresearch.admin_tech
@@ -7,7 +7,7 @@
var/program_type
var/datum/nanite_program/program
/obj/item/disk/nanite_program/Initialize()
/obj/item/disk/nanite_program/Initialize(mapload)
. = ..()
if(program_type)
program = new program_type
@@ -18,7 +18,7 @@
var/busy_icon_state
var/message_cooldown = 0
/obj/machinery/public_nanite_chamber/Initialize()
/obj/machinery/public_nanite_chamber/Initialize(mapload)
. = ..()
occupant_typecache = GLOB.typecache_living
+2 -2
View File
@@ -87,7 +87,7 @@ Nothing else in the console has ID requirements.
linked_imprinter = D
D.linked_console = src
/obj/machinery/computer/rdconsole/Initialize()
/obj/machinery/computer/rdconsole/Initialize(mapload)
. = ..()
stored_research = SSresearch.science_tech
stored_research.consoles_accessing[src] = TRUE
@@ -1145,7 +1145,7 @@ Nothing else in the console has ID requirements.
req_access = null
req_access_txt = "29"
/obj/machinery/computer/rdconsole/robotics/Initialize()
/obj/machinery/computer/rdconsole/robotics/Initialize(mapload)
. = ..()
if(circuit)
circuit.name = "R&D Console - Robotics (Computer Board)"
+1 -1
View File
@@ -18,7 +18,7 @@
/obj/machinery/rnd/proc/reset_busy()
busy = FALSE
/obj/machinery/rnd/Initialize()
/obj/machinery/rnd/Initialize(mapload)
. = ..()
wires = new /datum/wires/rnd(src)
+5 -5
View File
@@ -6,7 +6,7 @@
custom_materials = list(/datum/material/iron=300, /datum/material/glass=100)
var/datum/techweb/stored_research
/obj/item/disk/tech_disk/Initialize()
/obj/item/disk/tech_disk/Initialize(mapload)
. = ..()
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
@@ -17,7 +17,7 @@
desc = "A debug item for research"
custom_materials = null
/obj/item/disk/tech_disk/debug/Initialize()
/obj/item/disk/tech_disk/debug/Initialize(mapload)
. = ..()
stored_research = new /datum/techweb/admin
@@ -27,7 +27,7 @@
icon_state = "rndmajordisk"
custom_materials = list(/datum/material/iron=300, /datum/material/glass=100)
/obj/item/disk/tech_disk/major/Initialize()
/obj/item/disk/tech_disk/major/Initialize(mapload)
. = ..()
stored_research = new /datum/techweb/bepis
@@ -36,7 +36,7 @@
desc = "A technology disk containing schematics for syndicate inspired equipment."
custom_materials = null
/obj/item/disk/tech_disk/illegal/Initialize()
/obj/item/disk/tech_disk/illegal/Initialize(mapload)
. = ..()
stored_research = new /datum/techweb/syndicate
@@ -45,6 +45,6 @@
desc = "You feel like it's not Gray because of its color."
custom_materials = null
/obj/item/disk/tech_disk/abductor/Initialize()
/obj/item/disk/tech_disk/abductor/Initialize(mapload)
. = ..()
stored_research = new /datum/techweb/abductor
+1 -1
View File
@@ -18,7 +18,7 @@
var/temp_tolerance_high = T20C
var/temp_penalty_coefficient = 0.5 //1 = -1 points per degree above high tolerance. 0.5 = -0.5 points per degree above high tolerance.
/obj/machinery/rnd/server/Initialize()
/obj/machinery/rnd/server/Initialize(mapload)
. = ..()
SSresearch.servers |= src
stored_research = SSresearch.science_tech
+1 -1
View File
@@ -123,7 +123,7 @@ If you create T5+ please take a pass at gene_modder.dm [L40]. Max_values MUST fi
var/rating = 1
rad_flags = RAD_NO_CONTAMINATE
/obj/item/stock_parts/Initialize()
/obj/item/stock_parts/Initialize(mapload)
. = ..()
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
@@ -37,7 +37,7 @@ To add a crossbreed:
throw_speed = 3
throw_range = 6
/obj/item/slimecross/Initialize()
/obj/item/slimecross/Initialize(mapload)
. = ..()
name = effect + " " + colour + " extract"
var/itemcolor = "#FFFFFF"
@@ -92,7 +92,7 @@ To add a crossbreed:
var/del_on_empty = TRUE
var/list/list_reagents
/obj/item/slimecrossbeaker/Initialize()
/obj/item/slimecrossbeaker/Initialize(mapload)
. = ..()
create_reagents(50, INJECTABLE | DRAWABLE)
if(list_reagents)
@@ -132,7 +132,7 @@ To add a crossbreed:
var/ignore_flags = FALSE
var/self_use_only = FALSE
/obj/item/slimecrossbeaker/autoinjector/Initialize()
/obj/item/slimecrossbeaker/autoinjector/Initialize(mapload)
. = ..()
reagents.reagents_holder_flags = DRAWABLE // Cannot be refilled, since it's basically an autoinjector!
@@ -176,7 +176,7 @@ To add a crossbreed:
color = "#DDAAAA"
list_reagents = list(/datum/reagent/pax/peaceborg = 10, /datum/reagent/drug/space_drugs = 15) //Peace, dudes
/obj/item/slimecrossbeaker/autoinjector/peaceandlove/Initialize()
/obj/item/slimecrossbeaker/autoinjector/peaceandlove/Initialize(mapload)
. = ..()
reagents.reagents_holder_flags = NONE // It won't be *that* easy to get your hands on pax.
@@ -73,7 +73,7 @@
max_integrity = 100
armor = list("melee" = 30, "bullet" = 50, "laser" = -50, "energy" = -50, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = -80, "acid" = 30)
/obj/structure/ice_stasis/Initialize()
/obj/structure/ice_stasis/Initialize(mapload)
. = ..()
playsound(src, 'sound/magic/ethereal_exit.ogg', 50, 1)
@@ -17,7 +17,7 @@
fire_sound = 'sound/effects/attackblob.ogg'
total_mass = TOTAL_MASS_HAND_REPLACEMENT
/obj/item/gun/magic/bloodchill/Initialize()
/obj/item/gun/magic/bloodchill/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
@@ -9,7 +9,7 @@ Burning extracts:
effect = "burning"
icon_state = "burning"
/obj/item/slimecross/burning/Initialize()
/obj/item/slimecross/burning/Initialize(mapload)
. = ..()
create_reagents(10, INJECTABLE | DRAWABLE)
@@ -10,7 +10,7 @@ Charged extracts:
effect = "charged"
icon_state = "charged"
/obj/item/slimecross/charged/Initialize()
/obj/item/slimecross/charged/Initialize(mapload)
. = ..()
create_reagents(10, INJECTABLE | DRAWABLE)
@@ -9,7 +9,7 @@ Chilling extracts:
effect = "chilling"
icon_state = "chilling"
/obj/item/slimecross/chilling/Initialize()
/obj/item/slimecross/chilling/Initialize(mapload)
. = ..()
create_reagents(10, INJECTABLE | DRAWABLE)
@@ -277,7 +277,7 @@ Consuming extracts:
taste = "vanilla and " //Randomly selected color dye.
var/colour = "#FFFFFF"
/obj/item/slime_cookie/pyrite/Initialize()
/obj/item/slime_cookie/pyrite/Initialize(mapload)
. = ..()
var/tastemessage = "paint remover"
switch(rand(1,7))
@@ -19,7 +19,7 @@ Industrial extracts:
/obj/item/slimecross/industrial/proc/do_after_spawn(obj/item/spawned)
return
/obj/item/slimecross/industrial/Initialize()
/obj/item/slimecross/industrial/Initialize(mapload)
. = ..()
create_reagents(100, INJECTABLE | DRAWABLE)
START_PROCESSING(SSobj,src)
@@ -13,7 +13,7 @@ Recurring extracts:
var/cooldown = 0
var/max_cooldown = 5 //In sets of 2 seconds.
/obj/item/slimecross/recurring/Initialize()
/obj/item/slimecross/recurring/Initialize(mapload)
. = ..()
extract = new extract_type(src.loc)
visible_message("<span class='notice'>[src] wraps a layer of goo around itself!</span>")
@@ -178,7 +178,7 @@ Regenerative extracts:
target.forceMove(T)
do_sparks(5,FALSE,target)
/obj/item/slimecross/regenerative/bluespace/Initialize()
/obj/item/slimecross/regenerative/bluespace/Initialize(mapload)
. = ..()
T = get_turf(src)
@@ -14,7 +14,7 @@ Self-sustaining extracts:
var/obj/item/slime_extract/extract
//Just divides into the actual item.
/obj/item/slimecross/selfsustaining/Initialize()
/obj/item/slimecross/selfsustaining/Initialize(mapload)
..()
visible_message("<span class='warning'>The [src] shudders, and splits into four smaller extracts.</span>")
for(var/i = 0, i < 4, i++)
@@ -14,7 +14,7 @@ Stabilized extracts:
var/datum/status_effect/linked_effect
var/mob/living/owner
/obj/item/slimecross/stabilized/Initialize()
/obj/item/slimecross/stabilized/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj,src)
@@ -110,7 +110,7 @@ Stabilized extracts:
mob_spawn_pets += T
mob_type = pick(mob_spawn_pets)
/obj/item/slimecross/stabilized/gold/Initialize()
/obj/item/slimecross/stabilized/gold/Initialize(mapload)
. = ..()
generate_mobtype()
@@ -5,7 +5,7 @@
icon_state = "generic_camera"
var/allowed_area = null
/mob/camera/aiEye/remote/xenobio/Initialize()
/mob/camera/aiEye/remote/xenobio/Initialize(mapload)
var/area/A = get_area(loc)
allowed_area = A.name
. = ..()
@@ -41,7 +41,7 @@
light_color = LIGHT_COLOR_PINK
/obj/machinery/computer/camera_advanced/xenobio/Initialize()
/obj/machinery/computer/camera_advanced/xenobio/Initialize(mapload)
. = ..()
slime_place_action = new
slime_up_action = new
@@ -36,7 +36,7 @@
qdel(O)
..()
/obj/item/slime_extract/Initialize()
/obj/item/slime_extract/Initialize(mapload)
. = ..()
create_reagents(100, INJECTABLE | DRAWABLE)