Commit Graph

630 Commits

Author SHA1 Message Date
Nathan Winters
0bbc523dad Adds colored shoes to loadout, makes satchels craftable (#23293)
* Add colored shoes to loadout

* Allow crafting of satchels
2023-11-24 15:38:12 +00:00
Qwertytoforty
207e35cddf Adds 3 ipc only implants. (#22798)
* FUCK fix drugs first

* done just wait for prs to be merged (sorry s34n)

* removes uneeded chest implant redifine, repair implant

* Apply suggestions from code review

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

* !human, fluid

* guard variable lisst

* oops

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Update code/modules/surgery/organs/organ_external.dm

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

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

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

* Apply suggestions from code review

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

* lewcs good to them?

* Apply suggestions from code review

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

* not needed

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-21 16:19:39 -05:00
Contrabang
48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777)
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

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

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

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

* fuck

* bah

* Update tools/ci/check_grep2.py

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

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-12 20:59:43 +00:00
Migratingcocofruit
23e2c250ec Adds soil clumps and a compost bin. (#22585)
* Adds soil clumps, which are used to make soil(alternative to sandstone).

* Adds soil clump recipe to the biogenerator

* Adds the compost bin to the game. Which converts biomass to compost and makes soil from it.

* Adds sprites for the compost bin

* Adds a recipe for the compost bin(10 planks)

* Added interface for the compost bin.

* Applying suggested changes to compost bin(redundant condition removal, spell check, auto doc)

* Applying suggested changes to soil sheets(initialize, remove empty line)

* Changed min and max to clamp where able, removed redundant return, compost recursion stays in convert_biomass().

* Call parent on init

* Identation and style changes

* Rephrase description

* Unauto docing unnecessary bits, clicking with screwdriver no longer an attack, removed redundancies, reordred ui procs and changed ui data list to new format.

* Converting plant to biomass is now its own function

* removed SOIL define. using path as is instead

* Moved the compost_bin-3 sprite up a pixel so it aligns with the rest

* Added spaces for readability

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

* Moved plant deletion to make_biomass()

* Rebuilt tgui

* Filled gaps in sprite with mostly transparent pixels to make it easier to click

* Rebuild tgui

* rebuild tgui

* Adds the soil clump sprites back after update

* Added Trailing newline to compost_bin.dm

check said it's missing

* Adds a check for presence of biomass when initializing to prevent unneeded proc call

Checks whether a compost bin has any biomass before attempting to compost it.

* Adding back compost bin icons

* rebuild tgui

* Made interface window slightly shorter.

from 300 to 200 pixels tall.

* Replaced the enough_compost() proc with an if statement in the only place it was used

* Replaced the compost() proc and calls to it with process().

* Rebuild TGUI

* Removed an unused var, idented a comment, and returned the onhit proc to it's original form

* Ran prettier on the compost bin interface file

* Wake Up Icon Diffbot

* Aw shit, here we go again.

* Empty-Commit

* Wake up icondiffbot

* Last attempt for today

* Removed redundant new line from sheet_types.dm

* removed redundant new lines and moved the ui procs together.

* Changed compost label to Compost

* Recompile tgui

* Rebuild Tgui

* Rebuild TGUI

* Rebuild TGUI

* Capitaliize the word soil in the biogenerator listing for it

* following some suggestions

Replaced compost capacity defines with "magic numbers", removed redundant init proc, added spaces around a '-' sign.

* Removing a redundant check in the insertion proc.

moved the check for the compost bin being full to the end of the loop since I already make one before the loop starts.

* Rebuild TGUI

* Rebuild Tgui

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

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

* Rebuild TGUI

* ReRebuild TGUI

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-11-04 16:42:07 -04:00
DGamerL
cb511ae725 Fixes it all, I hate it (#23008) 2023-10-30 19:10:39 +00:00
Mitchs98
fc8f214b22 Buffs Cult Door Damage Reflection to 20. Ups Runed Metal cost to 3 (#22978)
* buff door

* extra buff
2023-10-26 10:39:49 +01:00
HMBGERDO
35cc3bd4f8 More information messages with burn wounds (#22176)
* more messages for burn wounds

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

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

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

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

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

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

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

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

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

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

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-14 20:38:02 +02:00
McRamon
b089d905e8 all at once (#22692) 2023-10-09 20:39:32 +01:00
Venuska1117
21c7ada399 Add 2 new stupidly resistant wheelchairs. (#22604)
* Add stupidly strong and pain to make wheelchairs
- i dont know how to name them better tbh

* Add wheelchairs description

* Changes typos:
- Sorry but i am bad at sprites

* Sprites and slight config

* changes x_x

* Decreased times for wheelchair crafting.

* wheelchair is now typed as "wheelchair"

* peep bop sup boop bip boop beeeeeeee-
- stack amount removed, inherd good.

* skreee
no i am not vox player, but it fit for this thing perfectly.

* changes
please let it stop

* Henri requested changes
2023-10-09 20:35:07 +01:00
biogod420
d374be622d added comments (#22662) 2023-10-03 13:29:45 -04:00
Octus
2bdd9397aa Removes Pet Hospital, Adds Althland Corporation Refinery Ruins (#22287)
* byebyepet

* typo fix

* more typo fixes

* fixes

* another fix

* delete hospital shit

* ok seriously work now you fuc-

* improvements

* changes tempature

* heat proof lattice

* hi qwerty

* test

* ok lmao

* lattice moment

* oopsie!

* ok fuck you

* map update

* yes

* Revert "yes"

This reverts commit 9892a11232.

* Update lavaland_surface_althland_facility.dmm

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

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

* henri review

* adds lore

* fix

* fix

* more fix

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 12:24:43 +01:00
Marm
5e8536871b Cargo QOL + Mail Bag Fix (#22500)
* aaaaaa

I forgot

* mailn't

Removes QOL.
2023-09-19 21:09:57 -04:00
Marm
ecfaa26cc2 You've Got Mail! Adds Mail system (#22269)
* heres the mail it never fails

Adds envelopes and its functions.

* It makes me want to wag my tail

Adds new envelope sprites courtesy of McRamon, makes mail bags and envelopess able to be carried by cargo clothing.

* when it comes i want to whail

Makes Wizard and Nukie equip change to off station role. Adds mail crates and functionality/logging for randomly choosing recipients of mail.

* MAAAAAAAAAAAAAAIIIL!!!!

Adds functionality for the mail scanner alongside sounds. Begins the process of making mail arrive on the shuttle.

* MAIL

* THE MAILMAN IS HERE

* MAIL IS REAL

* Give me an M, give me an A, give me an I, give me an L. What does that spell? MAIL.

Finalises pre-review mail features, adding the mail scanner to cargo tech loadout/autolathe.

* Update code/game/gamemodes/nuclear/nuclear.dm

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

* Update code/modules/shuttle/supply.dm

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

* Update code/game/jobs/job/support.dm

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

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

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

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

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

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

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

* Update code/controllers/subsystem/SSeconomy.dm

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

* check out what you got now

Removes unused sprite bloat.

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* First few Contra reviews

* Second batch

* Cl doesn't fail anymore

* Even more fucking reviews

* Doesn't quite work yet but we're almost there

* WHEN DOES IT EEEEEND

* I have no energy to make a blues clues reference

More commits to respond to reviews

* God I miss Steve

Adds hand sprites to mail scanners

* Woooo Mail works again

* Science envelopes

* Update code/game/objects/mail.dm

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

* my god it worked

II hate it

* Bread and Circuses

splits up service envelopes into two categories, addresses other reviews.

* Lewc review - needs testing

* Almost there

Changing lists and more.

* Last fix

* IT IS ALL WORKING NOW

* Mail. Is. Done.
Final pass.

* Update code/controllers/subsystem/SSeconomy.dm

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

* Update code/game/objects/mail.dm

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

* The fix

* Just this one too

* Lewc review

* mail?

yeah

* Begone, ye powersink

* Sirryan review

* Update code/__DEFINES/economy_defines.dm

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

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* Update code/controllers/subsystem/SSeconomy.dm

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

* Update code/game/objects/mail.dm

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

* Update code/game/objects/mail.dm

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

* Wjpp[s

* Removes useless comment

* We ball

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-19 19:30:03 -04:00
HMBGERDO
d1d38d3982 eye stab bypassing everything fix, some med kits not working on use in hand fix (#22320)
* eyestab no longer bypass pacifism and shields

* medical items not working on activate fixes
2023-09-19 16:58:20 +01:00
HMBGERDO
42c762ccd2 Using medicine on yourself on activate (#21955)
* now you can use patches, pills, injectors

* more supported meds

* apply proc
2023-09-01 23:02:34 +01:00
1080pCat
99f24119c5 yippie cyborgs and drones get them now (#21608) 2023-09-01 22:34:41 +01:00
Cocacolagua
6f8abfd3f7 fixes empty sandbags (#22071) 2023-08-25 16:17:07 +01:00
matttheficus
597835b031 The TC Inflation Act of 2023 - No Balance Changes This Time (#22024)
* its time for me to make Hal cry again

* hal review
2023-08-21 00:20:47 +01:00
Aylong
ceea2c54e5 tweak: Better stacks (#21861)
* tweak: Better stacks

* review changes

* del return

* that's it
2023-08-16 20:11:39 +01:00
Venuska1117
3db565f553 Add Railings "Caps" for Aesthetic Use. (#21803)
* Add railing caps
-subtype of railing corners

* Batch of changes:
- Fixed cap sprite
- Added 2 more instances of caps (left and right)
- Added caps to rods crafting menu
- Changed cost of corner from 3 to 2
- Added cost to cap, it cost 2 rods

* Woops:
- Apparently railings corners and such borrow code from normal railing so they always drop 3 rods.

* Change railings to list

* removed density/climbable
- they inhert it from railing
2023-08-16 19:58:57 +01:00
Vi3trice
a5ecf3bce5 Catwalk floors for interior use (#21437)
* That's a start

* We had sounds all this time

* New icons, fix tile interaction with plating.
2023-07-07 13:50:17 +01:00
DGamerL
173bfb92f5 Removes bio resist from the code (#21108)
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01:00
datlo
cf07639da3 Tweak kitchen spikes (#21152)
* Tweak kitchen spike

* fix deconstruction

* fix mistake lmao

* revert wrench_act and fix metal drop

* fix accidental removal

* and the damn end of line

* AAAA

* add mob check to victim, deconstructing tweak

* fix bug preventing attack on spikes
2023-06-02 19:12:02 +01:00
Englishformula
a5d5086819 Alien Alloy Sprite Fix (#21103)
* Update mineral.dm

* Update mineral.dm
2023-06-02 18:07:24 +01:00
Silverplate
19af733ad2 Medical stacks (#20824)
* Fixes gauze upgrading

* Fixes accidental line removal

* Unessassary boolean

* shortens code, adds flag to /stack/medical

* Clarity and proper inhertance
2023-04-25 16:00:37 -05:00
Henri215
6826d2ba7b Moving some in hand icons to different files (#20748)
* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
2023-04-25 21:13:02 +02:00
Henri215
dc75a748f1 Fixing common spelling mistakes part 3 (#20870)
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
2023-04-22 09:44:27 +02:00
Contrabang
b47f22ffb9 Fixes a runtime with cyborg stacks being initialized with no power source (#20848)
* begone runtime

* refactor
2023-04-22 09:43:51 +02:00
S34N
8d8f488f2d fixes this (#20745) 2023-04-16 22:13:35 +02:00
Charlie
e6085895c1 burn wounds, for real this time (#20542)
* burn wounds

* user feedback

* ready for review

* sean review

* Apply suggestions from code review

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

* surgery fix

* other repair methods

* GDN review

* health scanner feedback

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

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

* bodyscanner print out

* Update code/game/machinery/adv_med.dm

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-04-14 15:58:38 +02:00
S34N
c8418fa1b2 sinew (#20718) 2023-03-26 13:59:53 +01:00
S34N
a65706a368 Fixes missing stacks, wonky ORM icons (#20717)
* oh god why

* lol TGUI rebuild
2023-03-26 13:16:21 +01:00
S34N
5ce5a66c81 Ports a load of Pigeonverde322 sprites from beestation (#20588)
* initial

* second

* MORE

* spelling

* more spelling, rods

* qwik mafs
2023-03-26 12:11:01 +01:00
GDN
5557f6ae32 Nukes detailed examine (#20314)
* Nukes detailed examine, converts to normal examine stuff

* THE SHOOTENING

* Update code/game/objects/structures/grille.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* oop

* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm

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

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

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

* Update code/modules/projectiles/guns/energy/nuclear.dm

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

* bam

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-03-17 16:20:53 -05:00
AffectedArc07
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
Adri
579fd817c1 Adds disco light floor (#20109)
* Adds disco light floor

* Fixes tiles not stacking

* Fixes linter issue

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

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

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

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

* Update code/__HELPERS/lists.dm

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

* Replaces shitcode with simple solutions

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

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

* pick excluding

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

* pick instead of rand

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

* Simplifies the color change process

* forgor setting current_color

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

* proper autodoc format

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-18 21:39:46 -06:00
Henri215
ad608cf016 Fix #20076 Plasmaglass and plasmarglass now returns the correct amount of materials (#20079)
* Plasmaglass and Plasmarglass now returns the correct amount of materials

* forgot alien alloy
2023-01-03 15:48:58 -05:00
Qwertytoforty
1c05e8aa5e Mining borgs now have melee armor. (#19986)
* Mining borgs now have melee armor.

* oh, and one more thing

* Apply suggestions from code review

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

* siryan code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2023-01-03 01:04:39 -05:00
warriorstar-orion
066bd06e8d Whitespace cleanup part 3. (#19897)
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
2022-12-27 11:00:39 -05:00
Henri215
ab8217f012 Mineral doors now takes 2 seconds to build (#19992) 2022-12-24 11:05:24 -05:00
Daylight
ebf2d2b18f Creates full stacks of all sheets and minerals (#19911)
* /fifty

* re-adds plastinium, even if the sheets themselves have no sprite

* adds glass stacks and plastitanium
2022-12-19 14:29:55 +00:00
Henri215
74a5925def A museum's finest: Statues tweaks (#19680)
* tweaks and adds to statues

* bust removed
2022-11-26 16:02:52 -05:00
S34N
4de47b8b58 Refactors table creation (#19441)
* refactors table creation

* probably works will test later

* tested and tweaked

* words are hard

* Apply suggestions from code review

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

* steel review

* proc breakout

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-15 15:45:55 -06:00
Henri215
eea6b82b15 Sarcophagus now can be made using sandstone (#19625)
* added sarcophagus to sandstone recipes

* 5 seconds to build
2022-11-11 14:31:58 +01:00
Contrabang
32146754c1 bye bye macro (#19574) 2022-11-02 20:52:22 +00:00
Vi3trice
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
Henri215
499a0f3b9d Moved wood floor (#19487) 2022-10-25 20:35:28 +02:00
DevanStrife
bb2e2a9d45 Allows wooden airlocks to be made and removes another text2path function. (#19199)
* Fixes #18882 and refactors for door assemblies

* Removes text2path, makes wooden airlocks buildable

* Use mineral crafting menu

* Minor oversight

* Comments improvement

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

* Review suggestions

* Removes unneeded vars

* Fixed tab spacing

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-16 13:04:50 -05:00
Henri215
70762ba7e0 Adds briefcase/card box as leather recipes and reorganizes other recipes (#19342)
* adds briefcase and card box to leather and reorganizes recipes

* standardized the coded and removed unnecessary  \

* seconds
2022-10-16 13:47:33 +02:00
Vi3trice
59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00