Commit Graph

230 Commits

Author SHA1 Message Date
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379)
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 19:00:02 +00:00
HMBGERDO
d7a1621da8 APC access ID must have an icon (#23774)
* this ID must have icon

* APC access is engineering
2024-01-14 12:40:29 +00:00
Daylight
7caf286dd9 Replaces the ghost role alert ping with an unique sound, and decreases ghost window highlight spam (#23586)
* A commit

* Make it louder

* Golem flash cooldown
2024-01-06 21:44:47 +00:00
Qwertytoforty
9b534f3c3f Ports baby watcher from TG* (#22768)
* Ports baby watcher from TG*

* ah. I see. Alphabetical. Should have seen that coming.

* here comes the better mapped boi 🎵

* removes recursive_loc_check, uses get. also removes the debug always place WHOOPS

* fixes arguments, need to update and edit map

* adds bombable turfs

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* changes

* ///

* R-R-R-RUN IT BACK

* Update code/modules/awaymissions/mob_spawn.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* oops spacing

* part 1/2

* Update code/modules/awaymissions/mission_code/ruins/watcher_grave.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* 2 / 2

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-12-16 12:03:07 +00:00
dj-34
46b4b22563 Fix: change waterfall drip recursive timer to loop one (#23149) 2023-11-12 19:44:52 +00:00
Kano
5fe9b37246 Reworks xenomorph space ruin: Moonoutpost19 (#22784)
* i have come to bargain

* oops

* oversight fixes and stuff

* Uhh

I made some mistakes in vscode in commit procedure, so i can't return there. Obligatory webediting

* Henri215's review

grammar fix

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* this one too

* waiter waiter less holotables in my ruin please

* oops

* i cannot can

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-11-02 22:30:39 +00:00
Octus
2bdd9397aa Removes Pet Hospital, Adds Althland Corporation Refinery Ruins (#22287)
* byebyepet

* typo fix

* more typo fixes

* fixes

* another fix

* delete hospital shit

* ok seriously work now you fuc-

* improvements

* changes tempature

* heat proof lattice

* hi qwerty

* test

* ok lmao

* lattice moment

* oopsie!

* ok fuck you

* map update

* yes

* Revert "yes"

This reverts commit 9892a11232.

* Update lavaland_surface_althland_facility.dmm

* Update code/game/objects/items/stacks/rods.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* henri review

* adds lore

* fix

* fix

* more fix

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 12:24:43 +01:00
GDN
685e0ee506 fixes a bunch of turfs being active roundstart (#22233)
* fixes a bunch of turfs being active roundstart

* some ruins

* qwerty dun broke it

* main stations

* that should do it

* i'm blowing up qwerty

* should be it

* empty commit to check ci

* merge fix

* yippie

* joyous

* lavaland tax

* regex w

* I'm gonna fax mapmerge a low teir god gif

* SOMEONE ELSE GOTTA GET FAXED

* Update code/controllers/subsystem/SSair.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-09-20 12:47:46 +01:00
DGamerL
05c6654fce Adds a new spell, Summon Cheese (#22393)
* Here we go so Cheese
Cheese
Cheese
Butter
Spread it

* I hate that this is so much better
Cheese

* CC mapping changes

* Update code/game/objects/items/granters/action_granters/summon_cheese.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-17 18:24:19 +01:00
Venuska1117
b234b3e4ba Sort "mob_spawn.dm" to 2 specific categories. (#21728)
* NanoMap Auto-Update (Sun Jul  2 02:02:08 UTC 2023)

* Sorting mob_spawn file to have 2 categories.

* Holy jesus
So many files using alive and corpses... send help.

* Delete wizardcrash.dmm

* Trying..

* fixing mime/clown .dmm stuff

* Test

* Fix UpdatePaths file
now it should contain all corpses/alive path swapping.

---------

Co-authored-by: NanoMap Generation <action@github.com>
2023-09-08 21:23:30 +01:00
Zelf
a25dae604b Remakes the Syndi Cakes Factory space ruin. (#21611)
* adds ruin papers

* updates the paradise dme thingy

* replaces the old with new factory

* fixes icon_dead for the corgis

* minor typo on the paper

* meeras review

* seans requested changes

* windows n dat
2023-07-23 22:59:51 +01:00
DGamerL
8aceaeba5d Adds golems to the check antagonists panel, and gives a message when their owner is an antagonist/hijacker (#21571)
* I WANT MY COOKIE

* GDN review

* I'll figure out later why this is not working

* Jimkil review

* oops

* ayyyy huds work

* mindslave icon, hijacker icon coming soon™️

* mindslave hijack moment
2023-07-17 15:13:24 +01:00
Zelf
70103384b9 this is so embarrassing (#21593) 2023-07-10 11:52:41 +01:00
Zelf
e15438fdfe Reworks the "derelict5" space ruin. (#21524)
* drink mini potions before big potions

* fix numero uno

* adds the paper in mission_code

* fix numero dos

* fix numero tres
2023-07-07 13:28:42 +01:00
Octus
98ddced488 Explorer Overhaul and Gateway Retirement (#20855)
* Adds Explorer spawnability, removes Cyberaid gateways

* deletes some REALLY old bloat maps and deletes Gateway.dm

* Fixes runtime, and removes more stuff like gateway config... cause we dont have a gateway anymore

* removes all mention of /obj/machine/gateway

* Goodbye test_tiny and evil_santa 😈

* removed a literal fucking pamphlet

* changes map area name from Gateway to Expedetition

* changes the access from ACCESS_GATEWAY to ACCESS_EXPEDITION

* Revert "Goodbye test_tiny and evil_santa 😈"

This reverts commit eda775ecd5.

* ok deletes evil_santa only

* Fixes a runtime

* Adds new visuals for new area and explorer spawn marker

* Unhides explorers from the pref menu

* adds spawns and fixes the gateways for all maps, adds Expedition room to Cere

* improves and cleans up the expedition room maps, also clothes for Explorers

* GET OUT OF HERE EXAMPLE.

* byebye button
2023-06-03 15:22:37 -05:00
DGamerL
173bfb92f5 Removes bio resist from the code (#21108)
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01:00
Contrabang
3f87165a03 CI now bans files with the same name (PART 2) (#21051)
* CI change

* world.dm

* .dme world.dm

* subsystem renaming

* .dme for subsystems

* ai_laws.dm

* armor.dm

* emote.dm

* logging.dm

* spell.dm

* air_alarm.dm

* crew.dm

* decal.dm

* emissive_blocker.dm

* footstep.dm

* spawner.dm

* fire.dm

* carbon.dm

* living.dm

* mob.dm

* movement.dm

* thermal_drill.dm

* plasmamen.dm

* lavaland.dm

* chaplain.dm

* lightning.dm

* magnet.dm

* mimic.dm

* wizard.dm

* morph.dm

* vampire.dm

* click.dm

* self.dm

* radiation_storm.dm

* airlock.dm

* autolathe.dm

* mulebot.dm

* nuclearbomb.dm

* particle_accelerator.dm

* smartfridge.dm

* syndicatebomb.dm

* vending.dm

* wires.dm

* sound.dm

* mining.dm

* syndicate_space_base.dm

* monkey.dm

* guardian.dm

* bomb.dm

* standard.dm

* nuclear.dm

* pinpointer.dm

* access.dm

* departments.dm

* job.dm

* science.dm

* buttons.dm

* cloning.dm

* igniter.dm

* wishgranter.dm

* atmos_control.dm

* message.dm

* power_monitor.dm

* mecha.dm

* combat.dm

* mining_tools.dm

* meteors.dm

* spiders.dm

* contraband.dm

* aliens.dm

* uplinks.dm

* voice.dm

* intercom.dm

* lights.dm

* robot_items.dm

* mineral.dm

* dice.dm

* extinguisher.dm

* paint.dm

* signs.dm

* staff.dm

* smokebomb.dm

* boxes.dm

* random.dm

* janicart.dm

* statue.dm

* cargo.dm

* asteroid.dm

* headslug.dm

* fulton.dm

* atmospherics.dm

* pump.dm

* corpse.dm

* oldstation.dm

* gps.dm

* preferences.dm

* clothing.dm

* ears.dm

* glasses.dm

* boxing.dm

* color.dm

* renames ninja gear files

* recipes.dm

* error_handler.dm

* anomaly.dm

* floorcluwne.dm

* undead.dm

* overmind.dm

* shield.dm

* bottle.dm

* organ.dm

* piano.dm

* plasma_fist.dm

* language.dm

* mob_defines.dm

* mob_helpers.dm

* damage_procs.dm

* _defines.dm

* empress.dm and queen.dm

* brain.dm

* organ file renaming

* subsystems.dm

* constructs.dm

* bot.dm

* pet.dm

* nature.dm

* magic.dm

* colors.dm

* drugs.dm

* medicine.dm

* toxins.dm

* shuttle.dm

* surgery.dm

* moves a bunch of define files

* traits.dm

* names.dm

* other_mobs.dm

* flags.dm

* some final define files

* well turns out contractor_pinpointer.dm was  taken

* I forgot to remove this file

* how in the hell did this get unticked

* I DID INCLUDE IT, but there was a "w" there

* swaps the world definitions

* camera renamed to SScamera

* examine -> alien_examine
2023-06-02 14:30:17 -05:00
Qwertytoforty
1fd9336cf3 Removes bluespace crystal sheets, makes crystals look as expected (#21028) 2023-05-22 22:05:34 +02:00
Henri215
dc75a748f1 Fixing common spelling mistakes part 3 (#20870)
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
2023-04-22 09:44:27 +02:00
Henri215
e711cd5921 Fixes lots of common spelling mistakes (#20086)
* Fixes common spelling errors: "atleast", "infront", "succesfully", "alot"

* recieve -> receive

* spelling mistakes: percieve, wierd, posession, seperate, succesful

* Spelling mistakes: noticable, concious, enviroment, existance, foward, interupted, independant

* tgui rebuild

* lets make this run

* "succeded" mispelling

* reverting money spam change
2023-01-08 20:12:31 -05:00
warriorstar-orion
a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
S34N
0a441dc5d7 Revenant buff (#19577)
* spooky

* not yet tested

* i hate my life

* CI

* Update code/datums/spell.dm

* Update code/game/gamemodes/miniantags/revenant/revenant_abilities.dm

* review pass 1

* wise charlie words

* icons

* farie suggestion

* double vars

* haha oops

* bye you useless waste of space

* more damage

* farie review

* pass 2

* and this

* this is not a bool

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* charlie review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-11-10 21:10:03 +01:00
S34N
667dd5d4ac 515 Compatibility (#19636)
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
2022-11-08 23:08:40 +00:00
S34N
96b39e6a28 Removes USSP gateway, adds nothing (#19373)
* removes ruskie gateway

* mira

* space ruin

* oops make it a proper template

* y e e t
2022-10-19 21:13:30 +01:00
GDN
06d04e23ab Golem Clarification (#19196) 2022-10-05 22:43:40 -05:00
ParaGitV
4c500fb3d6 Golem shells require more dexterity (#18902)
* Golem shells require more dexterity

* Update check

I'm dumb and forgot ishuman exists

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update check 2.0

Because I'm turbo blind

* Update tres

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-08-31 13:15:50 +01:00
AffectedArc07
4140275ca8 Axes TS gateway (#18825)
* Axes TS gateway

* This too

* Commit for MDB

* This PR finna become my MDB2 test

* aaaaaaaaa
2022-08-18 23:48:29 +01:00
ParaGitV
bb19261a82 Golem mind-transfer carries over antag status (#18721) 2022-08-09 10:05:45 +01:00
moxian
e639b8acab /obj/item/reagent_container is Initialize (#18555) 2022-08-05 20:39:25 +01:00
Edan
1d552ab0e4 Armour Refactor (#18547)
* initial commit

* bullet fix + 100% armour pen

* equivalent armour values

* percentage armour pen

* updates bombing

* adds more defines

* i like armour too much

* review pass 1

* review pass 2

* updates with lavaland elites

* armour penetration value tweaks

* wt550 AP round change
2022-08-01 20:23:49 +01:00
S34N
07265abdf2 Makes trees transparent if important objects are hiding behind them (#18627)
* tree!

* Update code/modules/admin/verbs/freeze.dm

* yeet

* steel review, animate transparency

* more critical items

* charlie review

* charlie
2022-07-31 23:24:12 +01:00
AffectedArc07
38825f5c13 The beginning - Converts meatpackers gateway mission to ruin (#18434)
* Converts meatpackers gateway to ruin

* Line endings more like life endings

* Sean said this works

* Sean review

* the biggest edit
2022-07-30 13:05:30 +01:00
Contrabang
38f4445e26 Resprites areas, fixes areas covering more rooms than needed [MAP EDIT] (#18348)
* so much area

* oops forgot to remove unused sprites

* okay thats way better

* restores storage wing
2022-07-21 14:02:25 +01:00
Vi3trice
f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
KalevTait
938135f3d8 modules misc (#18315) 2022-07-20 22:56:34 +02:00
moxian
f0768024d2 /obj/item/storage no longer uses /New (#18306) 2022-07-12 21:38:06 +01:00
Contrabang
ed203d9f69 Space ruins no longer have lava underneath them (#18047)
* begone space lava, remaps most of space ruins

* removes druglab having DJ station area

* renames "gasthelizards.dmm"

* revert "renames "gasthelizards.dmm""

* goodbye syringe gun, hello turf/template_noop
2022-06-24 10:50:21 +01:00
LightFire53
52a2a90966 Fixes Area Shenanigans on Labour Camp, Derelict 5, and CharlieStation (#17987)
* Area tweaks

* Update oldstation.dm

* When you are Near Space

* 2 missed lattices...

I love catching things I missed in a screenshot...

I need a finer comb.
2022-06-17 12:19:23 +01:00
S34N
e372e95933 Removes gateway missions we don't and won't use (#17530)
* removes gateway missions we don't and won't use

* removes additionals

* Update code/modules/power/singularity/singularity.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* makes things work properly

* tick this please

* and of course this map used some random single gun stolen from another away mission

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-03-29 11:38:56 +01:00
S34N
ac6f9b4725 [IDB Ignore] Refactor icon smoothing to use 8-bit bitmasking (#16620) 2021-12-15 17:04:24 +01:00
Farie82
576482907b Refactors spell targeting to delegate it to a targeting datum (#16552)
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-12-13 17:40:36 +01:00
SabreML
1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906)
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
2021-11-04 19:47:31 +01:00
variableundefined
1b04314884 Merge pull request #16783 from Sirryan2002/WinterRuin
Reworks the Snow Biodome Ruin
2021-11-02 23:24:35 -05:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
Fox McCloud
1c40951338 Ports Cloth Golems 2021-09-24 19:48:15 -04:00
Sirryan2002
2760317d59 Reworks the Snow Biodome Ruin 2021-09-23 18:14:27 -04:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
AffectedArc07
b0e9db64bd Revert "Merge pull request #16520 from SabreML/fix-bundle-4"
This reverts commit 9a62622fbc, reversing
changes made to 841ad0f1fd.
2021-09-07 16:16:40 +01:00
variableundefined
c2664eec0d Merge pull request #16311 from S34NW/does-anyone-else-hate-genetics
Replaces genetics xray vision with other vision genes
2021-09-06 23:16:04 -05:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00