cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Made facehugger ignore mobs disease.

Browse Source 
- Added disease longevity
- Added magboots. They prevent slipping. In space or on wet floors. Found in EVA.
- Small meteor fixes.
- Some comments and general faggotry.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@364 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
panurgomatic
2010-11-02 06:44:11 +00:00
parent 2ca03bb86a
commit 18e52e6a09
16 changed files with 131 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/alien/facehugger.dm
+2
View File
@@ -247,6 +247,8 @@
target.alien_egg_flag = 1
var/mob/trg = target
src.death()
if(trg.virus)
trg.virus.cure(0)
trg.contract_disease(new /datum/disease/alien_embryo(0))
return
else
code/game/objects/devices/PDA.dm
+1 -1
View File
@@ -1477,7 +1477,7 @@ Code:
/obj/item/device/pda/clown/HasEntered(AM as mob|obj) //Clown PDA is slippery.
if (istype(AM, /mob/living/carbon))
var/mob/M = AM
if ((istype(M, /mob/living/carbon/human) && istype(M:shoes, /obj/item/clothing/shoes/galoshes)) || M.m_intent == "walk")
if ((istype(M, /mob/living/carbon/human) && (istype(M:shoes, /obj/item/clothing/shoes) && M:shoes.flags&NOSLIP)) || M.m_intent == "walk")
return
if ((istype(M, /mob/living/carbon/human) && (M.real_name != src.owner) && (istype(src.cartridge, /obj/item/weapon/cartridge/clown))))
code/game/objects/effect_system.dm
+1 -1
View File
@@ -681,7 +681,7 @@ steam.start() -- spawns the effect
if (istype(AM, /mob/living/carbon))
var/mob/M = AM
if ((istype(M, /mob/living/carbon/human) && istype(M:shoes, /obj/item/clothing/shoes/galoshes)))
if (istype(M, /mob/living/carbon/human) && (istype(M:shoes, /obj/item/clothing/shoes) && M:shoes.flags&NOSLIP))
return
M.pulling = null
code/game/objects/items/clothing.dm
+19 -1
View File
@@ -306,4 +306,22 @@ DEATH COMMANDO GAS MASK
/obj/item/clothing/under/color/orange/mode = 3
/obj/item/clothing/under/color/orange/attack_self(mob/user as mob)
user << "There are no controls for the sensing equipment woven into the fabric."
user << "There are no controls for the sensing equipment woven into the fabric."
/obj/item/clothing/shoes/magboots/attack_self(mob/user as mob)
if(src.flags&NOSLIP)
src.flags &= ~NOSLIP
icon_state = "magboots0"
user << "You disable the mag-pulse traction system."
else
src.flags |= NOSLIP
icon_state = "magboots1"
user << "You enable the mag-pulse traction system."
/obj/item/clothing/shoes/magboots/examine()
..()
var/state = "disabled"
if(src.flags&NOSLIP)
state = "enabled"
usr << "Its mag-pulse traction system appears to be [state]."
code/game/objects/items/weapons/clown_items.dm
+1 -1
View File
@@ -21,7 +21,7 @@ BIKE HORN
/obj/item/weapon/bananapeel/HasEntered(AM as mob|obj)
if (istype(AM, /mob/living/carbon))
var/mob/M = AM
if ((istype(M, /mob/living/carbon/human) && istype(M:shoes, /obj/item/clothing/shoes/galoshes)))
if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))
return
M.pulling = null