cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-17 19:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Completely refactors hallucinations, and also adds a few [MDB IGNORE] (#16348)

Browse Source 
* Completely refactors hallucinations, and also adds a few

* delete 5 old hallucination types that should have been removed

* Fixed old leftover tips conflicts

* Fixes all the leftover conflicts and otherwise broken code

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2022-09-26 01:43:45 +02:00
committed by GitHub
parent 5e6b821887
commit 8f033ead91
128 changed files with 4066 additions and 2488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+1
View File
@@ -229,6 +229,7 @@ GLOBAL_PROTECT(admin_verbs_debug)
/client/proc/open_lua_editor,
/client/proc/validate_puzzgrids,
/client/proc/debug_spell_requirements,
/client/proc/debug_hallucination_weighted_list_per_type,
)
GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release))
GLOBAL_PROTECT(admin_verbs_possess)
code/modules/admin/force_event.dm
+2 -1
View File
@@ -61,7 +61,8 @@
var/datum/round_event_control/event = locate(event_to_run_type) in SSevents.control
if(!event)
return
event.admin_setup(usr)
if(event.admin_setup(usr) == ADMIN_CANCEL_EVENT)
return
var/always_announce_chance = 100
var/no_announce_chance = 0
event.runEvent(announce_chance_override = announce_event ? always_announce_chance : no_announce_chance, admin_forced = TRUE)