diff --git a/code/WorkInProgress/ZomgPonies/karma.dm b/code/WorkInProgress/ZomgPonies/karma.dm index 44bb9f3a123..151b1051aa1 100644 --- a/code/WorkInProgress/ZomgPonies/karma.dm +++ b/code/WorkInProgress/ZomgPonies/karma.dm @@ -149,11 +149,10 @@ You've gained [totalkarma] total karma in your time here.
"} Unlock Kidan -- 30KP
Unlock Grey -- 30KP
Unlock Vox -- 45KP
+ Unlock Slime People -- 45KP
PLEASE NOTE THAT PEOPLE WHO TRY TO GAME THE KARMA SYSTEM WILL END UP ON THE WALL OF SHAME. THIS INCLUDES BUT IS NOT LIMITED TO TRADES, OOC KARMA BEGGING, CODE EXPLOITS, ETC. "} -// Unlock Slime People -- 45KP
- var/datum/browser/popup = new(usr, "karmashop", "
Karma Shop
", 400, 400) popup.set_content(dat) popup.open(0) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 99fb3160f2f..efa45700f4e 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -70,7 +70,7 @@ mob/living/carbon/human/airflow_stun() if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown) return 0 if(buckled) return 0 if(shoes) - if(shoes.flags & NOSLIP) return 0 + if((shoes.flags & NOSLIP) || (species.bodyflags & FEET_NOSLIP)) return 0 if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN)) src << "\blue You stay upright as the air rushes past you." return 0 diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index b07d99ee20d..54927dff791 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -890,7 +890,8 @@ steam.start() -- spawns the effect var/mob/M = AM if (istype(M, /mob/living/carbon/human) && (istype(M:shoes, /obj/item/clothing/shoes) && M:shoes.flags&NOSLIP)) return - + if (istype (M, /mob/living/carbon/human) && M:species.bodyflags & FEET_NOSLIP) + return M.stop_pulling() M << "\blue You slipped on the foam!" playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 47d1846e6ad..0bdd2c485a9 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -13,6 +13,8 @@ var/mob/M = AM if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP)) return + if(istype(M, /mob/living/carbon/human) && M:species.bodyflags & FEET_NOSLIP) + return M.stop_pulling() M << "\blue You slipped on the [name]!" diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm index f27374d9b25..33f1aa923aa 100644 --- a/code/game/objects/items/weapons/grenades/clowngrenade.dm +++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm @@ -69,7 +69,7 @@ var/mob/living/M = AM if(ishuman(M)) if(isobj(M:shoes)) - if(M:shoes.flags&NOSLIP) + if((M:shoes.flags&NOSLIP) || (M:species.bodyflags & FEET_NOSLIP)) return else M << "\red Your feet feel like they're on fire!" diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 442fd796b36..7d7428d310f 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -103,7 +103,7 @@ else M.inertia_dir = 0 return - else if(!istype(M, /mob/living/carbon/slime)) + else if(!istype(M, /mob/living/carbon/slime) || (M:species.bodyflags & FEET_NOSLIP)) if (M.m_intent == "run") M.stop_pulling() step(M, M.dir) @@ -140,7 +140,7 @@ else M.inertia_dir = 0 return - else if(!istype(M, /mob/living/carbon/metroid)) + else if(!istype(M, /mob/living/carbon/metroid) || (M:species.bodyflags & FEET_NOSLIP)) if (M.m_intent == "run" && prob(30)) M.stop_pulling() step(M, M.dir) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index ac3181aac44..8ac82438695 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -164,6 +164,7 @@ flags = WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS bloodflags = BLOOD_SLIME + bodyflags = FEET_NOSLIP /datum/species/grey diff --git a/code/setup.dm b/code/setup.dm index 924fe576538..72dac3dbc44 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -751,6 +751,7 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define FEET_CLAWS 1 #define FEET_PADDED 2 +#define FEET_NOSLIP 4 //Language flags.