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

Merge pull request #6582 from Novacat/nova-basicfixes

Browse Source 
Replaces Tramadol maint pills with Paracetamol
This commit is contained in:
Novacat
2020-02-17 16:12:28 -05:00
committed by GitHub
parent 9bead57015 a5f3776a91
commit ed37b715aa
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,3 +115,9 @@
name = "vacuum-sealed pill (Kitsuhanan Cure)" name = "vacuum-sealed pill (Kitsuhanan Cure)"
desc = "A small vacuum-sealed package containing a singular pill. For emergencies only." desc = "A small vacuum-sealed package containing a singular pill. For emergencies only."
starts_with = list(/obj/item/weapon/reagent_containers/pill/sleevingcure) starts_with = list(/obj/item/weapon/reagent_containers/pill/sleevingcure)
/obj/item/weapon/storage/pill_bottle/paracetamol
name = "pill bottle (Paracetamol)"
desc = "Contains over the counter medicine to treat pain."
starts_with = list(/obj/item/weapon/reagent_containers/pill/paracetamol = 7)
wrapper_color = COLOR_GRAY

2
code/game/objects/random/misc.dm
View File

@@ -229,7 +229,7 @@
icon_state = "purplecomb" icon_state = "purplecomb"
spawn_nothing_percentage = 50 spawn_nothing_percentage = 50
/obj/random/contraband/item_to_spawn() /obj/random/contraband/item_to_spawn()
return pick(prob(6);/obj/item/weapon/storage/pill_bottle/tramadol, return pick(prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol, //VOREStation Edit,
prob(8);/obj/item/weapon/haircomb, prob(8);/obj/item/weapon/haircomb,
prob(4);/obj/item/weapon/storage/pill_bottle/happy, prob(4);/obj/item/weapon/storage/pill_bottle/happy,
prob(4);/obj/item/weapon/storage/pill_bottle/zoom, prob(4);/obj/item/weapon/storage/pill_bottle/zoom,

2
code/game/objects/random/mob_vr.dm
View File

@@ -146,7 +146,7 @@
return pick(prob(10);/obj/item/weapon/contraband/poster,\ return pick(prob(10);/obj/item/weapon/contraband/poster,\
prob(8);/obj/item/weapon/haircomb,\ prob(8);/obj/item/weapon/haircomb,\
prob(6);/obj/item/weapon/material/wirerod,\ prob(6);/obj/item/weapon/material/wirerod,\
prob(6);/obj/item/weapon/storage/pill_bottle/tramadol,\ prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol,\
prob(6);/obj/item/weapon/material/butterflyblade,\ prob(6);/obj/item/weapon/material/butterflyblade,\
prob(6);/obj/item/weapon/material/butterflyhandle,\ prob(6);/obj/item/weapon/material/butterflyhandle,\
prob(4);/obj/item/weapon/storage/pill_bottle/happy,\ prob(4);/obj/item/weapon/storage/pill_bottle/happy,\

2
code/game/objects/structures/loot_piles.dm
View File

@@ -258,7 +258,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/weapon/reagent_containers/syringe/steroid, /obj/item/weapon/reagent_containers/syringe/steroid,
/obj/item/weapon/storage/pill_bottle/zoom, /obj/item/weapon/storage/pill_bottle/zoom,
/obj/item/weapon/storage/pill_bottle/happy, /obj/item/weapon/storage/pill_bottle/happy,
/obj/item/weapon/storage/pill_bottle/tramadol /obj/item/weapon/storage/pill_bottle/paracetamol //VOREStation Edit
) )
// Contains loads of different types of boxes, which may have items inside! // Contains loads of different types of boxes, which may have items inside!

2
code/game/objects/structures/trash_pile.dm → code/game/objects/structures/trash_pile_vr.dm
View File

@@ -219,7 +219,7 @@
return I return I
/obj/structure/trash_pile/proc/produce_beta_item() /obj/structure/trash_pile/proc/produce_beta_item()
var/path = pick(prob(6);/obj/item/weapon/storage/pill_bottle/tramadol, var/path = pick(prob(6);/obj/item/weapon/storage/pill_bottle/paracetamol,
prob(4);/obj/item/weapon/storage/pill_bottle/happy, prob(4);/obj/item/weapon/storage/pill_bottle/happy,
prob(4);/obj/item/weapon/storage/pill_bottle/zoom, prob(4);/obj/item/weapon/storage/pill_bottle/zoom,
prob(4);/obj/item/seeds/ambrosiavulgarisseed, prob(4);/obj/item/seeds/ambrosiavulgarisseed,

2
vorestation.dme
View File

@@ -1313,7 +1313,7 @@
#include "code\game\objects\structures\tank_dispenser.dm" #include "code\game\objects\structures\tank_dispenser.dm"
#include "code\game\objects\structures\target_stake.dm" #include "code\game\objects\structures\target_stake.dm"
#include "code\game\objects\structures\transit_tubes.dm" #include "code\game\objects\structures\transit_tubes.dm"
#include "code\game\objects\structures\trash_pile.dm" #include "code\game\objects\structures\trash_pile_vr.dm"
#include "code\game\objects\structures\under_wardrobe.dm" #include "code\game\objects\structures\under_wardrobe.dm"
#include "code\game\objects\structures\watercloset.dm" #include "code\game\objects\structures\watercloset.dm"
#include "code\game\objects\structures\windoor_assembly.dm" #include "code\game\objects\structures\windoor_assembly.dm"