Skip to content

Commit

Permalink
Merge branch 'BeeStation:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
DrDuckedGoose authored Apr 21, 2024
2 parents e4e5f84 + dce7d08 commit 4147a65
Show file tree
Hide file tree
Showing 59 changed files with 371 additions and 319 deletions.
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
# In the event that multiple org members are to be informed of changes
# to the same file or dir, add them to the end under Multiple Owners

# Mapping

/_maps @BeeStation/beestation-mapping

# crossedfall

.dockerignore @crossedfall
Expand All @@ -26,10 +30,6 @@ Dockerfile @crossedfall
/code/modules/shuttle/super_cruise @powerfulbacon
/code/modules/shuttle/shuttle_creation @powerfulbacon

# pestoverde322

/_maps @pestoverde322

# itsmeow

/code/game/gamemodes/dynamic @itsmeow
Expand Down
3 changes: 2 additions & 1 deletion beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@
#include "code\controllers\subsystem\fail2topic.dm"
#include "code\controllers\subsystem\fire_burning.dm"
#include "code\controllers\subsystem\garbage.dm"
#include "code\controllers\subsystem\hub.dm"
#include "code\controllers\subsystem\icon_smooth.dm"
#include "code\controllers\subsystem\idlenpcpool.dm"
#include "code\controllers\subsystem\input.dm"
Expand Down Expand Up @@ -631,7 +632,6 @@
#include "code\datums\components\effect_remover.dm"
#include "code\datums\components\embedded.dm"
#include "code\datums\components\explodable.dm"
#include "code\datums\components\footstep.dm"
#include "code\datums\components\force_move.dm"
#include "code\datums\components\forensics.dm"
#include "code\datums\components\gps.dm"
Expand Down Expand Up @@ -804,6 +804,7 @@
#include "code\datums\elements\embed.dm"
#include "code\datums\elements\empprotection.dm"
#include "code\datums\elements\firestacker.dm"
#include "code\datums\elements\footstep.dm"
#include "code\datums\elements\forced_gravity.dm"
#include "code\datums\elements\frozen.dm"
#include "code\datums\elements\item_scaling.dm"
Expand Down
10 changes: 10 additions & 0 deletions code/__DEFINES/footsteps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
//misc footstep sounds
#define FOOTSTEP_GENERIC_HEAVY "heavy"

//footstep mob defines
#define FOOTSTEP_MOB_CLAW 1
#define FOOTSTEP_MOB_BAREFOOT 2
#define FOOTSTEP_MOB_HEAVY 3
#define FOOTSTEP_MOB_SHOE 4
#define FOOTSTEP_MOB_HUMAN 5 //Warning: Only works on /mob/living/carbon/human
#define FOOTSTEP_MOB_SLIME 6
#define FOOTSTEP_OBJ_MACHINE 7
#define FOOTSTEP_OBJ_ROBOT 8

/*
id = list(
Expand Down
50 changes: 0 additions & 50 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -173,47 +173,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(

#define iscogscarab(A) (istype(A, /mob/living/simple_animal/drone/cogscarab))

GLOBAL_LIST_INIT(shoefootmob, typecacheof(list(
/mob/living/carbon/human/,
/mob/living/simple_animal/cow,
/mob/living/simple_animal/hostile/cat_butcherer,
/mob/living/simple_animal/hostile/faithless,
/mob/living/simple_animal/hostile/nanotrasen,
/mob/living/simple_animal/hostile/pirate,
/mob/living/simple_animal/hostile/russian,
/mob/living/simple_animal/hostile/syndicate,
/mob/living/simple_animal/hostile/wizard,
/mob/living/simple_animal/hostile/zombie,
/mob/living/simple_animal/hostile/retaliate/clown,
/mob/living/simple_animal/hostile/retaliate/spaceman,
/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace,
/mob/living/simple_animal/hostile/retaliate/goat,
/mob/living/carbon/true_devil,
)))

GLOBAL_LIST_INIT(clawfootmob, typecacheof(list(
/mob/living/carbon/alien/humanoid,
/mob/living/simple_animal/hostile/alien,
/mob/living/simple_animal/pet/cat,
/mob/living/simple_animal/pet/dog,
/mob/living/simple_animal/pet/fox,
/mob/living/simple_animal/chicken,
/mob/living/simple_animal/hostile/bear,
/mob/living/simple_animal/hostile/jungle/mega_arachnid
)))

GLOBAL_LIST_INIT(barefootmob, typecacheof(list(
/mob/living/carbon/monkey,
/mob/living/simple_animal/pet/penguin,
/mob/living/simple_animal/hostile/gorilla,
/mob/living/simple_animal/hostile/jungle/mook
)))

GLOBAL_LIST_INIT(heavyfootmob, typecacheof(list(
/mob/living/simple_animal/hostile/megafauna,
/mob/living/simple_animal/hostile/jungle/leaper
)))

//Misc mobs
#define isobserver(A) (istype(A, /mob/dead/observer))

Expand All @@ -227,15 +186,6 @@ GLOBAL_LIST_INIT(heavyfootmob, typecacheof(list(

#define isaicamera(A) (istype(A, /mob/camera/ai_eye))

//Footstep helpers
#define isshoefoot(A) (is_type_in_typecache(A, GLOB.shoefootmob))

#define isclawfoot(A) (is_type_in_typecache(A, GLOB.clawfootmob))

#define isbarefoot(A) (is_type_in_typecache(A, GLOB.barefootmob))

#define isheavyfoot(A) (is_type_in_typecache(A, GLOB.heavyfootmob))

//Objects
#define isobj(A) istype(A, /obj) //override the byond proc because it returns true on children of /atom/movable that aren't objs

Expand Down
2 changes: 2 additions & 0 deletions code/controllers/configuration/entries/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

/datum/config_entry/string/servername // server name (the name of the game window)

/datum/config_entry/string/servertag // Server tagline for displaying on the hub

/datum/config_entry/string/serversqlname // short form server name used for the DB

/datum/config_entry/string/stationname // station name (the name of the station in-game)
Expand Down
7 changes: 7 additions & 0 deletions code/controllers/subsystem/hub.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SUBSYSTEM_DEF(hub)
name = "Hub Entry"
flags = SS_NO_INIT
wait = 1 MINUTES

/datum/controller/subsystem/hub/fire(resumed)
world.update_status()
108 changes: 0 additions & 108 deletions code/datums/components/footstep.dm

This file was deleted.

Loading

0 comments on commit 4147a65

Please sign in to comment.