Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Wisemonster/goonstation i…
Browse files Browse the repository at this point in the history
…nto HoP-Pet-2
  • Loading branch information
Wisemonster committed Aug 2, 2023
2 parents 1a6a25c + a424e83 commit 08985aa
Show file tree
Hide file tree
Showing 403 changed files with 121,788 additions and 26,213 deletions.
2 changes: 1 addition & 1 deletion +secret
4 changes: 2 additions & 2 deletions .github/MAP_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ If these features do not work in the current codebase then your map PR will be *

## Tips and Tricks
###### These aren't one hundred percent necessary to make maps, but they might make your life a bit easier
- **Cable spawners** `/obj/cablespawner` exist, they autoconnect to neighbouring cables and other cablespawners. It has reinforced and coloured variants and if you want to make it create nodes for terminal connections and whatnot, you can use the `/node` subtype. When needing something pretty and/or handcrafted (like cable art, or two non connected but crossing networks) probably use regular cables placed manually, cablespawners are for convenience in places where you don't care.
- **Pipe spawners** are similar to cable spawners, but they can't be used to make junctions (you'll have to set directions and priorities manually). Still, they're handy for drawing very long stretches of disposal/mail/cargo/morgue/transport pipe. Do be warned that you'll have to use the `/obj/disposalpipespawner/regular` for ordinary disposal pipes, otherwise it'll try to connect itself to ALL subtypes, which will runtime and make you sad.
- **Cable spawners** `/obj/cables/auto` autoconnect to neighbouring cables pointing at that tile and other auto cables, placing multiple cables if necessary. It has reinforced and coloured variants and if you want to make it create nodes for terminal connections and whatnot, you can use the `/node` subtype. When needing something pretty and/or handcrafted (like cable art, or two non connected but crossing networks) it's probably best to just use regular cables placed manually; cablespawners are for convenience in places where you don't care.
- **Pipe spawners** are similar to cable spawners, but they can't be used to make junctions (you'll have to set directions and priorities manually). Still, they're handy for drawing very long stretches of disposal/mail/cargo/morgue/transport pipe. Do be warned that you'll have to use the `/obj/disposalpipe/auto/regular` for ordinary disposal pipes, otherwise it'll try to connect itself to ALL subtypes, which will runtime and make you sad.
- **Auto Catwalks** and **Auto lattices** similarly are useful. Auto catwalks are now the default placement method of catwalks, and auto lattices are stored under `/obj/lattice/auto` (Like cable spawners and pipe spawners, auto lattices will break if placed alone). There's different connection options too, for auto connection with turfs or just walls.
- **Palettes** are small rooms with assortments of walls, floors and such in different arrangements, available for you to copy over to your projects. Palettes are available at the #immapper channel on the [goonstation discord](https://discord.com/invite/goonstation), and get updated every so often. You'll have to link your byond account with your discord account first, though.
- In StrongDMM, "ctrl+1,2,3 to toggle layers, shift click to highlight thing, ctrl shift click to delete thing, 1 2 3 to switch between placing a singular thing, placing multiple things in the area via clickdrag and selecting an area without placing things" ~ Caro, in the #immapper pins
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/beepsky.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: actions/checkout@v3

- name: Cache BYOND
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
run: |
tools/ci/check_filedirs.sh goonstation.dme
tools/ci/build_tgui.sh
tools/ci/check_grep.sh
tools/ci/check_grep_secret.sh
tools/bootstrap/python tools/ci/validate_dme.py <goonstation.dme
tools/bootstrap/python -m dmi.test
tools/bootstrap/python -m mapmerge2.dmm_test
Expand Down
1 change: 1 addition & 0 deletions _std/__std.dme
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "defines\antagonists.dm"
#include "defines\announcement_origins.dm"
#include "defines\artifacts.dm"
#include "defines\artemis.dm"
#include "defines\atom.dm"
#include "defines\bioeffect.dm"
#include "defines\blocking.dm"
Expand Down
2 changes: 1 addition & 1 deletion _std/defines/actions.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// Internal flag that will always interrupt any action.
/// Internal flag that will always interrupt any action, and disables action resumability
#define INTERRUPT_ALWAYS -1
/// dont
#define INTERRUPT_NONE 0
Expand Down
13 changes: 13 additions & 0 deletions _std/defines/artemis.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//Artemus REMOVAL


//#define DEBUG_ARTEMIS 1
//#define FORCE_ARTEMIS_MODE
//#define ARTEMIS_LINK_AT_ROUNDSTART

#define ASTEROID_BASIC_COUNT 8

#define PLANET_NUMPREFABS 1
#define PLANET_NUMPREFABSEXTRA 3

#define PLANET_MAPBORDER 1
5 changes: 5 additions & 0 deletions _std/defines/atom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,8 @@
#define ANCHORED 1
/// For an atom that's always immovable, even by stuff like black holes and gravity artifacts.
#define ANCHORED_ALWAYS 2

/// The atom is below the floor tiles.
#define UNDERFLOOR 1
/// The atom is above the floor tiles.
#define OVERFLOOR 2
2 changes: 2 additions & 0 deletions _std/defines/component_defines/component_defines_atom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@

/// when the outermost movable in the .loc chain changes (thing, old_outermost_movable, new_outermost_movable)
#define XSIG_OUTERMOST_MOVABLE_CHANGED list(/datum/component/complexsignal/outermost_movable, "mov_outermost_changed")
/// When the outermost movable in the .loc chain moves to a new area. (thing, old_area, new_area)
#define XSIG_MOVABLE_AREA_CHANGED list(/datum/component/complexsignal/outermost_movable, "mov_area_changed")
/// When the outermost movable in the .loc chain moves to a new turf. (thing, old_turf, new_turf)
#define XSIG_MOVABLE_TURF_CHANGED list(/datum/component/complexsignal/outermost_movable, "mov_turf_changed")
/// when the z-level of a movable changes (works in nested contents) (thing, old_z_level, new_z_level)
Expand Down
2 changes: 2 additions & 0 deletions _std/defines/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@
#define LANDMARK_LRT "lrt landmark"
#define LANDMARK_SAMOSTREL_WARP "samostrel"
#define LANDMARK_EVIL_CHEF_CORPSE "evilchef_corpse"
#define LANDMARK_PLANETS "artemis planets"
#define LANDMARK_SHIPS "artemis ships"

// Visual mirror warp modes
#define LANDMARK_VM_WARP_NONE 0
Expand Down
39 changes: 38 additions & 1 deletion _std/defines/materials.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,42 @@ var/global/list/material_category_names = list(
"REF-1" = "Reflective Material",
"ORG|RUB" = "Organic or Rubber Material",
"RUB" = "Rubber Material",
"WOOD" = "Wood"
"WOOD" = "Wood",
"GEM-1" = "Any Gemstone"
)

#define TRIGGERS_ON_BULLET "triggersOnBullet"
#define TRIGGERS_ON_EAT "triggersOnEat"
#define TRIGGERS_ON_TEMP "triggersTemp"
#define TRIGGERS_ON_CHEM "triggersChem"
#define TRIGGERS_ON_PICKUP "triggersPickup"
#define TRIGGERS_ON_DROP "triggersDrop"
#define TRIGGERS_ON_EXPLOSION "triggersExp"
#define TRIGGERS_ON_ADD "triggersOnAdd"
#define TRIGGERS_ON_LIFE "triggersOnLife"
#define TRIGGERS_ON_ATTACK "triggersOnAttack"
#define TRIGGERS_ON_ATTACKED "triggersOnAttacked"
#define TRIGGERS_ON_ENTERED "triggersOnEntered"
#define TRIGGERS_ON_REMOVE "triggersOnRemove"
#define TRIGGERS_ON_HIT "triggersOnHit"
#define TRIGGERS_ON_BLOBHIT "triggersOnBlobHit"


/// This contains the names of the trigger lists on materials. Required for copying materials. Remember to keep this updated if you add new triggers.
var/global/list/triggerVars = list(
TRIGGERS_ON_BULLET,
TRIGGERS_ON_EAT,
TRIGGERS_ON_TEMP,
TRIGGERS_ON_CHEM,
TRIGGERS_ON_PICKUP,
TRIGGERS_ON_DROP,
TRIGGERS_ON_EXPLOSION,
TRIGGERS_ON_ADD,
TRIGGERS_ON_LIFE,
TRIGGERS_ON_ATTACK,
TRIGGERS_ON_ATTACKED,
TRIGGERS_ON_ENTERED,
TRIGGERS_ON_REMOVE,
TRIGGERS_ON_HIT,
TRIGGERS_ON_BLOBHIT,
)
6 changes: 6 additions & 0 deletions _std/defines/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,11 @@
#define DECOMP_STAGE_HIGHLY_DECAYED 3
#define DECOMP_STAGE_SKELETONIZED 4

// Butchering defines
#define BUTCHER_NOT_ALLOWED 0
#define BUTCHER_ALLOWED 1
/// Extra "WHAT A MONSTER" message on butchering
#define BUTCHER_YOU_MONSTER 2

//idk where else to put this
#define DEFAULT_MIRANDA "You have the right to remain silent. Anything you say can and will be used against you in a NanoTrasen court of Space Law. You have the right to a rent-an-attorney. If you cannot afford one, a monkey in a suit and funny hat will be appointed to you."
2 changes: 2 additions & 0 deletions _std/defines/sight.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#define CLIENT_IMAGE_GROUP_ARREST_ICONS "arrest_icons"
#define CLIENT_IMAGE_GROUP_HEALTH_MON_ICONS "health_mon_icons"
#define CLIENT_IMAGE_GROUP_PACKETVISION "packetvision"
#define CLIENT_IMAGE_GROUP_ARTEMIS_MAP_ICONS "artemis_map_icons"
#define CLIENT_IMAGE_GROUP_ARTEMIS_SHIP_ICONS "artemis_ship_icons"
#define CLIENT_IMAGE_GROUP_ILLUSSION "illusion_icons"
#define CLIENT_IMAGE_GROUP_CURSES "curses_icons"
#define CLIENT_IMAGE_GROUP_GHOSTDRONE "ghostdrone_static_icons"
Expand Down
1 change: 1 addition & 0 deletions _std/defines/sims.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define SIMS_HYGIENE_THRESHOLD_FILTHY 15
#define SIMS_HYGIENE_THRESHOLD_MESSY 50
#define SIMS_HYGIENE_THRESHOLD_CLEAN 85
#define SIMS_HUNGER_FAMISHED 30
3 changes: 3 additions & 0 deletions _std/setup.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
#ifdef IM_REALLY_IN_A_FUCKING_HURRY_HERE
#define SKIP_FEA_SETUP 1
#define SKIP_Z5_SETUP 1
#define SKIP_PLANETS_SETUP 1
#define IM_TESTING_SHIT_STOP_BARFING_CHANGELOGS_AT_ME 1 //Skip changelogs
#define I_DONT_WANNA_WAIT_FOR_THIS_PREGAME_SHIT_JUST_GO 1 //Automatically ready up and start the game ASAP. No input required.
#endif

#ifndef IM_REALLY_IN_A_FUCKING_HURRY_HERE
#define SKIP_FEA_SETUP 0 //Skip atmos setup
#define SKIP_Z5_SETUP 0 //Skip z5 gen
#define SKIP_PLANETS_SETUP 0
#endif

// Server side profiler stuff for when you want to profile how laggy the game is
Expand Down Expand Up @@ -73,6 +75,7 @@
// other toggles

#define FOOTBALL_MODE 1
#define ENABLE_ARTEMIS 0
//#define RP_MODE

#ifdef Z_LOG_ENABLE
Expand Down
10 changes: 5 additions & 5 deletions assets/maps/prefabs/largetest.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
/turf/simulated/wall,
/area/space)
"c" = (
/obj/item/fish/bass,
/obj/item/reagent_containers/food/fish/bass,
/turf/simulated/floor/airless,
/area/space)
"d" = (
/obj/item/fish/carp,
/obj/item/reagent_containers/food/fish/carp,
/turf/simulated/floor/airless,
/area/space)
"e" = (
/obj/item/fish/mahimahi,
/obj/item/reagent_containers/food/fish/mahimahi,
/turf/simulated/floor/airless,
/area/space)
"f" = (
/obj/item/fish/red_herring,
/obj/item/reagent_containers/food/fish/red_herring,
/turf/simulated/floor/airless,
/area/space)
"g" = (
/obj/item/fish/salmon,
/obj/item/reagent_containers/food/fish/salmon,
/turf/simulated/floor/airless,
/area/space)

Expand Down
Loading

0 comments on commit 08985aa

Please sign in to comment.