mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
home stretch
This commit is contained in:
nevimer
@@ -149,7 +149,6 @@
|
||||
desc = "When you fed your worms, you should have expected this."
|
||||
icon = 'modular_skyrat/modules/ashwalkers/icons/misc_tools.dmi'
|
||||
icon_state = "fertilizer"
|
||||
grind_results = list(/datum/reagent/plantnutriment/eznutriment = 3, /datum/reagent/plantnutriment/left4zednutriment = 3, /datum/reagent/plantnutriment/robustharvestnutriment = 3)
|
||||
singular_name = "fertilizer"
|
||||
merge_type = /obj/item/stack/worm_fertilizer
|
||||
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
icon_state = "bananaspider_peel"
|
||||
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
|
||||
foodtypes = GORE | MEAT | RAW
|
||||
juice_typepath = /datum/reagent/consumable/banana
|
||||
|
||||
/obj/item/food/deadbanana_spider/grind_results()
|
||||
return list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5)
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
/obj/item/bitrunning_disk/item/ancient_milsim
|
||||
name = "compiled bitrunning gear: ancient milsim"
|
||||
desc = "A disk containing early access downloadable content. It can be used to preload items into the virtual domain."
|
||||
selectable_items = list(
|
||||
/obj/item/choice_beacon/ancient_milsim,
|
||||
)
|
||||
@@ -128,11 +128,11 @@
|
||||
name = "lit [name]"
|
||||
|
||||
if(reagents.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire
|
||||
reagent_explode(datum/reagents/reagents)
|
||||
reagent_explode(reagents)
|
||||
qdel(src)
|
||||
return
|
||||
if(reagents.get_reagent_amount(/datum/reagent/fuel)) // the fuel explodes, too, but much less violently
|
||||
reagent_explode(datum/reagents/reagents)
|
||||
reagent_explode(reagents)
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
var/chosen_style = GLOB.robotic_styles_list[prefs.augment_limb_styles[slot]]
|
||||
new_limb.set_icon_static(chosen_style)
|
||||
new_limb.current_style = prefs.augment_limb_styles[slot]
|
||||
new_limb.replace_limb(augmented, special = TRUE)
|
||||
new_limb.replace_limb(augmented)
|
||||
qdel(old_limb)
|
||||
|
||||
//HEADS
|
||||
|
||||
@@ -152,8 +152,8 @@
|
||||
return
|
||||
switch(yesnomaybe)
|
||||
if("Yes")
|
||||
reset_grid()
|
||||
SStgui.update_uis(src)
|
||||
/* reset_grid() Broken
|
||||
*/ SStgui.update_uis(src)
|
||||
if("No")
|
||||
return
|
||||
if("Maybe")
|
||||
|
||||
@@ -26,5 +26,9 @@
|
||||
distill_reagent = /datum/reagent/consumable/ethanol/shakiri
|
||||
tastes = list("ultra-sweet jelly" = 1)
|
||||
|
||||
/obj/item/food/grown/kiri/grind_results()
|
||||
return list(/datum/reagent/consumable/kiri_jelly = 0.1)
|
||||
|
||||
|
||||
/obj/item/food/grown/kiri/make_bakeable()
|
||||
AddComponent(/datum/component/bakeable, /obj/item/food/baked_kiri, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
|
||||
|
||||
@@ -22,9 +22,11 @@
|
||||
icon = 'modular_skyrat/master_files/icons/obj/hydroponics/harvest.dmi'
|
||||
icon_state = "muli"
|
||||
foodtypes = VEGETABLES
|
||||
juice_typepath = /datum/reagent/consumable/muli_juice
|
||||
grind_results = list(/datum/reagent/consumable/muli_juice = 0.1)
|
||||
tastes = list("mint and savory sweetness" = 1)
|
||||
|
||||
/obj/item/food/grown/muli/grind_results()
|
||||
retrun list(/datum/reagent/consumable/muli_juice = 0.1)
|
||||
|
||||
|
||||
/obj/item/food/grown/muli/make_bakeable()
|
||||
AddComponent(/datum/component/bakeable, /obj/item/food/baked_muli, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
|
||||
|
||||
@@ -23,5 +23,9 @@
|
||||
icon = 'modular_skyrat/master_files/icons/obj/hydroponics/harvest.dmi'
|
||||
icon_state = "nakati"
|
||||
foodtypes = VEGETABLES
|
||||
grind_results = list(/datum/reagent/consumable/nakati_spice = 0)
|
||||
tastes = list("overwhelming spicyness" = 1)
|
||||
|
||||
/obj/item/food/grown/nakati/grind_results()
|
||||
return list(/datum/reagent/consumable/nakati_spice = 0)
|
||||
|
||||
|
||||
|
||||
@@ -25,3 +25,7 @@
|
||||
foodtypes = VEGETABLES
|
||||
grind_results = list(/datum/reagent/consumable/piru_flour = 0)
|
||||
tastes = list("chalky dryness" = 1)
|
||||
|
||||
/obj/item/food/grown/piru/grind_results()
|
||||
return list(/datum/reagent/consumable/piru_flour = 0)
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
icon = 'modular_skyrat/master_files/icons/obj/hydroponics/harvest.dmi'
|
||||
icon_state = "catnip"
|
||||
filling_color = "#4582B4"
|
||||
grind_results = list(/datum/reagent/pax/catnip = 2, /datum/reagent/water = 1)
|
||||
distill_reagent = /datum/reagent/consumable/pinkmilk //Don't ask, cats speak in poptart
|
||||
|
||||
/obj/item/food/grown/tea/catnip/grind_results()
|
||||
return list(/datum/reagent/pax/catnip = 2, /datum/reagent/water = 1)
|
||||
|
||||
@@ -145,10 +145,12 @@
|
||||
heal_brute = 5
|
||||
flesh_regeneration = 5
|
||||
sanitization = 3
|
||||
grind_results = list(/datum/reagent/medicine/oxandrolone = 3)
|
||||
merge_type = /obj/item/stack/medical/ointment/red_sun
|
||||
custom_price = PAYCHECK_LOWER * 1.5
|
||||
|
||||
/obj/item/stack/medical/ointment/red_sun/grind_results()
|
||||
return list(/datum/reagent/medicine/oxandrolone = 3)
|
||||
|
||||
/obj/item/stack/medical/ointment/red_sun/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/user)
|
||||
. = ..()
|
||||
healed_mob.reagents.add_reagent(/datum/reagent/medicine/lidocaine, 2)
|
||||
|
||||
@@ -5,9 +5,12 @@
|
||||
icon_state = "hemo_suture"
|
||||
heal_brute = 7
|
||||
stop_bleeding = 1
|
||||
grind_results = list(/datum/reagent/medicine/coagulant = 2)
|
||||
merge_type = /obj/item/stack/medical/suture/bloody
|
||||
|
||||
/obj/item/stack/medical/suture/bloody/grind_results()
|
||||
return list(/datum/reagent/medicine/coagulant = 2)
|
||||
|
||||
|
||||
/obj/item/stack/medical/suture/bloody/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/user)
|
||||
. = ..()
|
||||
if(healed_mob.blood_volume <= BLOOD_VOLUME_SAFE)
|
||||
|
||||
@@ -829,17 +829,12 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
|
||||
message_admins("[ADMIN_LOOKUPFLW(user)] has beamed out [living_user.pulling] alongside them.")
|
||||
var/turf/pulling_turf = get_turf(living_user.pulling)
|
||||
playsound(pulling_turf, 'sound/effects/magic/Repulse.ogg', 100, 1)
|
||||
var/datum/effect_system/basic/spark_spread/quantum/sparks = new
|
||||
sparks.set_up(10, 1, pulling_turf)
|
||||
sparks.attach(pulling_turf)
|
||||
sparks.start()
|
||||
var/datum/effect_system/basic/spak_spread/quantum/sparks = new
|
||||
do_sparks(10, 1, pulling_turf)
|
||||
qdel(living_user.pulling)
|
||||
var/turf/user_turf = get_turf(living_user)
|
||||
playsound(user_turf, 'sound/effects/magic/Repulse.ogg', 100, 1)
|
||||
var/datum/effect_system/basic/spark_spread/quantum/sparks = new
|
||||
sparks.set_up(10, 1, user_turf)
|
||||
sparks.attach(user_turf)
|
||||
sparks.start()
|
||||
do_sparks(10, 1, pulling_turf)
|
||||
qdel(user)
|
||||
else
|
||||
user.balloon_alert(user, "beam-out cancelled")
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
human_owner.AdjustSleeping(-50 * seconds_per_tick, FALSE)
|
||||
to_chat(owner, span_notice("You feel a rush of energy course through your body!"))
|
||||
cooldown = addtimer(CALLBACK(src, PROC_REF(sleepytimerend)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE | TIMER_DELETE_ME)
|
||||
. = ..()
|
||||
|
||||
/obj/item/organ/cyberimp/brain/anti_sleep/proc/sleepytimerend()
|
||||
to_chat(owner, span_notice("You hear a small beep in your head as your CNS Jumpstarter finishes recharging."))
|
||||
|
||||
@@ -350,8 +350,6 @@
|
||||
var/datum/weakref/target_override
|
||||
//////Target Assessment System. Whether or not it's targeting according to flags or even ignoring everyone.
|
||||
var/target_assessment = TURRET_FLAG_SHOOT_EVERYONE
|
||||
//////Ally system.
|
||||
var/allies = list()
|
||||
//////Do we want this to shut up? Mostly for testing and debugging purposes purposes.
|
||||
var/claptrap_moment = TRUE
|
||||
////// Do we want it to eject casings?
|
||||
@@ -787,6 +785,7 @@
|
||||
|
||||
/// Handles the firing process. Will need edited for special ammo types like 980.
|
||||
/obj/machinery/porta_turret/syndicate/toolbox/mag_fed/proc/handle_firing(obj/item/ammo_casing/casing, atom/movable/target)
|
||||
var/ignored_factions = list()
|
||||
var/obj/projectile/our_projectile = casing.loaded_projectile
|
||||
if(ignore_faction)
|
||||
our_projectile.ignored_factions = (faction + allies)
|
||||
|
||||
@@ -109,14 +109,6 @@
|
||||
|
||||
/obj/item/ammo_casing/smart/Initialize(mapload)
|
||||
. = ..()
|
||||
RegisterSignal(src, COMSIG_CHAMBERED_BULLET_FIRE, PROC_REF(iff_transfer))
|
||||
|
||||
/obj/item/ammo_casing/smart/proc/iff_transfer(datum/source, list/iff_factions)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
if(istype(loaded_projectile, /obj/projectile/bullet/smart))
|
||||
var/obj/projectile/bullet/smart/smart_proj = loaded_projectile
|
||||
smart_proj.ignored_factions = iff_factions.Copy()
|
||||
|
||||
/obj/item/ammo_casing/smart
|
||||
firing_effect_type = null
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
return ..()
|
||||
|
||||
/datum/wound/muscle/remove_wound(ignore_limb, replaced)
|
||||
/datum/wound/muscle/remove_wound(ignore_limb, replaced, destroying)
|
||||
limp_slowdown = 0
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -7478,7 +7478,6 @@
|
||||
#include "modular_skyrat\modules\bitrunning\code\spawners.dm"
|
||||
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\area.dm"
|
||||
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\choice_beacon.dm"
|
||||
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\disk.dm"
|
||||
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\fluff.dm"
|
||||
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\fog_of_war.dm"
|
||||
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\ghost_spawner.dm"
|
||||
|
||||
Reference in New Issue
Block a user