mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 14:08:31 +01:00
[MIRROR] tgui Preferences Menu + total rewrite of the preferences backend (#8153)
* tgui Preferences Menu + total rewrite of the preferences backend * nah, we dont need to ping those people * trying to remove the funny stuff * unmodularizing this * prefs reset * this may need to be reverted, who knows * okay, this part * perhaps * EEEEEEEEE * unsanitary * E * Stage 1 + loadout system * more fixes * E * I mean, it launches? * More fixes and reorganisation * E * customisation code is spaget. * disable ERP prefs * Update erp_preferences.dm * Update erp_preferences.dm * E * Slowly getting there * It may be time for help :) * tri...colors... help * preferences now pass preferences * Update dna.dm * Fuck this man * missing savefile return, set_species works, removed dumb stuff from updateappearance * https://github.com/Skyrat-SS13/Skyrat-tg/pull/8199 * https://github.com/Skyrat-SS13/Skyrat-tg/pull/8224 * https://github.com/tgstation/tgstation/pull/61519 * https://github.com/Skyrat-SS13/Skyrat-tg/pull/8278 * e * le butonAZARAK HELLO * hhh * Proper recognition where it's due, MrMelbert! * EEEE * examine block * Better gen hit sounds from whitedream * final loadout touches, more bug fixes im sure to come * i said there would be bugfixes * Update LoadoutManager.js * Missing preferences in the html menu * LIVE TESTING PHASE BABY * Update LoadoutManager.js * EEE * LAUNCH TEST FIRE * Update job.dm * Update new_player.dm * 50gb DAY ONE PATCH * EEE * Update preferences.dm * buggle fixes * Update examine.dm * >LOOC starts on Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> Co-authored-by: Gandalf <jzo123@hotmail.com> Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
co-authored by
Mothblocks
jjpark-kb
Gandalf
Azarak
parent
a5bfc42228
commit
124ddd7cca
@@ -63,9 +63,10 @@ GLOBAL_LIST_INIT(summoned_magic, list(
|
||||
/obj/item/book/granter/spell/barnyard,
|
||||
/obj/item/book/granter/spell/charge,
|
||||
/obj/item/book/granter/spell/summonitem,
|
||||
/obj/item/gun/magic/wand/nothing, //SKYEDIT EDIT - Removes wand of polymorph
|
||||
/obj/item/gun/magic/wand/nothing,
|
||||
/obj/item/gun/magic/wand/death,
|
||||
/obj/item/gun/magic/wand/resurrection,
|
||||
/obj/item/gun/magic/wand/polymorph,
|
||||
/obj/item/gun/magic/wand/teleport,
|
||||
/obj/item/gun/magic/wand/door,
|
||||
/obj/item/gun/magic/wand/fireball,
|
||||
@@ -77,7 +78,8 @@ GLOBAL_LIST_INIT(summoned_magic, list(
|
||||
/obj/item/immortality_talisman,
|
||||
/obj/item/melee/ghost_sword))
|
||||
|
||||
GLOBAL_LIST_INIT(summoned_special_magic, list( //SKYEDIT EDIT - Removes wand of polymorph
|
||||
GLOBAL_LIST_INIT(summoned_special_magic, list(
|
||||
/obj/item/gun/magic/staff/change,
|
||||
/obj/item/gun/magic/staff/animate,
|
||||
/obj/item/storage/belt/wands/full,
|
||||
/obj/item/antag_spawner/contract,
|
||||
@@ -202,9 +204,10 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list(
|
||||
UnregisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED)
|
||||
|
||||
///signal proc to give magic to new crewmembers
|
||||
/proc/magic_up_new_crew(mob/living/carbon/human/new_crewmember, rank)
|
||||
/datum/summon_magic_controller/proc/magic_up_new_crew(datum/source, mob/living/new_crewmember, rank)
|
||||
SIGNAL_HANDLER
|
||||
INVOKE_ASYNC(GLOB.summon_magic, .proc/give_magic, new_crewmember)
|
||||
if(ishuman(new_crewmember))
|
||||
INVOKE_ASYNC(GLOB.summon_magic, .proc/give_magic, new_crewmember)
|
||||
|
||||
/**
|
||||
* The guns controller handles the summon guns event.
|
||||
@@ -230,7 +233,8 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list(
|
||||
UnregisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED)
|
||||
|
||||
///signal proc to give guns to new crewmembers
|
||||
/proc/arm_up_new_crew(mob/living/carbon/human/new_crewmember, rank)
|
||||
/datum/summon_guns_controller/proc/arm_up_new_crew(datum/source, mob/living/new_crewmember, rank)
|
||||
SIGNAL_HANDLER
|
||||
INVOKE_ASYNC(GLOB.summon_guns, .proc/give_guns, new_crewmember)
|
||||
if(ishuman(new_crewmember))
|
||||
INVOKE_ASYNC(GLOB.summon_guns, .proc/give_guns, new_crewmember)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user