cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Committing from the Proposed Commit forum:

Browse Source 
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:
johnsonmt88@gmail.com
2012-05-14 16:47:19 +00:00
parent 333ad1f318
commit d2736aa6ea
11 changed files with 38 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/defines/obj/hydro.dm
View File

@@ -1679,6 +1679,9 @@
reagents = R
R.my_atom = src
/obj/item/weapon/grown/proc/changePotency(newValue) //-QualityVan
potency = newValue
/obj/item/weapon/grown/log
name = "tower-cap log"
desc = "It's better than bad, it's good!"

8
code/game/machinery/hydroponics.dm
View File

@@ -820,7 +820,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
var/t_amount = 0
while ( t_amount < (yield * parent.yieldmod ))
var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new produce(user.loc, potency) // User gets a consumable
var/obj/item/weapon/grown/t_prod = new produce(user.loc, potency) // User gets a consumable -QualityVan
t_prod.seed = mypath
t_prod.species = species
t_prod.lifespan = lifespan
@@ -828,7 +828,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
t_prod.maturation = maturation
t_prod.production = production
t_prod.yield = yield
t_prod.potency = potency
t_prod.changePotency(potency) // -QualityVan
t_prod.plant_type = plant_type
t_amount++
@@ -840,7 +840,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
var/t_amount = 0
while ( t_amount < (yield * parent.yieldmod ))
var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new produce(user.loc, potency) // User gets a consumable
var/obj/item/weapon/grown/t_prod = new produce(user.loc, potency) // User gets a consumable -QualityVan
t_prod.seed = mypath
t_prod.species = species
t_prod.lifespan = lifespan
@@ -848,7 +848,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
t_prod.maturation = maturation
t_prod.production = production
t_prod.yield = yield
t_prod.potency = potency
t_prod.changePotency(potency) // -QualityVan
t_prod.plant_type = plant_type
t_amount++

8
code/game/objects/items/weapons/hydroponics.dm
View File

@@ -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)

5
code/game/objects/storage/storage.dm
View File

@@ -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

14
code/modules/chemical/Chemistry-Tools.dm
View File

@@ -551,10 +551,22 @@
for(var/mob/living/carbon/M in D.loc)
if(!istype(M,/mob/living/carbon)) continue
if(M == user) continue
//Syring gune attack logging by Yvarov
var/R
for(var/datum/reagent/A in D.reagents.reagent_list)
R += A.id + " ("
R += num2text(A.volume) + "),"
if (istype(M, /mob))
M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])"
user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])"
log_attack("<font color='red'>[user] ([user.ckey]) shot [M] ([M.ckey]) with a syringegun ([R])</font>")
else
M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>syringegun</b> ([R])"
log_attack("<font color='red'>UNKNOWN shot [M] ([M.ckey]) with a <b>syringegun</b> ([R])</font>")
D.reagents.trans_to(M, 15)
M.take_organ_damage(5)
for(var/mob/O in viewers(world.view, D))
O.show_message(text("\red [] was hit by the syringe!", M), 1)
O.show_message(text("\red [] is hit by the syringe!", M.name), 1)
del(D)
if(D)

18
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
View File

@@ -29,21 +29,7 @@
handle_regular_hud_updates()
if (src.stat == 2 || src.mutations & XRAY)
src.sight |= SEE_TURFS
src.sight |= SEE_MOBS
src.sight |= SEE_OBJS
src.see_in_dark = 8
src.see_invisible = 2
else if (src.stat != 2)
src.sight |= SEE_MOBS
src.sight |= SEE_TURFS
src.sight &= ~SEE_OBJS
src.see_in_dark = 5
src.see_invisible = 2
if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping)
if (src.rest) src.rest.icon_state = text("rest[]", src.resting)
..() //-Yvarov
if (src.healths)
if (src.stat != 2)
@@ -82,7 +68,7 @@
if(src.sleeping)
Paralyse(3)
if (prob(10) && health) spawn(0) emote("snore")
//if (prob(10) && health) spawn(0) emote("snore") Invalid Emote
src.sleeping--
if(src.resting)

18
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
View File

@@ -29,21 +29,7 @@
handle_regular_hud_updates()
if (src.stat == 2 || src.mutations & XRAY)
src.sight |= SEE_TURFS
src.sight |= SEE_MOBS
src.sight |= SEE_OBJS
src.see_in_dark = 8
src.see_invisible = 2
else if (src.stat != 2)
src.sight |= SEE_MOBS
src.sight &= SEE_TURFS
src.sight &= ~SEE_OBJS
src.see_in_dark = 7
src.see_invisible = 3
if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping)
if (src.rest) src.rest.icon_state = text("rest[]", src.resting)
..() //-Yvarov
if (src.healths)
if (src.stat != 2)
@@ -83,7 +69,7 @@
if(src.sleeping)
Paralyse(3)
if (prob(10) && health) spawn(0) emote("snore")
//if (prob(10) && health) spawn(0) emote("snore") Invalid Emote
src.sleeping--
if(src.resting)

2
code/modules/mob/living/carbon/alien/humanoid/life.dm
View File

@@ -404,7 +404,7 @@
if(src.sleeping)
Paralyse(3)
if (prob(10) && health) spawn(0) emote("snore")
//if (prob(10) && health) emote("snore") //Invalid emote for aliens, but it might be worth making sleep noticeable somehow -Yvarov
src.sleeping--
if(src.resting)

18
code/modules/mob/living/carbon/alien/humanoid/queen.dm
View File

@@ -32,21 +32,7 @@
handle_regular_hud_updates()
if (src.stat == 2 || src.mutations & XRAY)
src.sight |= SEE_TURFS
src.sight |= SEE_MOBS
src.sight |= SEE_OBJS
src.see_in_dark = 8
src.see_invisible = 2
else if (src.stat != 2)
src.sight |= SEE_MOBS
src.sight |= SEE_TURFS
src.sight &= ~SEE_OBJS
src.see_in_dark = 8
src.see_invisible = 2
if (src.sleep) src.sleep.icon_state = text("sleep[]", src.sleeping)
if (src.rest) src.rest.icon_state = text("rest[]", src.resting)
..() //-Yvarov
if (src.healths)
if (src.stat != 2)
@@ -84,7 +70,7 @@
if(src.sleeping)
Paralyse(3)
if (prob(10) && health) spawn(0) emote("snore")
//if (prob(10) && health) spawn(0) emote("snore") Invalid Emote
src.sleeping--
if(src.resting)

2
code/modules/mob/living/carbon/alien/larva/life.dm
View File

@@ -327,7 +327,7 @@
if(sleeping)
Paralyse(3)
if (prob(10) && health) spawn(0) emote("snore")
//if (prob(10) && health) spawn(0) emote("snore") Invalid Emote
sleeping--
if(resting)

2
code/modules/mob/new_player/sprite_accessories.dm
View File

@@ -157,7 +157,7 @@
hogan
name = "Hulk Hogan Mustache"
icon_state = "facial_chaplin"
icon_state = "facial_hogan" //-Neek
vandyke
name = "Van Dyke Mustache"