cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

no relative pathing (#16234)

Browse Source 
* the voices win in the end

* cleanup

* changelog

* secure.dm hates me

* make_exact_fit() in initialize instead of whatever was happening before
This commit is contained in:
harryob
2023-04-30 21:10:13 +00:00
committed by GitHub
parent ad29453d4a
commit 578bae6f6f
144 changed files with 9951 additions and 9675 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/protolathe/tool_designs.dm
+2 -2
View File
@@ -20,7 +20,7 @@
req_tech = list(TECH_ENGINEERING = 6, TECH_MATERIAL = 5)
build_path = /obj/item/overcapacitor
datum/design/item/tool/advanced_light_replacer
/datum/design/item/tool/advanced_light_replacer
desc = "A specialised light replacer which stores more lights, refills faster from boxes, and sucks up broken bulbs."
req_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 4)
materials = list(DEFAULT_WALL_MATERIAL = 500)
@@ -161,4 +161,4 @@ datum/design/item/tool/advanced_light_replacer
/datum/design/item/tool/inductive_charger/engineering
name = "Inductive Charger (Engineering)"
build_path = /obj/item/inductive_charger/handheld/engineering
build_path = /obj/item/inductive_charger/handheld/engineering
code/modules/research/xenoarchaeology/artifact/effect.dm
+1 -1
View File
@@ -83,7 +83,7 @@
DoEffectPulse()
//returns 0..1, with 1 being no protection and 0 being fully protected
proc/GetAnomalySusceptibility(var/mob/living/carbon/human/H)
/proc/GetAnomalySusceptibility(var/mob/living/carbon/human/H)
if(!H || !istype(H))
return 1
code/modules/research/xenoarchaeology/chemistry.dm
+37 -34
View File
@@ -13,7 +13,7 @@
volume = 2
flags = OPENCONTAINER
obj/item/reagent_containers/glass/solution_tray/attackby(obj/item/W as obj, mob/living/user as mob)
/obj/item/reagent_containers/glass/solution_tray/attackby(obj/item/W as obj, mob/living/user as mob)
if(W.ispen())
var/new_label = sanitizeSafe(input("What should the new label be?","Label solution tray"), MAX_NAME_LEN)
if(new_label)
@@ -26,57 +26,60 @@ obj/item/reagent_containers/glass/solution_tray/attackby(obj/item/W as obj, mob/
name = "solution tray box"
icon_state = "solution_trays"
fill()
..()
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
/obj/item/storage/box/solution_trays/fill()
..()
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
new /obj/item/reagent_containers/glass/solution_tray( src )
/obj/item/reagent_containers/glass/beaker/tungsten
name = "beaker 'tungsten'"
Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/tungsten,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/tungsten/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/tungsten,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/oxygen
name = "beaker 'oxygen'"
Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/acetone,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/oxygen/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/acetone,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/sodium
name = "beaker 'sodium'"
Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/sodium,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/sodium/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/sodium,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/lithium
name = "beaker 'lithium'"
Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/lithium,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/lithium/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/lithium,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/water
name = "beaker 'water'"
Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/water,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/water/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/water,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/fuel
name = "beaker 'fuel'"
Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/fuel,50)
update_icon()
/obj/item/reagent_containers/glass/beaker/fuel/Initialize()
. = ..()
reagents.add_reagent(/singleton/reagent/fuel,50)
update_icon()
code/modules/research/xenoarchaeology/finds/finds_eguns.dm
+12 -8
View File
@@ -2,23 +2,27 @@
/obj/item/gun/energy/laser/xenoarch
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "egun3"
update_icon()
return
/obj/item/gun/energy/laser/xenoarch/update_icon()
return
/obj/item/gun/energy/laser/practice/xenoarch
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "egun1"
update_icon()
return
/obj/item/gun/energy/laser/practice/xenoarch/update_icon()
return
/obj/item/gun/energy/xray/xenoarch
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "egun5"
update_icon()
return
/obj/item/gun/energy/xray/xenoarch/update_icon()
return
/obj/item/gun/energy/captain/xenoarch
icon = 'icons/obj/xenoarchaeology.dmi'
icon_state = "egun4"
update_icon()
return
/obj/item/gun/energy/captain/xenoarch/update_icon()
return
code/modules/research/xenoarchaeology/misc.dm
+9 -9
View File
@@ -47,15 +47,15 @@
/obj/structure/bookcase/manuals/xenoarchaeology
name = "Xenoarchaeology Manuals bookcase"
New()
..()
new /obj/item/book/manual/excavation(src)
new /obj/item/book/manual/mass_spectrometry(src)
new /obj/item/book/manual/materials_chemistry_analysis(src)
new /obj/item/book/manual/anomaly_testing(src)
new /obj/item/book/manual/anomaly_spectroscopy(src)
new /obj/item/book/manual/stasis(src)
update_icon()
/obj/structure/bookcase/manuals/xenoarchaeology/New()
..()
new /obj/item/book/manual/excavation(src)
new /obj/item/book/manual/mass_spectrometry(src)
new /obj/item/book/manual/materials_chemistry_analysis(src)
new /obj/item/book/manual/anomaly_testing(src)
new /obj/item/book/manual/anomaly_spectroscopy(src)
new /obj/item/book/manual/stasis(src)
update_icon()
//---- Lockers and closets