cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update VOREStation specific code to use merged in features.

Browse Source 
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
This commit is contained in:
Leshana
2018-01-19 17:54:43 -05:00
parent 3c3dac7102
commit 436d48b337
5 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_onclick/hud/hud.dm
View File

@@ -14,7 +14,7 @@ var/list/global_huds = list(
global_hud.meson,
global_hud.science,
global_hud.material,
global_hud.holomap
global_hud.holomap // VOREStation Edit - Holomap
)
/datum/hud/var/obj/screen/grab_intent
@@ -33,7 +33,7 @@ var/list/global_huds = list(
var/obj/screen/meson
var/obj/screen/science
var/obj/screen/material
var/obj/screen/holomap
var/obj/screen/holomap // VOREStation Edit - Holomap
/datum/global_hud/proc/setup_overlay(var/icon_state)
var/obj/screen/screen = new /obj/screen()
@@ -72,6 +72,7 @@ var/list/global_huds = list(
science = setup_overlay("science_hud")
material = setup_overlay("material_hud")
// VOREStation Edit Begin - Holomap
// The holomap screen object is actually totally invisible.
// Station maps work by setting it as an images location before sending to client, not
// actually changing the icon or icon state of the screen object itself!
@@ -83,6 +84,7 @@ var/list/global_huds = list(
holomap.icon = null
holomap.screen_loc = ui_holomap
holomap.mouse_opacity = 0
// VOREStation Edit End
var/obj/screen/O
var/i

5
code/modules/power/singularity/singularity.dm
View File

@@ -363,6 +363,11 @@
if (!isturf(T))
return 0
// VOREStation Edit Start
if(istype(get_area(T), /area/crew_quarters/sleep)) //No going to dorms
return 0
// VOREStation Edit End
if ((locate(/obj/machinery/containment_field) in T) || (locate(/obj/machinery/shieldwall) in T))
return 0
else if (locate(/obj/machinery/field_generator) in T)

13
code/modules/reagents/reagent_containers/glass/bottle_vr.dm
View File

@@ -3,20 +3,11 @@
desc = "A small bottle of ickypak. The smell alone makes you gag."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
/obj/item/weapon/reagent_containers/glass/bottle/ickypak/New()
..()
reagents.add_reagent("ickypak", 60)
update_icon()
prefill = list("ickypak" = 60)
/obj/item/weapon/reagent_containers/glass/bottle/unsorbitol
name = "unsorbitol bottle"
desc = "A small bottle of unsorbitol. Sickeningly sweet."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-3"
/obj/item/weapon/reagent_containers/glass/bottle/unsorbitol/New()
..()
reagents.add_reagent("unsorbitol", 60)
update_icon()
prefill = list("unsorbitol" = 60)

35
code/modules/reagents/reagent_containers/glass_vr.dm
View File

@@ -1,63 +1,54 @@
/obj/item/weapon/reagent_containers/glass/beaker/neurotoxin
New()
..()
reagents.add_reagent("neurotoxin",50)
update_icon()
prefill = list("neurotoxin" = 50)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr
possible_transfer_amounts = list(5,10,15,30) //Dunno why there was no '30' option before.
w_class = ITEMSIZE_SMALL //Why would it be the same size as a beaker?
var/comes_with = list() //Easy way of doing this.
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/New()
..()
for(var/R in comes_with)
reagents.add_reagent(R,comes_with[R])
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/bicaridine
name = "vial (bicaridine)"
comes_with = list("bicaridine" = 30)
prefill = list("bicaridine" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dylovene
name = "vial (dylovene)"
comes_with = list("dylovene" = 30)
prefill = list("dylovene" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dermaline
name = "vial (dermaline)"
comes_with = list("dermaline" = 30)
prefill = list("dermaline" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/kelotane
name = "vial (kelotane)"
comes_with = list("kelotane" = 30)
prefill = list("kelotane" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/inaprovaline
name = "vial (inaprovaline)"
comes_with = list("inaprovaline" = 30)
prefill = list("inaprovaline" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dexalin
name = "vial (dexalin)"
comes_with = list("dexalin" = 30)
prefill = list("dexalin" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dexalinplus
name = "vial (dexalinp)"
comes_with = list("dexalinp" = 30)
prefill = list("dexalinp" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/tricordrazine
name = "vial (tricordrazine)"
comes_with = list("tricordrazine" = 30)
prefill = list("tricordrazine" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/alkysine
name = "vial (alkysine)"
comes_with = list("alkysine" = 30)
prefill = list("alkysine" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/imidazoline
name = "vial (imidazoline)"
comes_with = list("imidazoline" = 30)
prefill = list("imidazoline" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/peridaxon
name = "vial (peridaxon)"
comes_with = list("peridaxon" = 30)
prefill = list("peridaxon" = 30)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/hyronalin
name = "vial (hyronalin)"
comes_with = list("hyronalin" = 30)
prefill = list("hyronalin" = 30)

8
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -379,19 +379,19 @@
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_st
name = "vial (stabilize)"
desc = "10 Tricordrazine, 10 Dexalin Plus, 5 Tramadol, 5 Inaprovaline"
comes_with = list("tricordrazine"=10,"dexalinp"=10,"tramadol"=5,"inaprovaline"=5)
prefill = list("tricordrazine"=10,"dexalinp"=10,"tramadol"=5,"inaprovaline"=5)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bt
name = "vial (brute)"
desc = "25 Bicaridine, 5 Tricordrazine"
comes_with = list("bicaridine"=25,"tricordrazine"=5)
prefill = list("bicaridine"=25,"tricordrazine"=5)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bu
name = "vial (burn)"
desc = "10 Kelotane, 15 Dermaline, 5 Tricordrazine"
comes_with = list("kelotane"=10,"dermaline"=15,"tricordrazine"=5)
prefill = list("kelotane"=10,"dermaline"=15,"tricordrazine"=5)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_tx
name = "vial (toxins)"
desc = "25 Dylovene, 2 Hyronalin, 3 Tricordrazine"
comes_with = list("anti_toxin"=25,"hyronalin"=2,"tricordrazine"=3)
prefill = list("anti_toxin"=25,"hyronalin"=2,"tricordrazine"=3)
//Swat43:Fortune Bloise
/obj/item/weapon/storage/backpack/satchel/fluff/swat43bag