shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

here we go again (#2456)

Browse Source
This commit is contained in:
LetterJay
2017-08-24 21:24:25 -05:00
committed by kevinz000
parent c7ed043fd5
commit 188193eb61
1107 changed files with 25420 additions and 25417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/living_vr.dm
+3 -3
View File
@@ -173,9 +173,9 @@
//
//End vore code.
/*
//Handle case: /obj/item/weapon/holder
if(/obj/item/weapon/holder/micro)
var/obj/item/weapon/holder/H = I
//Handle case: /obj/item/holder
if(/obj/item/holder/micro)
var/obj/item/holder/H = I
if(!isliving(user)) return 0 // Return 0 to continue upper procs
var/mob/living/attacker = user // Typecast to living
code/modules/vore/resizing/holder_micro_vr.dm
+6 -6
View File
@@ -1,6 +1,6 @@
// Micro Holders - Extends /obj/item/weapon/holder
// Micro Holders - Extends /obj/item/holder
/obj/item/weapon/holder/micro
/obj/item/holder/micro
name = "micro"
desc = "Another crewmember, small enough to fit in your hand."
icon_state = "micro"
@@ -9,11 +9,11 @@
item_icons = null // Override value from parent. We don't have magic sprites.
pixel_y = 0 // Override value from parent.
/obj/item/weapon/holder/micro/examine(var/mob/user)
/obj/item/holder/micro/examine(var/mob/user)
for(var/mob/living/M in contents)
M.examine(user)
/obj/item/weapon/holder/MouseDrop(mob/M as mob)
/obj/item/holder/MouseDrop(mob/M as mob)
..()
if(M != usr) return
if(usr == src) return
@@ -22,11 +22,11 @@
for(var/mob/living/carbon/human/O in contents)
O.show_inv(usr)
/obj/item/weapon/holder/micro/attack_self(var/mob/living/user)
/obj/item/holder/micro/attack_self(var/mob/living/user)
for(var/mob/living/carbon/human/M in contents)
M.help_shake_act(user)
/obj/item/weapon/holder/micro/update_state()
/obj/item/holder/micro/update_state()
// If any items have been dropped by contained mob, drop them to floor.
for(var/obj/O in contents)
O.forceMove(get_turf(src))
code/modules/vore/resizing/resize_vr.dm
+2 -2
View File
@@ -18,7 +18,7 @@ GLOBAL_VAR_CONST(SIZESCALE_A_SMALLTINY,(GLOB.SIZESCALE_SMALL + GLOB.SIZESCALE_TI
// Define holder_type on types we want to be scoop-able
//mob/living/carbon/human
// holder_type = /obj/item/weapon/holder/micro
// holder_type = /obj/item/holder/micro
/**
* Scale up the size of a mob's icon by the size_multiplier.
@@ -91,7 +91,7 @@ GLOBAL_VAR_CONST(SIZESCALE_A_SMALLTINY,(GLOB.SIZESCALE_SMALL + GLOB.SIZESCALE_TI
usr << "<span class='notice'>You have to unbuckle \the [M] before you pick them up.</span>"
return 0
if(M.get_effective_size() - src.get_effective_size() >= 0.75)
var/obj/item/weapon/holder/m_holder = get_scooped(M)
var/obj/item/holder/m_holder = get_scooped(M)
if (m_holder)
return 1
else
code/modules/vore/resizing/sizegun_vr.dm
+3 -3
View File
@@ -2,7 +2,7 @@
// Size Gun
//
/*
/obj/item/weapon/gun/energy/sizegun
/obj/item/gun/energy/sizegun
name = "shrink ray"
desc = "A highly advanced ray gun with two settings: Shrink and Grow. Warning: Do not insert into mouth."
icon = 'icons/obj/gun_vr.dmi'
@@ -91,7 +91,7 @@ datum/design/sizeray
req_tech = list("combat" = 5, "materials" = 4, "engineering" = 5, "bluespace" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 1000, MAT_GLASS = 1000, MAT_DIAMOND = 2500, MAT_URANIUM = 2500, MAT_TITANIUM = 1000)
build_path = /obj/item/weapon/gun/energy/laser/sizeray
build_path = /obj/item/gun/energy/laser/sizeray
category = list("Weapons")
/obj/item/projectile/sizeray
@@ -149,7 +149,7 @@ datum/design/sizeray
//Gun here
/obj/item/weapon/gun/energy/laser/sizeray
/obj/item/gun/energy/laser/sizeray
name = "size ray"
icon_state = "bluetag"
desc = "Size manipulator using bluespace breakthroughs."