Commit Graph

30996 Commits

Author SHA1 Message Date
Cody Brittain
743ff2b3fd Added Vysokan Stolitism, and Sikhism (#16438)
* Added Vysokan Stolitism, Confucianism, and Sikhism

* CL

* Correct missing defines

* Updated Vysoka's description to match current lore.

* Removed Confucianism

* Fix build
2023-06-24 12:37:04 +00:00
senorsapo
6ef56f3c71 max payne 3 (#16502)
* cocaina

* fix init error

* inhales
2023-06-24 09:31:42 +00:00
Geeves
433a275fc8 Overmap Range Tweak (#16439) 2023-06-23 16:38:16 +00:00
Geeves
5991d40468 Sensor Tweaks (#16434)
* Sensor Tweaks

* anotha one

* sound tweaks

* removed debug code
2023-06-23 10:57:15 +00:00
Butterrobber202
f6e19cf4e7 Unapologetic Changeling Arm Blade Buff (#16447)
* Arm Blade AP

* Create butterlingarmblade

* Rename butterlingarmblade to butterlingarmblade.yml

* Update mushrooms.dm

kois editting

* Update mushrooms.dm

THIS WAS THE WRONG PR
2023-06-22 21:25:14 +00:00
Wowzewow (Wezzy)
127101d762 Better Flagpatches (#16433)
* Flagpatches

  - imageadd: "Adds more generic flagpatch shapes. Improves how flagpatch sprites are shaded."

* fixes

* fix
2023-06-22 21:24:53 +00:00
Fluffy
9640071dfd Smart token bucket (#16463)
* Initial implementation, fixedttl w/ leaky seems to work so far

* Port things to macros to save proc overheads

* Pain

* Pain

* More work

* More work

* Added high and low watermark vars

* *sigh

* Final implementation and unit tests

* Changelog, recomment MUT

* I hate the linter

* Prefer this?

* bnkjbn

* sdf

* NON-WORKING test

* sdfgds

* nikjk

* dsfsfg

* dfghsdh

* Stupid linter

* ???

* wtf

* me dumb?
2023-06-22 21:23:57 +00:00
TheDanseMacabre
79b8d5e471 sneed (#16493)
Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
2023-06-22 21:23:19 +00:00
CampinKiller24
c48bed0b9d adds it (#16472) 2023-06-22 21:23:05 +00:00
kyres1
eb378fc3fa Intrepid overhaul and additions (#16449)
* getting started

* finishing up

* what

* changelog????

* there is a rag in a window send help

* fixes apc check and also adds docking controllers on exterior

* making a blast door

* intercomm bloat
2023-06-22 21:22:42 +00:00
Geeves
2b70d859f0 Exoplanet Ore Patches (#16271)
* the end of the beginning

* SPEED

* SPEED

* we real speed

* fix ore gen

* re-organize exoplanet stuff

* reorg and rename defines, fix ores

* Everything Else

* 1.2.0+a3 rust_g

* fix merge

* get rid of noise maps

* fix adhomai, delete random maps

* make adhomai poggers or something idk

* debug

* crystal planet, misc bugfixes

* fixes

* log

* change mineral gen to make adhomai work

* try this

* huh

* huhw

* rust_g 1.2.0+a4

* Ore Patches

* finishing touches hopefully

---------

Co-authored-by: John Wildkins <john.wildkins@gmail.com>
2023-06-22 20:29:48 +00:00
CampinKiller24
3b1eb87315 Adds Silversun Flag/Banner (#16459)
* SILVERSUN

Adds the flag/banner/loadout

* sprite fix

* sprite tweak
2023-06-22 20:12:55 +00:00
Llywelwyn
6d16b5f489 Fixes missing organ pain msg at 61-69 range (#16495)
* fixes pain msg

* cl

* infinity
2023-06-20 09:33:52 +00:00
Matt Atlas
22a0e6cc04 Fixes banners being offset. (#16492)
* Fixes banners being offset.

* lol

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-06-19 19:54:49 +00:00
TheDanseMacabre
261518b3f7 awd (#16479)
Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
2023-06-19 10:00:06 +00:00
Wildkins
7963839662 fights lag by killing the sun (#16481) 2023-06-18 20:07:45 +00:00
Matt Atlas
316a80c231 Splits telecrystals into bluecrystals and telecrystals. (#16380)
* bluecrystals 1

* Splits telecrystals into bluecrystals and telecrystals.

* fixes

* dans ma tete ce n'est pas evident

* c'est toujours trop beau pour etre vrai

* on ne peut toucher le ciel des doigts

* thanks lily

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-06-18 12:43:49 +00:00
CampinKiller24
1991d19144 Station to Ship (#16461)
* Alert level change

Changes references from station to ship

* Revert "Alert level change"

This reverts commit f198380c4b.

* Revert "Revert "Alert level change""

This reverts commit efee31daf9.

* actual change

actually fixes it in config because I'm an idiot

* reg fix

changes references from station to ship in regs

* changelog
2023-06-17 20:28:30 +00:00
Fluffy
fb8d2ca917 Wallrot runtime fix (#16458)
* Atomization

* Changelog

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-06-17 20:04:55 +00:00
juniper
3f07fb5090 himeo industrial rig variant (#16456)
* adds a himeo industrial rig variant

* unintended behavior- don't you act clever

* kit now works on the rig assembly, not the rig

* removes junk code

* tweaks and fixes 1

* mynah update FEAT. geeves, matt, and atteria

* if it works it works

* for all my FTC homies out there

* fixes the lack of spaces while im here
2023-06-17 20:04:53 +00:00
RustingWithYou
071ff3e122 Lets Vaurca select Unathi clothing in loadout (#16239)
* Lets Vaurca select Unathi clothing

* typo fix
2023-06-10 12:38:23 +00:00
atteria
69efb2eb39 adds nhp flags (#16415) 2023-06-10 12:35:01 +00:00
feartheblackout
b98bbdd3ed Fixes the large Port Antillia flag in loadout (#16429)
* Fixes the large Port Antilia flag in loadout

* changelog
2023-06-10 12:34:40 +00:00
Llywelwyn
2f755aeafe San Colette zippo, and San Colette + Europa coffee cups (#16442)
* san colette coffee cup

* europa coffee cup

* san colette zippo + typo

+ cl

* oops forgot to stage this in last commit

* zippo inhands

* right inhands were out by a pixel

* as prev

* okay man whatever

* tiny change to extended desc of lighter

san colette aren't an independent state, just got recognised as a sub-polity
2023-06-10 12:34:10 +00:00
Pirouette
ae497e5c37 Disables HoS taking Zavod Sec uniforms (#16454) 2023-06-10 12:33:32 +00:00
Yonnimer
cb119a5a0c Adds new Dionae accents (#16444)
* Adds the defines

* Adds the accents to the accent thing

* Biesel ironsong

* CoC Ironsong/kingcrimson

* Deep Ironsong/crimsonsong

* Eridani ironsong

* EUM Ironsong

* Moghes iromen/king crimson

* wait i forgor to actually add the unathi accents lol

* skemlth

* Adds some skrell accents to the eum ones

* iron

* xrim things

* naqwrows

* Adds the sprites for the new Dionae accents

* changelog

* /

* actually puts accent before kingcrimson

* changes the sus tag

* no longer sus

* conflict fixes
2023-06-10 01:08:25 +00:00
kyres1
bea87e5632 john epic (#16448) 2023-06-10 01:07:47 +00:00
Geeves
391a9043ec PEAC Stuff (#16274) 2023-06-09 10:09:45 +00:00
Matt Atlas
bf194304f5 Fixes checkpulse ignoring ling fakedeath. (#16451)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-06-09 10:08:48 +00:00
TheStryker
ba7284611f Adds ponytails without hair ties. (#16441)
* adds the ponytail sprites

* adds code for the ponytails

* fixes a thing

* fixes glitches, adds changelog

---------

Co-authored-by: TheStryker <irligones@gmail.com>
2023-06-08 15:12:02 +00:00
RustingWithYou
bf132c3367 torn cities accent (#16409) 2023-06-07 21:15:20 +00:00
Llywelwyn
3fdf89a601 Higher SMES input/output defaults for a less tedious RCON setup (#16412)
* higher smes i/o defaults

i dont think this should have any negative effect

* ChangeMe

* output to 140000

* substation SMES subtype, reverts regular smes i/o
2023-06-07 21:15:17 +00:00
Llywelwyn
dde3e66019 Flashlight changes and fixes (#16437)
* Flashlight Fixes

* lantern small + grammar fix

also did other cases of missing \the or whatever whilst at it

* numbers

* cl

this sucked to write

* cl but better

* use SPAN_WHATEVER whilst we're here

* if i didnt link my github to employers i would write a bad word here

i missed a bracket

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-06-06 21:49:01 +00:00
Wowzewow (Wezzy)
1e7c3ea540 Flag Fix 2 (#16432)
* Flag Fix 2

  - rscadd: "Fixes Dominian flag structures being invisible. Not like any were mapped in to begin with, but better safe than sorry."

* damn

* fail-safe 2
2023-06-05 22:36:17 +00:00
Geeves
676b8f1aef Visible Overmap Projectiles (#16440) 2023-06-05 22:35:58 +00:00
TheDanseMacabre
e054ad1cf6 Freebooter Ship (#16353)
* f

* adw

* awd

* the abomination

* daw

* dwa

* adw

* wda

* awd

* Sneed!

* s

* swa

* wad

* w

* wda

* wd

* s

* wd

* adw

* daw

* awd

* adw

* adw

* adw

* adw

* adw

* dwa

* fixes

* awd

* adw

* wah

* awd

* d

---------

Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
2023-06-03 10:23:06 +00:00
Ramke
ce7b49f9d3 Biogenerator Additions (#16416)
* biogenerator buff

* adds requested changes, updates changelog
2023-06-03 10:23:00 +00:00
TheDanseMacabre
4338997af0 Necromancy: Part One (#16419)
* awd

* adw

* dw

* dw

* adw

* sneed

* wd

* f

* fda

* w

* fix

* d

* w

---------

Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
2023-06-03 09:13:22 +00:00
Llywelwyn
3a22f09c5e Overmap events now respect their opacity settings, rather than all hazards being opaque (#16428)
* sensors bugfix + standardisation

standardises datums and events so they default to 0 opacity and require events to be set explicitly if opaque, instead of events working one way and the datums the other.

also fixes the sensor ping from setting every event to opaque every time it scans

* cl

* fixes events going transparent by toggling sensors on and off

* better solution - doesn't leave blocked vision on overmap when toggling

toggling sensors doesn't leave opaque tiles on the overmap doing it like this

* just rewording cl, no code change here
2023-06-03 09:06:00 +00:00
RustingWithYou
b162969bd9 awful hacky garbage (#16421) 2023-06-03 09:05:33 +00:00
Llywelwyn
3314638ac5 Fixes a bunch of typos (#16422)
* typo begone

* cl

* bugfix to spellcheck
2023-06-02 16:34:38 +00:00
Llywelwyn
ef9d56f70d bulletholes (#16411)
adds atom/proc/ to create/clear bulletholes
makes walls use this proc
2023-06-02 16:33:13 +00:00
Pirouette
4493f33894 digusting -> disgusting (#16426)
* digusting -> disgusting

* Update html/changelogs/digusting.yml

Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

---------

Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
2023-06-02 12:40:49 +00:00
DreamySkrell
b3d49c48ae a (#16420)
Co-authored-by: DreamySkrell <>
2023-05-31 14:43:29 +00:00
io
77a88f69bc Fixes Cyborgs becoming invisible once created by Machinists (#16413)
* fixes cyborg invisibility on creation

* adds the changelog
2023-05-30 16:29:37 +00:00
Matt Atlas
4e39aa496f Potentially fix light/atmos lag. (#16379)
* Potentially fix light/atmos lag.

* oops

* 2

* 3

* ff

* br

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-05-30 16:15:34 +00:00
Alberyk
45ce4ee228 Grass planet atmos fix (#16408) 2023-05-30 16:15:25 +00:00
Matt Atlas
edbb8c3b5a Fixes firing delays. (#16414)
* Fixes firing delays.

* put that back in

* final fixes

* cl update

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-05-30 16:15:23 +00:00
Llywelwyn
85b2ca6b31 /half_full (#16410)
full stack is 50
2023-05-30 16:15:20 +00:00
Matt Atlas
b13ba13521 Fixes some cases where fakedeath doesn't work. (#16404)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-05-30 16:14:31 +00:00