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

[MIRROR] [IDB IGNORE] [MDB IGNORE] Makes the icons/mob folder sane [MDB IGNORE] (#16030)

Browse Source 
* [IDB IGNORE] [MDB IGNORE] Makes the icons/mob folder sane

* fix map merges

* icon paths and merge conflicts

Co-authored-by: skylord-a52 <skylord-a52@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2022-09-24 20:10:28 -04:00
committed by GitHub
co-authored by skylord-a52 tastyfish
parent e1b1166239
commit d27cd97f74
302 changed files with 489 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/mapping.dm
+4 -4
View File
@@ -301,9 +301,9 @@ GLOBAL_VAR_INIT(say_disabled, FALSE)
var/datum/job/JB = new job
switch(JB.title)
if(JOB_AI)
final.Insert(icon('icons/mob/ai.dmi', "ai", SOUTH, 1), "AI")
final.Insert(icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1), "AI")
if(JOB_CYBORG)
final.Insert(icon('icons/mob/robots.dmi', "robot", SOUTH, 1), "Cyborg")
final.Insert(icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1), "Cyborg")
else
for(var/obj/item/I in D)
qdel(I)
@@ -331,9 +331,9 @@ GLOBAL_VAR_INIT(say_disabled, FALSE)
to_chat(world, "Generating icon for job [JB.title]")
switch(JB.title)
if("AI")
job_key_to_icon["AI"] = icon('icons/mob/ai.dmi', "ai", SOUTH, 1)
job_key_to_icon["AI"] = icon('icons/mob/silicon/ai.dmi', "ai", SOUTH, 1)
if("Cyborg")
job_key_to_icon["Cyborg"] = icon('icons/mob/robots.dmi', "robot", SOUTH, 1)
job_key_to_icon["Cyborg"] = icon('icons/mob/silicon/robots.dmi', "robot", SOUTH, 1)
else
randomize_human(D)
if(JB.outfit)