diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index aa17d28fe93..6bd5f0c7c70 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -2005,6 +2005,18 @@ datum ..() return + lemon_lime + name = "Lemon Lime" + description = "A tangy substance made of 0.5% natural citrus!" + id = "lemon_lime" + reagent_state = LIQUID + on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature-8) //310 is the normal bodytemp. 310.055 + M:nutrition += 1 + ..() + return + beer name = "Beer" id = "beer" diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 101dd0f2311..6062c1d4ecb 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -2141,6 +2141,17 @@ src.pixel_x = rand(-10.0, 10) src.pixel_y = rand(-10.0, 10) +/obj/item/weapon/reagent_containers/food/drinks/lemon_lime + name = "Lemon-Lime" + desc = "You wanted ORANGE. It gave you Lemon Lime." + icon_state = "lemon-lime" + New() + ..() + reagents.add_reagent("lemon_lime", 30) + src.pixel_x = rand(-10.0, 10) + src.pixel_y = rand(-10.0, 10) + + /obj/item/weapon/reagent_containers/food/drinks/sillycup name = "Paper Cup" desc = "A paper water cup." diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index c899d92d37e..83422e7c13a 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -146,6 +146,30 @@ datum return 1 + + block + explanation_text = "Do not allow any humans to escape on the shuttle alive." + + check_completion() + if(!istype(owner.current, /mob/living/silicon)) + return 0 + if(emergency_shuttle.location<2) + return 0 + + if(!owner.current) + return 0 + + var/area/shuttle = locate(/area/shuttle/escape/centcom) + var/protected_mobs[] = list(/mob/living/silicon/ai, /mob/living/silicon/pai, /mob/living/silicon/robot) + for(var/mob/living/player in world) + if(player.type in protected_mobs) continue + if (player.mind) + if (player.stat != 2) + if (get_turf(player) in shuttle) + return 0 + + return 1 + escape explanation_text = "Escape on the shuttle alive." diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index a23cafdfa14..8702547801e 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -108,6 +108,11 @@ survive_objective.owner = traitor traitor.objectives += survive_objective + if(prob(10)) + var/datum/objective/block/block_objective = new + block_objective.owner = traitor + traitor.objectives += block_objective + else switch(rand(1,100)) if(1 to 50) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index f2f786b9edb..1ad65c3e9ae 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ