mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-02 13:34:49 +00:00
Fixed some stuff related to the previous commit.
This commit is contained in:
@@ -491,14 +491,25 @@
|
||||
return
|
||||
|
||||
var/jobName
|
||||
var/list/accesses = list()
|
||||
|
||||
if(istype(src, /obj/item/device/pda))
|
||||
if(src:id)
|
||||
jobName = src:id:assignment
|
||||
accesses = src:id:access
|
||||
if(istype(src, /obj/item/weapon/card/id))
|
||||
jobName = src:assignment
|
||||
accesses = src:access
|
||||
|
||||
if(jobName in get_all_jobs())
|
||||
return jobName
|
||||
|
||||
var/centcom = 0
|
||||
for(var/i = 1, i <= accesses.len, i++)
|
||||
if(accesses[i] > 100)
|
||||
centcom = 1
|
||||
break
|
||||
if(centcom)
|
||||
return "centcom"
|
||||
else
|
||||
return "Unknown"
|
||||
@@ -209,7 +209,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
|
||||
"mobtype" = /mob/living/silicon/ai, // the mob's type
|
||||
"realname" = from, // the mob's real name
|
||||
"name" = from, // the mob's display name
|
||||
"job" = "(Automated Announcement)", // the mob's job
|
||||
"job" = "Automated Announcement", // the mob's job
|
||||
"key" = "none", // the mob's key
|
||||
"vmessage" = "*garbled automated announcement*", // the message to display if the voice wasn't understood
|
||||
"vname" = "synthesized voice", // the name to display if the voice wasn't understood
|
||||
@@ -261,7 +261,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
|
||||
"mobtype" = /mob/living/silicon/ai, // the mob's type
|
||||
"realname" = from, // the mob's real name
|
||||
"name" = from, // the mob's display name
|
||||
"job" = "(Automated Announcement)", // the mob's job
|
||||
"job" = "Automated Announcement", // the mob's job
|
||||
"key" = "none", // the mob's key
|
||||
"vmessage" = "*garbled automated announcement*", // the message to display if the voice wasn't understood
|
||||
"vname" = "synthesized voice", // the name to display if the voice wasn't understood
|
||||
@@ -294,7 +294,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
|
||||
// Send a mundane broadcast with limited targets:
|
||||
|
||||
Broadcast_Message(connection, new /mob/living/silicon/ai(src), 0, "*garbled automated announcement*",
|
||||
src, message, from, "(Automated Announcement)", from, "synthesized voice",
|
||||
src, message, from, "Automated Announcement", from, "synthesized voice",
|
||||
filter_type, signal.data["compression"])
|
||||
return
|
||||
|
||||
|
||||
@@ -190,7 +190,7 @@ proc/trigger_armed_response_team()
|
||||
camera.c_tag = real_name
|
||||
|
||||
//Basic Uniform
|
||||
equip_if_possible(new /obj/item/clothing/under/color/black(src), slot_w_uniform)
|
||||
equip_if_possible(new /obj/item/clothing/under/syndicate/tacticool(src), slot_w_uniform)
|
||||
equip_if_possible(new /obj/item/device/flashlight(src), slot_l_store)
|
||||
equip_if_possible(new /obj/item/weapon/clipboard(src), slot_r_store)
|
||||
equip_if_possible(new /obj/item/weapon/gun/energy/gun(src), slot_belt)
|
||||
|
||||
@@ -37,6 +37,16 @@
|
||||
for(var/obj/O in contents)
|
||||
O.emp_act(severity)
|
||||
|
||||
attack(mob/living/M as mob, mob/living/user as mob, def_zone)
|
||||
if (M == user && user.zone_sel.selecting == "mouth" && load_into_chamber())
|
||||
M.visible_message("\red [user] sticks their gun in their mouth, ready to pull the trigger...")
|
||||
if(!do_after(user, 40))
|
||||
M.visible_message("\blue [user] decided life was worth living")
|
||||
return
|
||||
M.visible_message("\red [user] pulls the trigger.")
|
||||
M.apply_damage(70, BRUTE, "head")
|
||||
M.apply_damage(110, BRUTE, "chest")
|
||||
return
|
||||
|
||||
afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)//TODO: go over this
|
||||
if(flag) return //we're placing gun on a table or in backpack
|
||||
@@ -50,15 +60,6 @@
|
||||
M.drop_item()
|
||||
del(src)
|
||||
return
|
||||
if (target == user && user.zone_sel.selecting == "mouth")
|
||||
M.visible_message("\red [user] sticks their gun in their mouth, ready to pull the trigger...")
|
||||
if(!do_after(user, 20))
|
||||
M.visible_message("\blue [user] decided life was worth living")
|
||||
return
|
||||
M.visible_message("\red [user] pulls the trigger.")
|
||||
M.apply_damage(60, BRUTE, "head")
|
||||
M.apply_damage(90, BRUTE, "chest")
|
||||
return
|
||||
|
||||
if (!user.IsAdvancedToolUser())
|
||||
user << "\red You don't have the dexterity to do this!"
|
||||
|
||||
@@ -94,8 +94,8 @@ h1, h2, h3, h4, h5, h6
|
||||
|
||||
.comradio
|
||||
{
|
||||
color:#0028FF;
|
||||
background: #FFD700;
|
||||
color:#FF9966;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.syndradio
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
Reference in New Issue
Block a user