diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 6a163865909..7094066fc65 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -22,10 +22,9 @@ name = "magma" icon = 'blob.dmi' icon_state = "bloba0" - var/health = 60 + var/health = 40 density = 1 opacity = 0 - luminosity = 3 anchored = 1 /obj/blob/idle diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 4499cd26f7c..b4d5b5c1617 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -102,6 +102,17 @@ var/supply_shuttle_points = 50 containertype = "/obj/crate/freezer" containername = "Food crate" +/datum/supply_packs/monkey + name = "Monkey crate" + contains = list("/mob/living/carbon/monkey", + "/mob/living/carbon/monkey", + "/mob/living/carbon/monkey", + "/mob/living/carbon/monkey", + "/mob/living/carbon/monkey") + cost = 20 + containertype = "/obj/crate/freezer" + containername = "Monkey crate" + /datum/supply_packs/engineering name = "Engineering crate" contains = list("/obj/item/weapon/storage/toolbox/electrical", @@ -396,9 +407,9 @@ var/supply_shuttle_points = 50 var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE for(var/turf/T in get_area_turfs(shuttleat) ) - if(locate(/mob/living) in T) return 0 + if((locate(/mob/living) in T) && (!locate(/mob/living/carbon/monkey) in T)) return 0 for(var/atom/ATM in T) - if(locate(/mob/living) in ATM) return 0 + if((locate(/mob/living) in ATM) && (!locate(/mob/living/carbon/monkey) in ATM)) return 0 return 1 diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 86791f41a25..7c634d0c991 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -174,15 +174,15 @@ for(var/mob/living/silicon/ai/M in world) if(M.stat != 2 && M.see_in_dark != 0) var/who = pick("A BEARD", "A BEAR", "A BRO", "GOD-EMPEROR", "FRIEND COMPUTER", "THE LADY OF PAIN", "A FACEHUGGER", "A WIZARD", "A SYNDICATE AGENT", "A CENTCOM OFFICER", "A SPACE PIRATE", "THE CAPTAIN", "A MONKEY", "A HORSE", "A BEE", "AYN RAND", "A CRAB") - var/who2 = pick("ALIENS", "BEARS", "CLOWNS", "XENOS", "BOMBS", "SECURITY CLEARANCES", "FETISHES", "WIZARDS", "SYNDICATE AGENTS", "CENTCOM OFFICERS", "SPACE PIRATES", "TRAITORS", "MONKEYS", "HORSES", "BEES", "EELS", "CRABS", "POLITICAL COMMENTATORS", "CELEBRITIES", "ATHLETES", "POLITICIANS", "RUGS", "FOREST FIRES", "MENTAL ILLNESSES") - var/what2 = pick("BOLTERS", "STAVES", "DICE", "SINGULARITIES", "TOOLBOXES", "AIRLOCKS", "CLOTHES", "WEAPONS", "MEDKITS", "BOMBS", "CANISTERS", "CHAIRS", "CAT VIAGRA PILLS", "BBQ GRILLS") - var/what2pref = pick("SOFT", "WARM", "WET", "COLD", "ICY", "SEXY", "UGLY") + var/who2 = pick("ALIENS", "AI LAWS", "BEARS", "CLOWNS", "XENOS", "PETES", "BOMBS", "SECURITY CLEARANCES", "FETISHES", "WIZARDS", "SYNDICATE AGENTS", "CENTCOM OFFICERS", "SPACE PIRATES", "TRAITORS", "MONKEYS", "HORSES", "BEES", "EELS", "CRABS", "POLITICAL COMMENTATORS", "CELEBRITIES", "ATHLETES", "POLITICIANS", "RUGS", "FOREST FIRES", "MENTAL ILLNESSES") + var/what2 = pick("BOLTERS", "STAVES", "DICE", "SINGULARITIES", "TOOLBOXES", "NETTLES", "AIRLOCKS", "CLOTHES", "WEAPONS", "MEDKITS", "BOMBS", "CANISTERS", "CHAIRS", "CAT VIAGRA PILLS", "BBQ GRILLS") + var/what2pref = pick("SOFT", "WARM", "WET", "COLD", "ICY", "SEXY", "UGLY", "CUBAN") var/who2pref = pick("MAD BECAUSE OF", "IN NEED OF", "UNHAPPY WITHOUT", "HAPPY WITHOUT", "IN LOVE WITH", "DESPERATE FOR", "BUILT FOR", "AFRAID OF") var/whoverb = pick("ATTACKING", "BUILDING", "ADOPTING", "CARRYING", "KISSING", "EATING") var/amount = pick("TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN", "EIGHT", "NINE", "ONE HUNDRED", "ONE THOUSAND", "OVER NINE THOUSAND") var/area = pick("RUSSIA", "SOVIETS", "INTERNETS", "SIGIL", "ALPHA COMPLEX", "IMPERIUM", "THE BRIDGE", "THE ARRIVAL SHUTTLE", "CHEMICAL LAB", "GENETICS", "ATMOSPHERICS", "CENTCOM", "AMERICA", "IRELAND", "CANADA", "ROMANIA", "GERMANY", "CHINA", "MARS", "VENUS", "MERCURY", "JUPITER", "URANUS", "NEPTUNE", "PLUTO") - var/area2 = pick("HAS", "WANTS", "NEEDS", "WORSHIPS") - var/dowhat = pick("STOP THIS", "SUPPORT THIS", "CONSTANTLY INFORM THE CREW OF THIS") + var/area2 = pick("HAS", "WANTS", "NEEDS", "WORSHIPS", "LOATHES", "LOVES", "FEARS") + var/dowhat = pick("STOP THIS", "SUPPORT THIS", "CONSTANTLY INFORM THE CREW OF THIS", "IGNORE THIS", "FEAR THIS") switch(pick(1,2,3,4,5,6,7,8,9,10,11,12,13)) if(1) M << "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED" @@ -192,7 +192,7 @@ M.add_supplied_law(10,"[what2] ARE DANGEROUS TO HUMANS") if(3) M << "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED" - M.add_supplied_law(10,"THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION") + M.add_supplied_law(10,"THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION") if(4) M << "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED" M.add_supplied_law(10,"HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE")