cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue with invisible inventory-sprite for LUNE

Browse Source 
Also moved the custom synthetic sprites into their own subfolder of the
mob icons folder.

Created 3 new dmi files to support left and right inhands as well as
head on-mob sprites for custom synthetics, moving the states from
custom-synthetic.dmi into their new files as appropriate. Yes, this
kinda splits them up a bit, but thats why i made the folder!
This commit is contained in:
FalseIncarnate
2017-03-15 23:17:37 -04:00
parent 5a4ac30071
commit 56b52d8c64
8 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/ai/ai.dm
+5 -5
View File
@@ -304,7 +304,7 @@ var/list/ai_verbs_default = list(
if(Entry[2] == ckey && Entry[3] == real_name) //They're in the list? Custom sprite time, var and icon change required
custom_sprite = 1
icon = 'icons/mob/custom-synthetic.dmi'
icon = 'icons/mob/custom_synthetic/custom-synthetic.dmi'
//if(icon_state == initial(icon_state))
@@ -971,10 +971,10 @@ var/list/ai_verbs_default = list(
if("ancient machine")
holo_icon = getHologramIcon(icon('icons/mob/ancient_machine.dmi', "ancient_machine"))
if("custom")
if("[ckey]-ai-holo" in icon_states('icons/mob/custom-synthetic.dmi'))
holo_icon = getHologramIcon(icon('icons/mob/custom-synthetic.dmi', "[ckey]-ai-holo"))
else if("[ckey]-ai-holo" in icon_states('icons/mob/custom-synthetic64.dmi'))
holo_icon = getHologramIcon(icon('icons/mob/custom-synthetic64.dmi', "[ckey]-ai-holo"))
if("[ckey]-ai-holo" in icon_states('icons/mob/custom_synthetic/custom-synthetic.dmi'))
holo_icon = getHologramIcon(icon('icons/mob/custom_synthetic/custom-synthetic.dmi', "[ckey]-ai-holo"))
else if("[ckey]-ai-holo" in icon_states('icons/mob/custom_synthetic/custom-synthetic64.dmi'))
holo_icon = getHologramIcon(icon('icons/mob/custom_synthetic/custom-synthetic64.dmi', "[ckey]-ai-holo"))
else
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))
code/modules/mob/living/silicon/pai/pai.dm
+6 -5
View File
@@ -414,7 +414,7 @@
if(Entry[2] == ckey && Entry[3] == real_name) //They're in the list? Custom sprite time, var and icon change required
custom_sprite = 1
icon = 'icons/mob/custom-synthetic.dmi'
icon = 'icons/mob/custom_synthetic/custom-synthetic.dmi'
if(custom_sprite)
chassis = "[ckey]-pai"
@@ -594,10 +594,11 @@
icon_state = "[chassis]"
resting = 0
if(custom_sprite)
H.icon_override = 'icons/mob/custom-synthetic.dmi'
H.lefthand_file = 'icons/mob/custom-synthetic.dmi' //unless we want to make a new file for the left and right in-hands for custom pAIs...
H.righthand_file = 'icons/mob/custom-synthetic.dmi' //you'll want to just use one in-hand sprite that looks the same in both hands. --FalseIncarnate
H.icon_state = "[icon_state]_head"
H.icon = 'icons/mob/custom_synthetic/custom-synthetic.dmi'
H.icon_override = 'icons/mob/custom_synthetic/custom_head.dmi'
H.lefthand_file = 'icons/mob/custom_synthetic/custom_lefthand.dmi'
H.righthand_file = 'icons/mob/custom_synthetic/custom_righthand.dmi'
H.icon_state = "[icon_state]"
H.item_state = "[icon_state]_hand"
else
H.icon_state = "pai-[icon_state]"
code/modules/mob/living/silicon/robot/robot.dm
+1 -1
View File
@@ -189,7 +189,7 @@ var/list/robot_verbs_default = list(
if(Entry[2] == ckey && Entry[3] == real_name) //They're in the list? Custom sprite time, var and icon change required
custom_sprite = 1
icon = 'icons/mob/custom-synthetic.dmi'
icon = 'icons/mob/custom_synthetic/custom-synthetic.dmi'
return 1