Commit Graph

434 Commits

Author SHA1 Message Date
Migratingcocofruit
ebf7fdbfd2 Radiation Rework (#28320)
* initial changes

* Rad wave is working. now to implement the rest

* Makes the waves square

* Makes wave square

* multiplies the strength in all instances of radiation_pulse by 4 because each pulse makes one wave instead of 4 now

* Undef thing and apply suggestion

* Make radiation_pulse() not radiate the radiation source and implements contamination

* Adds contamination to uranium walls and meteors

* Fixes stuff

* Handle some contamination on attack still need to take care of meteors

* Fixed the meteor stuff

* Introduce emission types

* moves contaminate_touch to an atom proc and renames it to contaminate_atom

* deduplicates some contamination code

* Move inherent radioactivity to a component and signals from the atom vars and behaviour

* fix some things with the new component

* Update inherent_radioactivity.dm

* implement contaminating things that hit things that are inherently radioactive

* window things

* adds emission type to the rad_act call

* Changes radiation insulation values on a bunch of stuff

* fixes radioactive component radiating the wrong type

* more adjustments

* refactros rad_act

* adjustments to collector power production

* Adds plastitaniumglass windows and makes further adjustments

* Adds sprites to the shards and plastitanium directional window

* Update misc_cleanables.dm

* removes alpha rad insulation from floor turfs

* Fixes a bug with the starting tile of radiation waves

* More adjustments

* Adjusting singularity rad production

* reduces window half life a bit to make power smoother and buffs full window rad conversion

* Strengthens gamma and beta radiation effect on mobs.

* Makes radsuit block radiation completely

* Fixes Geiger Counters

* Fixes contamination not irradiating the contaminated thing

* Fixes inherent radioactivity not processing. Also makes it stop processing when a nuke core is contained

* Fixes ghost contamination

* Adds info to the collector

* Handles alpha radiation better on humans and changes some instances of rad_act to base_rad_act

* oops

* adjustments and fixes to alpha rad handling on mobs

* Make collector info more compact

* Core no longer radiates and contaminates from within the nuke until the plates are removed

* Contamination no longer counts as being inside a mob(it is supposed to be surface level)

* Adds inherent radioactivity to a bunch of uranium things. makes it all process.

* Nerf full windows

* Adjustments to collector and fulltile window radiation absorption

* Reduces passive contamination, especially while on the floor

* Adds different rad types to the geiger counter and fixes a runtime

* Makes full tile windows strong again and disallows building them on top of collectors

* adds emissive blockers to the rad blacklist and gives windows and collectors priority when irradiating for increased consistency

* Gives each contamination type it's own color.

* Gives each contamination type it's own color.  And makes the rad hud display them separately

* Changes how much the radiation wave affects the source tile, adds decay for performance reasons and adjusts collector parameters as well as SM and singulo rad production

* improves performance at very high rad amounts

* Fixes supermatter sliver box not containing radiation

* Restores supermatter sliver to old behaviour(not inherently radioactive)

* Slight nerf to fulltile windows and removes an unnecessary multiplication from rad wave processing

* Removes redundant line from window rad act

* Fixes radiation waves ignoring walls

* fixes it better

* more adjustments to collector stats

* Adjustment to collector gamma absorption

* increases grille beta blocking

* Review changes
2025-03-02 20:34:45 +00:00
Charlie Nolan
194e851b8f SSair performance improvements (#28271) 2025-02-12 22:39:09 +00:00
McRamon
a9d36a6028 Bookcase rework/resprite (#28003)
* first test

* hmmm

* lets see

* new shelves

* crafting

* deconstruction

* fixes

* more crafting
2025-01-18 17:58:01 +00:00
Adri
a23f2dfb74 Adds surgical tray crafting recipe, renames and increases cost for the wheeled one (#27897)
* Adds surgical tray crafting recipe, renames and increases cost for the wheeled one

* Changes cost
2025-01-12 19:22:44 +00:00
Tojo
9779e473a9 Resprites Comfy Chairs (#27846)
* New Comfy Chairs + Resprite

* Fixes back gap

* Adds gaps in chairs

* Updated Armrest
2025-01-10 02:11:37 +00:00
Charlie Nolan
8e60888659 Dragging storage bags now drops items around the mouse pointer (#27790)
* Standardize attom scatter and make bag drops offset it based on mouse position

* Init sanity

* Update code/game/atoms_movable.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-01-06 18:02:09 +00:00
PollardTheDragon
1c1eb2d3f7 Bluespace Harvester: Loot changes, Events, and more (#27438)
* Description, vars

* Lootpools and item spawning

* Automatic spawning, Motherlode

* PBJ Bag, Proper dirty probability

* Added more items to organic lootpool

* BSH Events

* Event condensing, product var fix

* Spawn location condensing

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

* Postclean

* Event list relocation, some announcement changes.

* Motherlode announcement over radio instead of announcement

* Created parent type for engineering events

* Motherlode spawn location optimization and turf selection

* More efficient rarity picking

* Adjusted lootpool

* Adjusted ruins that use BSH loot pools

* Excess Spacing

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Comment Format

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Comment Format

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Lootpool comments

* Made syndie donk rare

* Migrated lootpools

* Map fixes

* fix up maps

* Repaths a couple map things

* Engineering event documentation and cleanup

* Product documentation, tap location, formatting

* Nulled var on destroy, documentation

* Handles not finding a valid spawn location

* Error fixes

* Fixes runtime if no NAD spawn points.

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-01-05 11:29:05 +00:00
Bm0n
6a63097109 Converts a bunch of items into using neck slot (#27474)
* woe upon me

* update

* few changes

* critters

* critters

* THIS IS A CERTIFIED VOX CLASSIC

* removes comment from sql script

* i think i have a skill issue

* fuck

* TGUI Bundle Rebuild

* furcape

* attackby update

* cerefix

* buildstgui

* ajust size of loadout menu again

* tie layering toggle

* renames layer

* fucking map conflicts

* woe

* deconflict

* tgui

* conflicts again

* conflicts

* manual deconflict again

* oops

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* give this one more try

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* review

* scarffixforemerald

* tgui rebuild

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-01-02 22:47:50 +00:00
warriorstar-orion
c68637011a /New -> /Initialize Migration §2: Stacks. (#27446)
* refactor: /New -> /Initialize §2: stacks

* remove named arg from phazon BS crystal removal

* whoops
2024-12-30 14:36:32 +00:00
CRUNCH
c6fcd16078 Buffs Brass - Adds a Selection of New Brass Furnishings (#27465)
* creation

* Update clockwork-overlays.dmi

* Update computer.dmi

* Update computer.dmi

* Update Operating.dm

* airlock

* Update airlock_types.dm

* Update code/game/machinery/Sleeper.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-12-10 16:04:47 +00:00
warriorstar-orion
525c68d617 Attack chain, initial setup. (pull *immediately* for *any* TM issues) (#26834)
* refactor: Attack chain, initial setup.

* migrate curtain to make dreamchecker happy

* update thurible

* don't call attacked_by separately for legacy attack chain

* remove duplicate proc

* condense similar code, put allowances for legacy code in new procs

* update docs, include diagram source

* add comment on how to update diagram

* fix admonition

* mindflayer updates

* remove commented out code

* clarify all steps

* after_attack should be overridable

* whoops

* retrofit recent changes

* duh, can't restrict this yet because of tool_acts

* i hate ore bags with the fire of a thousand suns

* return correct value for object attack logic

* Various cleanups.

We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.

I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.

* simplify some argument names

* fuck it

* make it do the thing

* Rename CI module call

* Prove that CI works

* improve test output

* aaand fix it again

* fix curtain tool interactions

* fix compile error

* fix compile error

* Better docs, introduce migration plan tool.
2024-12-02 23:36:36 +00:00
warriorstar-orion
0ffa8303a7 Rename all non-snake_case types. (#27268)
* refactor: Rename all non-snake_case types (not procs or vars (yet)).

* completely dynamic update script

* might help to include the data

* update aa's scuffed python

* oh

* set script PR number

* run updatepaths again

* Add other table updates with JSON columns

* bump SQL version

* just fucking end my life

* move JSON data
2024-11-30 19:08:45 +00:00
Contrabang
396215501c Machine Frames are now structures and not machines (WTF???) (#27388)
* yes

* yes 2

* consistency

* yes

* rename update paths
2024-11-27 16:51:46 +00:00
Paul
bd7cbb1a54 Brass light fixtures (#27312)
* add brass lights

* start adding clockwork floor lights

* implement floor lights

* fix an error and add missing brass light sprites
2024-11-13 19:14:31 +00:00
warriorstar-orion
9465b565b8 refactor/ci: enforce mapload in Initialize args (#26878)
* refactor/ci: enforce mapload in Initialize args

* add new missing mapload arg

* add yet another missing mapload arg

* Update code/modules/power/engines/singularity/particle_accelerator/particle.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-10-23 19:07:46 +00:00
Contrabang
413ddc8b73 Adds Floor Lights (and makes lights not have random ranges) (#26923)
* Adds Floor Lights

* undef

* remove TECHNICAL DEBT™

* remove more technical debt™

* mapping changes
2024-10-06 09:33:31 +00:00
warriorstar-orion
b61f4f3ff8 feat: Storage shelves and gun racks. (#26744)
* feat: Storage shelves and gun racks.

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* review comments

* better examine

* fix lint

* Examine for empty shelves

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* rest of review comments

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-09-28 22:28:44 +00:00
Burzah
c434f08f4f Replaces info class with notice and purges info (#26421) 2024-08-13 09:46:58 +00:00
Aylong
11d98a0e44 [TGUI] Stack Craft 3: Rebirth (#26443)
* Initial commit

* Back to JS (Skill Issue & lazyness)

* Update UI please

* No need that

* Uhhh... documentation?
2024-08-12 17:32:30 +00:00
DGamerL
b497e4c925 Removes a lot of redefined procs (#26186)
* aaaaaaaaaaaaaaa

* Forgor

* Adds missing /proc/

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-07-30 13:19:32 +00:00
CRUNCH
b057000cf5 Fixes Some Minor Typos in Mineral & Glass Lore (#26235)
* Kills you for a minor spelling mistake

* Update glass.dm
2024-07-22 07:41:19 +00:00
DGamerL
4cf6595d12 Makes all playsounds use bools for vary (#26183)
* Makes all playsounds use `TRUE` for vary

* Same but for `FALSE`
2024-07-08 23:54:38 +00:00
CRUNCH
46ca5d3133 Update glass.dm (#26184) 2024-07-08 12:51:04 +00:00
Luc
77253c5ae7 Gives Surgical Drapes a Use (#25686)
* Gives drapes some utility for starting surgeries

* Adds a nice helping of drapes throughout the codebase

* add icon, realize I didn't think that through

* Handles blood with signals

* whoopsie daisy

* range

* how about borgs

* Apply suggestions from code review

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* burza suggestion

* more dgamer reviews

* Oops

* Update code/modules/surgery/surgery.dm

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

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-07-01 19:01:17 +00:00
Taurtura
1e1b711be5 More medkits ! With the correct branch this time! (#25985)
* tactical medkit craft

* machine and aquatic kit from plastic

* adds fake tactical kit

* change recipe to make the fake tactical kit
2024-06-29 17:59:35 +00:00
CRUNCH
bb2e96792b Tweaks the Light Replacer (#25932)
* Light Replacer Enhancement

* Update code/game/objects/items/devices/lightreplacer.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update

* Update lightreplacer.dm

* Update lightreplacer.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-28 03:16:37 +00:00
warriorstar-orion
4697b01241 ID-lock Theta equipment in indestructible crates. (#25660)
* ID-lock Theta equipment in indestructible crates.

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* Update code/modules/power/cables/cable_coil.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-12 18:22:46 +00:00
CRUNCH
8f2b24be32 Lore Expansion Pack: M I N E R A L S ! (#25427)
* D E E P   L O R E

* Update mineral.dm

* Apply suggestions from code review

Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/mining/ores_coins.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* reformatted and added more lore

* Even more lore

* oops

* Update sheet_types.dm

* Update code/game/objects/items/stacks/sheets/mineral.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/mining/ores_coins.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* updates

* Update ores_coins.dm

* Update code/game/objects/items/stacks/sheets/glass.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/game/objects/items/stacks/sheets/mineral.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update ores_coins.dm

* Update ores_coins.dm

* update

* refactor (again)

* Update sheet_types.dm

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* Update code/modules/mining/ores_coins.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update bscrystal.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-12 17:56:45 +00:00
Сиротка
cc1cd39305 Change "Construct Ripley" task description for robo + cargo fix (#25674)
* Make "Construct Firefighter" task for robo + cargo fix

* fix

* Update code/game/jobs/job_objectives/science.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/modules/supply/supply_packs/pack_science.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/jobs/job_objectives/science.dm

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-06-06 20:36:47 +00:00
Migratingcocofruit
88d236d5c9 Adds saltpetre crystals, which grind into saltpetre (#25050)
* Added saltpeter crystal, a way to make them, and sprites.

* comment changes

* forgot to undef

* actually undefing this time

* raises saltpeter crystal yield when ground to 8

I did some play testing and it simply takes too many clicks to pump in the ammonia required to get the amount of saltpeter you need.

* The compost bin being full of compost no longer hinders your saltpetre production

* rebuild TGUI

* Allows the compost bin to accept ammonia directly from plants that contain it

* adding the K back to KNO3

* Minor ui adjustments

* Compost bin can use ash now

* I am made of stupid.

* fixing a tiny little offset in the biomass bar

* Icon update, new description for Saltpetre crystals, style fixes and recompile tgui

* period

* minor changes

* rebuild TGUI

* Apply suggestions from code review

Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-05-28 14:34:17 +00:00
Сиротка
094d7bd13b Fix undestrictible armor from attachable armor (#25608)
* Fix undestrictible armor from ataacable armor

* also fix ash hide comsumption
2024-05-27 14:56:07 -05:00
Сиротка
c9f44b1f29 Improve mecha circuit crates to make them useful + few fixes (#25516)
* Improve mecha circuit crates to make them useful

* fix

* Update ripley.dm
2024-05-27 16:42:02 +00:00
Aylong
1409c03463 [TGUI] Noticeboard (#25095)
* [TGUI] NoticeBoard

Well... that's... something?

Little animation

Update tgui.bundle.css

Pretty laggy animations

More design

Revert inset shadow

Polishing

You can craft it now

Wrap this shit

RMB func

* Polish

* Review changes

* Rebuild rebuild rebuild...

* Rebuild TGUI

* Unwrench it
2024-05-17 17:27:10 +00:00
Сиротка
b216289b41 FEAT: Two new attachable armor for Ripley (#25231)
* FEAT: Two new attachable armor for Ripley

* Delete mecha 32x48.dmi

* Update code/game/objects/items/stacks/sheets/leather.dm

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

* Update code/game/mecha/working/ripley.dm

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

* Update code/game/mecha/working/ripley.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* Add defines into separate files, change descriptions a bit

* fix

* change (loc) to get_turf(src)

* mecha

* edit defines

* Update leather.dm

* Update code/game/mecha/working/ripley.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update leather.dm

* Update code/game/objects/items/stacks/sheets/leather.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update mechfabricator_designs.dm

* fix .dmi

* Update code/game/mecha/working/ripley.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/mecha/working/ripley.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/mecha/working/ripley.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update ripley.dm

* Update code/game/objects/items/stacks/sheets/leather.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/objects/items/stacks/sheets/leather.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

---------

Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-05-17 12:45:32 +00:00
Christasmurf
d587effe2c Beret + softcap .dmi split (#25314)
* beret softcap dmi split

* icon rename

* dme crlf to lf

* tsf cap fixes

* Apply suggestions from code review

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

* vox cap icon name

* remove beret subtype on fluff

* Update code/modules/clothing/head/soft_caps.dm

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

---------

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-05-02 11:37:44 +00:00
Divulf
15e7fcdb3f Improves barsigns and makes them buildable. (#24685)
* Improves barsigns and makes them buildable.

* Requested fixes.

* fingerprints and a parent call on attack_hand() (sure hope this doesn't break anything)

* More fixes.  (the change to barsigns.dmi is removing a bunch of almost-transparent pixels on the mead bay sign that shouldn't have been there)

* Even more fixes.

* Better code and sprite fixes.

* early returns

* better

* more

* switch

* qwertyuiop

* whoops

* maps are stupid

* mcramon sprites :o

* i hope mapmerge works this time

* i hope mapmerge works THIS time

* zrsxdctfhghfcdszzsxdgcfhv

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-05-02 09:59:35 +00:00
Qwertytoforty
af5d187014 Adds magic tarot cards [SERIOUS DO NOT CLOSE AFTER AFD] (#24933)
* starts it

* Update magic_tarot.dm

* MORE PROGRESS

* So many thanks to Cloudbucket, for sprites

* The Work, the Art, continues.

* more changes

* pushes the Work foward. All cards done.

* and more thanks github

* adds to BSH

* tochat

* Finishes QWERTYTODO. Magic key. World smoke

* Isaac and his mother lived alone in a small house on a hill.  Isaac kept to himself, drawing pictures and playing with his toys as his mom watched Christian broadcasts on the television.  Life was simple, and they were both happy. That was, until the day Isaac’s mom heard a voice from above.  “Your son has become corrupted by sin. He needs to be saved.”  “I will do my best to save him, my Lord,” Isaac’s mother replied, rushing into Isaac’s room, removing all that was evil from his life.  Again the voice called to her, "Isaac’s soul is still corrupt. He needs to be cut off from all that is evil in this world and confess his sins."  “I will follow your instructions, Lord. I have faith in thee,” Isaac’s mother replied, as she locked Isaac in his room, away from the evils of the world.  One last time, Isaac’s mom heard the voice of God calling to her.  “You've done as I've asked, but I still question your devotion to me. To prove your faith, I will ask one more thing of you."  "Yes Lord, anything!” Isaac’s mother begged.  "To prove your love and devotion, I require a sacrifice. Your son, Isaac, will be this sacrifice. Go into his room and end his life, as an offering to me to prove you love me above all else."  "Yes Lord", she replied, grabbing a butcher’s knife from the kitchen.  Isaac, watching through a crack in his door, trembled in fear.  Scrambling around his room to find a hiding place, he noticed a trap door to the basement hidden under his rug.  Without hesitation, he flung open the hatch, just as his mother burst through his door, and threw himself down into the unknown depths below.

* nanny bag it before I forget

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* returns early

* Apply suggestions from code review

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

* RE-RE-RE-REVIEW

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>

* requested changes and such

* duh

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* returns early

* Update code/datums/status_effects/buffs.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* new hrefs here to troll CI :trollface:

* Update code/game/gamemodes/wizard/magic_tarot.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
2024-04-24 23:10:46 +00:00
Aylong
a1ca632a19 [TGUI] Coin Mint (#24885)
* Backend

* Simplify

* Almost ready

* Done., i think

* You can now craft a money bag

* Autodoc

* Fingerprints

* Earlier return if no money bag

* Update code/modules/mining/mint.dm

* Update code/modules/mining/mint.dm

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

* Update tgui.bundle.js

* Rebuild

* Fuckin hell

* Rebuild

* Update tgui.bundle.js

* Update code/modules/mining/mint.dm

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

* Update code/modules/mining/mint.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-04-22 22:37:59 +00:00
chuga-git
6ddee5eced Minor bamboo related fixes (#25063)
* alphabetizes bamboo seeds in vendor

* makes caltrop component properly check for outer suit flags

* removes bamboo stool from wood recipes and adds it to bamboo recipes (i am very dumb)
2024-04-12 18:52:16 +00:00
chuga-git
df8fef119d Ports TG bamboo and Punji Sticks (#24497)
* adds most things

* STOP BECOMING CRLF

* half the sprites ported

* adds floor turfs, hopefully

* adds bamboo stack recipes and parameter documentation for datum/stack_recipe

* adds the crude syringe and sprite

* Revert "adds the crude syringe and sprite"

This reverts commit d949332055.

* adds crude syringe and sprite

* nevermind, goon license moment

* bamboo walls, false walls, and sprites

* caltrops check for shoe thickmaterial flag

* added spear and fixed filepaths

* smoothing and caltrops are even more broken

* Fixes sprite smoothing and caltrop weirdness

* whitespace

* fixes tile stacking

* Henri review

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

* royal blue and red carpets no longer smooth

* henri review

* actual henri review, thanks git

* Henri review electric boogaloo

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

* removes bamboo walls (rip)

* Update code/game/turfs/simulated/floor/fancy_floor.dm

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

---------

Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-04-07 09:38:10 +00:00
Contrabang
2ec55dbfbb Datumizes Cult. (#24379)
* cult 1

* massive data refactor

* progress

* More crap

* IM SCARED IT COMPILES

* oops

* more fixes

* good comment

* hell yeah, team control

* lol

* blamo

* blam

* More stuff

* team refactor

* epic merge fail

* src not _src_

* more

* progress

* cult

* more stuff

* water

* goodbye __IMPLIED_TYPE__

* time to undraft

* FUCK FUCK FUCK

* okay this is better

* goodbye todos

* fix

* order of operations

* last fix? maybe

* yeah

* oops

* okay this should be ALL the fixes

* wow

* hell yeah

* wow

* fixes duplicate teams + adds more team safeties

* how the fuck did this happen

* admin objective improvements

* wah more bullshit

* guh

* fuuuuck

* fucking hell

* fixes
2024-03-16 20:36:55 +00:00
DGamerL
c4412be390 Makes borgs require to refill their metal, glass and reinforced glass manually instead of automatically from a cyborg recharger (#23944)
* Makes some borg sheet types require manual refilling

* Oopsie

* Fixes ORM deductions + Reverts changes for drones

* Contra review

* Fixes module logic

* Update code/modules/mining/machine_redemption.dm

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

* Update code/modules/mining/machine_redemption.dm

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

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

* Farie review

* Update code/modules/mining/machine_redemption.dm

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

* Update code/modules/mining/machine_redemption.dm

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

* Farie review

* I am an idiot

* Fixes a comment

* Update code/modules/mining/machine_redemption.dm

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

* Farie Review

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2024-03-14 18:46:30 +00:00
cybercapitalism
c22691c295 Adds shards to glass and plasmaglass crafting menu (#24226) 2024-03-06 13:27:50 +00:00
warriorstar-orion
0667f20681 move all EOL comments on typepath names to dmdoc (#23928)
* move all EOL comments on typepath names to dmdoc

* Apply suggestions from code review

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

* Apply suggestions from code review

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-03-01 20:05:49 +00:00
Marm
3c5cb36e81 Adds Construction Bag (#24067)
* imagine actually building things?

* Update code/game/objects/items/weapons/storage/bags.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-02-08 12:50:40 +00:00
firstghost
c2d3489869 Spray bottle to autolathe (#23725)
* Spray bottle to autolathe

* Update code/modules/research/designs/autolathe_designs.dm

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

* Update spray.dm

* Update autolathe_designs.dm

* Increase spray bottle cost

2000 metal and 5000 glass

* Add plastic variant recipe

6 sheets

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-01-30 14:42:07 +00:00
Varelion
7d789033cc Adds ability to create droppers from glass (#23765)
* Create reagent vomicilin

* Update vomicilin

* Update code/modules/reagents/chemistry/reagents/medicine.dm

Updating as suggested.

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Revert vomicilin

* Revert vomicilin

* Revert vomicilin

* Add the ability to create droppers from glass

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-01-21 21:14:14 +00:00
Henri215
9cecb68e88 New surprise mechanic: Roulettes! (#23577)
* roulette

* part 2

* radial menu

* updated sprite

* Apply suggestions from code review

* Update code/game/objects/items/roulette.dm
2024-01-09 12:48:29 +00:00
DGamerL
fad6509b5e Removes most hardsuits from the code, replaces with MODsuits where appropriate, alongside a small sprite cleanup (#23652)
* TODO: ERT HARDSUITS

* Drask and Taj

* Unathi, Vox and Vulp

* Last things

* Hats off to you

* Fixes a dumb drask corset issue
2024-01-06 23:04:33 +00:00
Sadhorizon
d3ff8c9921 Resprites lockets, makes necklaces craftable. (#23387)
* lockets!

* this shouldn't need directionals, actually
2023-12-11 16:56:44 +00:00