From e52425ef6e8aeb04cccfe975a18173c272689436 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 4 Jun 2021 12:41:27 -0300 Subject: [PATCH] Bug fixes: asteroid deletation and smokebomb edition (#12001) --- .../items/weapons/grenades/smokebomb.dm | 28 +++++++++---------- code/modules/background/accent/tajara.dm | 6 ++-- code/modules/background/defines.dm | 2 +- code/modules/mining/mine_turf_types.dm | 4 +++ .../human/species/station/tajara/tajara.dm | 2 +- .../station/tajara/tajaran_subspecies.dm | 4 +-- html/changelogs/alberyk-threebugfixes.yml | 7 +++++ 7 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 html/changelogs/alberyk-threebugfixes.yml diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 68104105605..67fec39273d 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -7,6 +7,7 @@ item_state = "flashbang" slot_flags = SLOT_BELT var/datum/effect/effect/system/smoke_spread/bad/smoke + var/smoke_times = 4 /obj/item/grenade/smokebomb/New() ..() @@ -14,29 +15,28 @@ src.smoke.attach(src) /obj/item/grenade/smokebomb/Destroy() - qdel(smoke) + QDEL_NULL(smoke) smoke = null return ..() /obj/item/grenade/smokebomb/prime() playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) - src.smoke.set_up(10, 0, usr.loc) - spawn(0) - src.smoke.start() - sleep(10) - src.smoke.start() - sleep(10) - src.smoke.start() - sleep(10) - src.smoke.start() - + smoke = new /datum/effect/effect/system/smoke_spread/bad + smoke.attach(src) + smoke.set_up(10, 0, get_turf(src)) + START_PROCESSING(SSprocessing, src) for(var/obj/effect/blob/B in view(8,src)) var/damage = round(30/(get_dist(B,src)+1)) B.health -= damage B.update_icon() - sleep(80) - qdel(src) - return + QDEL_IN(src, 8 SECONDS) + +/obj/item/grenade/smokebomb/process() + if(!QDELETED(smoke) && (smoke_times > 0)) + smoke_times-- + smoke.start() + return + return PROCESS_KILL /obj/item/grenade/smokebomb/cyborg name = "mounted smoke deployer" diff --git a/code/modules/background/accent/tajara.dm b/code/modules/background/accent/tajara.dm index 80b9dc1f108..0d4bc23483b 100644 --- a/code/modules/background/accent/tajara.dm +++ b/code/modules/background/accent/tajara.dm @@ -73,8 +73,8 @@ short, sharp vowel sounds and clear pronunciation. Most speakers are found in the DPRA controlled area of the region, but some do exist within the PRA borders." tag_icon = "tajara_northrasnrr" -/datum/accent/dinaak - name = ACCENT_DINAAK - description = "Found in the isolated valleys of the Din'aak Mountains, little has changed in this accent since the first contact. It still clings to words and grammatical \ +/datum/accent/dinakk + name = ACCENT_DINAKK + description = "Found in the isolated valleys of the Din'akk Mountains, little has changed in this accent since the first contact. It still clings to words and grammatical \ structures that have long since fallen out of use by other Siik'maas speakers. It is described as strong and abrupt by other Tajara." tag_icon = "tajara_dinaak" \ No newline at end of file diff --git a/code/modules/background/defines.dm b/code/modules/background/defines.dm index e2e6a0bee0f..8da1485a6ad 100644 --- a/code/modules/background/defines.dm +++ b/code/modules/background/defines.dm @@ -93,7 +93,7 @@ #define ACCENT_NOMADDELVAHHI "Nomadic Delvahhi" #define ACCENT_OLDYASSA "Old Ya'ssa" #define ACCENT_NORTHRASNRR "Northern Ras'nrr Siik'maas" -#define ACCENT_DINAAK "Din'aak Mountains Siik'maas" +#define ACCENT_DINAKK "Din'akk Mountains Siik'maas" #define ACCENT_HEGEMON_NOBLE "Noble Hegemonic" #define ACCENT_HEGEMON_PEASANT "Peasant Hegemonic" diff --git a/code/modules/mining/mine_turf_types.dm b/code/modules/mining/mine_turf_types.dm index 56595a8a515..d36a8615288 100644 --- a/code/modules/mining/mine_turf_types.dm +++ b/code/modules/mining/mine_turf_types.dm @@ -85,6 +85,10 @@ light_range = 2 . = ..() +/turf/unsimulated/floor/asteroid/ReplaceWithLattice() + ChangeTurf(baseturf) + new /obj/structure/lattice(src) + /turf/unsimulated/floor/asteroid/ash name = "ash" icon_state = "ash" diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm index 9d72198e37f..1f0e78120be 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm @@ -92,7 +92,7 @@ allowed_religions = list(RELIGION_TWINSUNS, RELIGION_MATAKE, RELIGION_RASKARA, RELIGION_NONE, RELIGION_OTHER) default_accent = ACCENT_REPUBICLANSIIK - allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_DINAAK, ACCENT_OLDYASSA) + allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_DINAKK, ACCENT_OLDYASSA) inherent_verbs = list( /mob/living/carbon/human/proc/tie_hair) diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm index a044734ab17..a609f31fd01 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm @@ -28,7 +28,7 @@ heat_level_2 = 360 //RaceDefault 380 Default 400 heat_level_3 = 700 //RaceDefault 800 Default 1000 - allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_RURALDELVAHHI, ACCENT_NOMADDELVAHHI, ACCENT_DINAAK) + allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_RURALDELVAHHI, ACCENT_NOMADDELVAHHI, ACCENT_DINAKK) stomach_capacity = 7 @@ -65,7 +65,7 @@ default_h_style = "M'sai Ears" secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_SIGN_TAJARA) - allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_DINAAK) + allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK, ACCENT_NORTHRASNRR, ACCENT_DINAKK) max_nutrition_factor = 1.2 max_hydration_factor = 1.2 diff --git a/html/changelogs/alberyk-threebugfixes.yml b/html/changelogs/alberyk-threebugfixes.yml new file mode 100644 index 00000000000..b415fdfd6b8 --- /dev/null +++ b/html/changelogs/alberyk-threebugfixes.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Smoke bombs should now work properly." + - bugfix: "Placing rods on the asteroid ash should no longer create a hole."