cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44191 from AffectedArc07/removes-ss-religion

Browse Source 
Removes SSreligion
This commit is contained in:
oranges
2019-06-02 09:40:45 +12:00
committed by GitHub
parent 806e7ff66c e856ca9de2
commit 5be02315ea
9 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/_globalvars/misc.dm
View File

@@ -18,3 +18,12 @@ GLOBAL_LIST_EMPTY(powernets)
GLOBAL_VAR_INIT(bsa_unlock, FALSE) //BSA unlocked by head ID swipes GLOBAL_VAR_INIT(bsa_unlock, FALSE) //BSA unlocked by head ID swipes
GLOBAL_LIST_EMPTY(player_details) // ckey -> /datum/player_details GLOBAL_LIST_EMPTY(player_details) // ckey -> /datum/player_details
// All religion stuff
GLOBAL_VAR(religion)
GLOBAL_VAR(deity)
GLOBAL_VAR(bible_name)
GLOBAL_VAR(bible_icon_state)
GLOBAL_VAR(bible_item_state)
GLOBAL_VAR(holy_weapon_type)
GLOBAL_VAR(holy_armor_type)

11
code/controllers/subsystem/religion.dm
View File

@@ -1,11 +0,0 @@
SUBSYSTEM_DEF(religion)
name = "Religion"
flags = SS_NO_FIRE|SS_NO_INIT
var/religion
var/deity
var/bible_name
var/bible_icon_state
var/bible_item_state
var/holy_weapon_type
var/holy_armor_type

8
code/game/objects/items/holy_weapons.dm
View File

@@ -42,11 +42,11 @@
return holy_item_list return holy_item_list
/obj/item/choice_beacon/holy/spawn_option(obj/choice,mob/living/M) /obj/item/choice_beacon/holy/spawn_option(obj/choice,mob/living/M)
if(!SSreligion.holy_armor_type) if(!GLOB.holy_armor_type)
..() ..()
playsound(src, 'sound/effects/pray_chaplain.ogg', 40, 1) playsound(src, 'sound/effects/pray_chaplain.ogg', 40, 1)
SSblackbox.record_feedback("tally", "chaplain_armor", 1, "[choice]") SSblackbox.record_feedback("tally", "chaplain_armor", 1, "[choice]")
SSreligion.holy_armor_type = choice GLOB.holy_armor_type = choice
else else
to_chat(M, "<span class='warning'>A selection has already been made. Self-Destructing...</span>") to_chat(M, "<span class='warning'>A selection has already been made. Self-Destructing...</span>")
return return
@@ -194,7 +194,7 @@
reskin_holy_weapon(user) reskin_holy_weapon(user)
/obj/item/nullrod/proc/reskin_holy_weapon(mob/M) /obj/item/nullrod/proc/reskin_holy_weapon(mob/M)
if(SSreligion.holy_weapon_type) if(GLOB.holy_weapon_type)
return return
var/obj/item/nullrod/holy_weapon var/obj/item/nullrod/holy_weapon
var/list/holy_weapons_list = typesof(/obj/item/nullrod) var/list/holy_weapons_list = typesof(/obj/item/nullrod)
@@ -211,7 +211,7 @@
var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new
holy_weapon = new A holy_weapon = new A
SSreligion.holy_weapon_type = holy_weapon.type GLOB.holy_weapon_type = holy_weapon.type
SSblackbox.record_feedback("tally", "chaplain_weapon", 1, "[choice]") SSblackbox.record_feedback("tally", "chaplain_weapon", 1, "[choice]")

8
code/game/objects/items/storage/book.dm
View File

@@ -55,7 +55,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
if(!H.can_read(src)) if(!H.can_read(src))
return FALSE return FALSE
// If H is the Chaplain, we can set the icon_state of the bible (but only once!) // If H is the Chaplain, we can set the icon_state of the bible (but only once!)
if(!SSreligion.bible_icon_state && H.job == "Chaplain") if(!GLOB.bible_icon_state && H.job == "Chaplain")
var/dat = "<html><head><title>Pick Bible Style</title></head><body><center><h2>Pick a bible style</h2></center><table>" var/dat = "<html><head><title>Pick Bible Style</title></head><body><center><h2>Pick a bible style</h2></center><table>"
for(var/i in 1 to GLOB.biblestates.len) for(var/i in 1 to GLOB.biblestates.len)
var/icon/bibleicon = icon('icons/obj/storage.dmi', GLOB.biblestates[i]) var/icon/bibleicon = icon('icons/obj/storage.dmi', GLOB.biblestates[i])
@@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
/obj/item/storage/book/bible/Topic(href, href_list) /obj/item/storage/book/bible/Topic(href, href_list)
if(!usr.canUseTopic(src, BE_CLOSE)) if(!usr.canUseTopic(src, BE_CLOSE))
return return
if(href_list["seticon"] && SSreligion && !SSreligion.bible_icon_state) if(href_list["seticon"] && !GLOB.bible_icon_state)
var/iconi = text2num(href_list["seticon"]) var/iconi = text2num(href_list["seticon"])
var/biblename = GLOB.biblenames[iconi] var/biblename = GLOB.biblenames[iconi]
icon_state = GLOB.biblestates[iconi] icon_state = GLOB.biblestates[iconi]
@@ -79,8 +79,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
H.dna.add_mutation(CLOWNMUT) H.dna.add_mutation(CLOWNMUT)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), SLOT_WEAR_MASK) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), SLOT_WEAR_MASK)
SSreligion.bible_icon_state = icon_state GLOB.bible_icon_state = icon_state
SSreligion.bible_item_state = item_state GLOB.bible_item_state = item_state
SSblackbox.record_feedback("text", "religion_book", 1, "[biblename]") SSblackbox.record_feedback("text", "religion_book", 1, "[biblename]")
usr << browse(null, "window=editicon") usr << browse(null, "window=editicon")

4
code/modules/admin/verbs/pray.dm
View File

@@ -25,8 +25,8 @@
cross.icon_state = "kingyellow" cross.icon_state = "kingyellow"
font_color = "blue" font_color = "blue"
prayer_type = "CHAPLAIN PRAYER" prayer_type = "CHAPLAIN PRAYER"
if(SSreligion.deity) if(GLOB.deity)
deity = SSreligion.deity deity = GLOB.deity
else if(iscultist(usr)) else if(iscultist(usr))
cross.icon_state = "tome" cross.icon_state = "tome"
font_color = "red" font_color = "red"

20
code/modules/jobs/job_types/chaplain.dm
View File

@@ -26,14 +26,14 @@
var/obj/item/storage/book/bible/booze/B = new var/obj/item/storage/book/bible/booze/B = new
if(SSreligion.religion) if(GLOB.religion)
B.deity_name = SSreligion.deity B.deity_name = GLOB.deity
B.name = SSreligion.bible_name B.name = GLOB.bible_name
B.icon_state = SSreligion.bible_icon_state B.icon_state = GLOB.bible_icon_state
B.item_state = SSreligion.bible_item_state B.item_state = GLOB.bible_item_state
to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [SSreligion.deity]. Defer to the Chaplain.") to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [GLOB.deity]. Defer to the Chaplain.")
H.equip_to_slot_or_del(B, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(B, SLOT_IN_BACKPACK)
var/nrt = SSreligion.holy_weapon_type || /obj/item/nullrod var/nrt = GLOB.holy_weapon_type || /obj/item/nullrod
var/obj/item/nullrod/N = new nrt(H) var/obj/item/nullrod/N = new nrt(H)
H.put_in_hands(N) H.put_in_hands(N)
return return
@@ -102,9 +102,9 @@
else else
B.name = "The Holy Book of [new_religion]" B.name = "The Holy Book of [new_religion]"
SSreligion.religion = new_religion GLOB.religion = new_religion
SSreligion.bible_name = B.name GLOB.bible_name = B.name
SSreligion.deity = B.deity_name GLOB.deity = B.deity_name
H.equip_to_slot_or_del(B, SLOT_IN_BACKPACK) H.equip_to_slot_or_del(B, SLOT_IN_BACKPACK)

10
code/modules/library/lib_machines.dm
View File

@@ -484,11 +484,11 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
if(href_list["printbible"]) if(href_list["printbible"])
if(cooldown < world.time) if(cooldown < world.time)
var/obj/item/storage/book/bible/B = new /obj/item/storage/book/bible(src.loc) var/obj/item/storage/book/bible/B = new /obj/item/storage/book/bible(src.loc)
if(SSreligion.bible_icon_state && SSreligion.bible_item_state) if(GLOB.bible_icon_state && GLOB.bible_item_state)
B.icon_state = SSreligion.bible_icon_state B.icon_state = GLOB.bible_icon_state
B.item_state = SSreligion.bible_item_state B.item_state = GLOB.bible_item_state
B.name = SSreligion.bible_name B.name = GLOB.bible_name
B.deity_name = SSreligion.deity B.deity_name = GLOB.deity
cooldown = world.time + PRINTER_COOLDOWN cooldown = world.time + PRINTER_COOLDOWN
else else
say("Printer currently unavailable, please wait a moment.") say("Printer currently unavailable, please wait a moment.")

4
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
View File

@@ -61,8 +61,8 @@
strengthdiv = 8 strengthdiv = 8
for(var/mob/living/simple_animal/revenant/R in get_hearers_in_view(7,get_turf(holder.my_atom))) for(var/mob/living/simple_animal/revenant/R in get_hearers_in_view(7,get_turf(holder.my_atom)))
var/deity var/deity
if(SSreligion.deity) if(GLOB.deity)
deity = SSreligion.deity deity = GLOB.deity
else else
deity = "Christ" deity = "Christ"
to_chat(R, "<span class='userdanger'>The power of [deity] compels you!</span>") to_chat(R, "<span class='userdanger'>The power of [deity] compels you!</span>")

1
tgstation.dme
View File

@@ -257,7 +257,6 @@
#include "code\controllers\subsystem\ping.dm" #include "code\controllers\subsystem\ping.dm"
#include "code\controllers\subsystem\radiation.dm" #include "code\controllers\subsystem\radiation.dm"
#include "code\controllers\subsystem\radio.dm" #include "code\controllers\subsystem\radio.dm"
#include "code\controllers\subsystem\religion.dm"
#include "code\controllers\subsystem\research.dm" #include "code\controllers\subsystem\research.dm"
#include "code\controllers\subsystem\server_maint.dm" #include "code\controllers\subsystem\server_maint.dm"
#include "code\controllers\subsystem\shuttle.dm" #include "code\controllers\subsystem\shuttle.dm"