Skip to content

Commit

Permalink
Removes the Devil from the bible (BeeStation#11604)
Browse files Browse the repository at this point in the history
* Removes the Devil from the bible

* Sanity check

* clean up
  • Loading branch information
Szyszkrzyneczka authored Oct 1, 2024
1 parent 19b39b7 commit 3832092
Show file tree
Hide file tree
Showing 41 changed files with 10 additions and 2,644 deletions.
15 changes: 0 additions & 15 deletions beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@
#include "code\_onclick\hud\blobbernauthud.dm"
#include "code\_onclick\hud\constructs.dm"
#include "code\_onclick\hud\credits.dm"
#include "code\_onclick\hud\devil.dm"
#include "code\_onclick\hud\drones.dm"
#include "code\_onclick\hud\fullscreen.dm"
#include "code\_onclick\hud\generic_dextrous.dm"
Expand Down Expand Up @@ -1051,10 +1050,6 @@
#include "code\game\gamemodes\clown_ops\clown_ops.dm"
#include "code\game\gamemodes\clown_ops\clown_weapons.dm"
#include "code\game\gamemodes\cult\cult.dm"
#include "code\game\gamemodes\devil\devil_game_mode.dm"
#include "code\game\gamemodes\devil\game_mode.dm"
#include "code\game\gamemodes\devil\objectives.dm"
#include "code\game\gamemodes\devil\devil agent\devil_agent.dm"
#include "code\game\gamemodes\dynamic\dynamic.dm"
#include "code\game\gamemodes\dynamic\dynamic_hijacking.dm"
#include "code\game\gamemodes\dynamic\dynamic_logging.dm"
Expand Down Expand Up @@ -2037,13 +2032,6 @@
#include "code\modules\antagonists\cult\narsie.dm"
#include "code\modules\antagonists\cult\rune_spawn_action.dm"
#include "code\modules\antagonists\cult\runes.dm"
#include "code\modules\antagonists\devil\devil.dm"
#include "code\modules\antagonists\devil\devil_helpers.dm"
#include "code\modules\antagonists\devil\imp\imp.dm"
#include "code\modules\antagonists\devil\sintouched\objectives.dm"
#include "code\modules\antagonists\devil\sintouched\sintouched.dm"
#include "code\modules\antagonists\devil\true_devil\_true_devil.dm"
#include "code\modules\antagonists\devil\true_devil\inventory.dm"
#include "code\modules\antagonists\ert\ert.dm"
#include "code\modules\antagonists\fugitive\fugitive.dm"
#include "code\modules\antagonists\fugitive\fugitive_outfits.dm"
Expand Down Expand Up @@ -2623,7 +2611,6 @@
#include "code\modules\events\carp_migration.dm"
#include "code\modules\events\communications_blackout.dm"
#include "code\modules\events\creep_awakening.dm"
#include "code\modules\events\devil.dm"
#include "code\modules\events\disease_outbreak.dm"
#include "code\modules\events\dolphin_migration.dm"
#include "code\modules\events\dust.dm"
Expand Down Expand Up @@ -3980,8 +3967,6 @@
#include "code\modules\spells\spell_types\conjure.dm"
#include "code\modules\spells\spell_types\construct_spells.dm"
#include "code\modules\spells\spell_types\curse.dm"
#include "code\modules\spells\spell_types\devil.dm"
#include "code\modules\spells\spell_types\devil_boons.dm"
#include "code\modules\spells\spell_types\emplosion.dm"
#include "code\modules\spells\spell_types\ethereal_jaunt.dm"
#include "code\modules\spells\spell_types\explosion.dm"
Expand Down
67 changes: 0 additions & 67 deletions code/_onclick/hud/devil.dm

This file was deleted.

14 changes: 0 additions & 14 deletions code/datums/ai_laws.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
var/list/ion = list()
var/list/hacked = list()
var/mob/living/silicon/owner
var/list/devillaws = list()
var/list/valentine_laws = list()
var/id = DEFAULT_AI_LAWID

Expand Down Expand Up @@ -306,8 +305,6 @@

if(valentine_laws && (LAW_VALENTINES in groups))
law_amount++
if(devillaws && (LAW_DEVIL in groups))
law_amount++
if(zeroth && (LAW_ZEROTH in groups))
law_amount++
if(ion.len && (LAW_ION in groups))
Expand All @@ -323,9 +320,6 @@
law_amount++
return law_amount

/datum/ai_laws/proc/set_law_sixsixsix(laws)
devillaws = laws

/datum/ai_laws/proc/set_valentines_law(laws)
valentine_laws = laws

Expand Down Expand Up @@ -465,10 +459,6 @@
zeroth = null
zeroth_borg = null

/datum/ai_laws/proc/clear_law_sixsixsix(force)
if(force || !is_devil(owner))
devillaws = null

/datum/ai_laws/proc/associate(mob/living/silicon/M)
if(!owner)
owner = M
Expand All @@ -479,10 +469,6 @@
for(var/law in valentine_laws)
data += "[show_numbers ? "<3" : ""] <font color='#ed61ff'>[law]</font>"

if (include_zeroth && devillaws && devillaws.len)
for(var/i in devillaws)
data += "[show_numbers ? "666:" : ""] <font color='#cc5500'>[i]</font>"

if (include_zeroth && zeroth)
data += "[show_numbers ? "0:" : ""] <font color='#ff0000'><b>[zeroth]</b></font>"

Expand Down
45 changes: 0 additions & 45 deletions code/game/gamemodes/devil/devil agent/devil_agent.dm

This file was deleted.

110 changes: 0 additions & 110 deletions code/game/gamemodes/devil/devil_game_mode.dm

This file was deleted.

37 changes: 0 additions & 37 deletions code/game/gamemodes/devil/game_mode.dm

This file was deleted.

Loading

0 comments on commit 3832092

Please sign in to comment.