mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
- Something like a global map for extended and sandbox gamemodes. Explore space, blow up the asteroids, collect resources, build your own station. WIP
- Exosuit object. Patrially working. WIP. - Disease transmission on touch - Various minor changes. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@386 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -600,6 +600,7 @@ to clean it up, or just beat the shit out of it (which takes ages).
|
||||
return
|
||||
|
||||
/mob/living/carbon/alien/humanoid/attack_paw(mob/M as mob)
|
||||
..()
|
||||
if (M.a_intent == "help")
|
||||
src.sleeping = 0
|
||||
src.resting = 0
|
||||
@@ -628,6 +629,8 @@ to clean it up, or just beat the shit out of it (which takes ages).
|
||||
M << "No attacking people at spawn, you jackass."
|
||||
return
|
||||
|
||||
..()
|
||||
|
||||
if ((M.gloves && M.gloves.elecgen == 1 && M.a_intent == "hurt") /*&& (!istype(src:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
|
||||
if(M.gloves.uses > 0)
|
||||
M.gloves.uses--
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
if(M.client)
|
||||
M.show_message(text("\red <B>[user] attacks [src]'s stomach wall with the [I.name]!"), 2)
|
||||
playsound(user.loc, 'attackblob.ogg', 50, 1)
|
||||
|
||||
|
||||
if(prob(src.bruteloss - 50))
|
||||
src.gib()
|
||||
|
||||
@@ -41,4 +41,40 @@
|
||||
for(var/mob/N in viewers(src, null))
|
||||
if(N.client)
|
||||
N.show_message(text("\red <B>[M] bursts out of [src]!</B>"), 2)
|
||||
. = ..(give_medal)
|
||||
. = ..(give_medal)
|
||||
|
||||
|
||||
/mob/living/carbon/attack_hand(mob/M as mob)
|
||||
if(!istype(M, /mob/living/carbon)) return
|
||||
if(src.virus || M.virus)
|
||||
var/s_spread_type
|
||||
if(src.virus && src.virus.spread_type!=SPECIAL && src.virus.spread_type!=AIRBORNE)
|
||||
s_spread_type = src.virus.spread_type
|
||||
src.virus.spread_type = CONTACT_HANDS
|
||||
M.contract_disease(src.virus)
|
||||
src.virus.spread_type = s_spread_type
|
||||
|
||||
if(M.virus && M.virus.spread_type!=SPECIAL && M.virus.spread_type!=AIRBORNE)
|
||||
s_spread_type = M.virus.spread_type
|
||||
M.virus.spread_type = CONTACT_GENERAL
|
||||
src.contract_disease(M.virus)
|
||||
M.virus.spread_type = s_spread_type
|
||||
return
|
||||
|
||||
|
||||
/mob/living/carbon/attack_paw(mob/M as mob)
|
||||
if(!istype(M, /mob/living/carbon)) return
|
||||
if(src.virus || M.virus)
|
||||
var/s_spread_type
|
||||
if(src.virus && src.virus.spread_type!=SPECIAL && src.virus.spread_type!=AIRBORNE)
|
||||
s_spread_type = src.virus.spread_type
|
||||
src.virus.spread_type = CONTACT_HANDS
|
||||
M.contract_disease(src.virus)
|
||||
src.virus.spread_type = s_spread_type
|
||||
|
||||
if(M.virus && M.virus.spread_type!=SPECIAL && M.virus.spread_type!=AIRBORNE)
|
||||
s_spread_type = M.virus.spread_type
|
||||
M.virus.spread_type = CONTACT_GENERAL
|
||||
src.contract_disease(M.virus)
|
||||
M.virus.spread_type = s_spread_type
|
||||
return
|
||||
@@ -56,6 +56,9 @@
|
||||
usr << "\red [src.name] has a[src.belt.blood_DNA ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
|
||||
else
|
||||
usr << "\blue [src.name] has a \icon[src.belt] [src.belt.name] on [t_his] belt."
|
||||
if (src.shoes)
|
||||
usr << "[src.shoes.blood_DNA ? "\red" : "\blue"] [src.name] has a[src.shoes.blood_DNA ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
|
||||
|
||||
|
||||
if (src.gloves)
|
||||
if (src.gloves.blood_DNA)
|
||||
|
||||
@@ -1248,6 +1248,7 @@
|
||||
return
|
||||
|
||||
/mob/living/carbon/human/attack_paw(mob/M as mob)
|
||||
..()
|
||||
if (M.a_intent == "help")
|
||||
src.sleeping = 0
|
||||
src.resting = 0
|
||||
@@ -1438,6 +1439,8 @@
|
||||
M << "No attacking people at spawn, you jackass."
|
||||
return
|
||||
|
||||
..()
|
||||
|
||||
if ((M.gloves && M.gloves.elecgen == 1 && M.a_intent == "hurt") /*&& (!istype(src:wear_suit, /obj/item/clothing/suit/judgerobe))*/)
|
||||
if(M.gloves.uses > 0)
|
||||
M.gloves.uses--
|
||||
|
||||
@@ -150,6 +150,7 @@
|
||||
return
|
||||
|
||||
/mob/living/carbon/monkey/attack_paw(mob/M as mob)
|
||||
..()
|
||||
|
||||
if (M.a_intent == "help")
|
||||
src.sleeping = 0
|
||||
@@ -173,6 +174,7 @@
|
||||
return
|
||||
|
||||
/mob/living/carbon/monkey/attack_hand(mob/M as mob)
|
||||
..()
|
||||
|
||||
if (M.a_intent == "help")
|
||||
src.sleeping = 0
|
||||
|
||||
Reference in New Issue
Block a user