Commit Graph

2125 Commits

Author SHA1 Message Date
Contrabang
73eb774125 Makes Medals Cooler (#22652)
* medal buff

* reviews

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

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

* a

* oops

* bam

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

* Update code/modules/clothing/under/accessories/accessory.dm

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

* Update code/modules/clothing/under/accessories/accessory.dm

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

* Update code/modules/clothing/under/accessories/accessory.dm

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-10-16 18:28:04 +01:00
McRamon
48aa8aca70 4 new jackets (#22603)
* human sprites

* codsies

* code fix

* vendor

* whales and chicken

* stupid

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* assd

* missing useless corsets

* Apply suggestions from code review

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

* pixel fix

* yet another fix

* i will end myself

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-14 20:38:26 +02:00
Henri215
24cd97808e Fixes the black suit jacket from vendors and from uplink (#22807) 2023-10-13 14:24:39 +01:00
Brillcrafter
7d47f4d54b Hoodie hood Runtime fix (#22825)
* fixed issue with containers

* whoops

* fixed runtimes on hood, typo in medical designs

* made beaker description update with var edits

* Revert "fixed issue with containers"

This reverts commit e1c2a8165a.

* sorting out PRs

* Revert "fixed runtimes on hood, typo in medical designs"

This reverts commit 46ab4ff2e7.

* fixed runtime error
2023-10-12 18:17:39 +01:00
Contrabang
3fd8427218 Ashwalkers now use unathi clothing sprites (#22750)
* fixes this shit

* time to walk ash
2023-10-12 15:38:24 +01:00
Qwertytoforty
64456806a5 [READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. (#22016)
* hard mode stuff

* further progress

* more progress

* pausing work to fix bug

* lets pr this mess

* more progress saving as vacation soon

* sleep_check_qdel

* saving work

* medals into deconflicting

* icons

* Fix compilings, medals

* Apply suggestions from code review

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

* yes

* Apply suggestions from code review

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

* earliest of the returns

* icons

* Apply suggestions from code review

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

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

* ah lateload, my beloved and hated with no debug points

* todoops

* requested changes

* move medals / move comment

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-09 21:45:41 +01:00
Octus
1ba9bc7cb7 SWIM OR DRIP JACK (#22610) 2023-10-09 20:33:54 +01:00
Christasmurf
5b6a2de4ca Procedure dmi split + IAA resprite (#22580)
* dmi split and code stuff - species sprites coming soon(tm)

* species sprites

* update sprite name

* CI errors?

* CRLF to LF

* forgor species code

* Update code/modules/clothing/under/jobs/procedure.dm

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

* readds the ability to make cluwnes (how did this happen)

* fuck off shitcode breaking my shit

* Apply suggestions from code review

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

* forgor to delet extra sprites

* Suggestion

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* booleans

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-09 20:31:38 +01:00
Contrabang
f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
2023-10-03 18:27:51 +01:00
Adrer
2672d02eb3 [s] Martial arts granted by equipped items no longer persist through cloning. (#22684)
* Martial arts no longer persist through cloning

* Remove unnessecary var declarations

* Combo counter

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2023-10-03 08:47:19 +02:00
Octus
792ad7b904 Updates Sprite on Vox Breath Mask (#22422)
* updates mask

* fixes qwerty's concern

* recolor/better shade

* less phallus looking

* cleans a dupe

* new mask resprite thanks to McRamon
2023-10-01 14:21:46 +01:00
Henri215
85d8aeee96 Nt recruiter First DLC (emag and other tweaks) (#22427)
* New NT Recruiter update

* Adding emag effect for the arcade + other tweaks

* tickets for reward too

* ops

* Medal prize!

* adding sounds when losing!

* increasing minimum bad max age

* added small interaction cooldown

* adjusting time

* tgui rebuild

* ah shit, here we go again

* tgui rebuild

* lets fix this

* Apply suggestions from code review

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

* tgui rebuild

* tgui rebuild

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-10-01 11:49:24 +01:00
Contrabang
c78e1aeb8f adofiwefwoeiunf (#22593) 2023-10-01 11:48:24 +01:00
BiancaWilkson
bee378f52a Fixes some typos (#22583)
* list time

* just for you qwerty
2023-09-30 08:36:54 -04:00
Henri215
dfe6a99e5e Fixes some issues with soft caps (#22541) 2023-09-28 19:32:12 -04:00
TheKillfish
eee4d8b3d2 Makes the Templar Armor able to carry the Bible (#22509)
Makes it so the Templar Armor can carry the Chaplain's Bible.
2023-09-28 19:31:01 -04:00
Venuska1117
e74f75d73b Add support for prescription glasses to Night vision goggles. (#22484)
* Add support for Night vision

* fixed typo

* woops wrong one
2023-09-25 18:54:32 -04:00
McRamon
7cd7102663 Deliveryboy (#22185)
* sprites

* code1

* test

* more code and testings done

* i am loosing it

* if only i didnt make stupid mistakes

* good boy can be delivery boy

* Update code/modules/client/preference/loadout/loadout_hat.dm

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

* Update code/modules/client/preference/loadout/loadout_uniform.dm

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

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

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

* Update code/modules/clothing/under/jobs/cargo.dm

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

* Apply suggestions from code review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-09-20 14:19:10 +01:00
BogoTheDumass
927c41d6e9 Greys get a skull helm sprite. (#22454)
* grey_skull_helm_initial

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

silly tab

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

---------

Co-authored-by: Bogo <jackdpickels@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-20 12:48:18 +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
Contrabang
cedb419059 Adds the adminspawn debug outfit (#22223)
* debug outfit

* slip

* fix this

* review

* lewc review

* refactors the huds to be "not shit"
2023-09-19 16:28:04 -04:00
Adri
d5328f7d7c Fixes oversight about prescription glasses (#22445)
Co-authored-by: Miraviel <Miraviel@users.noreply.github.com>
2023-09-19 19:38:39 +01:00
DGamerL
87781cefb6 Woooo (#22466) 2023-09-19 13:12:46 +01:00
HMBGERDO
0b92d0728c Fixing examining logic (#22180)
* fixing examining logic

* new glob proc, god this looks much better

* this looks much better

* dont need this

* if they're missing arm, we know they're missing hand
2023-09-17 18:26:11 +01:00
GDN
f76a94e05a fixes battlemage armor recharging (#22436) 2023-09-17 18:24:36 +01:00
Christasmurf
c7380ae905 Science beret sprites (#22178)
* scienceberets

* black beret

* suggested change

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2023-09-13 11:45:28 +01:00
Qwertytoforty
52c5bf1a98 updates medals (#22172) 2023-09-13 10:47:15 +01:00
JimKil3
5450f598bf Adds the holo-cigar, a human-specific traitor item (#22062)
* badass trait

* the cigar

* sprites ft. mcramon

* makes it obtainable

* Apply suggestions from code review

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

* contra review

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

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

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

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

* henri review

* contra broke everything

* contra broke everything pt 2

* Update code/modules/clothing/glasses/glasses.dm

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

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

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

* lewc review

* update_icon_state

* Apply suggestions from code review

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

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

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

* are you happy now dgamer

* henri review 2

---------

Co-authored-by: Contrabang <91113370+Contrabang@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: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-12 17:10:23 -04:00
JimKil3
aaad2a5aba Adds the Oblivion Enforcer wizard loadout (#21920)
* initial addition

* adds wall/airlock obliteration
this definitely needs to be tuned a bit numbers-wise

* adds TRAIT_SUPERMATTER_IMMUNE & gloves

* adds more checks for the supermatter immune trait

* removes SM tongs logic from the halberd
Realistically, you would never actually have the halberd and tongs

* makes slivers bulky

* dusting downed people
also removing a useless assigned variable i missed

* adds the (incomplete) loadout

* halberd buff

* adds robes + sprites

* oops

* halberd icons

* knockdown

* stuff

* timer shortening

* species sprites part 2

* animation for dusting walls

* Apply suggestions from code review

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

* early return

* parry numbers!

* Update code/modules/power/engines/supermatter/supermatter.dm

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

* dgamer review

* dgamer review + no more pulling

* reverts early return thingamajig

* Update code/modules/power/engines/supermatter/supermatter.dm

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

* removes `get_turf`

* hal review pt 1

* hal review pt. 2

* Update code/game/objects/items/theft_items.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* `carve_sliver` proc

* unfucks icons

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@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: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-09-10 22:15:12 +01:00
matttheficus
ae78b936e5 Removes All CamelCase'd "NanoTrasen" (#22156)
* begone CamelCase

* someone did an oopsie and it wasnt me

* CI addition (thanks contra)

* contra review

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

* CI moment

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-07 11:18:29 +01:00
Adri
2f97b83ff4 Refactors prescriptioning glasses a little, fixes a duplication issue (#22227)
* A tiny prescription refactor

* Changes grammar so it fits singular and plural src

---------

Co-authored-by: Miraviel <Miraviel@users.noreply.github.com>
2023-09-07 11:15:51 +01:00
matttheficus
ea7c3cd892 Adds the Syndicate "Big Brother" Obfuscation Suit (#22151)
* here we go again

* dont feel good about this

* add to contractor kit

* name change

* oops CI moment

* henri review
2023-09-07 10:55:42 +01:00
TaM-tHe-JaM
e07d63702c Islamic Garb - My First Contribution (#22040)
* abayacontribute

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* adding a slash

* Update code/modules/clothing/suits/hood.dm

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

* NVM didnt get deleted, didnt transfer

* tab fix

* removed comma

* Deleted unnecessary list, thanks DGamerL

* deleted

* finallymergeconflictgone

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-01 23:33:44 +01:00
matttheficus
0c17a3c4f7 Engineer Scanner Goggles on Radiation Mode Prevent SM Hallucinations/Singulo Staring (#22069)
* here we go!

* singulo too

* contra review

* contra 2
2023-09-01 23:12:17 +01:00
Christasmurf
8700b3c88f ERT Jumpsuits, DS jumpsuit resprite (#22063)
* ertjumpsuits

* deathsquadjumpsuits
2023-09-01 23:11:01 +01:00
Sadhorizon
68ace6f0ef Kidan jumpsuit sprites: colored jumpsuits (#21894)
* all the colored stuff

* ancient

* psyche

* jerseys

* tweaks to jerseys
2023-09-01 22:53:56 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

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

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
PopeDaveThe3th
4386ff381d Buffs the Battlemage Armor, deletes Battlemage Armor charges (#21999)
* Buffs the Battlemage Armor, deletes Battlemage Armor charges

* Update code/modules/clothing/suits/wiz_robe.dm

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

* Update spellbook.dm

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

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

* Update code/modules/clothing/suits/wiz_robe.dm

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

* Update wiz_robe.dm

* Update wiz_robe.dm

* Update wiz_robe.dm

* Balance team suggestions

* Update spellbook.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-08-28 13:16:42 +01:00
Kaomiyo
097e5d45e1 Fixes Improper Description: HoP Dress Uniform (#22144) 2023-08-28 12:56:34 +01:00
Sadhorizon
22a1ebf132 ant's pants: kidan pants sprites (#21918)
* stuff

* pantzzz

* highlighted knees
2023-08-21 19:54:57 +01:00
Qwertytoforty
76a845d380 Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* biting off more than I can chew, but I feel like hurting myself

* more shit

* progress continues, moral stays sameish

* bite of 2587

* mod_theme down, but probably broken

* 385 errors, 16 warnings, zero tgui interactions

* 292 19

* final strech to buggy mess, break time

* it compiles. It almost fucking certainly doesnt work, but it compiles

* fudhsciffubgsbgpgb actions not working as should for modules

* fuck it we'll just open the pr as we work on it

* icons work now

* tgui stuff

* more progress

* JUDGEMENT

* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.

* jetpacks, gps, and go do what exo-suits yourself

* almost ready

* sorry to whoever has to review this

* should work™️

* should be good now

* pushing changes so I can do reviews next

* Apply suggestions from code review

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

* lore™️ Adds illegals level to modsuit parts from syndicate.

* early returns

* and these illegals

* no uplink reference idiot

* mod inhands are a good idea

* this is needed for inhands nerd

* Bomb detector working, modsutis cover ears. skin things

* overslotting removal, cyborg charging, ert loadout for gamma

* duplicated signal

* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.

* tether module, orb module, holster stuff

* built in no slip, cheaper 87

* removes modules already installed, engineer ert get jetpack, equip into modsuit storage

* comments spaces and duplicate flags

* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Compile TGUI, slowdown adjustment, Modsuit to MODsuit

* sonar, do after, more equipment, acid handling

* overlay bugs / ERT / DS suits autodeploy

* middle click action buttons

* traders, sec modsuit energy nerf

* surplus weighting

* Kinesis module.

* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis

* more power / unused module removed

* name, ds fix, pre equipped to cc suit

* depot / grammer

* ok should be good™️

* overslot, dupe gun, missing suit storage

* stealth nerf, new kit

* gun stuff  / ds theme

* bio armor is gone

* let me push changes please thank you

* makes shocks work right

* copies over some changes TG made to module prices after porting

* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-

* sirryans changes

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

* Update code/modules/telesci/gps.dm

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

* Update code/modules/telesci/gps.dm

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

* Control define, ERT / DS have gloves / boots again.

* Apply suggestions from code review

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

* More changes

* god I hate tgui. Why do all the bundles live underground, instead of in my basement?

* she updates my master till I testmerge

* modsuits can recharge again

* fixes a lot of shit

* Ready for TM probably

* sure fuck it whatever that makes sense I guess

* the pinpointer works better™️

* Another storage module bug fix

* hair and medical stuff

* fuck fuck fuck

* fixes sonar

* Bag exploit fixes / plasma runtimes / ear nerf

* dna lock improvement / cryostorage

* whoops

* Ball form second cooldown wasn't helping, no more infinite cores

* she springs my lock till I ***SNAP***

* plasmaman no longer die

* fixes modsuit emp issues

* atmos no longer fucking dies

* Fixes, module printing, and a restriction on newly constructed modsuits

* Inventory code my hated

* WOOO PREFERENCE CODE WOOOOO

* icons my hated

* fix for mods / spaceproof shit

* holy shit whhhyyyyy

* backpack first

* Update mod_theme.dm

* prevent infinite gun arms / infinite modsuit cores / syndicate modules

* fixes tm error

* scream loudly if species sprites break. They shouldn't, but, you know.

* deconflicted with luck

* converts to refit for species

* fix pathfinder

* fixes modsuits being funky power wise

* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit

* nerfs the atmos modsuit

* magboots for ds / CC modsuit

* downside of autosave: typing in wrong window saves bad stuff

* Gamma ERT have internal cameras again.

* spellcheck when

* ah fuck

* yes delete the null that works

* whoops

* fixes error / description

* un vulps your cannon

* fixes tails disapeering on base modsuits

* space to underscore

* tgui fix / tajaran

* springlock buff, cryopod fix

* u helps

* WHO PUTS A GUN IN ITEMS

* tgui moment

* mining modsuit nerf / hidden holster module

* PAIN

* UNATHI TIDE STATION WIDE

* I love special code

* slightly dense

* shark jumpscare

* fixes ghost item, fixes springlock being bad

* YIPPEEEE IT WORKED

* she decons my flict

* pain

* ebbas days are numbered :^)

* hidden

* r-r-r-ebuild

* fixes more bugs

* qwerty, you are dense

* fixes gps

* fix mulebot crate

* level fix

* adds back icon

* moving storage, fix bug, modules activate / deactivate message

* yeah

* yeah

* yeah™️

* steels requests

* windoors no longer make pathfinder module explode

* chat spam

* oil slicks + modsuits

* whoops

* bag check

* ofc

* Update code/modules/mod/mod_control.dm

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

* Apply suggestions from code review

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

* Update code/datums/uplink_items/uplink_nuclear.dm

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

* Update code/modules/mod/mod_control.dm

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

* Update code/modules/mod/modules/module_pathfinder.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-08-19 15:36:13 -05:00
Qwertytoforty
aad8529c24 Removes swiftness, add speed potions back as oil slick potions (#20939)
* Removes swiftness, add speed potions back as oil potions

* no shorting, icon update on mob

* early and forgotten returns

* ramon oil colours

* Update code/modules/research/xenobiology/xenobiology.dm

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

* no more slipery vehicles, now slippery tables

* just because it compiled the first time doesn't mean the second list will compile idiot

* icons my hated

* bottle4

* cleaner up

* qwerty my man what you doin: s34n 2023

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 21:07:39 +01:00
DGamerL
b0b347660e The Rapid Syringe gun now costs 12 TC. It can also pierce all clothing now. (#21674)
* RATATATATATA

* We use TRUE, not 1

* making it cost 12

* making progress

* FINALLY

* Lewcc review

* Whoops this too

* Lewcc review

* Might work, might not, but conflict time

* Henri review
2023-08-16 19:52:02 +01:00
Sadhorizon
f4867108a0 Fancy ants: kidan suit sprites. (#21922)
* stuff

* all of the suits
2023-08-12 19:30:46 +01:00
McRamon
fce54deb01 Pimp my drip (#21527)
* first changes, lest see bugs

* fix

* minor sprite fixes

* Update code/modules/clothing/suits/misc_suits.dm

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

* update

* mhm

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-07-31 19:12:26 +01:00
Sadhorizon
acdeedd178 hydrocoat (#21821) 2023-07-27 15:55:04 +01:00
HMBGERDO
b071d71c36 fix ablative hud not covering hair (#21822) 2023-07-27 15:54:48 +01:00
1080pCat
38c1b55de4 you need to WEAR the glasses to use them! (#21831)
* you need to WEAR the glasses to use them!

* mmm 1 more like true
2023-07-26 19:11:33 +02:00
1080pCat
907ee1abd1 Adds the research scanner ability to the sunscanners. (#21742)
* mm sunscanners fun

* forgot about tech potentials!
2023-07-24 15:47:36 +01:00