Merge pull request #3617 from SpadesNeil/centcom-not-centcomm

CentCom not centcomm
This commit is contained in:
Anewbe
2017-07-22 13:30:06 -05:00
committed by GitHub
20 changed files with 26 additions and 26 deletions

View File

@@ -47,7 +47,7 @@ var/list/admin_verbs_admin = list(
/client/proc/jumptomob, //allows us to jump to a specific mob,
/client/proc/jumptoturf, //allows us to jump to a specific turf,
/client/proc/admin_call_shuttle, //allows us to call the emergency shuttle,
/client/proc/admin_cancel_shuttle, //allows us to cancel the emergency shuttle, sending it back to centcomm,
/client/proc/admin_cancel_shuttle, //allows us to cancel the emergency shuttle, sending it back to CentCom,
/client/proc/cmd_admin_direct_narrate, //send text directly to a player with no padding. Useful for narratives and fluff-text,
/client/proc/cmd_admin_world_narrate, //sends text to all players with no padding,
/client/proc/cmd_admin_create_centcom_report,

View File

@@ -22,7 +22,7 @@
var/corpseid = 0 //Just set to 1 if you want them to have an ID
var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access
var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
var/corpseidicon = null //For setting it to be a gold, silver, centcomm etc ID
var/corpseidicon = null //For setting it to be a gold, silver, CentCom etc ID
var/species = "Human"
/obj/effect/landmark/corpse/initialize()

View File

@@ -414,7 +414,7 @@
//All of the armor below is mostly unused
/obj/item/clothing/suit/armor/centcomm
name = "Cent. Com. armor"
name = "CentCom armor"
desc = "A suit that protects against some damage."
icon_state = "centcom"
item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")

View File

@@ -25,7 +25,7 @@
var/corpseid = 0 //Just set to 1 if you want them to have an ID
var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access
var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
var/corpseidicon = null //For setting it to be a gold, silver, centcomm etc ID
var/corpseidicon = null //For setting it to be a gold, silver, CentCom etc ID
/obj/effect/landmark/mobcorpse/New()
createCorpse()

View File

@@ -394,7 +394,7 @@
dat += "Round Duration: [roundduration2text()]<br>"
if(emergency_shuttle) //In case NanoTrasen decides reposess CentCom's shuttles.
if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled
if(emergency_shuttle.going_to_centcom()) //Shuttle is going to CentCom, not recalled
dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"
if(emergency_shuttle.online())
if (emergency_shuttle.evac) // Emergency shuttle is past the point of no recall

View File

@@ -97,7 +97,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
D.linked_console = src
return
/obj/machinery/computer/rdconsole/proc/griefProtection() //Have it automatically push research to the centcomm server so wild griffins can't fuck up R&D's work
/obj/machinery/computer/rdconsole/proc/griefProtection() //Have it automatically push research to the CentCom server so wild griffins can't fuck up R&D's work
for(var/obj/machinery/r_n_d/server/centcom/C in machines)
for(var/datum/tech/T in files.known_tech)
C.files.AddTech2Known(T)
@@ -167,7 +167,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
screen = 1.2
files.AddTech2Known(t_disk.stored)
updateUsrDialog()
griefProtection() //Update centcomm too
griefProtection() //Update CentCom too
else if(href_list["clear_tech"]) //Erase data on the technology disk.
t_disk.stored = null
@@ -190,7 +190,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
screen = 1.4
files.AddDesign2Known(d_disk.blueprint)
updateUsrDialog()
griefProtection() //Update centcomm too
griefProtection() //Update CentCom too
else if(href_list["clear_design"]) //Erases data on the design disk.
d_disk.blueprint = null

View File

@@ -79,7 +79,7 @@
griefProtection()
..()
//Backup files to centcomm to help admins recover data after greifer attacks
//Backup files to CentCom to help admins recover data after greifer attacks
/obj/machinery/r_n_d/server/proc/griefProtection()
for(var/obj/machinery/r_n_d/server/centcom/C in machines)
for(var/datum/tech/T in files.known_tech)

View File

@@ -190,7 +190,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
if(!user_turf)
user << "<span class='warning'>You cannot cast spells in null space!</span>"
if(spell_flags & Z2NOCAST && (user_turf.z in using_map.admin_levels)) //Certain spells are not allowed on the centcomm zlevel
if(spell_flags & Z2NOCAST && (user_turf.z in using_map.admin_levels)) //Certain spells are not allowed on the CentCom zlevel
return 0
if(spell_flags & CONSTRUCT_CHECK)