Commit Graph

23 Commits

Author SHA1 Message Date
Molti
df51b30a0c Deletes all gamemodes in favor of storytellers (#22661)
* storytellers

* Update _base_event.dm

* Update _base_event.dm

* storytellers and midround events

* work

* antags

* last

* Update vote.dm

* fixes

* Update backrooms.dm

* so long gay dynamic

* Update vote.dm

* dynamic unit test

* cleanup

* delete minimum pop

* fix

* storyteller tweaks

* traitor awakening

* Update traitor.dm

* Update _basemap.dm

* Update ghost.dm

* oh god so much stuff

* Update _logging.dm

* buh bye events

* Update nuclearbomb.dm

* Update collections.ts

* Revert "Update collections.ts"

This reverts commit ff93cf170a.

* maybe

* fix

* fix

* Update game_mode.dm

* fixes

* fixes and more logging

* oh good gravy

* Update portal_storm.dm

* bring them back

* Update gamemode_subsystem.dm

* Update admin_verbs.dm

* Update force_event.dm

* damnit

* Update _base_event.dm

* fixes

* more

* it compiles :)

* more

* passes linter

* Update radiation_leak.dm

* Update dolphin_migration.dm

* Update brother.dm

* Update gamemode_subsystem.dm

* Update _base_event.dm

* Update _base_event.dm

* updates

* fixup

* add vampire remove prompt

* Update vampire.dm

* Update vampire.dm

* Update vampire.dm

* Update _base_event.dm

* Update gamemode_subsystem.dm

* Update gamemode_subsystem.dm

* Update dolphin_migration.dm

* fix migration

* title icon

* fixes

* formatting

* Update gamemode_subsystem.dm

* Update tzimisce.dm

* Update tzimisce.dm

* Update gamemode_subsystem.dm

* Update storytellers.dm

* tweak for our pop

* Update darkspawn.dm

* Update gamemode_subsystem.dm

* tweaks and fixes

* more and less roundstart

* Update ghost.dm

* lol lets just port the voting system

* Update scrubber_overflow.dm

* fix scrubber

* bye gamemode

* cleanup

* Update clown_operative.dm

* Update clown_operative.dm

* Update _base_event.dm

* probably fixed

* Update supermatter_surge.dm

* buh bye

* Update brain_trauma.dm

* more

* new pseudogamemode vote

* tweaks

* Update gamemode_subsystem.dm

* Update high_priority_bounty.dm

* Update gamemode_subsystem.dm

* Update storytellers.dm

* Update high_priority_bounty.dm

* tweaks

* Update high_priority_bounty.dm

* Update high_priority_bounty.dm

* fixes

* fixes

* tweak

* Update obsessed.dm

* so long pal

* Update battleroyale.dm

* deletions

* Update implant_dusting.dm

* bye

* uplinks fix

* Update uplink_items.dm

* Update uplink_items.dm

* delete more gamemodes

* more

* lol one ctrl f change

* hm what

* Update antagonists.dm

* Revert "Update antagonists.dm"

This reverts commit c3c2ee192e.

* Revert "hm what"

This reverts commit 43dbbcebcf.

* Revert "lol one ctrl f change"

This reverts commit 95e28f5221.

* cleanup

* more stuff

* more deletion

* this one gone too

* you and only you i shall save

* Update revolution.dm

* hold this please

* it's done

* bye admin stuff

* Update uplink.dm

* Update alert.dm

* should be fine

* fixes

* tweaks

* fixes

* fixes

* Update ticker.dm

* this is important

* Update heretic.dm

* Update clown_operative.dm

* rewrite

* fixes

* Update clockwork_cult.dm

* fixes

* Update uplink_items.dm

* reorganize

* Update objective.dm

* rewrite nightmare

* Update storytellers.dm

* tweak

* tweaks

* Update stray_cargo.dm

* Update stray_cargo.dm

* Update stray_cargo.dm

* delete unneeded tgui

* Update ticker.dm

* Update roundend.dm

* Update anomaly_grav.dm

* Update gamemode_subsystem.dm

* Update statpanel.dm

* Update statpanel.dm

* no additional delay

* clean up

* Update _base_event.dm

* Update _event.dm

* antag token and brothers

* no token picked

* Update _base_event.dm

---------

Co-authored-by: Byemoh <baiomurang@gmail.com>
2024-10-18 17:20:14 -05:00
Mqiib
d946ec09c2 less damage (#22649)
its a GOOD snake
2024-09-28 18:23:05 -05:00
Molti
22051e6b27 Tweaks the kinetic javelin (#22302)
* Update kinetic_javelin.dm

* Update kinetic_javelin.dm

* Update kinetic_javelin.dm

* holy fire

* done

* done

* Update holy_fire.dm
2024-07-07 02:56:04 -05:00
Molti
8bfbe66fa5 Modifies the rod of asclepius healing to be more consistent (#21978)
* tweak

* Update buffs.dm

* Update buffs.dm
2024-05-04 23:09:32 -05:00
Molti
341f960257 Deletes shadowling + Reworks darkspawn (#20581) 2024-04-08 20:44:37 +00:00
Chubbygummibear
093235868d [MDB IGNORE] Procedurally Generated Maints (Sorry no Gax in this PR just the tools) (#20555)
* i think it's ready

* this rustg define should match what it will be after the rust code is merged

* adding some documentation

* ready again

* my rust dll was out of date lmao

* fix things that makes biome cry

* i think it's ready

* this rustg define should match what it will be after the rust code is merged

* will this fix the linter?

* was that the issue?

* rust update

* ready again

* rip multi-z gax, you will return later

* my rust dll was out of date lmao

* fix things that makes biome cry

* why do these changes keep lingering

* that's already done

* is this alphabetical now

* why was there duplicates that required me to use the web editor to fix

* how did you get deleted

* that would have been bad lmao

* probably not super necessary but whatever

* that was bothering me

* that's already defined

* ok i think that's all the cleanup

* lastly stairs
2024-04-01 17:10:51 -05:00
Chubbygummibear
0fda5cfc6a Icon smoothing, and Rendering overhaul, and Camera fix, and mapmerge.py fix, and Multi-z, and THE PLANE CUBE (#21221)
* why no work

angy

* weird errors

shit sucks

* fixved it

I can spell good

* fix?

POSSIBLY

* nope

wasnt this

* no more immutable

thhanks koffee

* ok

ok

* removes all the pref stuff

""removes""

* remove this

idiot

* this goes bye

 bye

* these go too

genius

* bye

bye

* better night vision

* tries to fix camera

maybe

* ok fuck it we ball

we ball

* ok lets go back

go back go back go back

* WORK

DAMNIT

* ha

fuc kyou

* this

maybe

* this doesnt work :(

* maybe fix

maybe

* fucks everything

why do i do this

* test update

test

* Revert "tries to fix camera"

This reverts commit 2d14fbae66.

* reverts everything I just did

peko pain

* bye

bitch

* oh yeah add this

I guess

* Fucks up the camera net + chunk

why

* test maybe revert

* Revert "test maybe revert"

This reverts commit 98c5ef1b93.

* Revert "Fucks up the camera net + chunk"

This reverts commit 0e421ebf5f.

* this isnt going well

uh oh

* Attempts to rework out security camera

and probably more

* Revert "this isnt going well"

This reverts commit 1d8ceac867.

* Revert "Revert "this isnt going well""

This reverts commit e26fb61415.

* ok

ok

* Revert "ok"

This reverts commit 7e7a7f8372.

* Revert "Merge remote-tracking branch 'upstream/master' into NahI'dPortit"

This reverts commit 01094731c1, reversing
changes made to c0cf69ebf1.

* this doesn't need to be redefined

I guess

* no we need this

totally

* a familiar pain

* 515 is L

* yeah

yeah

* ok god

fine

* bye bye basemap :(

doesnt work on runtime station

* Fixes AI statis not working

god im good

* remove this

oh god

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NahI'dPortit""

This reverts commit b3fb3ba0db.

* proves to god I exist

and im pissed

* yog exclusive feature (tm)

plane master

* bring this back from previous push

* updates vendor emissives

as well as firealarms

* Updates barsign

and fucks everything up

* Fixes barsigns breaks all lights and updates barsigns to be machines and not structures

We will address this in a later patch

* not sure who changed that

oh well

* yeah

this got moved

* this needs updating

yeah

* turns off the carbon monoxide alarm

duh

* FIXES IT YES

thank you biome

* turns this off too

yeah

* Can't compile yet but ports a ton of shit

* L

* the game opens ig

* extra shit

* fixes

* signals and smooth queue

* look ma im going horribly out of scope

* fixes chasms

* this fixed nothing

* ???

* more barsigns

for later

* forgive me cowboy. also fuck diagonals

* oops

we need this apparently

* fuck it we ball

* Update _lists.dm

* Update icon_smoothing.dm

* it now works kinda

* Update atom_initializing_EXPENSIVE.dm

* lighting don't work

* we have light

* sort turfs better

* big fucking reorganize

* like everything except templates

* boy i sure hope nothing bad happens to these bar templates

* we're back

* no runtimes baby

* no errors

* shuttles are almost fixed i think

* Revert "shuttles are almost fixed i think"

This reverts commit 046058827c.

* Revert "Merge remote-tracking branch 'upstream/master' into icon_smoothing"

This reverts commit 863e1b776d, reversing
changes made to 884623e600.

* Revert "no errors"

This reverts commit 884623e600.

* too far back i think

* midround smoothing runtimes fixed i think

* comment cleanup

* should fix the component runtimes

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icon_smoothing""

This reverts commit a8ff8d63aa.

* NO RUNTIMES AND ICEMETA WORKS LET'S GOOOOOO

* please stay fixed icemeta

* organizing render dms

* woops this too in the reorganizing

* cryo fixed

* nah, i'd win

* parallax isn't my problem

* pls don't break icemeta

* runtime station gets a cam console

* well it compiles

* maybe fix the map

* woops

* man i hate maps

* was that it?

* PLEASE

* missing focus tests

* maybe that was it

* maybe

* let's take the batteries out of the carbon monoxide detector

* fuck osha

* i hate vending machines

* that's not a computer

* slot machine fix

* PLEASE

* that wasn't supposed to be there

* fuck it i can't fix everything at once

* BLUESPACE LOCKER?

* literally why

* hhh

* does this fix chasms?

* that should fix bad index

* please?

* turf_flags for reservations

* haha oops

* yolo (kill me)

* fix wood walls and other walls

* fix stairs

* that might have fixed shittles

* baseturfs are good now i think

* should fix plasma windows

* decals fixed

* please fix changelog

* shuttle lighting still fucky

* lighting is stinky slow and doesn't finish updating by the time the server starts guh

* lighting seemingly works

* slipping works

* shuttle sounds, slips, and windoors fixed

* why am i here

* fuck the changelog

* of course someone touched smoothing as i'm almost done

* we good?

* updating ai_eye and rename

* z updates and more ai cam updates

* ice fixed

* weather and ice fix

* clockies can see and other clean up catches

* windows fixed

* cowbot forgive me i'm trying to update flashlights to tg because there's no light on lower multi-z z's like ice meta bottom floor

* movable lighting works on multi-z

* gps fix

* item stacking from drag works

* falsewall fix

* job panel fixed

* AI HANDLED

* woops that comment should be gone

* i hate ai i hate ai

* brass glass visible again

* vents on top of tiles now

* sigdrobe sprite back

* centcomm portals work

* portals and see openspace mapping icons fixed

* icemeta my behated

* kill

* is that it

* lighting cutoff is old hat

* angery overlay

* not super necessary

* also extra but whatever

* ticker but thicker

* job fix i hope

* this isn't needed anymore

* latejoin fix?

* laserpointer, pipecrawl, and some consoles fixed

* i hate fixing bugs as they're made

* we're not ready for that

* redef cleanup

* gps arrows, gun flashlights, shuttle console placement, multi-z pulling fixed

* goofy ah gun code

* this was a good idea and necessary

* should fix caltrop component

* does this please the linter

* linter please accept this async function

* THERE

* take the batteries out

* make it stop

* cowbot stopped me from letting ghosts dab

* recycler loc fix

* fix border firedoors not blocking movement

* should fix screen fade out and fade in on round start and end

* darker command tile trim and fixed bronze wall sprites

* fuck you linter

* railings actually stop you from leaving

* probably fixes gibtonite overlay when struck

* armaments dispenser and clockwork catwalk

* turbine fix probably

* pointing at inhand items should be fixed

* fix overwatch app

* should hopefully fix cable rotation on shuttle move

* flashlights have better directionality logic

* hopefully fixes shuttle atmos on move

* grilles fixed

* hopefully this fixes shuttle buttons, airolocks, and other machinery not working after moving

* ice meta mining area finally not freezing

* fix lightbulb icons not updating

* lava mask and lighting dots

* we actually have this

* fuck glowshrooms GC

* fix light fixture interactions and icon updates

* hopefully catches all the updates

* lava lighting good to go

* seclite was missing inhands

* smoothing in replays

* light updates accurate in replays

* biome's multi-z requests

---------

Co-authored-by: cowbot92 <75333826+cowbot92@users.noreply.github.com>
Co-authored-by: Molti <gamingjoelouis@gmail.com>
Co-authored-by: Ringalong <53777086+JohnFulpWillard@users.noreply.github.com>
2024-02-18 13:16:55 -06:00
ktlwjec
022b344761 some spellchecking (#21280)
* spelling fixes

* more spelling fixes
2024-01-21 11:45:23 -06:00
Djiq
85db9beea2 [IDB IGNORE][MDB IGNORE] Adds Jungleland as a randomly chosen alternative to Lavaland, [Bounty] (#14802) 2024-01-05 12:15:25 -06:00
Molti
2cb3c6186b Slighty nerfs holy light favour gen + usability buffs (#20853)
* slightly nerf

* adds visual

* Update buffs.dm

* Update buffs.dm
2023-11-28 08:38:15 -06:00
Molti
9b3bff8463 bugfix (#20298) 2023-09-11 19:48:00 -04:00
Molti
10ec501185 Other idea holy light (#20228)
* OtherOption

* Update religion_sects.dm

* Update religion_sects.dm

* Update heal_react.dm

* Update religion_sects.dm

* Update religion_sects.dm

* Update code/modules/religion/religion_sects.dm

Co-authored-by: Theos <theubernyan@gmail.com>

---------

Co-authored-by: Theos <theubernyan@gmail.com>
2023-09-09 16:53:46 -05:00
Molti
b7e3a00fea Holy light medbot + antimagic (#20189)
* lol

* dif name

* Update buffs.dm

* Update buffs.dm
2023-09-01 19:48:58 -05:00
Theos
910ff9f531 Light water (#20178)
* :)

* going to obliterate about halcf of this :^

* initial work

* finalized

* geeeeeeeeet rrrrrrrridofit

* remove debug info (I test my code)

* rename :3
2023-09-01 19:48:30 -05:00
Molti
20b514bbb2 Adrenaline rush gives a mood boost (#20134)
* easier mood when in combat

* Update buffs.dm

* timer

* Update generic_positive_events.dm
2023-09-01 19:42:47 -05:00
N3D6
2adec0d393 [MDB IGNORE] IceMeta (#18054)
* Starts placing ice and snow at evac, makes shuttle dock

* IceMeta dm and json file

* A lot more ice and snow

* two files/?????

* maybe halfway done placing ice if even lol

* more ice. almost done with this LONG ASS PROCESS

* engines, maybe? this will take some testing

* a lotta lotta ice (HOLY SHIT I ALMOST CLOSED MY BROWSER WITHOUT COMMITTING THIS)

* Finishes placing ice and adds genturf around the map

* oops!

* couple little bugaroonies

* some stuff i missed

* some more stuff, mining base is done, added snow to some space i missed things

* stuff

* oops

* Config

* new landmarks

* ioopssie poopsie!!!!!!!!!!!

* forgor

* fmaily guy

* forgot like one or twenty tiles of ice

* Rename the map

* fix that a little

* why was this not here exactly?

* ATV room

* podbay door

* finishes up

* disables meta

* coats, boots and a pickaxe

* i caught you on camera acting sus

* removes bloat bandaid fix

* replaces bloat with not bloat

* finishes fixing that stuff

* oops

* space tile

* Quality issues and makes a cool snow path around the stayshun

* airless turf no bueno

* expand escape shuttle dock

* update meta

* fuck you *steals atmos*

* ye

* plz work uwu

* snow tiles on engine

* jortz

* makes tesla template look much better

* cleans up the outside of the station more

* sussy

* icemoon 2 z levels now

* Revert "icemoon 2 z levels now"

This reverts commit 9a6aaeea2e.

* plz work this time

* fixes json

* why isn't it working

* ned you're fucking retarded

* god fucking damnit ned

* poop

* Revert "poop"

This reverts commit 62cecf79eb.

* ok this time it should work

* one more thing

* fortnite

* rip spacemeta.... you did well

* ned are you fucking dumb?

* what the flip

* a zillion errors

* what the hell was the point of this?

* oops

* axes bloat icemoon maps

* forgot to delete this one lol

* adds joe the goliath to the mining base. super important change

* maybe fixes that? probably not

* fixes 2 runtimes

* fixes another runtime

* fix window

* b

* l

* fixes lavaland spawning

* random maint ruins with space in them suck anyway

* dogshit ass ruins

* fuck you maint ruins

* dilithium spawns now

* fixes KAs again and makes legion damage ignore apply to mining levels again

* b

* left some space

* prolly fixes solars

* Revert "Merge remote-tracking branch 'upstream/master' into icemeta"

This reverts commit 82e3ad1c73, reversing
changes made to 9d918cf020.

* Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta"

This reverts commit 9d918cf020, reversing
changes made to f06088b78b.

* Revert "Merge remote-tracking branch 'upstream/master' into icemeta"

This reverts commit f06088b78b, reversing
changes made to c217b19fcc.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta""

This reverts commit e4e618015c.

* Revert "Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta""

This reverts commit 6982c478e5.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta""

This reverts commit 5ea59d7339.

* security interace

* walls instead of windows for the space loop pipes so it's less cancerous in the long run

* Expands mining station atmos a little, shifts some stuff around the mining base in general, adds a heater so the base no longer gets mad chilly

* forgot a decal

* didn't commit it

* y

* ned

* i love this so much!

* brig :)

* L bozo

* THE DECALENING PART TWO: SCIENCE (#2)

* remove tiles

* forgot some red tiles

* farts

* done

* THE GREAT DECALENING PART 3: EVERYTHING ELSE (#3)

* should kill most tile decals

* should finish murdering old ones

* hey buddy you dropped this

* probably finishes killing old ones

* should properly shorten the ones that were done wrong

* maybe shrinks it now

* something went very wrong but i think we are back

* okay is this it

* silly ned

* what the flip

* balderdash

* Revert "balderdash"

This reverts commit 969dc70157342f60ac933f07e2d42eccd14f23e9.

* does like WAY too much stuff to describe

* ALMOST DONE

* ned you suck lol

* L ned + Ratio

* CONCLUDES THE GREAT DECAL-ENING

* few little tweaks

* HoP turnstile, as god intended

* remove free laser gun

* Fix Nukies P1: The Shuddle can drop (someone fix the flattening problems plz)

* Fix Nukies P2: Add plasma cutters and some plasma to the nukie shuttle

* gene wallmed 4 consistency

* fuck update appearance

* make bridge trims a ltitle better

* fuck this shit bro jesus

* i think i forgot this somehow idk

* fuck

* smart feller? no. fart smeller.

* makes engi and atmos way better looking trim-wise

* wait what if that's not actually true at all??

* plz work that'd be cool if it did

* i think this is right

* dumbass ned

* this might work idk

* plz

* Revert "plz"

This reverts commit c13270eb87.

* Revert "this might work idk"

This reverts commit 495db72813.

* Revert "dumbass ned"

This reverts commit cd59b84b9a.

* Revert "i think this is right"

This reverts commit 63a858aedd.

* Revert "plz work that'd be cool if it did"

This reverts commit b332d0f237.

* part 1

* ned is dumb

* part 2

* let me push this probably

* insignificant change to see if it fixes anything

* sick

* i deadass forgot to commit bro

* Revert "i deadass forgot to commit bro"

This reverts commit 986fa06991.

* Revert "Revert "i deadass forgot to commit bro""

This reverts commit 6d7bed5380.

* i hate this game

* n

* h

* h

* L

* cocaine

* that's important

* when you're here, you're family

* you suck eg ned

* starts working on this a little bit

* labor camp pt 1

* part 2

* sick

* it's done

* oops

* docking port

* kill the old one

* probably fixes pods

* finishing touches

* actual finishing touches

* touches up on a few poopy trims

* de-shittify tool storage

* why was this like that

* Aux base works now

* camra

* fixes everything

* a

* scrungularky

* gta 5

* lets see what this breaks

* unbreak the entire map

* does some stuff

* cool

* i think we are in the clear

* stuff, finishes stuff

* cool

---------

Co-authored-by: Byemoh <baiomurang@gmail.com>
2023-08-14 18:02:55 -05:00
Molti
fedc726866 More preternis food effects (#19806)
* more effects

* Update buffs.dm

* Diamonds not titanium

* Update buffs.dm

* Update ores_coins.dm
2023-08-04 22:39:29 -05:00
Code611
829a08c2b7 Rod of white no longer heals dead people (#19596)
* we can't heal dead people anymore

* woops i might be dyslexic
2023-07-12 15:01:37 -05:00
Molti
fef85c7eb9 Update buffs.dm (#19446) 2023-07-02 06:13:48 -04:00
Molti
6ecbd1caf1 Adrenaline no longer requires having a heart (#19170)
* adrenaline

* nowstatuseffect

* ipc flavour

* Update buffs.dm
2023-06-19 06:31:41 +00:00
Code611
47871acdf9 Holy Light rod now gives favor upon healing. (#19223)
* favor

* reduced to 20% point gain in comparison to "active" healing
2023-06-11 22:02:41 -05:00
LazennG
2d2d7c12a4 buster blocking some interacts (#19043)
* blocking interacts

* oops

corrects the damage reduction values on the double down buff lol

* Update code/game/machinery/_machinery.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

* Update code/game/objects/structures/crates_lockers/closets.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

---------

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>
2023-06-01 00:04:55 -05:00
tattax
4e5f8a27f3 adds antagonists to the game (#18514)
* commit 1 - get me out

* she lives

* adds wizards

* thing

* surprise end hits take 1

* s

* d

* surprise end hits take 2

* montreal

* REAl

* strangelight

* guilford fall

* natural disasters

* envelope

* h

* lady elect

* test 321

* test 123

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>

* hot toes test

* ss

* redundancy

* s

* test 2

* s²

* s³

* s²³

* a pray!

* life and limb

* epic problem

* hmm

* update

* fixes something

* fixes something²

* adds slaughter demons to the game

* rend it

* hmm

* restores something

* adds clockwork cult into the game

* adds changelings to the game

* cassevetes

* test 101

* :)

* against

* shut the door

* adds darkspawn to the game

* sad

* cashout

* adds vampires to the game

* 2

* summer freeze

* pink frosty

* test111

* adds game to the game

* 2

* syndrome

* test

* test 2

* test 3

* test 4

* adds replay to the game?

* maybe?

* slo

* hrn

* test II

* test III

* test IV

* new technique

* ahm hum

* d

* sensible

* c

* ss13

* a

* v

* f

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2023-05-25 19:54:14 -05:00