cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 15:47:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

More bug fixes for bug fixes

Browse Source
This commit is contained in:
Arokha Sieyes
2017-03-09 00:21:44 -05:00
parent 3256157bda
commit a9db9fa4e2
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_items_vr.dm
+19 -2
View File
@@ -736,7 +736,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
var/atom/real_dest = get_turf(destination)
//Destination beacon is held/eaten
if(isliving(destination.loc) && !((user == target.loc) && (user == target))) //We should definitely get televored unless we're teleporting ourselves into ourselves
if(isliving(destination.loc) && (target != destination.loc)) //We should definitely get televored unless we're teleporting ourselves into ourselves
var/mob/living/L = destination.loc
//Is the beacon IN a belly?
@@ -758,7 +758,7 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
real_dest = destination.loc
target_belly.internal_contents |= target
playsound(target_belly.owner, target_belly.vore_sound, 100, 1)
user << "<span class='warning'>\The [src] teleports you right into [target_belly.owner]'s [target_belly.name]!</span>"
target << "<span class='warning'>\The [src] teleports you right into [target_belly.owner]'s [target_belly.name]!</span>"
target_belly.owner << "<span class='warning'>Your [target_belly.name] suddenly has a new occupant!</span>"
//Phase-out effect
@@ -848,3 +848,20 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
return
..()
/obj/item/device/perfect_tele_beacon/attack_self(mob/user)
if(!isliving(user))
return
var/mob/living/L = user
var/confirm = alert(user, "You COULD eat the beacon...", "Eat beacon?", "Eat it!", "No, thanks.")
if(confirm == "Eat it!")
var/bellychoice = input("Which belly?","Select A Belly") in L.vore_organs|null
if(bellychoice)
var/datum/belly/B = L.vore_organs[bellychoice]
user.visible_message("<span class='warning'>[user] is trying to stuff \the [src] into [user.gender == MALE ? "his" : user.gender == FEMALE ? "her" : "their"] [bellychoice]!</span>","<span class='notice'>You begin putting \the [src] into your [bellychoice]!</span>")
if(do_after(user,5 SECONDS,src))
user.unEquip(src)
src.forceMove(user)
B.internal_contents |= src
user.visible_message("<span class='warning'>[user] eats a telebeacon!</span>","You eat the the beacon!")
playsound(user, B.vore_sound, 70, 1)
maps/virgo/virgo-2.dmm
+3 -3
View File
@@ -3021,7 +3021,7 @@
"bge" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/robotics)
"bgf" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "ls_ext_shutters"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/houseboat)
"bgg" = (/obj/machinery/light,/obj/machinery/chem_master,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/medical)
"bgh" = (/obj/machinery/vending/medical{pixel_y = -32; req_access = list()},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/medical)
"bgh" = (/obj/machinery/vending/medical{density = 0; pixel_y = -32; req_access = list()},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/medical)
"bgi" = (/obj/machinery/chemical_dispenser/ert,/obj/structure/table/steel_reinforced,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/medical)
"bgj" = (/obj/machinery/clonepod/transhuman,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/medical)
"bgk" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/houseboat)
@@ -3089,7 +3089,7 @@
"bhu" = (/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/neck)
"bhv" = (/obj/structure/table/standard,/obj/item/weapon/soap,/obj/item/weapon/towel{color = "#0000FF"},/obj/machinery/light,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/neck)
"bhw" = (/obj/machinery/light,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/neck)
"bhx" = (/obj/structure/sign/poster{pixel_y = -32},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/neck)
"bhx" = (/obj/structure/sign/poster{pixel_y = -32},/obj/machinery/recharge_station,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/neck)
"bhy" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2; req_access = list()},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/neck)
"bhz" = (/obj/machinery/light_switch{pixel_y = -28},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/neck)
"bhA" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/houseboat/common_area)
@@ -3174,7 +3174,7 @@
"bjb" = (/obj/machinery/door/airlock/external{frequency = 1331; icon_state = "door_locked"; id_tag = "ls_al_shuttle_inner"; locked = 1; name = "Ship Hatch"; req_access = list(13)},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/houseboat/airlock)
"bjc" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/machinery/door/airlock/external{frequency = 1331; icon_state = "door_locked"; id_tag = "ls_al_shuttle_inner"; locked = 1; name = "Ship Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/houseboat/airlock)
"bjd" = (/obj/machinery/vending/tool,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/engineering)
"bje" = (/obj/machinery/vending/engivend,/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/engineering)
"bje" = (/obj/machinery/vending/engivend{req_access = list()},/turf/simulated/shuttle/floor{icon_state = "floor7"},/area/houseboat/engineering)
"bjf" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/machinery/airlock_sensor{frequency = 1331; id_tag = "ls_al_sensor"; master_tag = "ls_al_control"; pixel_x = 25},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1331; id_tag = "ls_al_vent"},/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/houseboat/airlock)
"bjg" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; frequency = 1331; id_tag = "ls_al_vent"},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1331; id_tag = "ls_al_control"; pixel_x = -24; req_access = list(); tag_airpump = "ls_al_vent"; tag_chamber_sensor = "ls_al_sensor"; tag_exterior_door = "ls_al_shuttle_outer"; tag_interior_door = "ls_al_shuttle_inner"},/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/houseboat/airlock)
"bjh" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1331; master_tag = "ls_al_control"; pixel_x = 24; req_one_access = list()},/obj/machinery/door/airlock/external{frequency = 1331; icon_state = "door_locked"; id_tag = "ls_al_shuttle_outer"; locked = 1; name = "Ship Hatch"; req_access = list(13)},/turf/simulated/shuttle/floor4{icon_state = "floor7"; name = "shuttle floor"},/area/houseboat/airlock)