Skip to content

Commit

Permalink
adds rng gamemodes
Browse files Browse the repository at this point in the history
Update abnormalities.dm

Update ticker.dm

Makes AIB from Lobotomy Corp

update

Update management.dm

Update lobotomy-corp13.dme

adds joke abnos
  • Loading branch information
Kitsunemitsu committed May 10, 2024
1 parent 5c09317 commit b7fd12d
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 19 deletions.
14 changes: 5 additions & 9 deletions code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -249,16 +249,12 @@ SUBSYSTEM_DEF(ticker)
if(SSmaptype.maptype in SSmaptype.combatmaps)
if(!(istype(mode, /datum/game_mode/combat)))
mode = new /datum/game_mode/combat

// Among Us.
else if(SSmaptype.maptype == "skeld")
// mode = new /datum/game_mode/traitor
toggle_ooc(FALSE) // Turn it off
CONFIG_SET(flag/norespawn, 1)

else
if(!istype(mode, /datum/game_mode/management))
mode = new /datum/game_mode/management/classic
var/choosingmap = pick(/datum/game_mode/management/classic,
// /datum/game_mode/management/pure,
// /datum/game_mode/management/branch
)
mode = new choosingmap

CHECK_TICK

Expand Down
23 changes: 21 additions & 2 deletions code/game/gamemodes/management/management.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
announce_span = "notice"
announce_text = "Manage a selection of abnormalities strictly from Lobotomy Corporation HQ!"
abno_types = list(
ABNORMALITY_ORIGIN_LOBOTOMY
ABNORMALITY_ORIGIN_LOBOTOMY,
ABNORMALITY_ORIGIN_ALTERED
)

/datum/game_mode/management/branch
Expand Down Expand Up @@ -93,7 +94,7 @@
ABNORMALITY_ORIGIN_LIMBUS,
)

/datum/game_mode/management/limbuswl
/datum/game_mode/management/devsonly
name = "L Corp - Developer's Select"
config_tag = "original"
votable = 1
Expand All @@ -104,3 +105,21 @@
ABNORMALITY_ORIGIN_ARTBOOK,
ABNORMALITY_ORIGIN_ORIGINAL
)

/datum/game_mode/management/jokemode
name = "L Corp - Freaky Friday"
config_tag = "joke"
votable = 1

announce_span = "notice"
announce_text = "Manage all abnormalities, including joke abnormalities!"
abno_types = list(

Check failure on line 116 in code/game/gamemodes/management/management.dm

View workflow job for this annotation

GitHub Actions / Run Linters

unknown variable: ABNORMALITY_ORIGIN_JOKE
ABNORMALITY_ORIGIN_JOKE,
ABNORMALITY_ORIGIN_LOBOTOMY,
ABNORMALITY_ORIGIN_ALTERED,
ABNORMALITY_ORIGIN_ARTBOOK,
ABNORMALITY_ORIGIN_WONDERLAB,
ABNORMALITY_ORIGIN_RUINA,
ABNORMALITY_ORIGIN_LIMBUS,
ABNORMALITY_ORIGIN_ORIGINAL
)
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Ping Chiemi for bugs, suffering
// Sorry this was reduced to a joke - Kirie/Kitsunemitsu

#define TCC_SORROW_COOLDOWN (5 SECONDS)
#define TCC_COMBUST_COOLDOWN (20 SECONDS)

Expand Down Expand Up @@ -190,7 +192,7 @@
new /obj/effect/temp_visual/fire/fast(get_turf(L))

/mob/living/simple_animal/hostile/abnormality/crying_children/BreachEffect(mob/living/carbon/human/user, breach_type)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(show_global_blurb), 20, "No one’s going to cry on my behalf even if I’m sad.", 25))
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(show_global_blurb), 20, "No one’s going to cry on my behalf even if I’m sad.", 25))
..()
desc = "A towering angel statue, setting everything on it's path ablaze"
icon = 'ModularTegustation/Teguicons/96x96.dmi'
Expand Down Expand Up @@ -456,7 +458,7 @@
forceMove(T)

/mob/living/simple_animal/hostile/abnormality/crying_children/proc/FinalPhase()
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(show_global_blurb), 20, "I don’t want to hear anything. I don’t want to see anything, or speak anything…", 25))
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(show_global_blurb), 20, "I don’t want to hear anything. I don’t want to see anything, or speak anything…", 25))
icon_phase = "desperation"
icon_living = "[icon_phase]_idle"
icon_state = "[icon_phase]_idle"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@

stat_attack = HARD_CRIT

can_spawn = FALSE//it's a joke abnormality

ego_list = list(
/datum/ego_datum/weapon/mcrib,
/datum/ego_datum/armor/mcrib,
)
abnormality_origin = ABNORMALITY_ORIGIN_ORIGINAL
abnormality_origin = ABNORMALITY_ORIGIN_JOKE

Check failure on line 28 in code/modules/mob/living/simple_animal/abnormality/!joke/zayin/riblin.dm

View workflow job for this annotation

GitHub Actions / Run Linters

unknown variable: ABNORMALITY_ORIGIN_JOKE

/mob/living/simple_animal/hostile/abnormality/riblin/SuccessEffect(mob/living/carbon/human/user, work_type, pe)
. = ..()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ GLOBAL_LIST_EMPTY(army)
/mob/living/simple_animal/hostile/abnormality/khz = 1.5,
/mob/living/simple_animal/hostile/abnormality/mhz = 1.5,
)
abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY

//Unique variables
var/death_counter = 0
Expand Down
6 changes: 3 additions & 3 deletions lobotomy-corp13.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2763,6 +2763,9 @@
#include "code\modules\mob\living\simple_animal\simple_animal.dm"
#include "code\modules\mob\living\simple_animal\status_procs.dm"
#include "code\modules\mob\living\simple_animal\abnormality\_abnormality.dm"
#include "code\modules\mob\living\simple_animal\abnormality\!joke\aleph\barkley.dm"
#include "code\modules\mob\living\simple_animal\abnormality\!joke\aleph\crying_children.dm"
#include "code\modules\mob\living\simple_animal\abnormality\!joke\zayin\riblin.dm"
#include "code\modules\mob\living\simple_animal\abnormality\!tutorial\bill.dm"
#include "code\modules\mob\living\simple_animal\abnormality\!tutorial\cube.dm"
#include "code\modules\mob\living\simple_animal\abnormality\!tutorial\fairies.dm"
Expand All @@ -2789,10 +2792,8 @@
#include "code\modules\mob\living\simple_animal\abnormality\_tools\zayin\wishwell.dm"
#include "code\modules\mob\living\simple_animal\abnormality\_tools\zayin\you_happy.dm"
#include "code\modules\mob\living\simple_animal\abnormality\aleph\army_in_black.dm"
#include "code\modules\mob\living\simple_animal\abnormality\aleph\barkley.dm"
#include "code\modules\mob\living\simple_animal\abnormality\aleph\blue_star.dm"
#include "code\modules\mob\living\simple_animal\abnormality\aleph\censored.dm"
#include "code\modules\mob\living\simple_animal\abnormality\aleph\crying_children.dm"
#include "code\modules\mob\living\simple_animal\abnormality\aleph\distortedform.dm"
#include "code\modules\mob\living\simple_animal\abnormality\aleph\last_shot.dm"
#include "code\modules\mob\living\simple_animal\abnormality\aleph\melting_love.dm"
Expand Down Expand Up @@ -2936,7 +2937,6 @@
#include "code\modules\mob\living\simple_animal\abnormality\zayin\one_sin.dm"
#include "code\modules\mob\living\simple_animal\abnormality\zayin\pile_of_mail.dm"
#include "code\modules\mob\living\simple_animal\abnormality\zayin\quiet_day.dm"
#include "code\modules\mob\living\simple_animal\abnormality\zayin\riblin.dm"
#include "code\modules\mob\living\simple_animal\abnormality\zayin\sleeping_beauty.dm"
#include "code\modules\mob\living\simple_animal\abnormality\zayin\sunset_traveller.dm"
#include "code\modules\mob\living\simple_animal\abnormality\zayin\we_can_change_anything.dm"
Expand Down

0 comments on commit b7fd12d

Please sign in to comment.