cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-20 04:17:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #570 from ArchieBeepBoop/enginemapfixes

Browse Source 
Some map fixes + changes
This commit is contained in:
QuoteFox
2020-10-12 15:35:06 +01:00
committed by GitHub
parent 4b28162d04 2381dd7504
commit 92d1fbaf1f
11 changed files with 160 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ruins/station.dm
+4 -4
View File
@@ -37,20 +37,20 @@
/datum/map_template/ruin/station/box/engine/teg
id = "engine_teg"
suffix = "Box/Engine/engine_tesla.dmm"
suffix = "Box/Engine/engine_teg.dmm"
name = "Box TEG"
/datum/map_template/ruin/station/box/engine/empty
id = "engine_empty"
suffix = "Box/Engine/engine_tesla.dmm"
suffix = "Box/Engine/empty.dmm"
name = "Box Empty"
/datum/map_template/ruin/station/box/engine/am
id = "engine_am"
suffix = "Box/Engine/engine_tesla.dmm"
suffix = "Box/Engine/engine_am.dmm"
name = "Box Antimatter"
/datum/map_template/ruin/station/box/engine/budget
id = "engine_budget"
suffix = "Box/Engine/engine_tesla.dmm"
suffix = "Box/Engine/budget.dmm"
name = "Box P.A.C.M.A.N"
code/modules/mob/living/simple_animal/friendly/dog.dm
+1 -1
View File
@@ -20,7 +20,7 @@
/mob/living/simple_animal/pet/dog/ComponentInitialize()
. = ..()
AddElement(/datum/element/wuv, "yaps_happily!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "growls!", EMOTE_AUDIBLE)
AddElement(/datum/element/wuv, "yaps happily!", EMOTE_AUDIBLE, /datum/mood_event/pet_animal, "growls!", EMOTE_AUDIBLE)
AddElement(/datum/element/mob_holder, held_icon)
//Corgis and pugs are now under one dog subtype