cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 15:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes Wizard + Conflux (#12067)

Browse Source
This commit is contained in:
Doxxmedearly
2021-06-30 19:55:06 -03:00
committed by GitHub
parent 361cfb766b
commit 3acb186b26
119 changed files with 63 additions and 3718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cigs_lighters.dm
+1 -1
View File
@@ -1029,7 +1029,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
..()
/obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/I, mob/user)
if(is_type_in_list(I, list(/obj/item/paper/cig/, /obj/item/paper/, /obj/item/teleportation_scroll)))
if(is_type_in_list(I, list(/obj/item/paper/cig/, /obj/item/paper/)))
if(!dry)
to_chat(user, SPAN_WARNING("You need to dry [src] first!"))
return
code/game/objects/items/weapons/gift_wrappaper.dm
+1
View File
@@ -167,6 +167,7 @@
/obj/random/spacecash,
/obj/random/glowstick,
/obj/random/gloves,
/obj/random/wizard_dressup,
/obj/item/storage/wallet,
/obj/item/storage/photo_album,
/obj/item/storage/box/snappops,
code/game/objects/items/weapons/scrolls.dm
-114
View File
@@ -1,114 +0,0 @@
/obj/item/teleportation_scroll
name = "scroll of teleportation"
desc = "A scroll for moving around."
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll"
item_state = "scroll"
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_books.dmi'
)
var/uses = 4.0
w_class = ITEMSIZE_TINY
item_state = "paper"
throw_speed = 4
throw_range = 20
origin_tech = list(TECH_BLUESPACE = 4)
/obj/item/teleportation_scroll/attack_self(mob/living/user as mob)
if(!user.is_wizard())
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
var/obj/item/organ/O = H.internal_organs_by_name[pick(BP_EYES, BP_APPENDIX, BP_KIDNEYS, BP_LIVER, BP_HEART, BP_LUNGS, BP_BRAIN)]
if(O == null)
to_chat(user, SPAN_NOTICE("You can't make any sense of the arcane glyphs. . . maybe you should try again."))
else
to_chat(user, SPAN_ALERT("As you stumble over the arcane glyphs, you feel a twisting sensation in [O]!"))
user.visible_message("<span class='danger'>A flash of smoke pours out of [user]'s orifices!</span>")
playsound(user, 'sound/magic/lightningshock.ogg', 40, 1)
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
smoke.set_up(5, 0, user.loc)
smoke.attach(user)
smoke.start()
user.show_message("<b>[user]</b> screams!",2)
user.drop_item()
if(O && istype(O))
O.removed(user)
return
else
user.set_machine(src)
var/dat = "<B>Teleportation Scroll:</B><BR>"
dat += "Number of uses: [src.uses]<BR>"
dat += "<HR>"
dat += "<B>Four uses use them wisely:</B><BR>"
dat += "<A href='byond://?src=\ref[src];spell_teleport=1'>Teleport</A><BR>"
dat += "Kind regards,<br>Wizards Federation<br><br>P.S. Don't forget to bring your gear, you'll need it to cast most spells.<HR>"
user << browse(dat, "window=scroll")
onclose(user, "scroll")
return
/obj/item/teleportation_scroll/Topic(href, href_list)
..()
if (usr.stat || usr.restrained() || src.loc != usr)
return
var/mob/living/carbon/human/H = usr
if (!( istype(H, /mob/living/carbon/human)))
return 1
if ((usr == src.loc || (in_range(src, usr) && istype(src.loc, /turf))))
usr.set_machine(src)
if (href_list["spell_teleport"])
if (src.uses >= 1)
teleportscroll(H)
attack_self(H)
return
/obj/item/teleportation_scroll/proc/teleportscroll(var/mob/user)
var/A
A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in teleportlocs
var/area/thearea = teleportlocs[A]
if (user.stat || user.restrained())
return
if(!((user == loc || (in_range(src, user) && istype(src.loc, /turf)))))
return
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
smoke.set_up(5, 0, user.loc)
smoke.attach(user)
smoke.start()
var/list/L = list()
for(var/turf/T in get_area_turfs(thearea))
if(!T.density && !T.is_hole)
var/clear = 1
for(var/obj/O in T)
if(O.density)
clear = 0
break
if(clear)
L+=T
if(!L.len)
to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.")
return
if(user && user.buckled_to)
user.buckled_to.unbuckle()
var/list/tempL = L
var/attempt = null
var/success = 0
while(tempL.len)
attempt = pick(tempL)
success = user.Move(attempt)
if(!success)
tempL.Remove(attempt)
else
break
if(!success)
user.forceMove(pick(L))
smoke.start()
src.uses -= 1
code/game/objects/items/weapons/storage/backpack.dm
+6 -6
View File
@@ -185,8 +185,8 @@
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/wizard
name = "wizard federation sack"
desc = "Perfect for keeping your shining crystal balls inside of."
name = "magical sack"
desc = "Perfect for keeping your shining crystal balls inside of. May not contain actual magic."
icon_state = "wizardpack"
empty_delay = 0.8 SECOND
@@ -293,8 +293,8 @@
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/satchel_wizard
name = "wizard federation satchel"
desc = "This stylish satchel will put a spell on anyone with some fashion sense to spare."
name = "magic satchel"
desc = "This stylish satchel will put a spell on anyone with some fashion sense to spare. Contains %0 actual magic."
icon_state = "satchel-wizard"
empty_delay = 0.8 SECOND
@@ -424,8 +424,8 @@
empty_delay = 0.8 SECOND
/obj/item/storage/backpack/duffel/wizard
name = "wizardly duffel bag"
desc = "A fancy blue wizard bag, duffel edition."
name = "magical duffel bag"
desc = "A fancy blue spell bag, duffel edition. Comes with zero spells because magic isn't real, nerd."
icon_state = "duffel-wizard"
slowdown = 0
empty_delay = 0.8 SECOND
code/game/objects/items/weapons/storage/bags.dm
+1 -1
View File
@@ -328,7 +328,7 @@
max_storage_space = 200
max_w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_NORMAL
can_hold = list(/obj/item/book, /obj/item/spellbook)
can_hold = list(/obj/item/book)
// -----------------------------
// Chemistry Bag
code/game/objects/items/weapons/storage/belt.dm
-21
View File
@@ -384,27 +384,6 @@
/obj/item/gun/energy/mousegun
)
/obj/item/storage/belt/wands
name = "wand belt"
desc = "A belt designed to hold various rods of power."
icon_state = "soulstonebelt"
item_state = "soulstonebelt"
storage_slots = 5
max_w_class = ITEMSIZE_NORMAL
max_storage_space = 28
can_hold = list(
/obj/item/gun/energy/wand
)
/obj/item/storage/belt/wands/full
starts_with = list(
/obj/item/gun/energy/wand/fire = 1,
/obj/item/gun/energy/wand/polymorph = 1,
/obj/item/gun/energy/wand/teleport = 1,
/obj/item/gun/energy/wand/force = 1,
/obj/item/gun/energy/wand/animation = 1
)
/obj/item/storage/belt/mining
name = "explorer's belt"
desc = "A versatile chest rig, cherished by miners and hunters alike."
code/game/objects/random/random.dm
+18 -3
View File
@@ -578,7 +578,6 @@
/obj/machinery/vending/security = 0.3,
/obj/machinery/vending/hydronutrients = 1,
/obj/machinery/vending/hydroseeds = 1,
/obj/machinery/vending/magivend = 0.5, //The things it dispenses are just costumes to non-wizards
/obj/machinery/vending/dinnerware = 1,
/obj/machinery/vending/sovietsoda = 2,
/obj/machinery/vending/tool = 1,
@@ -942,7 +941,8 @@
/obj/random/tool = 1,
/obj/random/toolbox = 1,
/obj/random_produce = 0.25,
/obj/random/watches = 1
/obj/random/watches = 1,
/obj/random/wizard_dressup = 0.25
)
@@ -1775,4 +1775,19 @@
/obj/item/seeds/peanutseed,
/obj/item/seeds/soyaseed,
/obj/item/seeds/cabbageseed
)
)
/obj/random/wizard_dressup
name = "random wizard clothes"
desc = "This is a random piece of fake wizard clothing."
icon = 'icons/obj/wizard.dmi'
icon_state = "staff"
has_postspawn = TRUE
/obj/random/wizard_dressup/spawn_item()
var/obj/item/clothing/suit/wizrobe/W = pick(typesof(/obj/item/clothing/suit/wizrobe))
. = new W(loc)
/obj/random/wizard_dressup/post_spawn(obj/thing)
var/obj/item/clothing/head/wizard/H = pick(typesof(/obj/item/clothing/head/wizard))
new H(loc)