Bleeding edgy refresh (#303)

* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
+1 -1
View File
@@ -173,7 +173,7 @@ Cook
department_head = list("Head of Personnel")
department_flag = CIVILIAN
faction = "Station"
total_positions = 1
total_positions = 2
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#bbe291"
+6 -3
View File
@@ -17,6 +17,9 @@ Clown
access = list(access_theatre)
minimal_access = list(access_theatre)
/datum/job/clown/after_spawn(mob/living/carbon/human/H, mob/M)
H.rename_self("clown", M.client)
/datum/outfit/job/clown
name = "Clown"
jobtype = /datum/job/clown
@@ -57,7 +60,6 @@ Clown
return
H.dna.add_mutation(CLOWNMUT)
H.rename_self("clown")
/*
Mime
@@ -78,6 +80,9 @@ Mime
access = list(access_theatre)
minimal_access = list(access_theatre)
/datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M)
H.rename_self("mime", M.client)
/datum/outfit/job/mime
name = "Mime"
jobtype = /datum/job/mime
@@ -106,8 +111,6 @@ Mime
H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak(null))
H.mind.miming = 1
H.rename_self("mime")
/*
Librarian
*/
@@ -45,7 +45,7 @@ Chaplain
B.name = SSreligion.Bible_name
B.icon_state = SSreligion.Bible_icon_state
B.item_state = SSreligion.Bible_item_state
H << "There is already an established religion onboard the station. You are an acolyte of [SSreligion.Bible_deity_name]. Defer to the Chaplain."
to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [SSreligion.Bible_deity_name]. Defer to the Chaplain.")
H.equip_to_slot_or_del(B, slot_in_backpack)
var/obj/item/weapon/nullrod/N = new(H)
H.equip_to_slot_or_del(N, slot_in_backpack)
+11 -2
View File
@@ -44,7 +44,9 @@
var/outfit = null
//Only override this proc
/datum/job/proc/after_spawn(mob/living/carbon/human/H)
//H is usually a human unless an /equip override transformed it
/datum/job/proc/after_spawn(mob/living/H, mob/M)
//do actions on H but send messages to M as the key may not have been transferred_yet
/datum/job/proc/announce(mob/living/carbon/human/H)
@@ -52,7 +54,7 @@
announce_head(H, head_announce)
//But don't override this
//Don't override this unless the job transforms into a non-human (Silicons do this for example)
/datum/job/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE)
if(!H)
return 0
@@ -68,6 +70,11 @@
if(!visualsOnly && announce)
announce(H)
if(config.enforce_human_authority && (title in command_positions))
H.dna.features["tail_human"] = "None"
H.dna.features["ears"] = "None"
H.regenerate_icons()
/datum/job/proc/get_access()
if(!config) //Needed for robots.
return src.minimal_access.Copy()
@@ -110,6 +117,8 @@
/datum/job/proc/config_check()
return 1
/datum/job/proc/map_check()
return TRUE
/datum/outfit/job
+5 -5
View File
@@ -183,11 +183,11 @@ Security Officer
var/list/available_depts = list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY)
/datum/job/officer/after_spawn(mob/living/carbon/human/H)
/datum/job/officer/after_spawn(mob/living/carbon/human/H, mob/M)
// Assign department security
var/department
if(H && H.client && H.client.prefs)
department = H.client.prefs.prefered_security_department
if(M && M.client && M.client.prefs)
department = M.client.prefs.prefered_security_department
if(!LAZYLEN(available_depts) || department == "None")
return
else if(department in available_depts)
@@ -255,9 +255,9 @@ var/list/available_depts = list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT
else
break
if(department)
H << "<b>You have been assigned to [department]!</b>"
to_chat(M, "<b>You have been assigned to [department]!</b>")
else
H << "<b>You have not been assigned to any department. Patrol the halls and help where needed.</b>"
to_chat(M, "<b>You have not been assigned to any department. Patrol the halls and help where needed.</b>")
+16 -5
View File
@@ -14,8 +14,17 @@ AI
minimal_player_age = 30
/datum/job/ai/equip(mob/living/carbon/human/H)
if(!H)
return 0
return H.AIize(FALSE)
/datum/job/ai/after_spawn(mob/living/silicon/ai/AI, mob/M)
AI.rename_self("ai", M.client)
//we may have been created after our borg
if(ticker.current_state == GAME_STATE_SETTING_UP)
for(var/mob/living/silicon/robot/R in silicon_mobs)
if(!R.connected_ai)
R.TryConnectToAI()
/datum/job/ai/config_check()
if(config && config.allow_ai)
@@ -37,6 +46,8 @@ Cyborg
minimal_player_age = 21
/datum/job/cyborg/equip(mob/living/carbon/human/H)
if(!H)
return 0
return H.Robotize()
return H.Robotize(FALSE, FALSE)
/datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, mob/M)
if(config.rename_cyborg) //name can't be set in robot/New without the client
R.rename_self("cyborg", M.client)
@@ -0,0 +1,6 @@
//this needs to come after the job_types subfolder to keep the correct ordering
#include "..\..\..\..\_maps\map_files\OmegaStation\job_changes.dm"
#undef JOB_MODIFICATION_MAP_NAME
#include "..\..\..\..\_maps\map_files\PubbyStation\job_changes.dm"
#undef JOB_MODIFICATION_MAP_NAME