cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-15 18:06:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into reagentsagain

Browse Source
This commit is contained in:
Archie
2020-12-09 14:32:55 -03:00
parent a7c539ac32 4e46a86f14
commit 838c20c200
7 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm
+1 -2
View File
@@ -140,11 +140,10 @@
var/objcount = 0
var/list/counted_roles = list() // So you can't have more than one Captain count.
for(var/datum/antagonist/vassal/V in antagdatum.vassals)
if (!V || !V.owner) // Must exist somewhere, and as a vassal.
if (!V || !V.owner || !V.owner.current) // Must exist somewhere, as a vassal and have a living body.
continue
var/thisRole = "none"
// Mind Assigned
if ((V.owner.assigned_role in valid_jobs) && !(V.owner.assigned_role in counted_roles))
//to_chat(owner, "<span class='userdanger'>PROTEGE OBJECTIVE: (MIND ROLE)</span>")
code/modules/antagonists/bloodsucker/powers/bs_brawn.dm
+3 -3
View File
@@ -110,7 +110,7 @@
if(user_C.handcuffed)
var/obj/O = user_C.get_item_by_slot(SLOT_HANDCUFFED)
if(istype(O))
//user_C.visible_message("<span class='warning'>[user_C] attempts to remove [O]!</span>", \
//user_C.visible_message("<span class='warning'>[user_C] attempts to remove [O]!</span>",
// "<span class='warning'>You snap [O] like it's nothing!</span>")
user_C.clear_cuffs(O,TRUE)
playsound(get_turf(usr), 'sound/effects/grillehit.ogg', 80, 1, -1)
@@ -122,7 +122,7 @@
if(user_H.wear_suit && user_H.wear_suit.breakouttime)
var/obj/item/clothing/suit/straight_jacket/S = user_H.get_item_by_slot(ITEM_SLOT_ICLOTHING)
if(istype(S))
user_C.visible_message("<span class='warning'>[user_C] attempts to remove [S]!</span>", \
user_C.visible_message("<span class='warning'>[user_C] attempts to remove [S]!</span>",
"<span class='warning'>You rip through [S] like it's nothing!</span>")
user_C.clear_cuffs(S,TRUE)
playsound(get_turf(usr), 'sound/effects/grillehit.ogg', 80, 1, -1)
@@ -131,7 +131,7 @@
if(user_C.legcuffed)
var/obj/O = user_C.get_item_by_slot(SLOT_LEGCUFFED)
if(istype(O))
//user_C.visible_message("<span class='warning'>[user_C] attempts to remove [O]!</span>", \
//user_C.visible_message("<span class='warning'>[user_C] attempts to remove [O]!</span>",
// "<span class='warning'>You snap [O] like it's nothing!</span>")
user_C.clear_cuffs(O,TRUE)
playsound(get_turf(usr), 'sound/effects/grillehit.ogg', 80, 1, -1)
code/modules/antagonists/bloodsucker/powers/bs_feed.dm
+2 -2
View File
@@ -159,8 +159,8 @@
// Broadcast Message
if (amSilent)
//if (!iscarbon(target))
// user.visible_message("<span class='notice'>[user] shifts [target] closer to [user.p_their()] mouth.</span>", \
// "<span class='notice'>You secretly slip your fangs into [target]'s flesh.</span>", \
// user.visible_message("<span class='notice'>[user] shifts [target] closer to [user.p_their()] mouth.</span>",
// "<span class='notice'>You secretly slip your fangs into [target]'s flesh.</span>",
// vision_distance = 2, ignored_mobs=target) // Only people who AREN'T the target will notice this action.
//else
var/deadmessage = target.stat == DEAD ? "" : " <i>[target.p_they(TRUE)] looks dazed, and will not remember this.</i>"
code/modules/oracle_ui/hookup_procs.dm
+2
View File
@@ -23,6 +23,8 @@
return TRUE
if(user.incapacitated())
return FALSE
if(isobj(src.loc) && get_dist(src, user) < 2)
return TRUE
if(isturf(src.loc) && Adjacent(user))
return TRUE
return FALSE
code/modules/paperwork/paper.dm
+6 -14
View File
@@ -32,6 +32,7 @@
var/contact_poison // Reagent ID to transfer on contact
var/contact_poison_volume = 0
var/datum/oracle_ui/ui = null
var/force_stars = FALSE // If we should force the text to get obfuscated with asterisks
/obj/item/paper/pickup(user)
@@ -59,7 +60,8 @@
updateinfolinks()
/obj/item/paper/oui_getcontent(mob/target)
if(!target.is_literate())
if(!target.is_literate() || force_stars)
force_stars = FALSE
return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>"
else if(istype(target.get_active_held_item(), /obj/item/pen) | istype(target.get_active_held_item(), /obj/item/toy/crayon))
return "<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=[REF(src)];help=1'>\[?\]</A></div></HTML>"
@@ -70,8 +72,8 @@
if(check_rights_for(target.client, R_FUN)) //Allows admins to view faxes
return TRUE
if(isAI(target))
var/mob/living/silicon/ai/ai = target
return get_dist(src, ai.current) < 2
force_stars = TRUE
return TRUE
if(iscyborg(target))
return get_dist(src, target) < 2
return ..()
@@ -133,18 +135,8 @@
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
addtimer(CALLBACK(src, .proc/reset_spamflag), 20)
/obj/item/paper/attack_ai(mob/living/silicon/ai/user)
var/dist
if(istype(user) && user.current) //is AI
dist = get_dist(src, user.current)
else //cyborg or AI not seeing through a camera
dist = get_dist(src, user)
if(dist < 2)
show_content(user)
else
to_chat(user, "<span class='notice'>You can't quite see it.</span>")
show_content(user)
/obj/item/paper/proc/addtofield(id, text, links = 0)
var/locid = 0