mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 23:27:34 +01:00
Removes unused wizard_clothes.dm and moves wizard_weapons.dm into artefact.dm (#94731)
## About The Pull Request This PR removes unused wizard_clothes.dm which has a duplicate path overriding the magus helm armor values This PR moves wizard_weapons which includes the singularity hammer and mjollnir into the wizard antag module This PR moves wizard_robe into wizard antag module ## Why It's Good For The Game So things are easier to find ## Changelog 🆑 Ezel fix: fixes the armour value of the magus helm to be the same as all other wizard gear /🆑
This commit is contained in:
@@ -1,30 +0,0 @@
|
||||
/obj/item/clothing/head/wizard/magus
|
||||
name = "magus helm"
|
||||
icon_state = "magus"
|
||||
inhand_icon_state = null
|
||||
desc = "A helm worn by the followers of Nar'Sie."
|
||||
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES|HIDESNOUT
|
||||
armor_type = /datum/armor/wizard_magus
|
||||
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
|
||||
|
||||
/datum/armor/wizard_magus
|
||||
melee = 50
|
||||
bullet = 30
|
||||
laser = 50
|
||||
energy = 50
|
||||
bomb = 25
|
||||
bio = 10
|
||||
fire = 10
|
||||
acid = 10
|
||||
|
||||
/obj/item/clothing/suit/magusred
|
||||
name = "magus robes"
|
||||
desc = "A set of armored robes worn by the followers of Nar'Sie."
|
||||
icon_state = "magusred"
|
||||
icon = 'icons/obj/clothing/suits/wizard.dmi'
|
||||
worn_icon = 'icons/mob/clothing/suits/wizard.dmi'
|
||||
inhand_icon_state = null
|
||||
body_parts_covered = CHEST|GROIN|LEGS|ARMS
|
||||
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
|
||||
armor_type = /obj/item/clothing/head/wizard/magus::armor_type
|
||||
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
|
||||
+5
-1
@@ -91,8 +91,10 @@
|
||||
|
||||
/obj/item/clothing/head/wizard/magus
|
||||
name = "\improper Magus helm"
|
||||
desc = "A mysterious helmet that hums with an unearthly power."
|
||||
icon_state = "magus"
|
||||
desc = "A mysterious helmet that hums with an unearthly power."
|
||||
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES|HIDESNOUT
|
||||
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
|
||||
inhand_icon_state = null
|
||||
dog_fashion = null
|
||||
|
||||
@@ -176,12 +178,14 @@
|
||||
desc = "A set of armored robes that seem to radiate a dark power."
|
||||
icon_state = "magusblue"
|
||||
inhand_icon_state = null
|
||||
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
|
||||
|
||||
/obj/item/clothing/suit/wizrobe/magusred
|
||||
name = "\improper Magus robe"
|
||||
desc = "A set of armored robes that seem to radiate a dark power."
|
||||
icon_state = "magusred"
|
||||
inhand_icon_state = null
|
||||
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
|
||||
|
||||
/obj/item/clothing/suit/wizrobe/santa
|
||||
name = "Santa's suit"
|
||||
+2
@@ -1,3 +1,4 @@
|
||||
/////////////////////////////////////////Singularity Hammer///////////////////
|
||||
/obj/item/singularityhammer
|
||||
name = "singularity hammer"
|
||||
desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows."
|
||||
@@ -71,6 +72,7 @@
|
||||
vortex(get_turf(target), user)
|
||||
addtimer(VARSET_CALLBACK(src, charged, TRUE), 10 SECONDS)
|
||||
|
||||
/////////////////////////////////////////Mjollnir///////////////////
|
||||
/obj/item/mjollnir
|
||||
name = "Mjollnir"
|
||||
desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
+2
-3
@@ -2612,8 +2612,6 @@
|
||||
#include "code\game\objects\items\weaponry.dm"
|
||||
#include "code\game\objects\items\wiki_manuals.dm"
|
||||
#include "code\game\objects\items\wind_turbine.dm"
|
||||
#include "code\game\objects\items\wizard_clothes.dm"
|
||||
#include "code\game\objects\items\wizard_weapons.dm"
|
||||
#include "code\game\objects\items\AI_modules\_AI_modules.dm"
|
||||
#include "code\game\objects\items\AI_modules\freeform.dm"
|
||||
#include "code\game\objects\items\AI_modules\full_lawsets.dm"
|
||||
@@ -3564,6 +3562,8 @@
|
||||
#include "code\modules\antagonists\wizard\equipment\enchanted_clown_suit.dm"
|
||||
#include "code\modules\antagonists\wizard\equipment\soulstone.dm"
|
||||
#include "code\modules\antagonists\wizard\equipment\teleport_rod.dm"
|
||||
#include "code\modules\antagonists\wizard\equipment\wiz_robe.dm"
|
||||
#include "code\modules\antagonists\wizard\equipment\wizard_hammer.dm"
|
||||
#include "code\modules\antagonists\wizard\equipment\wizard_spellbook.dm"
|
||||
#include "code\modules\antagonists\wizard\equipment\spellbook_entries\_entry.dm"
|
||||
#include "code\modules\antagonists\wizard\equipment\spellbook_entries\assistance.dm"
|
||||
@@ -4199,7 +4199,6 @@
|
||||
#include "code\modules\clothing\suits\utility.dm"
|
||||
#include "code\modules\clothing\suits\wetfloor.dm"
|
||||
#include "code\modules\clothing\suits\wintercoats.dm"
|
||||
#include "code\modules\clothing\suits\wiz_robe.dm"
|
||||
#include "code\modules\clothing\under\_suit_sensor.dm"
|
||||
#include "code\modules\clothing\under\_under.dm"
|
||||
#include "code\modules\clothing\under\color.dm"
|
||||
|
||||
Reference in New Issue
Block a user