The Eggcellent Update Part 2 (#30837)

* I'm unreasonably excited about this change

* Woopsy

* That was not on copy paste and 30 characters

Co-authored-by: Rubylips <Questionfrog@gmail.com>
This commit is contained in:
GreatBigFailure
2021-09-30 00:42:55 -04:00
committed by GitHub
parent 2d2320d3e6
commit df7ffcc397
16 changed files with 59 additions and 60 deletions

View File

@@ -17,7 +17,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
build_time = IMPRINTER_BUILD_TIME
build_number = 1
research_flags = HASOUTPUT | TAKESMATIN | CONSOLECONTROL | LOCKBOXES
research_flags = HASOUTPUT | TAKESMATIN | CONSOLECONTROL | LOCKBOXES | MULTIOUTPUT
// Don't log reagent transfers. They're just spammy.
log_reagents = 0
@@ -113,4 +113,4 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
/obj/machinery/r_n_d/fabricator/circuit_imprinter/suicide_act(var/mob/living/user)
to_chat(viewers(user), "<span class='danger'>[user] is placing \his mouth underneath the imprinter nozzle and turning the machine on! It looks like \he's trying to commit suicide.</span>")
return(SUICIDE_ACT_BRUTELOSS)
return(SUICIDE_ACT_BRUTELOSS)

View File

@@ -35,7 +35,7 @@
var/min_cap_T = 0.1 //The minimum cap used to how much time coeff can be improved
var/fabricator_cooldown = 2 //In deciseconds, the delay between each item starting to be built
machine_flags = SCREWTOGGLE | CROWDESTROY | WRENCHMOVE | FIXED2WORK | EMAGGABLE
machine_flags = SCREWTOGGLE | CROWDESTROY | WRENCHMOVE | FIXED2WORK | EMAGGABLE | MULTIOUTPUT
research_flags = TAKESMATIN | HASOUTPUT | HASMAT_OVER | NANOTOUCH
/obj/machinery/r_n_d/fabricator/New()

View File

@@ -13,7 +13,7 @@
icon_state = "genfab"
max_material_storage = GEN_FAB_BASESTORAGE
nano_file = "genfab.tmpl"
var/list/design_types = GENFAB | IMPRINTER | PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB
var/list/design_types = GENFAB | IMPRINTER | PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB | MULTIOUTPUT
var/removable_designs = 1
var/plastic_added = 1 //if plastic costs are added for designs - the autolathe doesn't have this

View File

@@ -20,7 +20,7 @@ it creates. All the menus and other manipulation commands are in the R&D console
light_color = LIGHT_COLOR_CYAN
research_flags = CONSOLECONTROL | HASOUTPUT | TAKESMATIN | HASMAT_OVER | LOCKBOXES
research_flags = CONSOLECONTROL | HASOUTPUT | TAKESMATIN | HASMAT_OVER | LOCKBOXES | MULTIOUTPUT
part_sets = list(
"Stock Parts" = list(),

View File

@@ -14,7 +14,6 @@ var/global/list/rnd_machines = list()
var/disabled = 0
var/shocked = 0
var/obj/machinery/computer/rdconsole/linked_console
var/output_dir = 0 // Direction used to output to (for things like fabs), set to 0 for loc.
var/stopped = 0
var/base_state = ""
var/build_time = 0
@@ -138,6 +137,10 @@ var/global/list/rnd_machines = list()
return TRUE
return FALSE
/obj/machinery/r_n_d/setOutputLocation(user)
if(research_flags &HASOUTPUT)
..()
/obj/machinery/r_n_d/attackby(var/obj/item/O as obj, var/mob/user as mob)
if (shocked)
shock(user,50, O.siemens_coefficient)
@@ -153,22 +156,6 @@ var/global/list/rnd_machines = list()
return 1
if (disabled)
return 1
if (istype(O, /obj/item/device/multitool))
if(!panel_open && research_flags &HASOUTPUT)
var/result = input("Set your location as output?") in list("Yes","No","Machine Location")
switch(result)
if("Yes")
if(!Adjacent(user))
to_chat(user, "<span class='warning'>Cannot set this as the output location; You're not adjacent to it!</span>")
return 1
output_dir = get_dir(src, user)
to_chat(user, "<span class='notice'>Output set.</span>")
if("Machine Location")
output_dir = 0
to_chat(user, "<span class='notice'>Output set.</span>")
return 1
return
if (!linked_console && !(istype(src, /obj/machinery/r_n_d/fabricator))) //fabricators get a free pass because they aren't tied to a console
to_chat(user, "\The [src] must be linked to an R&D console first!")
return 1
@@ -257,4 +244,4 @@ var/global/list/rnd_machines = list()
if(!.)
return loc // Map edge I guess.
#undef ANIM_LENGTH
#undef ANIM_LENGTH