Commit Graph

703 Commits

Author SHA1 Message Date
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
warriorstar-orion
79bad427c8 Movement cross/uncross implementation. (#26762)
* refactor: Movement cross/uncross implementation.

* wrong var name

* fix unit tests dropping PDAs into nowhere

* Add documentation.

* remove unused constants

* say which procs are off limits

* fix simpleanimal z change runtime

* helps not to leave merge conflicts

* kill me

* fix typecast

* fix projectile/table collision

* treadmills don't cause MC to crash anymore

* connect_loc is appropriate here

* fix windoors and teleporters

* fix bonfires and clarify docs

* fix proximity sensors

Tested with sensors in crates, sensors in modsuits
Tested new proximity component with firing projectiles at singularity
Tested new proximity component with portable flashes
Tested new proximity component with facehuggers

* lint

* fix: polarized access helper false positives

* Revert "fix: polarized access helper false positives"

This reverts commit 9814f98cf6.

* hopefully the right change for mindflayer steam

* Changes following cameras

* fix glass table collision

* appears to fix doorspam

* fix ore bags not picking up ore

* fix signatures of /Exited

* remove debug log

* remove duplicate signal registrar

* fix emptying bags into locations

* I don't trust these nested Move calls

* use connect_loc for upgraded resonator fields

* use moveToNullspace

* fix spiderweb crossing

* fix pass checking for windows from a tile off

* fix bluespace closet/transparency issues

* fix mechs not interacting with doors and probably other things

* fix debug

* fix telepete

* add some docs

* stop trying to shoehorn prox monitor into cards

* I should make sure things build

* kill override signal warning

* undef signal

* not many prox monitors survive going off like this

* small fixes to storage

* make moving wormholes respect signals

* use correct signals for pulse demon

* fix pulse heart too

* fix smoke signals

* may have fucked singulo projectile swerve

* fix singulo projectile arcing

* remove duplicate define

* just look at it

* hopefully last cleanups of incorrect signal usage

* fix squeaking

* may god have mercy on my soul

* Apply suggestions from code review

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

* lewc review

* Apply suggestions from code review

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

* burza review

* fix bad args for grenade assemblies

* Update code/__DEFINES/is_helpers.dm

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <daan.lyklema@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-12-21 08:07:44 +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
Contrabang
8352613d03 Adds CI for missing icon_states (#27063)
* Adds CI for missing icon_states

* yeah

* more fixes

* more fixes

* seems good

* moar

* fix

* yea

* hrtyhrt

* yeah

* WOE
2024-11-14 17:58:06 +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
bfb18b48e4 dmdoc: Some cleanups. (#27242)
* dmdoc: Some cleanups.

* satisfy check_grep
2024-11-13 13:37:37 +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
Truls20
fe83fe8af4 Lets cyborgs pick up catwalk tiles (#26944) 2024-10-02 15:17:10 +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
Chap
48807f8c0a [s] [FIX] Structure stacking fix (#26903)
* You can no longer stacking structrues on top of each-other

* Stop structure stacking

* Updated comment

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2024-09-26 08:54:41 +00:00
Aylong
9d968e6ba9 Port DmIcon & Image components from TG (#26623)
* Port DmIcon & Image components from TG

* Documentation

* Uh oh

* I hate it

* I will bang you
2024-09-23 21:04:37 +00:00
BiancaWilkson
8883a72060 Fixes borgs being unable to pick up some items. (#26791)
* Fixes cyborg stack merging

* i dint push

* Wait, this is fine actually
2024-09-17 17:23:17 +00:00
BiancaWilkson
f42a7d9ab0 Fixes a runtime caused by stacks accidentally merging twice (#26795)
* Fixes empty stacks trying to merge together

* more accurate comment
2024-09-16 01:58:29 +00:00
chuga-git
f57ebfa1a0 Fixes stacks, attempt 2 (#26633)
* this is hell pain

* fixes merge issues when cutting up various items

* adds early return to attackby
2024-09-10 22:14:01 +00:00
chuga-git
db89399e65 Fix item stacks qdeling themselves in Init and some item stack self-merge scenarios (port) (#26605)
* stops stacks from qdeling during initialization

* fixes comments after giving up on regex replacing var name
2024-08-28 23:58:49 +00:00
Aylong
d9927eb62a Fix ore picking with bag (#26488)
* No comments...

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Aylong <69762909+AyIong@users.noreply.github.com>

---------

Signed-off-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-08-13 15:10:16 +00:00
Burzah
c434f08f4f Replaces info class with notice and purges info (#26421) 2024-08-13 09:46:58 +00:00
Aylong
e1ce7b9572 Fix stack merge & return lost code (#26483)
* Fix stack merge & return lost code

* What is `S` and `O`?

* Comment

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

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

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-08-13 01:24:49 +00:00
DGamerL
e61b21d7d1 Fixes ores runtiming when being picked up (#26479) 2024-08-12 19:14:46 +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
Migratingcocofruit
fde4125a14 Fixes crafting multiples of recipes in a sublist (#26315)
* Fixes crafting multiples of recipes in a sublist

* Reduces some As

* missed one

* But wait there is more.

I think I got them all now.
2024-07-30 12:32: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
CRUNCH
4b3b64e540 [FIX] Cyborg Zipties Will Not be Consumed When Making Wired Rods (#25752)
* r o d

* Update handcuffs.dm

* Update handcuffs.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>

* Update handcuffs.dm

* Update handcuffs.dm

* Update handcuffs.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>

* Update handcuffs.dm

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

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-12 18:56:20 +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
Contrabang
bc0c8344cf Adds Zombies (Admin-spawn) (#25381)
* fuck it good enough

* Apply suggestions from code review

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

* TRIPLE-REVIEW

* this should do it

* wow

* bruh

* FIX

* fix

* yeah

* sirryan review

* aaaaa

* Apply suggestions from code review

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

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-05-31 02:17:31 +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
Сиротка
ccf5ef4fc4 Nanopaste now can repair mecha (#25251)
* Nanopaste now can repair mecha

* Update nanopaste.dm

* refactor mech code

* fix

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

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

* Update nanopaste.dm

* Update nanopaste.dm

* Update nanopaste.dm

* Update nanopaste.dm

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

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

* Update nanopaste.dm

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

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

* Update code/game/mecha/mecha.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/nanopaste.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: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-05-23 00:57:37 +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
tristan1333
ebbbf62cec Chicken meat/burger, Onigiri, Seaweed, updated boiled rice sprite (#24813)
* Adds chicken meat, burger, onigiri, updates boiled rice sprite

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

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

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

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

* changed chickenburger pathname, deleted old boiled rice sprite

* Transfers reagents from rice to onigiri

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

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

* All sushi now requires seaweed

* new seaweed desc, attackverb oopsy daisy, seaweed attack_self doesn't show pointless list, Onigiri goes in hand

* moved seaweed sprite to organic.dmi

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

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

* Update organic.dmi

* re

* goal

* oops

* early return

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

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

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

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

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

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

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-04-21 23:06:47 +00:00