Skip to content

Commit

Permalink
Fixes "A Positronic brain has been created in null!" (#11193)
Browse files Browse the repository at this point in the history
* Fixes Posi Created in null bug

And Dehardcode random PAI

* Fix stupid problem that slipped testing
  • Loading branch information
Programs-The-Station authored Jul 14, 2024
1 parent d747695 commit 493190a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions code/game/machinery/fabricators/modular_fabricator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -495,13 +495,13 @@
use_power(power)
materials.use_materials(materials_used)
if(is_stack)
var/obj/item/stack/N = new being_built.build_path(null, multiplier)
N.forceMove(A)
var/obj/item/stack/N = new being_built.build_path(src.loc, multiplier)
N.forceMove(A) //Forcemove to the release turf to trigger ZFall
N.update_icon()
else
for(var/i in 1 to multiplier)
var/obj/item/new_item = new being_built.build_path(null)
new_item.forceMove(A)
var/obj/item/new_item = new being_built.build_path(src.loc)
new_item.forceMove(A) //Forcemove to the release turf to trigger ZFall
if(length(picked_materials))
new_item.set_custom_materials(picked_materials, 1 / multiplier) //Ensure we get the non multiplied amount
being_built = null
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/dead/new_player/new_player.dm
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
"Science" = "#ffddff",
"Security" = "#ffdddd"
)
var/static/list/department_list = list(GLOB.command_positions) + list(GLOB.engineering_positions) + list(GLOB.supply_positions) + list(GLOB.nonhuman_positions - "pAI") + list(GLOB.civilian_positions) + list(GLOB.gimmick_positions) + list(GLOB.medical_positions) + list(GLOB.science_positions) + list(GLOB.security_positions)
var/static/list/department_list = list(GLOB.command_positions) + list(GLOB.engineering_positions) + list(GLOB.supply_positions) + list(GLOB.nonhuman_positions - ROLE_PAI) + list(GLOB.civilian_positions) + list(GLOB.gimmick_positions) + list(GLOB.medical_positions) + list(GLOB.science_positions) + list(GLOB.security_positions)

var/list/dat = list("<div class='notice'>Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]</div>")
if(SSjob.prioritized_jobs.len > 0)
Expand Down

0 comments on commit 493190a

Please sign in to comment.