cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5708 from Novacat/nova-basicfixes

Browse Source 
Minor Fixes
This commit is contained in:
Novacat
2019-08-29 15:07:28 -04:00
committed by GitHub
parent 1ead38b84e 485a458cc5
commit a006728e5d
12 changed files with 264 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/supplypacks/hospitality_vr.dm
View File

@@ -1,3 +1,6 @@
/datum/supply_pack/randomised/hospitality/pizza
cost = 50
/datum/supply_pack/randomised/hospitality/burgers_vr
num_contained = 5
contains = list(

10
code/game/objects/items/weapons/storage/firstaid_vr.dm
View File

@@ -12,51 +12,61 @@
name = "bottle of Rezadone pills"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
starts_with = list(/obj/item/weapon/reagent_containers/pill/rezadone = 7)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/weapon/storage/pill_bottle/peridaxon
name = "bottle of Peridaxon pills"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
starts_with = list(/obj/item/weapon/reagent_containers/pill/peridaxon = 7)
wrapper_color = COLOR_PURPLE
/obj/item/weapon/storage/pill_bottle/carthatoline
name = "bottle of Carthatoline pills"
desc = "Carthatoline is strong evacuant used to treat severe poisoning."
starts_with = list(/obj/item/weapon/reagent_containers/pill/carthatoline = 7)
wrapper_color = COLOR_GREEN_GRAY
/obj/item/weapon/storage/pill_bottle/alkysine
name = "bottle of Alkysine pills"
desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
starts_with = list(/obj/item/weapon/reagent_containers/pill/alkysine = 7)
wrapper_color = COLOR_YELLOW
/obj/item/weapon/storage/pill_bottle/imidazoline
name = "bottle of Imidazoline pills"
desc = "Heals eye damage."
starts_with = list(/obj/item/weapon/reagent_containers/pill/imidazoline = 7)
wrapper_color = COLOR_PURPLE_GRAY
/obj/item/weapon/storage/pill_bottle/osteodaxon
name = "bottle of Osteodaxon pills"
desc = "An experimental drug used to heal bone fractures."
starts_with = list(/obj/item/weapon/reagent_containers/pill/osteodaxon = 7)
wrapper_color = COLOR_WHITE
/obj/item/weapon/storage/pill_bottle/myelamine
name = "bottle of Myelamine pills"
desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
starts_with = list(/obj/item/weapon/reagent_containers/pill/myelamine = 7)
wrapper_color = COLOR_PALE_PURPLE_GRAY
/obj/item/weapon/storage/pill_bottle/hyronalin
name = "bottle of Hyronalin pills"
desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
starts_with = list(/obj/item/weapon/reagent_containers/pill/hyronalin = 7)
wrapper_color = COLOR_TEAL
/obj/item/weapon/storage/pill_bottle/arithrazine
name = "bottle of Arithrazine pills"
desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
starts_with = list(/obj/item/weapon/reagent_containers/pill/arithrazine = 7)
wrapper_color = COLOR_TEAL
/obj/item/weapon/storage/pill_bottle/corophizine
name = "bottle of Corophizine pills"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
starts_with = list(/obj/item/weapon/reagent_containers/pill/corophizine = 7)
wrapper_color = COLOR_PALE_GREEN_GRAY
/obj/item/weapon/storage/pill_bottle/healing_nanites
name = "bottle of Healing nanites capsules"

14
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm
View File

@@ -10,4 +10,16 @@
/mob/living/simple_mob/humanoid/merc/ranged/space
name = "mercenary commando"
maxbodytemp = 700
maxbodytemp = 700
/mob/living/simple_mob/humanoid/merc/ranged/virgo
name = "suspicious individual"
min_oxy = 0
max_oxy = 0
min_tox = 0
max_tox = 0
min_co2 = 0
max_co2 = 0
min_n2 = 0
max_n2 = 0
minbodytemp = 0

30
code/modules/reagents/reagent_containers/pill_vr.dm
View File

@@ -1,7 +1,7 @@
/obj/item/weapon/reagent_containers/pill/nutriment
name = "Nutriment pill"
desc = "Used to feed people on the field. Contains 30 units of Nutriment."
icon_state = "pill6"
icon_state = "pill10"
/obj/item/weapon/reagent_containers/pill/nutriment/Initialize()
..()
@@ -10,7 +10,7 @@
/obj/item/weapon/reagent_containers/pill/protein
name = "Meat pill"
desc = "Used to feed carnivores on the field. Contains 30 units of Protein."
icon_state = "pill20"
icon_state = "pill24"
/obj/item/weapon/reagent_containers/pill/protein/Initialize()
..()
@@ -19,11 +19,12 @@
/obj/item/weapon/reagent_containers/pill/rezadone
name = "Rezadone pill"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
icon_state = "pill13"
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/rezadone/Initialize()
..()
reagents.add_reagent("rezadone", 5)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/peridaxon
name = "Peridaxon pill"
@@ -37,38 +38,42 @@
/obj/item/weapon/reagent_containers/pill/carthatoline
name = "Carthatoline pill"
desc = "Carthatoline is strong evacuant used to treat severe poisoning."
icon_state = "pill17"
icon_state = "pill4"
/obj/item/weapon/reagent_containers/pill/carthatoline/Initialize()
..()
reagents.add_reagent("carthatoline", 10)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/alkysine
name = "Alkysine pill"
desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
icon_state = "pill7"
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/alkysine/Initialize()
..()
reagents.add_reagent("alkysine", 10)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/imidazoline
name = "Imidazoline pill"
desc = "Heals eye damage."
icon_state = "pill9"
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/imidazoline/Initialize()
..()
reagents.add_reagent("imidazoline", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/osteodaxon
name = "Osteodaxon pill"
desc = "An experimental drug used to heal bone fractures."
icon_state = "pill19"
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/osteodaxon/Initialize()
..()
reagents.add_reagent("osteodaxon", 10)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/myelamine
name = "Myelamine pill"
@@ -78,15 +83,17 @@
/obj/item/weapon/reagent_containers/pill/myelamine/Initialize()
..()
reagents.add_reagent("myelamine", 10)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/hyronalin
name = "Hyronalin pill"
desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
icon_state = "pill17"
icon_state = "pill4"
/obj/item/weapon/reagent_containers/pill/hyronalin/Initialize()
..()
reagents.add_reagent("hyronalin", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/arithrazine
name = "Arithrazine pill"
@@ -96,21 +103,24 @@
/obj/item/weapon/reagent_containers/pill/arithrazine/Initialize()
..()
reagents.add_reagent("arithrazine", 5)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/corophizine
name = "Corophizine pill"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
icon_state = "pill9"
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/corophizine/Initialize()
..()
reagents.add_reagent("corophizine", 5)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/healing_nanites
name = "Healing nanites capsule"
desc = "Miniature medical robots that swiftly restore bodily damage."
icon_state = "pill5"
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/healing_nanites/Initialize()
..()
reagents.add_reagent("healing_nanites", 30)
color = reagents.get_color()

4
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -693,9 +693,6 @@
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "rig-hos_mob"
//Slightly improved security voidsuit, which when made, was:
//armor = list(melee = 50, bullet = 25, laser = 25, energy = 5, bomb = 45, bio = 100, rad = 10)
armor = list("melee" = 60, "bullet" = 35, "laser" = 35, "energy" = 15, "bomb" = 50, "bio" = 100, "rad" = 10)
species_restricted = null
//HOS Hardsuit Helmet
@@ -709,7 +706,6 @@
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "rig0-hos_mob"
armor = list("melee" = 60, "bullet" = 35, "laser" = 35, "energy" = 15, "bomb" = 50, "bio" = 100, "rad" = 10)
species_restricted = null
//adk09:Lethe