diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 6add219b854..61cbeef2ec0 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -156,4 +156,11 @@ desc = "Eeeee~heheheheheheh!" icon_state = "witch" item_state = "witch" - flags = FPRINT | TABLEPASS | BLOCKHAIR \ No newline at end of file + flags = FPRINT | TABLEPASS | BLOCKHAIR + +/obj/item/clothing/head/bearpelt + name = "bear pelt hat" + desc = "Fuzzy." + icon_state = "bearpelt" + item_state = "bearpelt" + flags = FPRINT | TABLEPASS | BLOCKHAIR diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index fb39388a799..38765358be5 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -120,6 +120,8 @@ corpseidjob = "Clown" corpseidaccess = "Clown" + + /obj/effect/landmark/mobcorpse/pirate name = "Pirate" corpseuniform = /obj/item/clothing/under/pirate @@ -127,9 +129,20 @@ corpseglasses = /obj/item/clothing/glasses/eyepatch corpsehelmet = /obj/item/clothing/head/bandana -/obj/effect/landmark/mobcorpse/pirateranged - name = "Pirate" - corpseuniform = /obj/item/clothing/under/pirate - corpseshoes = /obj/item/clothing/shoes/jackboots + + +/obj/effect/landmark/mobcorpse/pirate/ranged + name = "Pirate Gunner" corpsesuit = /obj/item/clothing/suit/pirate - corpsehelmet = /obj/item/clothing/head/pirate \ No newline at end of file + corpsehelmet = /obj/item/clothing/head/pirate + + + +/obj/effect/landmark/mobcorpse/russian + name = "Russian" + corpseuniform = /obj/item/clothing/under/soviet + corpseshoes = /obj/item/clothing/shoes/jackboots + corpsehelmet = /obj/item/clothing/head/bearpelt + +/obj/effect/landmark/mobcorpse/russian/ranged + corpsehelmet = /obj/item/clothing/head/ushanka \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 587e9969d5a..ccf015adcba 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -7,6 +7,8 @@ desc = "A small robot" icon = 'icons/mob/hivebot.dmi' icon_state = "basic" + icon_living = "basic" + icon_dead = "basic" health = 15 maxHealth = 15 melee_damage_lower = 2 @@ -15,6 +17,15 @@ projectilesound = 'sound/weapons/Gunshot.ogg' projectiletype = /obj/item/projectile/hivebotbullet faction = "hivebot" + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 /mob/living/simple_animal/hostile/hivebot/range name = "Hivebot" @@ -47,6 +58,7 @@ desc = "Some odd beacon thing" icon = 'icons/mob/hivebot.dmi' icon_state = "def_radar-off" + icon_living = "def_radar-off" health = 200 maxHealth = 200 status_flags = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm index 41f89fd5148..6c2d55df6c4 100644 --- a/code/modules/mob/living/simple_animal/hostile/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm @@ -43,7 +43,7 @@ ranged = 1 rapid = 1 projectiletype = /obj/item/projectile/beam - corpse = /obj/effect/landmark/mobcorpse/pirateranged + corpse = /obj/effect/landmark/mobcorpse/pirate/ranged weapon1 = /obj/item/weapon/gun/energy/laser diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm new file mode 100644 index 00000000000..ec2f9dcfd7e --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/russian.dm @@ -0,0 +1,55 @@ +/mob/living/simple_animal/hostile/russian + name = "Russian" + desc = "For the Motherland!" + icon_state = "russianmelee" + icon_living = "russianmelee" + icon_dead = "russianmelee_dead" + icon_gib = "syndicate_gib" + speak_chance = 0 + turns_per_move = 5 + response_help = "pokes the" + response_disarm = "shoves the" + response_harm = "hits the" + speed = -1 + stop_automated_movement_when_pulled = 0 + maxHealth = 100 + health = 100 + harm_intent_damage = 5 + melee_damage_lower = 15 + melee_damage_upper = 15 + attacktext = "punches" + a_intent = "harm" + var/corpse = /obj/effect/landmark/mobcorpse/russian + var/weapon1 = /obj/item/weapon/kitchenknife + min_oxy = 5 + max_oxy = 0 + min_tox = 0 + max_tox = 1 + min_co2 = 0 + max_co2 = 5 + min_n2 = 0 + max_n2 = 0 + unsuitable_atoms_damage = 15 + faction = "russian" + status_flags = CANPUSH + + +/mob/living/simple_animal/hostile/russian/ranged + icon_state = "russianranged" + icon_living = "russianranged" + corpse = /obj/effect/landmark/mobcorpse/russian/ranged + weapon1 = /obj/item/weapon/gun/projectile/mateba + ranged = 1 + projectiletype = /obj/item/projectile/bullet + projectilesound = 'sound/weapons/Gunshot.ogg' + casingtype = /obj/item/ammo_casing/a357 + + +/mob/living/simple_animal/hostile/russian/Die() + ..() + if(corpse) + new corpse (src.loc) + if(weapon1) + new weapon1 (src.loc) + del src + return \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 05a1db3a956..eaf0ce60657 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -137,6 +137,7 @@ name = "viscerator" desc = "A small, twin-bladed machine capable of inflicting very deadly lacerations." icon_state = "viscerator" + icon_living = "viscerator" pass_flags = PASSTABLE health = 15 maxHealth = 15 @@ -145,6 +146,15 @@ attacktext = "cuts" attack_sound = 'sound/weapons/bladeslice.ogg' faction = "syndicate" + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 /mob/living/simple_animal/hostile/viscerator/Die() ..() diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 2145c4c9896..61bfae94086 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 4f78aaba6b6..e1955f82c8e 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 530ab96fc52..b8c1bd2379b 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 73be7396dfa..d3f20cf17b3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -212,7 +212,6 @@ #define FILE_DIR "interface" #define FILE_DIR "maps" #define FILE_DIR "maps/RandomZLevels" -#define FILE_DIR "maps/RandomZLevels/backup" #define FILE_DIR "music" #define FILE_DIR "music/interface" #define FILE_DIR "sound" @@ -1133,6 +1132,7 @@ #include "code\modules\mob\living\simple_animal\hostile\hivebot.dm" #include "code\modules\mob\living\simple_animal\hostile\hostile.dm" #include "code\modules\mob\living\simple_animal\hostile\pirate.dm" +#include "code\modules\mob\living\simple_animal\hostile\russian.dm" #include "code\modules\mob\living\simple_animal\hostile\syndicate.dm" #include "code\modules\mob\new_player\hud.dm" #include "code\modules\mob\new_player\login.dm"