cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 08:36:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Refactors monkeys into a species (#2379)

Browse Source 
* Refactors monkeys into a species

* aaa

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
SkyratBot
2020-12-31 21:08:07 +01:00
committed by GitHub
parent 898121f9cd
commit d7f054b035
155 changed files with 614 additions and 1609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+1 -1
View File
@@ -127,7 +127,7 @@
body += "<br>"
//Human
if(ishuman(M))
if(ishuman(M) && !ismonkey(M))
body += "<B>Human</B> | "
else
body += "<A href='?_src_=holder;[HrefToken()];humanone=[REF(M)]'>Humanize</A> | "
code/modules/admin/player_panel.dm
+3 -3
View File
@@ -231,10 +231,10 @@
if(isliving(M))
if(iscarbon(M)) //Carbon stuff
if(ishuman(M))
M_job = M.job
else if(ismonkey(M))
if(ismonkey(M))
M_job = "Monkey"
else if(ishuman(M))
M_job = M.job
else if(isalien(M)) //aliens
if(islarva(M))
M_job = "Alien larva"
code/modules/admin/topic.dm
+4 -4
View File
@@ -409,7 +409,7 @@
if("slime")
M.change_mob_type( /mob/living/simple_animal/slime , null, null, delmob )
if("monkey")
M.change_mob_type( /mob/living/carbon/monkey , null, null, delmob )
M.change_mob_type( /mob/living/carbon/human/species/monkey , null, null, delmob )
if("robot")
M.change_mob_type( /mob/living/silicon/robot , null, null, delmob )
if("cat")
@@ -894,9 +894,9 @@
if(!check_rights(R_SPAWN))
return
var/mob/living/carbon/monkey/Mo = locate(href_list["humanone"])
if(!istype(Mo))
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/monkey.", confidential = TRUE)
var/mob/living/carbon/human/Mo = locate(href_list["humanone"])
if(!ismonkey(Mo))
to_chat(usr, "This can only be used on monkeys.", confidential = TRUE)
return
log_admin("[key_name(usr)] attempting to humanize [key_name(Mo)].")
code/modules/admin/verbs/SDQL2/SDQL_2.dm
+1 -1
View File
@@ -99,7 +99,7 @@
Don't crash the server, OK?
"UPDATE /mob/living/carbon/monkey SET #null = forceMove(usr.loc)"
"UPDATE /mob/living/carbon/human/species/monkey SET #null = forceMove(usr.loc)"
Writing "#null" in front of the "=" will call the proc and discard the return value.
code/modules/admin/verbs/randomverbs.dm
+2 -2
View File
@@ -395,12 +395,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
//check if they were a monkey
else if(findtext(G_found.real_name,"monkey"))
if(alert("This character appears to have been a monkey. Would you like to respawn them as such?",,"Yes","No")=="Yes")
var/mob/living/carbon/monkey/new_monkey = new
var/mob/living/carbon/human/species/monkey/new_monkey = new
SSjob.SendToLateJoin(new_monkey)
G_found.mind.transfer_to(new_monkey) //be careful when doing stuff like this! I've already checked the mind isn't in use
new_monkey.key = G_found.key
to_chat(new_monkey, "You have been fully respawned. Enjoy the game.", confidential = TRUE)
var/msg = "<span class='adminnotice'>[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy xeno.</span>"
var/msg = "<span class='adminnotice'>[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy monkey.</span>"
message_admins(msg)
admin_ticket_log(new_monkey, msg)
return //all done. The ghost is auto-deleted
code/modules/admin/view_variables/topic.dm
+3 -3
View File
@@ -64,9 +64,9 @@
if(!check_rights(R_SPAWN))
return
var/mob/living/carbon/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list
if(!istype(Mo))
to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey", confidential = TRUE)
var/mob/living/carbon/human/Mo = locate(href_list["makehuman"]) in GLOB.mob_list
if(!ismonkey(Mo))
to_chat(usr, "This can only be done to monkeys", confidential = TRUE)
return
if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")