mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-07-11 15:13:37 +01:00
Committing from the Proposed Commit forum:
Work by Neek - Hulk Hogan moustache fix Work by Yvarov - Alien Unconciousness fix (Fixes Issue 283) - - Also commented out alien snoring all over because aliens don't snore. - Replacement light box fix (Fixes Issue 398) - Syringe gun attack logs added (Fixes Issue 465) Work by QualityVan - Nettle and Death Nettle force based on potency. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3593 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -97,6 +97,10 @@ Craftables (Cob pipes, potato batteries, pumpkinheads)
|
||||
usr << "All the leaves have fallen off the nettle from violent whacking."
|
||||
del(src)
|
||||
|
||||
/obj/item/weapon/grown/nettle/changePotency(newValue) //-QualityVan
|
||||
potency = newValue
|
||||
force = round((5+potency/5), 1)
|
||||
|
||||
|
||||
// Deathnettle
|
||||
|
||||
@@ -135,6 +139,10 @@ Craftables (Cob pipes, potato batteries, pumpkinheads)
|
||||
usr << "All the leaves have fallen off the deathnettle from violent whacking."
|
||||
del(src)
|
||||
|
||||
/obj/item/weapon/grown/deathnettle/changePotency(newValue) //-QualityVan
|
||||
potency = newValue
|
||||
force = round((5+potency/2.5), 1)
|
||||
|
||||
//Crafting
|
||||
|
||||
/obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
|
||||
@@ -230,11 +230,8 @@
|
||||
src.closer.icon_state = "x"
|
||||
src.closer.layer = 20
|
||||
spawn( 5 )
|
||||
var/col_num = 0
|
||||
var/row_count = min(7,storage_slots) -1
|
||||
if (contents.len > 7)
|
||||
if(contents.len % 7)
|
||||
col_num = round(contents.len / 7) // 7 is the maximum allowed column height for r_hand, l_hand and back storage items.
|
||||
var/col_num = round((storage_slots - 1) / 7) // 7 is the maximum allowed column height for r_hand, l_hand and back storage items. -Yvarov
|
||||
src.orient_objs(5, 10+col_num, 5 + row_count, 10)
|
||||
return
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user