cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polaris sync

Browse Source
This commit is contained in:
killer653
2017-08-06 19:07:17 -04:00
parent 7b850d6c10 923285b2af
commit 468e73c7f3
652 changed files with 44410 additions and 18080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/reagents/reagent_containers/borghydro.dm
View File

@@ -13,15 +13,15 @@
var/charge_tick = 0
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
var/list/reagent_ids = list("tricordrazine", "inaprovaline", "tramadol", "dexalin" ,"spaceacillin")
var/list/reagent_ids = list("tricordrazine", "inaprovaline", "anti_toxin", "tramadol", "dexalin" ,"spaceacillin")
var/list/reagent_volumes = list()
var/list/reagent_names = list()
/obj/item/weapon/reagent_containers/borghypo/surgeon
reagent_ids = list("tricordrazine", "inaprovaline", "tramadol", "dexalin" ,"spaceacillin")
reagent_ids = list("tricordrazine", "inaprovaline", "oxycodone", "dexalin" ,"spaceacillin")
/obj/item/weapon/reagent_containers/borghypo/crisis
reagent_ids = list("tricordrazine", "inaprovaline", "tramadol", "dexalin" ,"spaceacillin")
reagent_ids = list("tricordrazine", "inaprovaline", "anti_toxin", "tramadol", "dexalin" ,"spaceacillin")
/obj/item/weapon/reagent_containers/borghypo/New()
..()
@@ -121,7 +121,7 @@
recharge_time = 3
volume = 60
possible_transfer_amounts = list(5, 10, 20, 30)
reagent_ids = list("ale", "beer", "berryjuice", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
reagent_ids = list("ale", "beer", "berryjuice", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
/obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
return

10
code/modules/reagents/reagent_containers/food/cans.dm
View File

@@ -124,3 +124,13 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/sodawater/New()
..()
reagents.add_reagent("sodawater", 50)
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale
name = "\improper Classic Ginger Ale"
desc = "For when you need to be more retro than NanoTrasen already pays you for."
icon_state = "gingerale"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale/New()
..()
reagents.add_reagent("gingerale", 30)

10
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
View File

@@ -518,3 +518,13 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/New()
..()
reagents.add_reagent("ale", 30)
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake
name = "Mono-No-Aware Luxury Sake"
desc = "Dry alcohol made from rice, a favorite of businessmen."
icon_state = "sakebottle"
center_of_mass = list("x"=16, "y"=3)
/obj/item/weapon/reagent_containers/food/drinks/bottle/sake/New()
..()
reagents.add_reagent("sake", 100)

2
code/modules/reagents/reagent_containers/food/lunch.dm
View File

@@ -58,7 +58,7 @@ var/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing,
/datum/reagent/drink/dry_ramen,
/datum/reagent/drink/hell_ramen,
/datum/reagent/drink/hot_ramen,
/datum/reagent/drink/nuka_cola)
/datum/reagent/drink/soda/nuka_cola)
// This default list is a bit different, it contains items we don't want
var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit,

12
code/modules/reagents/reagent_containers/food/sandwich.dm
View File

@@ -23,16 +23,16 @@
sandwich_limit += 4
if(istype(W,/obj/item/weapon/material/shard))
user << "\blue You hide [W] in \the [src]."
user << "<font color='blue'>You hide [W] in \the [src].</font>"
user.drop_item()
W.loc = src
update()
return
else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks))
if(src.contents.len > sandwich_limit)
user << "\red If you put anything else on \the [src] it's going to collapse."
user << "<font color='red'>If you put anything else on \the [src] it's going to collapse.</font>"
return
user << "\blue You layer [W] over \the [src]."
user << "<font color='blue'>You layer [W] over \the [src].</font>"
var/obj/item/weapon/reagent_containers/F = W
F.reagents.trans_to_obj(src, F.reagents.total_volume)
user.drop_item()
@@ -81,7 +81,7 @@
/obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user)
..(user)
var/obj/item/O = pick(contents)
user << "\blue You think you can see [O.name] in there."
user << "<font color='blue'>You think you can see [O.name] in there.</font>"
/obj/item/weapon/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone)
@@ -96,6 +96,6 @@
H = M
if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable.
H << "\red You lacerate your mouth on a [shard.name] in the sandwich!"
H.adjustBruteLoss(5) //TODO: Target head if human.
H << "<font color='red'>You lacerate your mouth on a [shard.name] in the sandwich!</font>"
H.adjustBruteLoss(5) //TODO: Target head if human. //This TODO has been here for 4 years.
..()

26
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -145,11 +145,11 @@
if (bitecount==0)
return
else if (bitecount==1)
user << "\blue \The [src] was bitten by someone!"
user << "<font color='blue'>\The [src] was bitten by someone!</font>"
else if (bitecount<=3)
user << "\blue \The [src] was bitten [bitecount] times!"
user << "<font color='blue'>\The [src] was bitten [bitecount] times!</font>"
else
user << "\blue \The [src] was bitten multiple times!"
user << "<font color='blue'>\The [src] was bitten multiple times!</font>"
/obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/storage))
@@ -164,12 +164,12 @@
U.create_reagents(5)
if (U.reagents.total_volume > 0)
user << "\red You already have something on your [U]."
user << "<font color='red'>You already have something on your [U].</font>"
return
user.visible_message( \
"[user] scoops up some [src] with \the [U]!", \
"\blue You scoop up some [src] with \the [U]!" \
"<font color='blue'>You scoop up some [src] with \the [U]!</font>" \
)
src.bitecount++
@@ -551,7 +551,7 @@
..()
new/obj/effect/decal/cleanable/egg_smudge(src.loc)
src.reagents.splash(hit_atom, reagents.total_volume)
src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
src.visible_message("<font color='red'>[src.name] has been squashed.</font>","<font color='red'>You hear a smack.</font>")
qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -560,10 +560,10 @@
var/clr = C.colourName
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
usr << "\blue The egg refuses to take on this color!"
usr << "<font color='blue'>The egg refuses to take on this color!</font>"
return
usr << "\blue You color \the [src] [clr]"
usr << "<font color='blue'>You color \the [src] [clr]</font>"
icon_state = "egg-[clr]"
else
..()
@@ -749,17 +749,17 @@
reagents.add_reagent("pacid",6)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/spidermeat
name = "meat"
/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
name = "spider meat"
desc = "A slab of green meat."
icon_state = "xenomeat"
filling_color = "#43DE18"
center_of_mass = list("x"=16, "y"=10)
/obj/item/weapon/reagent_containers/food/snacks/spidermeat/New()
/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat/New()
..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("spidertoxin",6)
reagents.remove_reagent("pacid",6)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/meatball
@@ -1277,7 +1277,7 @@
/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume()
if(prob(unpopped)) //lol ...what's the point?
usr << "\red You bite down on an un-popped kernel!"
usr << "<font color='red'>You bite down on an un-popped kernel!</font>"
unpopped = max(0, unpopped-1)
..()

2
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -258,7 +258,7 @@
if (target != user && H.getarmor(target_zone, "melee") > 5 && prob(50))
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red <B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B>"), 1)
O.show_message(text("<font color='red'><B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B></font>"), 1)
user.remove_from_mob(src)
qdel(src)