cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 14:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also enables NIFs

Browse Source
This commit is contained in:
Jon
2018-12-22 14:26:02 +00:00
parent 727c2aef57
commit 27c9225728
39 changed files with 103 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/contraband_vr.dm
+1 -2
View File
@@ -47,8 +47,7 @@
/obj/item/clothing/accessory/permit/gun,
/obj/item/device/perfect_tele,
/obj/item/device/sleevemate,
// Chompstation Edit: Removing NIFs temporarily - Jon
// /obj/item/weapon/disk/nifsoft/compliance,
/obj/item/weapon/disk/nifsoft/compliance,
/obj/item/seeds/ambrosiadeusseed,
/obj/item/seeds/ambrosiavulgarisseed,
/obj/item/seeds/libertymycelium,
code/game/objects/items/devices/communicator/phone.dm
+7 -9
View File
@@ -211,14 +211,13 @@
var/list/mobs_to_relay
// Chompstation Edit: Removing NIFs temporarily - Jon
/*
if(istype(comm,/obj/item/device/communicator/commlink))
var/obj/item/device/communicator/commlink/CL = comm
mobs_to_relay = list(CL.nif.human)
else
*/
var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display
mobs_to_relay = in_range["mobs"]
var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display
mobs_to_relay = in_range["mobs"]
//VOREStation Edit End
for(var/mob/mob in mobs_to_relay) //We can't use visible_message(), or else we will get an infinite loop if two communicators hear each other.
@@ -242,14 +241,13 @@
//VOREStation Edit Start for commlinks
var/list/mobs_to_relay
// Chompstation Edit: Removing NIFs temporarily - Jon
/* if(istype(comm,/obj/item/device/communicator/commlink))
if(istype(comm,/obj/item/device/communicator/commlink))
var/obj/item/device/communicator/commlink/CL = comm
mobs_to_relay = list(CL.nif.human)
else
*/
var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display
mobs_to_relay = in_range["mobs"]
var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display
mobs_to_relay = in_range["mobs"]
//VOREStation Edit End
for(var/mob/mob in mobs_to_relay)
code/game/objects/items/devices/flash.dm
+1 -3
View File
@@ -77,8 +77,6 @@
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
var/flashfail = 0
//Chompstation Edit: Removing NIFs - Jon
/*
//VOREStation Add - NIF
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -86,7 +84,7 @@
flashfail = 1
H.nif.notify("High intensity light detected, and blocked!",TRUE)
//VOREStation Add End
*/
if(iscarbon(M) && !flashfail) //VOREStation Add - NIF
var/mob/living/carbon/C = M
if(C.stat != DEAD)
code/game/objects/items/devices/scanners_vr.dm
+5 -11
View File
@@ -97,14 +97,11 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
else
output += "<span class='warning'>Unable</span><br>"
//Chompstation Edit: Removing NIFs - Jon
/*
//Soulcatcher transfer
if(stored_mind && H.nif)
var/datum/nifsoft/soulcatcher/SC = H.nif.imp_check(NIF_SOULCATCHER)
if(SC)
output += "<b>Store in Soulcatcher: </b>\[<a href='?src=\ref[src];target=\ref[H];mindput=1'>Perform</a>\]<br>"
*/
to_chat(user,output)
/obj/item/device/sleevemate/Topic(href, href_list)
@@ -131,17 +128,15 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
to_chat(usr,"<span class='warning'>Target seems totally braindead.</span>")
return
//Chompstation Edit: Removing NIFs - Jon
/* var/nif
var/nif
if(ishuman(target))
var/mob/living/carbon/human/H = target
nif = H.nif
persist_nif_data(H)*/
persist_nif_data(H)
usr.visible_message("[usr] begins scanning [target]'s mind.","<span class='notice'>You begin scanning [target]'s mind.</span>")
if(do_after(usr,8 SECONDS,target))
// SStranscore.m_backup(target.mind,nif,one_time = TRUE) //Chompstation Edit: Removing NIFs - Jon
SStranscore.m_backup(target.mind,null,one_time = TRUE)
SStranscore.m_backup(target.mind,nif,one_time = TRUE)
to_chat(usr,"<span class='notice'>Mind backed up!</span>")
else
to_chat(usr,"<span class='warning'>You must remain close to your target!</span>")
@@ -184,8 +179,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
return
//Chompstation Edit: Removing NIFs - Jon
/*
if(href_list["mindput"])
if(!stored_mind)
to_chat(usr,"<span class='warning'>\The [src] no longer has a stored mind.</span>")
@@ -212,7 +206,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
stored_mind = null
to_chat(usr,"<span class='notice'>Mind transferred into Soulcatcher!</span>")
update_icon()
*/
/obj/item/device/sleevemate/update_icon()
if(stored_mind)
code/game/objects/items/weapons/tools.dm
+1 -1
View File
@@ -597,7 +597,7 @@
var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
if(!E)
return
// if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF //Chompstation Edit: Removing NIFs - Jon
if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF
switch(safety)
if(1)
to_chat(usr, "<span class='warning'>Your eyes sting a little.</span>")
code/game/objects/structures/trash_pile.dm
+2 -2
View File
@@ -230,13 +230,13 @@
prob(2);/obj/item/weapon/storage/box/syndie_kit/spy,
prob(2);/obj/item/weapon/grenade/anti_photon,
prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,
// prob(1);/obj/item/device/nif/bad, //Chompstation Edit: Removing NIFs - Jon
prob(1);/obj/item/device/nif/bad,
prob(1);/obj/item/device/radio_jammer,
prob(1);/obj/item/device/sleevemate,
prob(1);/obj/item/device/bodysnatcher,
prob(1);/obj/item/weapon/beartrap,
prob(1);/obj/item/weapon/cell/hyper/empty,
// prob(1);/obj/item/weapon/disk/nifsoft/compliance, //Chompstation Edit: Removing NIFs - Jon
prob(1);/obj/item/weapon/disk/nifsoft/compliance,
prob(1);/obj/item/weapon/material/knife/tacknife,
prob(1);/obj/item/weapon/reagent_containers/syringe/steroid)