Profakos
commented
2 weeks ago I will test the heretic changes soon, and push the next batch. My estimation for the update is probably early saturday, as I hope that the fix for sparks igniting everything when you open locked cargo crates will get merged.
Merge conflicts:
Characterprefs: spooked editor Techwebs: Had to move the SAD to a new node, "gene engineering" Basemap: spooked editor Blast cannon: spooked editor, updated our extra return with explicit FALSE Surgery: spooked editor Cultst: is_convertable_to_cult got moved to a different filed, moved x card check over
Other: secure/briefcase no longer exists, replaced our references with briefcase/secure Contract killer briefcases have icons now Table shuffling properly skips secure briefcases Sandboxvendor issue: reactive_armour_shell -> reactive_armor_shell /obj/machinery/zetan_pirate_experimentor/MouseDropT -> /obj/machinery/zetan_pirate_experimentor/mouse_drop_receive Removed two tone body markings. No longer supported. Moved the orb limb designs to Orb folder, and made our techs branch off from bioscan. A proper reorganization is needed. Heretic Renegotiation and Ritual now uses the upstream version
Biodome: Fixed active turfs by the library Fixes elevator doors of the lake elevator Removed another electric grille, and some railings from maint, some prettification. Replacer the space bus room with a secret union meeting room.