more changes
This commit is contained in:
@@ -135,3 +135,6 @@
|
||||
//defines for the two colour schemes, advanced and old
|
||||
#define OLD_CHARACTER_COLORING "old_color_system"
|
||||
#define ADVANCED_CHARACTER_COLORING "advanced_color_system"
|
||||
|
||||
#define FARTING_NOISES (1<<4) //GS13
|
||||
#define BURPING_NOISES (1<<5) //GS13
|
||||
|
||||
@@ -408,3 +408,22 @@
|
||||
#define FATNESS_MAX_MOVE_PENALTY 4
|
||||
#define FATNESS_WEAKLEGS_MODIFIER 35 // GS13 tweak
|
||||
#define FATNESS_STRONGLEGS_MODIFIER 0.5
|
||||
|
||||
#define RESIZE_MACRO 6
|
||||
#define RESIZE_HUGE 4
|
||||
#define RESIZE_BIG 2
|
||||
#define RESIZE_NORMAL 1
|
||||
#define RESIZE_SMALL 0.75
|
||||
#define RESIZE_TINY 0.50
|
||||
#define RESIZE_MICRO 0.25
|
||||
|
||||
#define MOVESPEED_ID_SIZE "SIZECODE"
|
||||
#define MOVESPEED_ID_STOMP "STEPPY"
|
||||
|
||||
//averages
|
||||
#define RESIZE_A_MACROHUGE (RESIZE_MACRO + RESIZE_HUGE) / 2
|
||||
#define RESIZE_A_HUGEBIG (RESIZE_HUGE + RESIZE_BIG) / 2
|
||||
#define RESIZE_A_BIGNORMAL (RESIZE_BIG + RESIZE_NORMAL) / 2
|
||||
#define RESIZE_A_NORMALSMALL (RESIZE_NORMAL + RESIZE_SMALL) / 2
|
||||
#define RESIZE_A_SMALLTINY (RESIZE_SMALL + RESIZE_TINY) / 2
|
||||
#define RESIZE_A_TINYMICRO (RESIZE_TINY + RESIZE_MICRO) / 2
|
||||
|
||||
@@ -160,6 +160,18 @@
|
||||
if(QDELETED(ROI))
|
||||
continue //sleeps in CHECK_TICK
|
||||
|
||||
//GS13 EDIT START
|
||||
if(isliving(ROI) && !check_mob_teleportability(ROI))
|
||||
continue
|
||||
|
||||
var/able_to_teleport_item = TRUE
|
||||
for(var/mob/living/found_mob in ROI.contents)
|
||||
if(isliving(found_mob) && !check_mob_teleportability(found_mob))
|
||||
able_to_teleport_item = FALSE
|
||||
|
||||
if(!able_to_teleport_item)
|
||||
continue
|
||||
|
||||
// if is anchored, don't let through
|
||||
if(ROI.anchored)
|
||||
if(isliving(ROI))
|
||||
|
||||
Reference in New Issue
Block a user