Skip to content
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.

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

Remove rp speed, ci fixes #26

Merged
merged 3 commits into from
Nov 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ jobs:
- name: Ticked File Enforcement
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: |
bash tools/ci/check_filedirs.sh tgstation.dme
bash tools/ci/check_changelogs.sh
bash tools/ci/check_grep.sh
bash tools/bandastation_check_grep.sh # BANDASTATION EDIT ADDITION - checking modular_bandastation code
bash tools/ci/check_misc.sh
bash tools/bandastation_check_grep.sh # BANDASTATION EDIT ADDITION - checking modular_bandastation code
tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/tgstation_dme.json
tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/unit_tests.json
Expand Down
10 changes: 5 additions & 5 deletions config/game_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ COMMENDATION_PERCENT_POLL 0.05
## To speed things up make the number negative, to slow things down, make the number positive.

## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied.
RUN_DELAY 2.5
WALK_DELAY 5
RUN_DELAY 1.5
WALK_DELAY 4

## The variables below affect the movement of specific mob types. THIS AFFECTS ALL SUBTYPES OF THE TYPE YOU CHOOSE!
## Entries completely override all subtypes. Later entries have precedence over earlier entries.
Expand All @@ -44,8 +44,8 @@ WALK_DELAY 5
##MULTIPLICATIVE_MOVESPEED /mob/living/silicon/robot 0
##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/alien 0
##MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal/slime 0
##MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 0
##MULTIPLICATIVE_MOVESPEED /mob/living/basic 0
MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 0
MULTIPLICATIVE_MOVESPEED /mob/living/basic 0


## NAMES ###
Expand Down Expand Up @@ -487,7 +487,7 @@ MICE_ROUNDSTART 10
ROUNDSTART_TRAITS

## Uncomment to disable human moods.
DISABLE_HUMAN_MOOD
#DISABLE_HUMAN_MOOD

## Enable night shifts
#ENABLE_NIGHT_SHIFTS
Expand Down
6 changes: 3 additions & 3 deletions modular_bandastation/modular_bandastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include "ai_laws/_ai_laws.dme"
#include "barsigns/_barsigns.dme"
#include "communication/_communication.dme"
#include "crawl_speed/_crawl_speed.dme"
//#include "crawl_speed/_crawl_speed.dme" // NO RP SPEED FOR MAIN SERVER
#include "cyrillic_fixes/_cyrillic_fixes.dme"
#include "discord/_discord.dme"
//#include "emote_panel/_emote_panel.dme"
#include "events/_events.dme"
//#include "emote_panel/_emote_panel.dme" // Waiting for upstream merge
//#include "events/_events.dme" // Going for pure TG right now...
#include "examine_panel/_examine_panel.dme"
#include "gunhud/_gunhud.dme"
#include "keybindings/_keybindings.dme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,7 @@
)
return "Я буду [translation[picked_serving]] [initial(reagent_type.name)]"


/mob/living/simple_animal/robot_customer/Initialize(mapload, datum/customer_data/customer_data, datum/venue/attending_venue)
/mob/living/basic/robot_customer/Initialize(mapload, datum/customer_data/customer_data, datum/venue/attending_venue)
. = ..()
var/datum/customer_data/customer_info = SSrestaurant.all_customers[customer_data]
if(customer_info)
Expand Down
4 changes: 2 additions & 2 deletions modular_bandastation/tts/code/base_seeds/mobs/friendly.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/mob/living/basic/pet/dog
tts_seed = "Stetmann"

/mob/living/simple_animal/hostile/retaliate/goat
/mob/living/basic/goat
tts_seed = "Muradin"

/mob/living/basic/cow
Expand Down Expand Up @@ -54,7 +54,7 @@
/mob/living/basic/pet/penguin
tts_seed = "Narrator"

/mob/living/simple_animal/sloth
/mob/living/basic/sloth
tts_seed = "Peon"

/mob/living/basic/butterfly
Expand Down
16 changes: 8 additions & 8 deletions modular_bandastation/tts/code/base_seeds/mobs/hostile.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Hostile mobs

/mob/living/simple_animal/hostile/blob
/mob/living/basic/blob_minion
tts_seed = "Earth"

/mob/living/basic/clockwork_marauder
Expand All @@ -9,25 +9,25 @@
/mob/living/basic/cortical_borer
tts_seed = "Gman_e2"

/mob/living/simple_animal/hostile/morph
/mob/living/basic/morph
tts_seed = "Treant"

/mob/living/simple_animal/revenant
/mob/living/basic/revenant
tts_seed = "Sylvanas"

/mob/living/simple_animal/hostile/imp/slaughter
/mob/living/basic/demon
tts_seed = "Mannoroth"

/mob/living/simple_animal/hostile/construct
/mob/living/basic/construct
tts_seed = "Acolyte"

/mob/living/simple_animal/hostile/construct/wraith
/mob/living/basic/construct/wraith
tts_seed = "Kelthuzad"

/mob/living/simple_animal/hostile/retaliate/snake
/mob/living/basic/snake
tts_seed = "Ladyvashj"

/mob/living/simple_animal/hostile/bear
/mob/living/basic/bear
tts_seed = "Shaker"

/mob/living/basic/carp
Expand Down
11 changes: 4 additions & 7 deletions modular_bandastation/tts/code/base_seeds/mobs/lavaland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,19 @@
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner
tts_seed = "Chen"

/mob/living/simple_animal/hostile/asteroid/basilisk
/mob/living/basic/mining/basilisk
tts_seed = "Antimage"

/mob/living/basic/mining/goliath/ancient
tts_seed = "Bloodseeker"

/mob/living/simple_animal/hostile/asteroid/hivelord
/mob/living/basic/mining/hivelord
tts_seed = "Ladyvashj"

/mob/living/simple_animal/hostile/asteroid/hivelordbrood
tts_seed = "Ladyvashj"

/mob/living/simple_animal/hostile/asteroid/hivelord/legion
/mob/living/basic/mining/legion
tts_seed = "Bloodseeker"

/mob/living/simple_animal/hostile/big_legion
/mob/living/basic/mining/legion/big
tts_seed = "Mannoroth"

/mob/living/simple_animal/hostile/asteroid/elite/broodmother
Expand Down
2 changes: 1 addition & 1 deletion modular_bandastation/tts/code/base_seeds/mobs/other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/obj/item/nullrod/scythe/talking
tts_seed = "Sylvanas"

/mob/living/simple_animal/shade
/mob/living/basic/shade
tts_seed = "Kelthuzad"

/mob/living/simple_animal/bot
Expand Down