does anyone review my shit

This commit is contained in:
Joan Lung
2016-07-04 20:55:15 -04:00
parent 0315686235
commit ab2fca0a49
6 changed files with 24 additions and 15 deletions
@@ -363,7 +363,7 @@
if(!message || !user || !user.canUseTopic(src))
return 0
user.whisper("Freinagf, urne zl jbeqf. [message]")
send_hierophant_message(user, message)
titled_hierophant_message(user, message)
return 1
/obj/item/clothing/glasses/wraith_spectacles //Wraith spectacles: Grants night and x-ray vision at the slow cost of the wearer's sight. Nar-Sian cultists are instantly blinded.
@@ -579,7 +579,7 @@
user << "<span class='warning'>The obelisk lacks the power to broadcast!</span>"
return
clockwork_say(user, "Uvrebcunag Oebnqpnfg, npgvingr!")
send_hierophant_message(user, input, "big_brass", "large_brass")
titled_hierophant_message(user, input, "big_brass", "large_brass")
if("Spatial Gateway")
if(gateway_active)
user << "<span class='warning'>The obelisk is already sustaining a gateway!</span>"
@@ -1,17 +1,13 @@
//sends messages via hierophant
/proc/send_hierophant_message(mob/user, message, name_span = "heavy_brass", message_span = "brass", user_title = "Servant")
/proc/titled_hierophant_message(mob/user, message, name_span = "heavy_brass", message_span = "brass", user_title = "Servant")
if(!user || !message || !ticker || !ticker.mode)
return 0
var/parsed_message = "<span class='[name_span]'>[user_title ? "[user_title] ":""][findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: </span><span class='[message_span]'>\"[message]\"</span>"
for(var/M in mob_list)
if(isobserver(M))
var/link = FOLLOW_LINK(M, user)
M << "[link] [parsed_message]"
else if(is_servant_of_ratvar(M))
M << parsed_message
var/parsed_message = "<span class='[name_span]'>[user_title ? "[user_title] ":""][findtextEx(user.name, user.real_name) ? user.name : "[user.real_name] (as [user.name])"]: \
</span><span class='[message_span]'>\"[message]\"</span>"
hierophant_message(parsed_message, FALSE, user)
return 1
/proc/generic_hierophant_message(message, servantsonly, atom/target) //sends a generic message to all servants and optionally observers
/proc/hierophant_message(message, servantsonly, atom/target) //sends a generic message to all servants and optionally observers
if(!message || !ticker || !ticker.mode)
return 0
for(var/M in mob_list)
@@ -21,7 +17,7 @@
M << "[link] [message]"
else
M << message
if(is_servant_of_ratvar(M))
else if(is_servant_of_ratvar(M))
M << message
//Function Call action: Calls forth a Ratvarian spear.
@@ -128,7 +124,7 @@
var/list/states = get_scripture_states()
for(var/i in states)
if(states[i] != previous_states[i])
generic_hierophant_message("<span class='big_brass'>[i] Scripture has been [states[i] ? "un":""]locked.</span>")
hierophant_message("<span class='large_brass'><i>Hierophant Network:</i> <b>[i] Scripture has been [states[i] ? "un":""]locked.</b></span>")
/proc/get_scripture_states() //returns the current unlock states of each unlockable scripture tier
. = list("Script" = scripture_unlock_check(SCRIPTURE_SCRIPT), \
@@ -130,6 +130,11 @@
change_construction_value(-1)
return ..()
/turf/open/floor/clockwork/ChangeTurf(path, defer_change = FALSE)
if(path != type)
change_construction_value(-1)
return ..()
/turf/open/floor/clockwork/Entered(atom/movable/AM)
..()
START_PROCESSING(SSobj, src)
@@ -160,9 +165,11 @@
/turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/weapon/crowbar))
user.visible_message("<span class='notice'>[user] begins slowly prying up [src]...</span>", "<span class='notice'>You begin painstakingly prying up [src]...</span>")
playsound(src, 'sound/items/Crowbar.ogg', 20, 1)
if(!do_after(user, 70 / I.toolspeed, target = src))
return 0
user.visible_message("<span class='notice'>[user] pries up [src]!</span>", "<span class='notice'>You pry up [src], destroying it!</span>")
playsound(src, 'sound/items/Crowbar.ogg', 80, 1)
make_plating()
return 1
return ..()
+7 -1
View File
@@ -59,11 +59,17 @@
change_construction_value(-5)
return ..()
/turf/closed/wall/clockwork/ChangeTurf(path, defer_change = FALSE)
if(path != type)
change_construction_value(-5)
return ..()
/turf/closed/wall/clockwork/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = I
if(!WT.isOn())
if(!WT.remove_fuel(0,user))
return 0
playsound(src, 'sound/items/Welder.ogg', 100, 1)
user.visible_message("<span class='notice'>[user] begins slowly breaking down [src]...</span>", "<span class='notice'>You begin painstakingly destroying [src]...</span>")
if(!do_after(user, 120 / WT.toolspeed, target = src))
return 0
@@ -138,4 +138,4 @@
return //we don't get hacked or give a shit about it
/mob/living/simple_animal/drone/cogscarab/drone_chat(msg)
send_hierophant_message(src, msg, "heavy_alloy") //HIEROPHANT DRONES
titled_hierophant_message(src, msg, "heavy_alloy") //HIEROPHANT DRONES