mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 00:29:02 +01:00
[MIRROR] Moves Pun Pun away from the kitchen on Delta (and makes monkeys actually look like monkeys in the map editor) [MDB IGNORE] (#8958)
* Moves Pun Pun away from the kitchen on Delta (and makes monkeys actually look like monkeys in the map editor) (#62108) * Moves Pun Pun away from the kitchen on Delta (and makes monkeys actually look like monkeys in the map editor) * Update DeltaStation2.dmm Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
co-authored by
Ghom
Gandalf
parent
b99c7559f5
commit
95c6cd76b4
+36727
-36727
File diff suppressed because it is too large
Load Diff
@@ -281,7 +281,7 @@
|
||||
if(species == "unknown")
|
||||
. += "Some <B>feet</B>."
|
||||
else if(species == SPECIES_MONKEY)
|
||||
. += "[icon2html('icons/mob/monkey.dmi', user, "monkey1")] Some <B>monkey feet</B>."
|
||||
. += "[icon2html('icons/mob/human.dmi', user, "monkey")] Some <B>monkey feet</B>."
|
||||
else if(species == SPECIES_HUMAN)
|
||||
. += "[icon2html('icons/mob/human_parts.dmi', user, "default_human_l_leg")] Some <B>human feet</B>."
|
||||
else
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
/datum/antagonist/monkey/get_preview_icon()
|
||||
// Creating a *real* monkey is fairly involved before atoms init.
|
||||
var/icon/icon = icon('icons/mob/monkey.dmi', "monkey1")
|
||||
var/icon/icon = icon('icons/mob/human.dmi', "monkey")
|
||||
|
||||
icon.Crop(4, 9, 28, 33)
|
||||
icon.Scale(ANTAGONIST_PREVIEW_ICON_SIZE, ANTAGONIST_PREVIEW_ICON_SIZE)
|
||||
|
||||
@@ -654,7 +654,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
|
||||
A = image('icons/effects/effects.dmi',H,"nothing")
|
||||
A.name = "..."
|
||||
if("monkey")//Monkey
|
||||
A = image('icons/mob/monkey.dmi',H,"monkey1")
|
||||
A = image('icons/mob/human.dmi',H,"monkey")
|
||||
A.name = "Monkey ([rand(1,999)])"
|
||||
if("carp")//Carp
|
||||
A = image('icons/mob/carp.dmi',H,"carp")
|
||||
@@ -698,7 +698,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
|
||||
feedback_details += "Type: [kind]"
|
||||
switch(kind)
|
||||
if("monkey")//Monkey
|
||||
A = image('icons/mob/monkey.dmi',target,"monkey1")
|
||||
A = image('icons/mob/human.dmi',target,"monkey")
|
||||
if("carp")//Carp
|
||||
A = image('icons/mob/animal.dmi',target,"carp")
|
||||
if("corgi")//Corgi
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
/mob/living/simple_animal/holodeck_monkey
|
||||
name = "monkey"
|
||||
desc = "A holographic creature fond of bananas."
|
||||
icon = 'icons/mob/monkey.dmi'
|
||||
icon_state = "monkey1"
|
||||
icon_living = "monkey1"
|
||||
icon_dead = "monkey1_dead"
|
||||
icon = 'icons/mob/human.dmi'
|
||||
icon_state = "monkey"
|
||||
icon_living = "monkey"
|
||||
icon_dead = "monkey_dead"
|
||||
speak_emote = list("chimpers")
|
||||
emote_hear = list("chimpers.")
|
||||
emote_see = list("scratches.", "looks around.")
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
/mob/living/carbon/human/species/monkey
|
||||
icon_state = "monkey" //for mapping
|
||||
race = /datum/species/monkey
|
||||
ai_controller = /datum/ai_controller/monkey
|
||||
faction = list("neutral", "monkey")
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB |
Reference in New Issue
Block a user