cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tribal-crafting-port' of https://github.com/nmajask/Yogstation-But-Worse into tribal-crafting-port

Browse Source
This commit is contained in:
nmajask
2022-05-12 19:39:10 -04:00
parent b0396f5085 5bc32df35a
commit 32967243c7
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/components/crafting/guncrafting.dm
View File

@@ -16,6 +16,6 @@
/obj/item/weaponcrafting/silkstring
name = "silkstring"
desc = "A long piece of Silk that looks like a cable coil."
desc = "A long piece of silk, which looks like a cable coil."
icon = 'icons/obj/improvised.dmi'
icon_state = "silkstring"

2
code/datums/status_effects/debuffs.dm
View File

@@ -1118,7 +1118,7 @@
/datum/status_effect/slowdown/watcherbola/on_apply()
if(ismegafauna(owner))
owner.visible_message(span_warning("[owner] easily brakes out of \the [original_legcuffs]"), span_warning("You easily brake out of \the [original_legcuffs]"))
owner.visible_message(span_warning("[owner] easily breaks out of \the [original_legcuffs]"), span_warning("You easily break out of \the [original_legcuffs]"))
qdel(original_legcuffs)
return FALSE
..()

4
code/game/objects/items/handcuffs.dm
View File

@@ -388,8 +388,8 @@
break_strength = 4
/obj/item/restraints/legcuffs/bola/watcher //tribal bola for tribal lizards
name = "watcher Bola"
desc = "A Bola made from the stretchy sinew of fallen watchers."
name = "watcher bola"
desc = "A bola made from the stretchy sinew of fallen watchers."
icon_state = "bola_watcher"
item_state = "bola_watcher"
breakouttime = 45

6
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -487,7 +487,7 @@
/obj/item/clothing/shoes/xeno_wraps/goliath
name = "goliath hide footwraps"
desc = "These make your feet feel snug and secure, while still being breathable and light."
desc = "These make your feet feel well protected and plated."
icon_state = "footwraps_goliath"
item_state = "footwraps_goliath"
armor = list("melee" = 5, "bullet" = 5, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 0)
@@ -498,7 +498,7 @@
/obj/item/clothing/shoes/xeno_wraps/dragon
name = "ash drake hide footwraps"
desc = "These make your feet feel snug and secure, while still being breathable and light."
desc = "These make your feet feel like they're wrapped in sandpaper. Positively draconian!"
icon_state = "footwraps_dragon"
item_state = "footwraps_dragon"
armor = list("melee" = 10, "bullet" = 10, "laser" = 15, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 0)
@@ -510,7 +510,7 @@
/obj/item/clothing/shoes/xeno_wraps/carpdragon
name = "carp dragon hide footwraps"
desc = "These make your feet feel snug and secure, while still being breathable and light."
desc = "These make your feet feel like they're wrapped in wet oily sandpaper. Disgusting, but oddly comfortable."
icon_state = "footwraps_carpdragon"
item_state = "footwraps_carpdragon"
armor = list("melee" = 15, "bullet" = 15, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 0)

6
code/modules/clothing/suits/armor.dm
View File

@@ -322,7 +322,7 @@
/obj/item/clothing/suit/hooded/cloak/goliath
name = "goliath cloak"
icon_state = "goliath_cloak"
desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits."
desc = "A staunch, practical cape made out of numerous monster materials. It is coveted amongst exiles and hermits."
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/twohanded/bonespear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat/bone, /obj/item/kitchen/knife/combat/survival)
armor = list("melee" = 35, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 10) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot
hoodtype = /obj/item/clothing/head/hooded/cloakhood/goliath
@@ -331,7 +331,7 @@
/obj/item/clothing/head/hooded/cloakhood/goliath
name = "goliath cloak hood"
icon_state = "golhood"
desc = "A protective & concealing hood."
desc = "A protective, concealing hood."
armor = list("melee" = 35, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50, "wound" = 10)
flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
transparent_protection = HIDEMASK
@@ -373,7 +373,7 @@
/obj/item/clothing/head/hooded/cloakhood/bone
name = "bone helmet"
icon_state = "hskull"
desc = "An intimidating tribal helmet, it doesn't look very comfortable."
desc = "An intimidating tribal helmet! It doesn't look very comfortable."
armor = list("melee" = 35, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT

2
code/modules/clothing/under/accessories.dm
View File

@@ -369,7 +369,7 @@
/obj/item/clothing/accessory/skilt
name = "Sinew Skirt"
desc = "For the last time. IT'S A KILT not a skirt."
desc = "A revolting piece of clothing made from sinew. Arguably, it is a kilt, not a skirt."
icon_state = "skilt"
item_color = "skilt"
above_suit = TRUE

12
code/modules/projectiles/ammunition/caseless/arrow.dm
View File

@@ -31,7 +31,7 @@
/obj/item/ammo_casing/caseless/arrow/bola
name = "bola arrow"
desc = "An arrow made from wood. a bola is wrapped around it."
desc = "An arrow made from wood, with a bola wrapped around it."
projectile_type = /obj/item/projectile/bullet/reusable/arrow/bola
/obj/item/ammo_casing/caseless/arrow/bola/Initialize()
@@ -58,7 +58,7 @@
/obj/item/ammo_casing/caseless/arrow/explosive
name = "explosive arrow"
desc = "An arrow made from wood. an explosive is attached to it."
desc = "An arrow made from wood. An explosive is attached to it."
projectile_type = /obj/item/projectile/bullet/reusable/arrow/explosive
/obj/item/ammo_casing/caseless/arrow/explosive/Initialize()
@@ -107,28 +107,28 @@
/obj/item/ammo_casing/caseless/arrow/energy
name = "energy bolt"
desc = "An arrow made from hardlight."
desc = "A hardlight arrow."
icon_state = "arrow_energy"
projectile_type = /obj/item/projectile/energy/arrow
var/overlay_state = "redlight"
/obj/item/ammo_casing/caseless/arrow/energy/disabler
name = "disabler bolt"
desc = "An arrow made from hardlight. This one stuns the victim in a non-lethal way."
desc = "A modified hardlight arrow. This one stuns the victim non-lethally."
icon_state = "arrow_disable"
overlay_state = "disable"
projectile_type = /obj/item/projectile/energy/arrow/disabler
/obj/item/ammo_casing/caseless/arrow/energy/pulse
name = "pulse bolt"
desc = "An arrow made from hardlight. This one can destroy most obstructions in one hit."
desc = "A modified hardlight arrow. This one is extremely powerful, and can destroy most obstructions in a single shot."
icon_state = "arrow_pulse"
overlay_state = "pulse"
projectile_type = /obj/item/projectile/energy/arrow/pulse
/obj/item/ammo_casing/caseless/arrow/energy/xray
name = "X-ray bolt"
desc = "An arrow made from hardlight. This one can pass through obstructions."
desc = "A modified hardlight arrow. This one can pass right through obstructions."
icon_state = "arrow_xray"
overlay_state = "xray"
projectile_type = /obj/item/projectile/energy/arrow/xray

4
code/modules/projectiles/guns/ballistic/bow.dm
View File

@@ -87,7 +87,7 @@
/obj/item/gun/ballistic/bow/energy
name = "Hardlight Bow"
desc = "A modern bow that can fabricate hardlight arrows using an internal energy."
desc = "A modern bow that can fabricate hardlight arrows using internal energy."
icon_state = "bow_hardlight"
mag_type = /obj/item/ammo_box/magazine/internal/bow/energy
var/recharge_time = 1.5 SECONDS
@@ -186,7 +186,7 @@
/obj/item/gun/ballistic/bow/energy/syndicate
name = "Syndicate Hardlight Bow"
desc = "A modern bow that can fabricate hardlight arrows using an internal energy. This one is designed for silent takedowns of targets by the syndicate."
desc = "A modern bow that can fabricate hardlight arrows using internal energy. This one is designed by the Syndicate for silent takedowns."
icon_state = "bow_syndicate"
mag_type = /obj/item/ammo_box/magazine/internal/bow/energy/syndicate
recharge_time = 2 SECONDS