cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Browse Source 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-02-14 22:02:06 +10:00
parent 431002cb30 e64297e162
commit 49e4eaeffb
12 changed files with 9068 additions and 9037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/civilian.dm
+1 -2
View File
@@ -51,7 +51,7 @@
supervisors = "the head of personnel"
selection_color = "#dddddd"
access = list(access_hydroponics, access_bar, access_kitchen, access_morgue)
minimal_access = list(access_kitchen, access_morgue)
minimal_access = list(access_kitchen)
alt_titles = list("Cook")
@@ -281,7 +281,6 @@
selection_color = "#dddddd"
access = list(access_janitor, access_maint_tunnels)
minimal_access = list(access_janitor, access_maint_tunnels)
alt_titles = list("Custodial officer")
equip(var/mob/living/carbon/human/H)
code/game/jobs/job/science.dm
+1 -1
View File
@@ -69,7 +69,7 @@
department_flag = MEDSCI
faction = "Station"
total_positions = 2
spawn_positions = 1
spawn_positions = 2
supervisors = "research director"
selection_color = "#ffeeff"
access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
code/game/jobs/job/security.dm
+4 -4
View File
@@ -56,7 +56,7 @@
supervisors = "the head of security"
selection_color = "#ffeeee"
access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue)
minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court)
minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels)
minimal_player_age = 7
equip(var/mob/living/carbon/human/H)
@@ -94,8 +94,8 @@
selection_color = "#ffeeee"
alt_titles = list("Forensic Technician")
access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
alt_titles = list("Forensic Technician")
minimal_player_age = 7
equip(var/mob/living/carbon/human/H)
@@ -142,7 +142,7 @@
supervisors = "the head of security"
selection_color = "#ffeeee"
access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue)
minimal_access = list(access_security, access_sec_doors, access_brig, access_court)
minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels)
minimal_player_age = 7
equip(var/mob/living/carbon/human/H)
if(!H) return 0
code/game/machinery/newscaster.dm
+7
View File
@@ -10,6 +10,7 @@
var/backup_author =""
var/is_admin_message = 0
var/icon/img = null
var/icon/backup_img
/datum/feed_channel
var/channel_name=""
@@ -28,6 +29,7 @@
src.backup_body = ""
src.backup_author = ""
src.img = null
src.backup_img = null
/datum/feed_channel/proc/clear()
src.channel_name = ""
@@ -640,6 +642,11 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
if(MSG.is_admin_message)
alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok")
return
if(MSG.img != null)
MSG.backup_img = MSG.img
MSG.img = null
else
MSG.img = MSG.backup_img
if(MSG.body != "<B>\[REDACTED\]</B>")
MSG.backup_body = MSG.body
MSG.body = "<B>\[REDACTED\]</B>"