cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-added missing "space assholes" verb.

Browse Source 
Reworked clothes slowdown code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@624 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Rygzengrho
2010-12-15 10:38:17 +00:00
parent dfb189a398
commit fdabcc451f
5 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/admin/admin_verbs.dm
View File

@@ -134,6 +134,7 @@
src.verbs += /client/proc/play_sound
src.verbs += /client/proc/cuban_pete // -- Urist
src.verbs += /client/proc/only_one // muskets
src.verbs += /client/proc/space_asshole // --Agouri :3
src.verbs += /proc/possess
src.verbs += /proc/release
@@ -253,6 +254,7 @@
src.verbs += /client/proc/play_sound
src.verbs += /client/proc/cuban_pete // -- Urist
src.verbs += /client/proc/only_one // muskets
src.verbs += /client/proc/space_asshole // --Agouri :3
src.verbs += /proc/possess
src.verbs += /proc/release
@@ -268,7 +270,6 @@
// Settings
//src.verbs += /client/proc/colorooc // -- Urist
src.verbs += /client/proc/only_one // muskets
src.verbs += /obj/admins/proc/adjump //toggle admin jumping
src.verbs += /obj/admins/proc/adrev //toggle admin revives
src.verbs += /obj/admins/proc/adspawn //toggle admin item spawning
@@ -373,6 +374,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
src.verbs += /client/proc/play_sound
//src.verbs += /client/proc/cuban_pete // -- Urist
//src.verbs += /client/proc/space_asshole // --Agouri :3
src.verbs += /proc/possess
src.verbs += /proc/release
@@ -521,6 +523,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
src.verbs += /client/proc/play_sound
//src.verbs += /client/proc/cuban_pete // -- Urist
//src.verbs += /client/proc/space_asshole // --Agouri :3
src.verbs += /proc/possess
src.verbs += /proc/release
@@ -659,6 +662,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
src.verbs += /client/proc/play_sound
//src.verbs += /client/proc/cuban_pete // -- Urist
//src.verbs += /client/proc/space_asshole // --Agouri :3
//src.verbs += /proc/possess
//src.verbs += /proc/release
@@ -793,6 +797,7 @@
//src.verbs += /client/proc/object_talk // -- TLE
//src.verbs += /client/proc/play_sound
//src.verbs += /client/proc/cuban_pete // -- Urist
//src.verbs += /client/proc/space_asshole // --Agouri :3
//src.verbs += /proc/possess
//src.verbs += /proc/release
@@ -1060,6 +1065,7 @@
src.verbs -= /client/proc/object_talk // -- TLE
src.verbs -= /client/proc/play_sound
src.verbs -= /client/proc/cuban_pete // -- Urist
src.verbs -= /client/proc/space_asshole // --Agouri :3
src.verbs -= /proc/possess
src.verbs -= /proc/release

28
code/modules/mob/living/carbon/human/human.dm
View File

@@ -128,32 +128,11 @@
if (hungry >= 70) tally += hungry/50
if(src.wear_suit)
switch(src.wear_suit.type)
if(/obj/item/clothing/suit/straight_jacket)
tally += 15
if(/obj/item/clothing/suit/fire) // firesuits slow you down a bit
tally += 1.3
if(/obj/item/clothing/suit/fire/heavy) // firesuits slow you down a bit
tally += 1.7
if(/obj/item/clothing/suit/bio_suit) // biosuits slow you down a bit
tally += 1.3
if(/obj/item/clothing/suit/bio_suit/plaguedoctorsuit) // biosuits slow you down a bit
tally += 1.3
if(/obj/item/clothing/suit/space)
if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space
tally += 3
if(/obj/item/clothing/suit/space/rig)
if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space
tally += 2
if(/obj/item/clothing/suit/space/syndicate)
if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space
tally += 1
tally += src.wear_suit.slowdown
if (istype(src.shoes, /obj/item/clothing/shoes))
if (src.shoes.chained)
tally += 15
else
tally += -1.0
tally += src.shoes.slowdown
if(src.mutations & 32)
tally += 1.5
if (src.bodytemperature < 283.222)
@@ -669,7 +648,6 @@
else if (W == src.l_hand)
src.l_hand = null
update_clothing()
/mob/living/carbon/human/db_click(text, t1)