diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index ea75b8ee29..abc2a2beb5 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -162,6 +162,7 @@ var/global/list/edible_trash = list(/obj/item/trash, /obj/item/device/paicard, /obj/item/device/mmi/digital/posibrain, /obj/item/weapon/digestion_remains, + /obj/item/device/communicator, /obj/item/device/aicard, /obj/item/ammo_casing, /obj/item/pizzabox, @@ -172,7 +173,15 @@ var/global/list/edible_trash = list(/obj/item/trash, /obj/item/weapon/glass_extra, /obj/item/weapon/paper, /obj/item/weapon/clipboard, - /obj/item/weapon/deck) + /obj/item/weapon/deck, + /obj/item/clothing/accessory/collar, //TFF 10/7/19 - add option to nom collars, + /obj/item/clothing/mask, + /obj/item/clothing/glasses, + /obj/item/clothing/gloves, + /obj/item/clothing/head, + /obj/item/clothing/shoes, + /obj/item/weapon/storage/box/khcrystal //TFF 27/9/19 - requested addition + ) var/global/list/edible_tech = list(/obj/item/weapon/cell, /obj/item/weapon/circuitboard, diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 95974c5334..1fff2cc350 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1356,6 +1356,11 @@ area/space/atmosalert() name = "\improper Fitness Room" icon_state = "fitness" +//CHOMPStation Addition TFF 24/9/19 - Sauna +/area/crew_quarters/sauna + name = "\improper Sauna" + icon_state = "pool" + /area/crew_quarters/longue_area name = "\improper Lounge" //VOREStation Edit - Muh speeling. icon_state = "recreation_area" @@ -1548,6 +1553,33 @@ area/space/atmosalert() icon_state = "atmos_storage" sound_env = SMALL_ENCLOSED +//CHOMPStation Addition Start TFF 24/9/19 - Add Atmos Gas Chambers..... +/area/engineering/gas_storage + icon_state = "atmos storage" + requires_power = 0 + +/area/engineering/gas_storage/air + name = "\improper Air Gas Storage" + +/area/engineering/gas_storage/oxygen + name = "\improper Oxygen Gas Storage" + +/area/engineering/gas_storage/nitrogen + name = "\improper Nitrogen Gas Storage" + +/area/engineering/gas_storage/co2 + name = "\improper Carbon Dioxide Gas Storage" + +/area/engineering/gas_storage/phoron + name = "\improper Phoron Gas Storage" + +/area/engineering/gas_storage/n2o + name = "\improper Nitrous Oxide Gas Storage" + +/area/engineering/gas_storage/mix + name = "\improper Gas Mixing" +//CHOMPStation Addition End + /area/engineering/drone_fabrication name = "\improper Engineering Drone Fabrication" icon_state = "drone_fab" @@ -1608,7 +1640,6 @@ area/space/atmosalert() name = "\improper Engineering Aft Hallway" icon_state = "engineering_aft_hallway" - //Solars /area/solar diff --git a/code/game/area/asteroid_areas.dm b/code/game/area/asteroid_areas.dm index 9e329ca20c..0bbacfec5b 100644 --- a/code/game/area/asteroid_areas.dm +++ b/code/game/area/asteroid_areas.dm @@ -8,22 +8,22 @@ /area/mine/explored name = "Mine" icon_state = "explored" - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/LRRMenu.ogg', 'sound/ambience/LRRTrack3.ogg') + ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/LRRMenu.ogg', 'sound/ambience/LRRTrack1.ogg', 'sound/ambience/LRRTrack2.ogg', 'sound/ambience/LRRTrack3.ogg') /area/mine/unexplored name = "Mine" icon_state = "unexplored" - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/LRRMenu.ogg', 'sound/ambience/LRRTrack3.ogg') + ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/LRRMenu.ogg', 'sound/ambience/LRRTrack1.ogg', 'sound/ambience/LRRTrack2.ogg', 'sound/ambience/LRRTrack3.ogg') /area/mine/explored/upper_level name = "Upper Level Mine" icon_state = "explored" - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/LRRMenu.ogg', 'sound/ambience/LRRTrack3.ogg') + ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/LRRMenu.ogg', 'sound/ambience/LRRTrack1.ogg', 'sound/ambience/LRRTrack2.ogg', 'sound/ambience/LRRTrack3.ogg') /area/mine/unexplored/upper_level name = "Upper Level Mine" icon_state = "unexplored" - ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/LRRMenu.ogg', 'sound/ambience/LRRTrack3.ogg') + ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/LRRMenu.ogg', 'sound/ambience/LRRTrack1.ogg', 'sound/ambience/LRRTrack2.ogg', 'sound/ambience/LRRTrack3.ogg') // OUTPOSTS diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 35bd05d49e..b6359e24cb 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -103,6 +103,12 @@ force = 0 var/luckynumber7 = 0 var/colorindex = 1 + + var/list/winitems = list( + /obj/item/weapon/reagent_containers/food/snacks/cookie, + /obj/item/weapon/spacecasinocash, + /obj/item/weapon/reagent_containers/syringe/drugs, + ) attackby(obj/item/W, mob/user) if(istype(W, /obj/item/weapon/pen)) @@ -116,22 +122,21 @@ attack_self(mob/user) var/mob/living/capsuleowner = user playsound(src, 'sound/effects/splat.ogg', 30, 1) + var/item = pick(winitems) sleep(100) switch(luckynumber7) if(1) capsuleowner.resize(RESIZE_TINY) //Loss Shrinking! if(2) capsuleowner.apply_damage(5, BRUTE) //Loss Damaging! if(3) capsuleowner.Weaken(5) //Loss Knee spaghetti! if(4) capsuleowner.hallucination += 66 //loss woah, dude. - if(5) new /obj/item/weapon/reagent_containers/food/snacks/cookie(src.loc) //Win! - if(6) new /obj/item/weapon/spacecasinocash(src.loc) //Win? + if(5) new item(capsuleowner.loc) //Win! if(7) - new /obj/item/weapon/material/butterfly/switchblade(src.loc) + new /obj/item/weapon/material/butterfly/switchblade(capsuleowner.loc) capsuleowner.apply_damage(10, BRUTE) //Loss Damaging! WIN KNIVE! - if(8) new /obj/item/weapon/reagent_containers/syringe/drugs(src.loc) if(9) - new /obj/item/weapon/gun/energy/sizegun/not_advanced(src.loc) + new /obj/item/weapon/gun/energy/sizegun/not_advanced(capsuleowner.loc) qdel(src) - if(777) new /obj/item/weapon/spacecash/c1000(src.loc) //for rigging + if(777) new /obj/item/weapon/spacecash/c1000(capsuleowner.loc) //for rigging else luckynumber7 = (rand(0,10)) luckynumber7 = rand(0,10) sleep(100) diff --git a/code/game/machinery/casino.dm b/code/game/machinery/casino.dm index 0026b2514c..50d0f26e28 100644 --- a/code/game/machinery/casino.dm +++ b/code/game/machinery/casino.dm @@ -204,10 +204,10 @@ busy = FALSE return - visible_message(output) //Output message + to_chat(user,output) //Output message if(platinumwin) // Did they win the platinum chip? - new /obj/item/weapon/casin_platinum_chip(src.loc) + new /obj/item/weapon/casino_platinum_chip(src.loc) playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) if(winnings) //Did the person win? @@ -296,9 +296,9 @@ "limejuice", "berryjuice", "mint", "matcha_latte", "lemon_lime", "sugar", "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua", "whiskey", "wine", "vodka", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters", "champagne", "singulo", "doctorsdelight", "nothing", "banana", "honey", "egg", - "coco", "cherryjelly", "carrot", "apple", "tomato", "nutbutter", "soymilk", "grenadine", "gingerale", "royrogers", + "coco", "cherryjelly", "carrotjuice", "applejuice", "tomatojuice", "nutbutter", "soymilk", "grenadine", "gingerale", "royrogers", "patron", "goldschlager", "gelatin", "melonliquor", "bluecuracao", "thirteenloko", "deadrum", "sake", "acidspit", - "amasec", "beepsky_smash", "atomicbomb", "nuka_cola", "threemileisland", "manhattan_proj", "psilocybin", "moonshine", + "amasec", "beepskysmash", "atomicbomb", "nuka_cola", "threemileisland", "manhattan_proj", "psilocybin", "moonshine", "specialwhiskey", "unathiliquor", "winebrandy", "snaps" ) @@ -364,9 +364,9 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/egg, /obj/item/weapon/reagent_containers/chem_disp_cartridge/coco, /obj/item/weapon/reagent_containers/chem_disp_cartridge/cherryjelly, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/carrot, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/apple, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/tomato, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/carrotjuice, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/applejuice, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/tomatojuice, /obj/item/weapon/reagent_containers/chem_disp_cartridge/nutbutter, /obj/item/weapon/reagent_containers/chem_disp_cartridge/soymilk, /obj/item/weapon/reagent_containers/chem_disp_cartridge/grenadine, @@ -382,7 +382,7 @@ /obj/item/weapon/reagent_containers/chem_disp_cartridge/sake, /obj/item/weapon/reagent_containers/chem_disp_cartridge/acidspit, /obj/item/weapon/reagent_containers/chem_disp_cartridge/amasec, - /obj/item/weapon/reagent_containers/chem_disp_cartridge/beepsky_smash, + /obj/item/weapon/reagent_containers/chem_disp_cartridge/beepskysmash, /obj/item/weapon/reagent_containers/chem_disp_cartridge/atomicbomb, /obj/item/weapon/reagent_containers/chem_disp_cartridge/nuka_cola, /obj/item/weapon/reagent_containers/chem_disp_cartridge/threemileisland, @@ -650,6 +650,7 @@