mirror of
https://github.com/KabKebab/GS13.git
synced 2026-08-23 04:56:23 +01:00
Stargate map changes and additions + new mineral wall sprites
This commit is contained in:
@@ -181,3 +181,11 @@
|
||||
throwforce = 15 //Massive pice of metal
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
item_flags = SLOWS_WHILE_IN_HAND
|
||||
|
||||
obj/item/shield/riot/egyptian
|
||||
name = "Egyptian Shield"
|
||||
desc = "A tower shield decorated with jewelry and gold."
|
||||
icon_state = "egyptian_shield"
|
||||
item_state = "egyptian_shield"
|
||||
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
|
||||
@@ -322,6 +322,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
|
||||
new/datum/stack_recipe("grey jumpsuit", /obj/item/clothing/under/color/grey, 3), \
|
||||
new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/sneakers/black, 2), \
|
||||
new/datum/stack_recipe("cloth footwraps", /obj/item/clothing/shoes/footwraps, 2), \
|
||||
new/datum/stack_recipe("tunic", /obj/item/clothing/under/tunic, 3), \
|
||||
null, \
|
||||
new/datum/stack_recipe("backpack", /obj/item/storage/backpack, 4), \
|
||||
new/datum/stack_recipe("duffel bag", /obj/item/storage/backpack/duffelbag, 6), \
|
||||
|
||||
@@ -732,3 +732,27 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
|
||||
M.visible_message("<span class='userdanger'>[user] has [pick(attack_verb)] [M] on the ass!</span>")
|
||||
else
|
||||
return ..(M, user)
|
||||
|
||||
/obj/item/khopesh
|
||||
name = "khopesh"
|
||||
desc = "An sickle-shaped sword that evolved from battle axes"
|
||||
icon_state = "khopesh"
|
||||
item_state = "khopesh"
|
||||
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
flags_1 = CONDUCT_1
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
force = 30
|
||||
throwforce = 10
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
sharpness = IS_SHARP
|
||||
max_integrity = 200
|
||||
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
|
||||
resistance_flags = FIRE_PROOF
|
||||
total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
|
||||
|
||||
/obj/item/khopesh/suicide_act(mob/user)
|
||||
user.visible_message("<span class='suicide'>[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||
return(BRUTELOSS)
|
||||
@@ -55,6 +55,27 @@
|
||||
/obj/item/clothing/shoes/winterboots,
|
||||
/obj/item/clothing/suit/hooded/wintercoat)
|
||||
|
||||
/mob/living/simple_animal/hostile/skeleton/villager
|
||||
name = "undead villager"
|
||||
desc = "The reanimated remains of some poor villager."
|
||||
icon_state = "villager"
|
||||
icon_living = "villager"
|
||||
icon_dead = "villager"
|
||||
deathmessage = "collapses into a pile of bones!"
|
||||
loot = list(/obj/effect/decal/remains/human)
|
||||
|
||||
/mob/living/simple_animal/hostile/skeleton/bone_warrior
|
||||
name = "bone warrior"
|
||||
desc = "An armed undead, wearing armor made of fallen skeletons."
|
||||
icon_state = "bone_warrior"
|
||||
icon_living = "bone_warrior"
|
||||
icon_dead = "bone_warrior"
|
||||
maxHealth = 100
|
||||
health = 100
|
||||
melee_damage_lower = 20
|
||||
melee_damage_upper = 25
|
||||
deathmessage = "collapses into a pile of bones, its armor turning into ashes!"
|
||||
loot = list(/obj/effect/decal/remains/human)
|
||||
|
||||
/mob/living/simple_animal/hostile/skeleton/templar
|
||||
name = "undead templar"
|
||||
|
||||
Reference in New Issue
Block a user