Skip to content

[TM ONLY] Bawn #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FalloutFalcon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[TM ONLY] Bawn #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 74 additions & 37 deletions _maps/map_files/Vampire/generic/forest.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
light_on = 1;
start_on = 14
},
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/floor/plating/rough,
/area/vtm/interior/forest/cave)
"by" = (
Expand Down Expand Up @@ -1668,7 +1668,7 @@
/obj/effect/turf_decal/darkpack/cave{
dir = 8
},
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"mD" = (
Expand Down Expand Up @@ -1841,7 +1841,7 @@
/area/vtm/interior/forest)
"nZ" = (
/obj/structure/glowshroom/single,
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/floor/plating/rough,
/area/vtm/interior/forest/cave)
"ob" = (
Expand Down Expand Up @@ -2264,7 +2264,7 @@
/obj/effect/turf_decal/darkpack/rough{
dir = 1
},
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"qY" = (
Expand Down Expand Up @@ -2332,7 +2332,9 @@
/obj/effect/turf_decal/darkpack/rough{
dir = 4
},
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest{
opacity = 1
},
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"rp" = (
Expand Down Expand Up @@ -2604,6 +2606,12 @@
/obj/machinery/hydroponics/soil/rich,
/turf/open/misc/dirt,
/area/vtm/outside/forest/sept)
"tr" = (
/obj/effect/realistic_fog/bawn/forest{
opacity = 1
},
/turf/open/floor/plating/rough/cave,
/area/vtm/interior/forest/cave)
"tt" = (
/obj/effect/turf_decal/darkpack/grass/corner{
dir = 1
Expand Down Expand Up @@ -2794,7 +2802,7 @@
/area/vtm/planetgeneration)
"ux" = (
/obj/effect/turf_decal/darkpack/cave/corner,
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"uz" = (
Expand Down Expand Up @@ -2868,7 +2876,7 @@
/area/vtm/interior/forest/cave)
"uT" = (
/obj/structure/flora/rock/darkpack,
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/floor/plating/rough/cave,
/area/vtm/interior/forest/cave)
"uZ" = (
Expand Down Expand Up @@ -3058,6 +3066,10 @@
},
/turf/open/misc/grass,
/area/vtm/interior/forest/cave)
"wi" = (
/obj/effect/realistic_fog/bawn/forest,
/turf/open/floor/plating/rough,
/area/vtm/interior/forest/cave)
"wl" = (
/obj/effect/turf_decal/darkpack/sand{
dir = 4
Expand Down Expand Up @@ -3667,6 +3679,10 @@
},
/turf/open/misc/dirt,
/area/vtm/outside/forest/sept)
"Bo" = (
/obj/effect/realistic_fog/bawn/forest,
/turf/open/floor/plating/rough/cave,
/area/vtm/interior/forest/cave)
"Bq" = (
/obj/effect/turf_decal/darkpack/rough{
dir = 5
Expand Down Expand Up @@ -3840,7 +3856,7 @@
/obj/effect/turf_decal/darkpack/rough/corner{
dir = 1
},
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"Cq" = (
Expand Down Expand Up @@ -3961,7 +3977,7 @@
"CZ" = (
/obj/effect/turf_decal/darkpack/cave,
/obj/effect/turf_decal/darkpack/rough/corner,
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"Db" = (
Expand Down Expand Up @@ -4505,7 +4521,9 @@
/obj/effect/turf_decal/darkpack/cave{
dir = 10
},
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest{
opacity = 1
},
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"Hz" = (
Expand Down Expand Up @@ -4962,6 +4980,10 @@
/obj/structure/stone_tile/surrounding/cracked,
/turf/open/floor/wood/smooth/old,
/area/vtm/interior/forest/cave)
"Li" = (
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"Lq" = (
/obj/effect/decal/pallet,
/obj/structure/table/wood,
Expand Down Expand Up @@ -4990,7 +5012,7 @@
dir = 4
},
/obj/effect/turf_decal/darkpack/cave/corner,
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"LA" = (
Expand Down Expand Up @@ -5021,6 +5043,13 @@
dir = 8
},
/area/vtm/interior/forest)
"LN" = (
/obj/effect/turf_decal/darkpack/cave{
dir = 9
},
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"LO" = (
/obj/effect/turf_decal/darkpack/grass/corner{
dir = 1
Expand Down Expand Up @@ -5361,6 +5390,12 @@
},
/turf/open/misc/grass/random/grass,
/area/vtm/outside/forest/sept)
"Oi" = (
/obj/effect/realistic_fog/bawn/forest{
opacity = 1
},
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"Oj" = (
/obj/effect/turf_decal/darkpack/cave/corner,
/turf/open/water/river,
Expand Down Expand Up @@ -5839,7 +5874,7 @@
dir = 4
},
/obj/effect/turf_decal/darkpack/rough/corner,
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"RG" = (
Expand All @@ -5851,7 +5886,7 @@
/area/vtm/interior/forest/cave)
"RJ" = (
/obj/structure/glowshroom,
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/floor/plating/rough/cave,
/area/vtm/interior/forest/cave)
"RO" = (
Expand Down Expand Up @@ -5952,7 +5987,7 @@
/obj/effect/turf_decal/darkpack/rough{
dir = 5
},
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"Sz" = (
Expand Down Expand Up @@ -6405,7 +6440,7 @@
/obj/effect/turf_decal/darkpack/cave/corner{
dir = 8
},
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/water/river,
/area/vtm/interior/forest/cave)
"Wc" = (
Expand Down Expand Up @@ -6678,7 +6713,9 @@
/turf/open/misc/beach/vamp,
/area/vtm/outside/forest)
"Ys" = (
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest{
opacity = 1
},
/turf/open/floor/plating/rough,
/area/vtm/interior/forest/cave)
"Yu" = (
Expand Down Expand Up @@ -6738,7 +6775,7 @@
/area/vtm/interior/forest/cave)
"YL" = (
/obj/structure/flora/rock/darkpack_big,
/obj/effect/realistic_fog/dense,
/obj/effect/realistic_fog/bawn/forest,
/turf/open/floor/plating/rough,
/area/vtm/interior/forest/cave)
"YN" = (
Expand Down Expand Up @@ -15684,9 +15721,9 @@ FK
FK
FK
FK
ZF
Li
Bx
Wf
Bo
aU
EH
EH
Expand Down Expand Up @@ -15881,11 +15918,11 @@ EH
iw
iw
Sb
ZF
Li
FK
Wa
yh
Wf
tr
Nr
RJ
hl
Expand Down Expand Up @@ -16080,14 +16117,14 @@ HD
ye
Sr
Sb
ZF
Li
FK
Wa
tF
Hv
aU
Wf
jF
Bo
LN
Lz
Fz
Nr
Expand Down Expand Up @@ -16275,13 +16312,13 @@ EH
EH
EH
Rh
Ys
wi
ye
qV
FK
ZF
Li
FK
ZF
Oi
Hm
mB
tF
Expand Down Expand Up @@ -16472,18 +16509,18 @@ EH
EH
EH
EH
Ys
wi
HD
Ys
wi
CO
Cp
FK
ZF
Oi
FK
ZF
Li
FK
ZF
FK
Li
Wa
EH
EH
Expand Down Expand Up @@ -16673,15 +16710,15 @@ EH
EH
bv
ye
Ys
wi
CO
rn
Sb
ZF
Li
FK
ZF
Li
FK
ZF
Li
EH
EH
EH
Expand Down Expand Up @@ -16876,7 +16913,7 @@ Ys
ye
Sr
Sb
ZF
Li
FK
EH
EH
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/~darkpack/traits/declarations.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_JAMMING_WEAPONS "jamming_weapons"
#define TRAIT_NATURAL "natural"
#define TRAIT_AURA_OF_CONFIDENCE "aura_of_confidence"
/// Allowed to enter through the forest bawn.
#define TRAIT_ALLOWED_FOREST_BAWN "allowed_forest_bawn"

/// Mob has had atleast one tooth yanked out while having no method of regenerating it.
#define TRAIT_TOOTH_PULLED "tooth_pulled"
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits/_traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_BRAIN_TRAUMA_IMMUNITY" = TRAIT_BRAIN_TRAUMA_IMMUNITY,
"TRAIT_NECROPOLIS_WORSHIP" = TRAIT_NECROPOLIS_WORSHIP,
"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - MERITS_FLAWS - ACUTE SENSE
"TRAIT_ALLOWED_FOREST_BAWN" = TRAIT_ALLOWED_FOREST_BAWN, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_BETRAYERS_MARK" = TRAIT_BETRAYERS_MARK, // DARKPACK EDIT ADD - MERITS_FLAWS - (Tremere)
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits/admin_tooling.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR,
"TRAIT_CARPOTOXIN_IMMUNE" = TRAIT_CARPOTOXIN_IMMUNE,
"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - MERITS_FLAWS - ACUTE SENSE
"TRAIT_ALLOWED_FOREST_BAWN" = TRAIT_ALLOWED_FOREST_BAWN, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
Expand Down
2 changes: 2 additions & 0 deletions modular_darkpack/modules/weather/code/effects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ GLOBAL_LIST_EMPTY(snow_list)

/obj/effect/realistic_fog
// Smaller sprite so you can use it in mapping without it sucking
name = "fog"
icon = 'modular_darkpack/modules/weather/icons/fog.dmi'
icon_state = MAP_SWITCH("fog", "helper")
alpha = 0
Expand All @@ -18,6 +19,7 @@ GLOBAL_LIST_EMPTY(snow_list)
var/alpha_upper = 21

/obj/effect/realistic_fog/dense
name = "dense fog"
alpha_lower = 10
alpha_upper = 40

Expand Down
Loading
Loading