Commit Graph
666 Commits
Author SHA1 Message Date
307120e7d3 Patches and pills are now no longer subtypes of food (#23063)
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

* Update code/modules/mob/living/carbon/carbon.dm

* Update code/modules/mob/living/carbon/carbon.dm

* Some missed patches

* Apply suggestions from code review

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

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

* Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/patch.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/carbon.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-21 15:37:16 +00:00
9384c2a074 Allows roundstart observers to freely use antag HUD without losing respawnability (#23009)
* First pass

* do away with old antag hud variable

* rework cannotPossess

* some verification + cleanups

* Update code/modules/mob/dead/observer/observer_base.dm

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

* splits up log call

* Slightly refactor proc calls, continuing contra's review

* Log admin

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-21 13:00:13 +00:00
dj-34andGitHub 46b4b22563 Fix: change waterfall drip recursive timer to loop one (#23149) 2023-11-12 19:44:52 +00:00
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
warriorstar-orionandGitHub 8b82046680 blackbox: record ruin placements (#22757)
* blackbox: record ruin placements

* use an alist of map filenames to exact coords
2023-10-12 17:16:22 +01:00
OctusandGitHub c3a78f9ce0 Removes Beach Bums, Adds Althland Excavation Pit (#22315)
* replace

* Update lavaland_biodome_beach.dmm

* fixes

* we are so BACK bros

* oh yeah, now were cookin

* turf

* oops!

* Update lavaland.dm

* work you fuck

* donedonedoneeeeeee
2023-10-10 21:44:58 +01:00
6df2c2e3d2 Ghost bar (#22368)
* Ghost bar initial changes

* more changes

* we ball again brothers

* we are (once again) SO back

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/game/objects/items/weapons/cards_ids.dm

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

* deck of cards and shittt

* global placement

* Update code/modules/ruins/ghost_bar.dm

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

* readded

* hotfix

* zamn

* fixes

* greyfix

* last of the fixes

* can't stop me baby

* bam

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-09 19:47:17 +01:00
ContrabangandGitHub 7e0aa47311 Refactors objectives, expands team functionality, and custom teams (#22374)
* step 1

* renaming 1

* how could I forget this

* renaming 2

* renaming 3

* add matching proc, even if unused can remove later

* rename team obj to match

* oops

* okay more stuff

* okay more stuff

* fix this stuff

* okay more stuff

* needs_target = FALSE

* OKAY MORE STUFF

* OOPS AGAIN.

* self-review

* more round_end stuff

* stuff 119

* yeah fix that too

* EVEN MORE CHANGES

* grammar

* fix

* s34n review

* fixes custom teams with no antags not showing objs

* makes objectives work properly with teams

* a
2023-10-01 14:14:10 +01:00
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
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
DGamerLandGitHub fe139d1093 Aaaaaaaaaaaa (#22453) 2023-09-17 20:38:52 -04:00
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
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
ZelfandGitHub 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
AffectedArc07andGitHub 8d7e066471 Adds OpenDream as a CI lint (#21099)
* Initial Commit

* Makes the CI work (maybe)

* Of course CI has a hissy fit

* Actually fixes the codebase

* Oops 1

* Tweaks

* oops
2023-07-18 20:50:31 -05:00
DGamerLandGitHub 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
ZelfandGitHub 70103384b9 this is so embarrassing (#21593) 2023-07-10 11:52:41 +01:00
ZelfandGitHub 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
OctusandGitHub 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
DGamerLandGitHub 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
ContrabangandGitHub 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
QwertytofortyandGitHub 1fd9336cf3 Removes bluespace crystal sheets, makes crystals look as expected (#21028) 2023-05-22 22:05:34 +02:00
Henri215andGitHub 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
b90845c2e3 Balances skeletons by adding a subtype (#20587)
* balance skellies

* spoopy and scary

* more skellybones

* Ancient

* Apply suggestions from code review

* Update code/modules/mob/living/carbon/human/species/skeleton_species.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-03-27 20:39:24 +02:00
Coolrune206andGitHub c5cccdefe4 makes mob spawners respect antag jobbans (#20430) 2023-03-04 16:38:26 +00:00
AffectedArc07andGitHub b34e8fa301 [READY] CI now bans files with the same name (#20195)
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
2023-02-04 16:33:41 -06:00
7c3cd86f14 APC & Machinery Refactor + Local Powernets (#19991)
* local powernet and machine power refactor

* some fixes

* more tweaks + powerchange() refactor

* fixes var edited apcs on meatpackers.dmm

* fixes issue with power channels

* Reviews

* delta fix

* Update code/game/machinery/portable_turret.dm

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

* Apply suggestions from code review

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

* removed area power change proc

* damn morgues

* requested changes

* request changes

* deconfliction

* mapping fixes

* some fixes from TM

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-01-30 22:28:10 +00:00
Henri215andGitHub 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-orionandGitHub a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
Bm0nandGitHub 4bb0eb822d Ports TG ID cards (#19807)
* new ids!

* tcomms fix for ERT

* as above

* star for ERT commander

* Syndie commander ID gets a star instead of crown

* fixed TDred ID card

* cmag tweak

* pda id overlay

* whoops i fucked up shaftminer

* first pass

* jobs_centcom

* SHHHHH

* WHY DO YOU HAVE GLOVES?
2022-12-24 18:15:49 +01:00
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
S34NandGitHub 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
warriorstar-orionandGitHub 12c873d816 Fix human appearance randomness in spawners. (#19561) 2022-11-03 17:59:30 +00:00
Vi3triceandGitHub 03ce2920e1 Defining Part 4 - Code cleanup toward defines (... and the rest) (#19388)
* I wasn't done

* nits
2022-10-28 19:28:23 +02:00
Vi3triceandGitHub 3ed0c435c6 Carbon mobs get proper species-based names for mob spawners (#19451)
* Even the dead bodies get the proper names

* Right, dead bodies
2022-10-21 19:56:46 +02:00
S34NandGitHub 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
ElorgRHGandGitHub e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
GDNandGitHub 06d04e23ab Golem Clarification (#19196) 2022-10-05 22:43:40 -05:00
924e8cc949 Renames non-cybernetic implants to bio-chips (#18937)
* CHIPS

* microchip implanter

* more chips to purge

* bio-chip

* catches more things

* tgui

* final merge changes

* Update code/game/machinery/cloning.dm

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

* oops

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-09-24 14:24:25 +01:00
AffectedArc07andGitHub 3975e3531d Fix some busted logic (#19105) 2022-09-19 13:00:37 +01:00
AffectedArc07andGitHub 279ee1dc12 Fixes a ton of security issues (#19005) 2022-09-10 14:12:16 +01:00
520b0914ab [TGUI] Implant Pad + Implanter Related Sprites + Slight Implant refactor (#18556)
* holy guacamole

* TGUI capitilization

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* TGUI rebuild

* implements requested changes

* fixes

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

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

* fulfilling more requests

* uplink fixes

* init order stuff

* charlies requested changes

* Apply suggestions from code review

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2022-09-03 00:33:58 -05:00
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
FloFluoroandGitHub 13ad05d1c4 Adds Nian to "pickable species" spawner list (#18881) 2022-08-30 16:52:57 +01:00
AffectedArc07andGitHub 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
AffectedArc07andGitHub 34ed47ae74 Refactors stack traces, tiny bit of cleanup (#18773) 2022-08-14 02:11:40 +01:00
AffectedArc07andGitHub d2384ddc23 The most experimental PR in the world (#18762) 2022-08-13 13:13:02 +01:00
ParaGitVandGitHub bb19261a82 Golem mind-transfer carries over antag status (#18721) 2022-08-09 10:05:45 +01:00
moxianandGitHub e639b8acab /obj/item/reagent_container is Initialize (#18555) 2022-08-05 20:39:25 +01:00
EdanandGitHub 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